gentoo resync : 10.11.2019

4 files changed, 31 insertions, 94 deletions

diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index b925c2d40a1a..1c71e962f282 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -1,12 +1,11 @@
 AUX aalib-1.4_rc4-gentoo.patch 1245 BLAKE2B 59451b7cad10881b27d5eb13211106c278d843f7e41be61bb6b723c2ece187b45532a3a5750fb30e3c31cd0231f352c58cb076823dbfbe5ebf4ea1626888bdb8 SHA512 058f594a573ac61dcd484b85bebdde8f80bb567ec72c0692312e3d129b5656b902ddcbe3253623812aabb82e3a4503b9cb22510faefe86595549c4dc090460a4
 AUX aalib-1.4_rc4-m4.patch 241 BLAKE2B 0fc63b7936334bfa171cdafdb0d8813ce499d3dfe29f32b59e8ca1873d5ca55f1154a3f2e1aa5c187b5ea8f5c138c60992378b4e7ba8e1fb4e646bd6ea85200d SHA512 bea8e769596ec8d529d67a2b6081d2a7c1e47d9089551a31356f8b15a4dbfd36fdc97839754ef188621d8870628707b274f2183cebffc219ea0f3784fa12d8f1
-AUX aalib-1.4_rc5-fix-aarender.patch 1350 BLAKE2B 72d20ea3fb5ddd5bca72dd0acb1891990a3e38fa2e47084cf710eba1492be396a9c291e500d801fd463c0927a6910e76ce90b620d669668a3b068ca8dee54b5f SHA512 83f6a1fffcdfa342d23df9a47d3803cd4416fba33a126602cc341405b953600f5e7b14ce21bd9f7699113f975815ddfcb6a9a95cc392ae62828557f59064a9da
+AUX aalib-1.4_rc5-fix-aarender.patch 1354 BLAKE2B e9456d951d0ac69685dc79243d1f17abbc304acbe247390a832208c5d9ea691ace9383dd0ce34b8edad254d95857ed729db6f26f16dc82765542981a3f73ef00 SHA512 4e30144ce0df3e1f063fc1bef34690ffc88719f3f52fa62f25f4d2e28a22b59713b5ea23f14c07f0fec5b3988a093572b3e9886ef052cbba48a028f84eb84588
 AUX aalib-1.4_rc5-fix-protos.patch 2105 BLAKE2B 4b701691a61a400a52a7ab7cdc213f0e47bb47c7f7d5f72ea862b7744641df5b510b434e85f0b5bfcc2c88f864ee6d651441d41571283661a9008018068c7e0c SHA512 e46268f5fb972500851f5489cc6311171a07a8b1a7a564bdafe5760008db72787650ad74e5144cbdb30b7fef027ee646e5534dd2eabddbd057bef1b27229af37
 AUX aalib-1.4_rc5-key-down-OOB.patch 504 BLAKE2B 1742e3d22889e7faabaf0fcacecc7db4dff4d126361f02d0311e11a93a2a1445de78f1e5a38cb43860bee1809c8350829715b843b52f7354f2ffe22cd21e7e1a SHA512 e3a79459024e25180b5407b92031c1b675659038289daff5a62485a01dc79afd8223652f9bd3e521a975158ecaa8210e35e536dfe3719259f2631a87d83e19b7
 AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f1f780c37f5d5282c27985ef064e53221d369974c3147634b1bfb1af6df7232088a71fdd12230e587c475c5817180a602c SHA512 c2b723af88a0ca70505086bc7436e5c213d2f52698b293392be2a6b18ef26ef285a09e460577a4a60b328df45b1d61c50064f3ba1f3df43a844082f2c5da25b2
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
-EBUILD aalib-1.4_rc5-r6.ebuild 1757 BLAKE2B 96346a567f3ce645a81b21df05201aa04022e5fc64ff77e2c87480305efa81f488eadcaf0317b3e48d1f7267d2e387f7dea2387a4fc74878137be30bb79d9ea1 SHA512 d8dae2e701307d88184ccd85867feeda9ee190aec6031293fa8cd4d2e3055c17836b7bccc31ca2f726c25fa82bcbbeeafa795de76d0b2876c6daaedef407a72e
-EBUILD aalib-1.4_rc5-r7.ebuild 1822 BLAKE2B 94e890b7f75f4c6f77934380d3457f2009f446f8a5c24be9fcf779a6e57ec0d325be56ce32a90e5ef1b0d6978d5cc3c8708bea09ea2d54c7bf1f95ac08a8a5ed SHA512 2915a30e54341f8b94b27aacfe857a4f6a27e538836ce7ffd83bd0702d159ac5c43859bf0816839eb5175aeea147cfa09a640b7949824324d37fbaff6cab375c
 EBUILD aalib-1.4_rc5-r8.ebuild 1952 BLAKE2B e63df56ae0ff3bd304763f5ed09af2ad6bd875f812c24eaddc4eb9eccdaefaef9a2291e0861de3f6024c4c2f1427f589fa19b9bb86c1633decb07397895baabe SHA512 7a34dcbd79a379078fe37a0cbdd75d166180ad6903e693e62b72e26a580ac1b582982ff956ab8fc8cfe16b43aea686e35d249d5512c81fdafa9f692c7e511061
+EBUILD aalib-1.4_rc5-r9.ebuild 1950 BLAKE2B da62e9aed3b9a3533ae4969395ee71a8f75cb2d518f80bc2770d357fd691345807e2962956828c2907bdc7e87413baa939afea4c0d917744e2405b33767b3342 SHA512 cfeedcdce3b0ade9d778d72887829f7ce5a661e75a33db7ae68ca618a4e64c4a9bc412931d3d1abaf4aa76e0fc04cd5db4534dfff9db88370f71e8aaad498bd6
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild b/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
deleted file mode 100644
index 64ea7bfd9bb9..000000000000
--- a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib eutils toolchain-funcs
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${PN}-1.4.0"
-
-DESCRIPTION="A ASCII-Graphics Library"
-HOMEPAGE="http://aa-project.sourceforge.net/aalib/"
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="X slang gpm static-libs"
-
-RDEPEND="
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	gpm? ( >=sys-libs/gpm-1.20.7-r2[${MULTILIB_USEDEP}] )
-	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
-	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )
-"
-
-DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-1.4_rc4-m4.patch
-	epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267
-	epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-aarender.patch #214142
-	epatch "${FILESDIR}"/${PN}-1.4_rc5-tinfo.patch #468566
-	epatch "${FILESDIR}"/${PN}-1.4_rc6-key-down-OOB.patch
-
-	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/src/*.c
-
-	# Fix bug #165617.
-	use gpm || sed -i \
-		's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in"
-
-	#467988 automake-1.13
-	mv configure.{in,ac} || die
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with slang slang-driver)
-		$(use_with X x11-driver)
-		$(use_enable static-libs static)
-	)
-
-	PKG_CONFIG=$(tc-getPKG_CONFIG) \
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	use static-libs || prune_libtool_files --all
-}
diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index b9c8de5910dc..750d19857c67 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools-multilib eutils toolchain-funcs
+inherit autotools multilib-minimal toolchain-funcs
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${PN}-1.4.0"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
@@ -30,12 +30,18 @@ DEPEND="${RDEPEND}
 
 DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README*"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
+	"${FILESDIR}"/${PN}-1.4_rc4-m4.patch
+	"${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267
+	"${FILESDIR}"/${PN}-1.4_rc5-fix-aarender.patch #214142
+	"${FILESDIR}"/${PN}-1.4_rc5-tinfo.patch #468566
+	"${FILESDIR}"/${PN}-1.4_rc5-key-down-OOB.patch
+	"${FILESDIR}"/${PN}-1.4_rc5-more-protos.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-1.4_rc4-m4.patch
-	epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267
-	epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-aarender.patch #214142
-	epatch "${FILESDIR}"/${PN}-1.4_rc5-tinfo.patch #468566
+	default
 
 	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/src/*.c
 
@@ -50,18 +56,18 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	local myeconfargs=(
-		$(use_with slang slang-driver)
-		$(use_with X x11-driver)
-		$(use_enable static-libs static)
-	)
-
-	PKG_CONFIG=$(tc-getPKG_CONFIG) \
-	autotools-multilib_src_configure
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		$(use_with slang slang-driver) \
+		$(use_with X x11-driver) \
+		$(use_enable static-libs static) \
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
 }
 
-src_install() {
-	autotools-multilib_src_install
-	use static-libs || prune_libtool_files --all
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -type f -delete || die
+	fi
 }
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch b/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch
index 97c59836b5c9..2c3d5bf437f7 100644
--- a/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch
+++ b/media-libs/aalib/files/aalib-1.4_rc5-fix-aarender.patch
@@ -19,8 +19,8 @@ image, not cause part of it to miss.
 Gentoo-bug: http://bugs.gentoo.org/id=214142
 Reported-by: Reimar Döffinger
 Fixed-by: Reimar Döffinger
---- src/aarender.c.orig	2008-03-18 23:55:32.000000000 +0100
-+++ src/aarender.c	2008-03-18 23:55:50.000000000 +0100
+--- a/src/aarender.c.orig	2008-03-18 23:55:32.000000000 +0100
++++ b/src/aarender.c	2008-03-18 23:55:50.000000000 +0100
 @@ -94,8 +94,8 @@
  	gamma = randomval / 2;
      mval = (c->parameters[c->filltable[255]].p[4]);