gentoo resync : 22.01.2019

3 files changed, 65 insertions, 8 deletions

diff --git a/dev-libs/9libs/9libs-1.0-r3.ebuild b/dev-libs/9libs/9libs-1.0-r3.ebuild
index 608cb956d74a..22450aa79dbf 100644
--- a/dev-libs/9libs/9libs-1.0-r3.ebuild
+++ b/dev-libs/9libs/9libs-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A package of Plan 9 compatibility libraries"
-HOMEPAGE="http://www.netlib.org/research/9libs/9libs-1.0.README"
-SRC_URI="ftp://www.netlib.org/research/9libs/${P}.tar.bz2"
+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"
@@ -25,15 +25,12 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC
 	econf \
 		--includedir=/usr/include/9libs \
 		--enable-shared
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
 src_install() {
 	make install DESTDIR="${D}"
 	dodoc README
diff --git a/dev-libs/9libs/9libs-1.0-r4.ebuild b/dev-libs/9libs/9libs-1.0-r4.ebuild
new file mode 100644
index 000000000000..84c7b9323a14
--- /dev/null
+++ b/dev-libs/9libs/9libs-1.0-r4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools 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="static-libs X"
+
+DEPEND="
+	X? (
+		>=x11-libs/libX11-1.0.0[static-libs?]
+		>=x11-libs/libXt-1.0.0[static-libs?]
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=(
+	README
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-va_list.patch # Bug 385387
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with X x) \
+		--enable-shared \
+		--includedir=/usr/include/9libs
+}
+
+src_install() {
+	default
+
+	# 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
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/9libs/Manifest b/dev-libs/9libs/Manifest
index 96d95f1a89ed..82edadcc0155 100644
--- a/dev-libs/9libs/Manifest
+++ b/dev-libs/9libs/Manifest
@@ -1,4 +1,5 @@
 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 934 BLAKE2B 11a106a9b6663c7f567c031c8d4d65b78da2983710f21b988552bc8279b09999c89b6249ea4e731b1afef10af2f9a5bf11864fe45b50d4b440e8af4d1873bde2 SHA512 e5961649f168af6f64088c3021e4ccb91cb1f2aa969aa1fab57a396a5c06f65fbf3ac5ff6b78d68893104a196f90471ad8ac22ab031fd56979a41b75ef30fc90
+EBUILD 9libs-1.0-r3.ebuild 905 BLAKE2B a359141d09d964fcf6d45f406c52bb05f2256021c0c1c7fba813ea02964464ab389a6cb13583172f45017c5099eb97db972f82b8b9f2e7aad43c6066576e8633 SHA512 809aed79b0ac99150d2c4535a18b5275daa9306f23b6d8ae4469b6d2271f85e488632edafbf32839cd576f9e1d44093c3023b26f6c652e265572d239b185809c
+EBUILD 9libs-1.0-r4.ebuild 1108 BLAKE2B 61a7f75075170d77f57e9ba4775f4f48d95b6b4775f6c6daaff3ab27affe707162ff7cf0854816305882e2889032b868117996970a220fdbfbd2e31a20847168 SHA512 166d9fce0cc41c31157407031d4d23736a552334c3d1eb647f50fae86a0e86e4a448be41501a08a9e36f3d185738f75a8137ce1edf7dd70ab817d537d92c3536
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84