gentoo resync : 02.08.2019

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index ed0fbf7c822f..c8459960e1ea 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,5 +1,3 @@
-DIST mxml-2.12.tar.gz 9112072 BLAKE2B 29e63abdd567c76209ca41adf608bd752863cdb2911d5bda482a2c6ac50ccdae2179941a3899d7e58480bab8903fee8a6c431619072d2861acd01f18d0eeb9e5 SHA512 49233a0087f3ef73a01ef71bb79511af36bb72027e3d9f6df919385e9ff0b03a489a3ccc590941bc4af1f558f82b2ed9bf8ff641863300a7791ce6dddfd56e77
 DIST mxml-3.0.tar.gz 9266886 BLAKE2B d5d3481cfd1d015c620ef897bfc21e839ad2a70f5ffd58973f8435e0e6a66abd477f8fcaacfab05ce608314fed27241702becb60b49b8492560bcc9418b317f5 SHA512 3c540348022226b122ce014f183368cda6631600a11d8f4d43c99c62fba2f3ca4b23dff4122082f63915b59a46a5475d1d12d0081f9315c65f5c044ac3c751d6
-EBUILD mxml-2.12.ebuild 1399 BLAKE2B 45f9336f240800aedee82bc14eae8aec5981235d577f72075a77885836fa0a7532d0970c4e58047081f22cbeccaf5752f1242e19195c04c73e6612c7df438b0f SHA512 c9b7c017c4d7b069e377ab2905c1aa5e444754d9cac89b4486c13dfbe8d702d8a5e4a8e209450701a98ea39694232408dff59603ea3370964905611e8f38575b
-EBUILD mxml-3.0.ebuild 1406 BLAKE2B 8a250e56f57064c7f3e4af0767794dff7078b8f21a0fa81be3c85116896bbbd6828ab9f21ace6521ff37ecb500f15b249c1be923c96d065f6c3f8cd6186e8fbb SHA512 157e2a69b4aa77c080fd7738278ba0f835f9e7d91cfe9d8f6b2f0bba000ff3b48e290b3c5ba9373fef3e5e1587514fa58cd25ed481c79e8dbed646890b9b6881
+EBUILD mxml-3.0.ebuild 1402 BLAKE2B 5ab3a112c010bd0a9a16ddc35c702138b22b88f4fc44dd0caa0f6227247ab19476978a81faf632753fba510e82fe2aa441e7e1ed81f041627c69dc9fb43d585b SHA512 1dbcf5b958c0e952d80c56079f0d3e21f91ab8a5b4e55dde68c71f152a0f4ea208f97b7f9fadd11178ef7379466c27df43674bac5e5f5cdaa08cc5645e2b0dad
 MISC metadata.xml 1498 BLAKE2B b0ff99450cec828ef5614c2b3819d02cc97e402b60ce7b9bca20962166c47a9e3053e2457eb7b29210886aa7b0297e97340b55cf74a0aabc20ecb4c451d576c6 SHA512 5ead3d76daa42879139a96cceb0a12a84a23df8372a8e2e9e9d1e38ede0266b480ca404f03047f4e66ed7d989171d37333051e2a111dfa0900b9cbba703b22d6
diff --git a/dev-libs/mxml/mxml-2.12.ebuild b/dev-libs/mxml/mxml-2.12.ebuild
deleted file mode 100644
index 1944085d2527..000000000000
--- a/dev-libs/mxml/mxml-2.12.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 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"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-LICENSE="Mini-XML"
-SLOT="0"
-IUSE="static-libs threads"
-
-BDEPEND="virtual/pkgconfig"
-
-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 myeconfopts=(
-		$(use_enable threads)
-		--with-docdir=/usr/share/doc/${PF}
-	)
-
-	econf "${myeconfopts[@]}"
-}
-
-src_test() {
-	emake testmxml
-}
-
-src_install() {
-	emake DSTROOT="${ED}" install
-}
diff --git a/dev-libs/mxml/mxml-3.0.ebuild b/dev-libs/mxml/mxml-3.0.ebuild
index c158f00b2a06..11e653135297 100644
--- a/dev-libs/mxml/mxml-3.0.ebuild
+++ b/dev-libs/mxml/mxml-3.0.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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"