gentoo resync : 15.01.2020

3 files changed, 3 insertions, 47 deletions

diff --git a/dev-libs/9libs/9libs-1.0-r3.ebuild b/dev-libs/9libs/9libs-1.0-r3.ebuild
deleted file mode 100644
index 22450aa79dbf..000000000000
--- a/dev-libs/9libs/9libs-1.0-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A package of Plan 9 compatibility libraries"
-HOMEPAGE="https://www.netlib.org/research/9libs/9libs-1.0.README"
-SRC_URI="https://www.netlib.org/research/9libs/${P}.tar.bz2"
-
-LICENSE="PLAN9"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/libX11-1.0.0
-	>=x11-libs/libXt-1.0.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Bug 385387
-	epatch "${FILESDIR}/${PN}-va_list.patch"
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--includedir=/usr/include/9libs \
-		--enable-shared
-}
-
-src_install() {
-	make install DESTDIR="${D}"
-	dodoc README
-
-	# rename some man pages to avoid collisions with dev-libs/libevent
-	local f
-	for f in add balloc bitblt cachechars event frame graphics rgbpix; do
-		mv "${D}"/usr/share/man/man3/${f}.{3,3g} || die
-	done
-}
diff --git a/dev-libs/9libs/9libs-1.0-r4.ebuild b/dev-libs/9libs/9libs-1.0-r4.ebuild
index 8e9ba36eccd2..cc510097ffa9 100644
--- a/dev-libs/9libs/9libs-1.0-r4.ebuild
+++ b/dev-libs/9libs/9libs-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.netlib.org/research/9libs/${P}.tar.bz2"
 
 LICENSE="PLAN9"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-libs/9libs/Manifest b/dev-libs/9libs/Manifest
index f827f4ccb883..b49c023b2c1b 100644
--- a/dev-libs/9libs/Manifest
+++ b/dev-libs/9libs/Manifest
@@ -1,5 +1,4 @@
 AUX 9libs-va_list.patch 2819 BLAKE2B 641d1a22c9feecb635d470c072ee28fb4e3fd0fb54d2db3c667bf6907d38f4928cc951057df1b1dc2bc0dd4c98d2d5ff16d1b94243df9db1d96d2f52608db804 SHA512 3c441f0bca520baebe06b63e099ee4ba138257c40d3870894c910173379f0d1e52f1627e984ceac61dca76ec68ac68e75cffa919895cebd4b38d09e12f271783
 DIST 9libs-1.0.tar.bz2 163744 BLAKE2B 3cc984ff83ff48969148f8fb3b78e6b85b32280634e99f552c869e650d4893a18ea2164c10ea7662a704c7d55a49bf7434caa219c3a716637895d1f3df4d2ad8 SHA512 35fdd874dbf9aca07e681d7c3f707d22a45cc8cadb2c273a1fbc5f8303886a6b512eb16fc1b81d64d7f665b16a3b19a8d678a540cd4ad453de853b90905d98d2
-EBUILD 9libs-1.0-r3.ebuild 905 BLAKE2B a359141d09d964fcf6d45f406c52bb05f2256021c0c1c7fba813ea02964464ab389a6cb13583172f45017c5099eb97db972f82b8b9f2e7aad43c6066576e8633 SHA512 809aed79b0ac99150d2c4535a18b5275daa9306f23b6d8ae4469b6d2271f85e488632edafbf32839cd576f9e1d44093c3023b26f6c652e265572d239b185809c
-EBUILD 9libs-1.0-r4.ebuild 1088 BLAKE2B 97dde042b6525a171521c97e35a9215dc2ca8f4efdf2e7248253bfc0dd439fc1c032d2c8d6cd1e80f17c639e09616ce649a714754c8f0928798ac5136f54125b SHA512 fe2ddd6f2aad6512a89fca607457a7ae53d34b75b3573257dee630ada6690860a36398057758f039946bf42b84427b17402ed90c99c40d068630edf73291e821
+EBUILD 9libs-1.0-r4.ebuild 1086 BLAKE2B cb8aedf43f07c1cfe9662dfb8f89012f468ba39c7729a9fdaa2a3c50233501809d7146321eebc9c20a2cacdd74e14d5c095bd7bd2d613e670828bdd5b1df62d1 SHA512 dcd4db6f4ddbab96c968dc3f007e0bae663a0765a721a4f6ae6279ab0983851a3e0d734f95f6858fe39f1c0d8434bff47e76133cb85aa3aca406f91e644d0f74
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84