gentoo resync : 22.12.2021

4 files changed, 2 insertions, 95 deletions

diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 9abb3161a5ee..8ce555167deb 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,6 +1,3 @@
-AUX mxml-3.2-slibtool.patch 723 BLAKE2B d5e086ac0b600c2314d92224ec37da16b0c1276d2da8032579d95b4ae4eb641c985bd6374411453037779d3cd0d8e86e7d89a445ba263c03d1863968d7e22460 SHA512 3077e580bb44843a09f7a8c80ff05996af70658195eb07e31f5da69409744729e5aacd706ca5f4f91e2ddf75c79f554dbc3667bb6720997c03e8c57ad279db60
-DIST mxml-3.2.tar.gz 9267930 BLAKE2B f244dab599233b8a26aba5a11526979bf2f4d20b5fce67858f7759abc5bd2f3e2aac19d512c887248839d130cf1314065687cd1ccf91edbf5533ae2d342f286b SHA512 ed3f2b361394ef225a708b0032976a3d191d5eaea3022e190b29e0ee140e8f998f1d65c64e4898872b169516cee44f4f5f18401c6410c3b5aa1e9680b23e8675
 DIST mxml-3.3.tar.gz 1550358 BLAKE2B 2b815cd8c2031099e2767caad93cc389962ec547fadade92b0a7fb48a2352fd0940c9e434c2081b7419e0cfb489266d7116dacefd6fb9d7ce40d6de0f49cb2a6 SHA512 5a8453bec17e46afc9b100df03dba2219353a076152f34a5dc41b7f042fa570723effc3472680a4380674c412c3ab31e017f6704b1e8308227a4d9b3f13cb197
-EBUILD mxml-3.2.ebuild 1456 BLAKE2B 55a8efb6c1e105b247c247de0a347310139f13348ee6e8ddc0096ba915026ddacc1e9cacfce388f0ef77e9ad388a0f7f80eda91087295fb6db3164fba025dfa2 SHA512 506db0f7762d585f208d15202d937d5eb52550ce99fe39450b7d05d5ad904cd0944f9568e554b39931a2824edbad4e461bd4d7308c2ade606818749ab475a092
-EBUILD mxml-3.3.ebuild 1344 BLAKE2B a4889416809a773305d33b4836047a73239bdaef01fda00cc96e44ba2e7407e9e2247c7818954204dfeae9bdd62222c46a3dd88d65a8896efaa8167177fc0490 SHA512 bd1a9555c210bfb16370f6b8ba6ae939c580eae720768414f7da810914506d18872250ea3a272c8e957fc7b94ac560e7a712751aabf762635d43610d7ebef4b0
+EBUILD mxml-3.3.ebuild 1347 BLAKE2B 5a90de864906aaf60f3b3c685de49033cbb170e92b82ef9281a110706c08c9cfb1f7374668e859c2a86fc7e89f78f96cca3ec3f516a9611d0c3131ffe0e11f26 SHA512 d745e253e43e9a49a4eb63fabb1698e925a82127a6ab2e545512e4a2248cd50e52a090992243d8ac1ee42938f86a11911794b3af81fe481e1e24633b831649e1
 MISC metadata.xml 1380 BLAKE2B ba169e7d7bf4572b56e2cc8923a48fce4b31af61107bd908d77f4a211aa096b4f0adfed9ae1d52cbad6b4309793f545cbd562a553e0c5aa1d0786b088f472cd7 SHA512 2895d86c62cb799302ba1515a3b638d52ca253f78e07bcc542bbb99338b84bc2079d48f42fb85a627e9252a545a853629943f9a904ead600aff161a24e1f1658
diff --git a/dev-libs/mxml/files/mxml-3.2-slibtool.patch b/dev-libs/mxml/files/mxml-3.2-slibtool.patch
deleted file mode 100644
index b5d0df44df7f..000000000000
--- a/dev-libs/mxml/files/mxml-3.2-slibtool.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4e2e31236f731c0b7e880078269d9f98f595bfd3 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 7 Apr 2021 09:17:52 -0700
-Subject: [PATCH] build: Don't use libtool.
-
----
- Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 8c05daf..cdc3450 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52,10 +52,10 @@ BUILDROOT	=	$(DSTROOT)
- # Install commands...
- #
- 
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
-+INSTALL_BIN	=	$(INSTALL) -m 755
- INSTALL_DATA	=	$(INSTALL) -m 644
- INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
-+INSTALL_LIB	=	$(INSTALL) -m 755
- INSTALL_MAN	=	$(INSTALL) -m 644
- INSTALL_SCRIPT	=	$(INSTALL) -m 755
- 
diff --git a/dev-libs/mxml/mxml-3.2.ebuild b/dev-libs/mxml/mxml-3.2.ebuild
deleted file mode 100644
index b21734763a11..000000000000
--- a/dev-libs/mxml/mxml-3.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
-HOMEPAGE="
-	https://github.com/michaelrsweet/mxml
-	https://www.msweet.org/mxml/
-"
-SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Mini-XML"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="static-libs threads"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-slibtool.patch" )
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os -g//' -i configure.ac || die
-
-	# Don't run always tests
-	# Enable verbose compiling
-	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
-
-	# Build only static-libs, when requested by user, also build docs without static-libs in that case
-	if ! use static-libs; then
-		local mysedopts=(
-			-e '/^install:/s/install-libmxml.a//g'
-			-e '/^mxml.xml:/s/-static//g'
-			-e '/^mxml.epub:/s/-static//g'
-			-e '/^valgrind/s/-static//g'
-			-e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." .\/mxmldoc/g'
-		)
-		sed "${mysedopts[@]}" -i Makefile.in || die
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable threads)
-		--with-docdir=/usr/share/doc/"${PF}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake testmxml
-}
-
-src_install() {
-	emake DSTROOT="${ED}" install
-}
diff --git a/dev-libs/mxml/mxml-3.3.ebuild b/dev-libs/mxml/mxml-3.3.ebuild
index a0e3cdb5191b..cd7924fd99c9 100644
--- a/dev-libs/mxml/mxml-3.3.ebuild
+++ b/dev-libs/mxml/mxml-3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Mini-XML"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"