gentoo resync : 10.11.2019

11 files changed, 30 insertions, 109 deletions

diff --git a/app-misc/bb/Manifest b/app-misc/bb/Manifest
index 3639aba3bd3a..33e5f3739b7d 100644
--- a/app-misc/bb/Manifest
+++ b/app-misc/bb/Manifest
@@ -1,12 +1,11 @@
-AUX bb-1.3.0_rc1-disable-pulse.patch 803 BLAKE2B a93fa403f76b8edbc3425be071b3a9ee1b8c6c7926f54539fe31ea9348bcf14b145224b1b0e9dd7ec6306ec3ed6ec236c02a2177e08ecd367e6e43fcbe5ffa2e SHA512 97f5255b19ea80c68eaa53aa6c9db55ad5e38e9749db24ba035ab5894cd5f9675dc0bbe695ec78d3e41037d771f669b9cf792feb41c0acc615b53cdf9eefbc1f
-AUX bb-1.3.0_rc1-fix-protos.patch 369 BLAKE2B 97b101ccb06cc8442928e55ef8e7b4acffbb2995eae6671cfa10c6787818a49cc8e3d76ec6a4577b8b49dd807c1ff87446ac792f460242fe1102b2b3e1c81298 SHA512 0f078053b9fed2a20cdd02b606ab7172ac3210f975ee3965a7a8699acd9b8c9a12e1c8119cc916a408db8df5572ce5d1b6d78a1956f055261b74abc4ce9fb960
-AUX bb-1.3.0_rc1-m4-stuff.patch 16358 BLAKE2B 7bac36976a4f024b2cc09011dc10cef4b315299d21356858b85547e3c2d0627a12b7ad4eb56230d065afcb1b255923ea1b9204969b6dcb1db5413534b1ea5c04 SHA512 cfa47a1aa4c602b789c9b6d8fd9b163639971f270c66030a4219b65169ddc83ed5c917665195c6533afb45364ac1d8a45879d341421e9e9c5e8ea44edb57087d
-AUX bb-1.3.0_rc1-messager-overlap.patch 1623 BLAKE2B d62400fa49b2bf57ade223eb14960500391a155cdedbccee7096b7c2688e5f68681bcc5d378099061a534c45d20c43b9e799bcf38af54e4a21326203c42f8508 SHA512 745dd6e5ed1bd1760509183ea4884f575b035165f6c0b9be804dbb28378ed39c899562c75aa1db8e006bff23734181fd5604092adae31de71685b728f78a173b
-AUX bb-1.3.0_rc1-noattr.patch 509 BLAKE2B c13edb1874a0ac334c86f35c76ebc9175e6c965f54a02f62018e322c520da619cdc36f9d69e8dd8d05c71a13232ca38d8901652491d5a20576fa46edd9ceec48 SHA512 e7c4831d8286db8afa0710a11d150e254d6fc738f91d45be6aaeddfcbdf4c530c1cc21091f967d9ba8ef6a399321d6c3ccf194d686a1a77861c72eb60454726c
-AUX bb-1.3.0_rc1-printf-cleanup.patch 2885 BLAKE2B 8e98079763901a468e11344f3f0553d1d335ae5d41a045f75ffe9093bf4bc6b9bc5579bc414fb8013670024cbc5ff3c0bb8bdf74bc77868d79e8b3d63b6ed1bb SHA512 c7181ace0914f9aac7963c473019058fe4d7340337fc19d06ae252bb6bfb2c96b9883915a903f419fb706916796906497c77ad4180d9d861a2a255959b1507de
-AUX bb-1.3.0_rc1-protos.patch 297 BLAKE2B f024f5ddf8567b04fd794c4ac5b9b1cab10ac979d6262657eea8b54ad05d6e1134d4a87251cc2a5fcb9366934772c55755421ee12e87a89a27df9c8ffff35415 SHA512 5e59bb912f1a5187e6a23fc9a66ddbed6e48c12074fd4d74b19fb88bc94aa39b8df27d62cfe8f7856a9e434f2be15261522a4150cb0f92588b53c99e33b853de
-AUX bb-1.3.0_rc1-zbuff-fault.patch 1105 BLAKE2B a6d183c91eb9a9f4c6f0095a6d36fe94931b27daaaf56e04c8b177d2fd77f583e6a267a06894a64b59e05a7749e39ae8bd6898466277b779aa98b1da811e06f6 SHA512 10159f628d993058074d6c97001acad2bc4c71df4331cea2f0d6c1b8bd8c578e230d2cc2e4313457c75252108ab136a1ccc8a626a760fcd4e024b6a370ed1e59
+AUX bb-1.3.0_rc1-disable-pulse.patch 744 BLAKE2B 0ded7bea285b29ec81bd8b35ca409bf48bed3092098e160d57c41a57d99e9900afd397853ba5bb06f629dc7ded90e7a842fa6b575c9af6614f469683f6ba5ebc SHA512 d43eea0c7088fd3e172b5794eeeef092f97edd5e5e1556e5b936031ab9f81d79cf91c5394d82e16f4752864e0b5aa9d72418ab80239d34a1e256c843b6d54fc1
+AUX bb-1.3.0_rc1-fix-protos.patch 310 BLAKE2B be8d5cb30a20c082d0ed7ea8193a58faa48834b3efa2eb0c5ef453e765afc2f3443ab516db2e39e00f3d5eded7bbca909bea6aa7754c08728849fd9c0c75417d SHA512 60b4e05648c53669f901da762691859810ee1c8644b9d9fe6d49995547eef1b0564ce2151a1882630527af553112bbbfa2c81ecd865a832887903d09901597c7
+AUX bb-1.3.0_rc1-m4-stuff.patch 16192 BLAKE2B c5b3be2ba29b4cd03b83112134fd797d916c7256579309bbb58308bdced7b639b84d46c44d132cd5443b0f268e989693f88890b97cf0a75348d3ab12ea98e40c SHA512 3e1e0cbf14fa548e6d7bc50a51ac8e4e711b3baf1d3db60bd7bfcb5a70abed7476e609282bd08678e38d25221833c3437b54085cffbc87c5d8ef33952985cd3c
+AUX bb-1.3.0_rc1-messager-overlap.patch 1556 BLAKE2B 8b4aa3efdc8990025f93128dcc2b58a20077d78a12d1e8a65d69803401fcb2f6b6366132e42b4e1e8c9b3d817bf193a25c3b0e6b8477ebe4dfd322ccc230af0f SHA512 516657e3a937d1a05bfda9abb3ef784119fe6d365901fc852b2a2feeeb9884e4f7ebd8c72d2ca9f4ce995f67b9c312ed7a0e1245cc2a42f37bacaf5bc514b8c2
+AUX bb-1.3.0_rc1-noattr.patch 513 BLAKE2B 6c41a98aa03ebaf1014524f04715a8165a3e31a8089859ea4d79a109152ad942d9e1d2d3affcab56f20e01240b7404a981752407af7f606d41d0dbf18d6d7eda SHA512 2f35394e6d6a197797c11fee787c26bee5be71545079aa6d8b948363e01b0b1500ab2834e77fa10b05cc722ed1a025869e8fbf77d0ab6b4f274b6473c366f854
+AUX bb-1.3.0_rc1-printf-cleanup.patch 2826 BLAKE2B 26ccbf74ba95f2d695d56a788f340243a72c89baaf4f5adb45aeee80ac02cb18b5b19613a2c7a7a0a821d8580dbcdc3bb8f999d7c4fda20d28054c55405a1bc7 SHA512 24e7b32abf80a44bebf00b192d151aad682b26283187fdbce6d64541df8535e821ae878dc4dd0abd1fcae04bdfa32b203d64920cbda4102fe7597af50721e51c
+AUX bb-1.3.0_rc1-protos.patch 183 BLAKE2B 61112802cba379eda21b293270b2bf61e6be892f8cd36ce494f31284ff7a92ab5e6c828f5cd7365868128d40f2711aa099f3148989151875025ddbb7f24fb0b4 SHA512 bcccae0c1838ee89a62581c25a4896e468cd1fcd5dd4bf98bbe2395aa40d15a39ea8408bfad31517ff57385d8d0b2e65ced8c7a93fd17cc7f9039390805229c5
+AUX bb-1.3.0_rc1-zbuff-fault.patch 1048 BLAKE2B bf8729e1654bb44bfc32ff9bb857e5aef082d7e2ba40494304696f399fe43bc82540f1f323504a24afc003c408e6b73d8decabb1599dd5ffbfa186cc3a19e89d SHA512 bce66400732270b9b4957cbcfe83d97baa9ff011876517ce292949c1fe23945fb02768542c8b4b59b350403a0a3f8b1dae998800b64d84f34b8c37e5e3ba0cc2
 DIST bb-1.3rc1.tar.gz 1416292 BLAKE2B 342a11002a94f160de23739c5578acf685ff886ae66e182b33cd971b74b258bae6ecd7e9e795f1e6a53a062a4c0ba5296bdbb6f41dd8cca6be4550bb49943023 SHA512 f05eb741f1189038a5a63016437f8eaeb25eb001307561bfe8827701bc246873fec14462e586d5966dcd1c74cddaf346f4670254b712713625e139300817c0a9
-EBUILD bb-1.3.0_rc1-r3.ebuild 1799 BLAKE2B 920436513b8477421a225f68e2e685974f386bad559d7d8c95fef731434650c34e93788012526c61e3d570d58164e1938e0e94e3110485b454379754ec4cb9a6 SHA512 8ea1fe26660536ac59f49d8d7769eaf80e38e12bee8109915700f540c18f215ae779fe8f3825d0c1f19a0164fbcca9cea1170ca11a9ddbbc71fca642b0f264f0
-EBUILD bb-1.3.0_rc1-r4.ebuild 1959 BLAKE2B b011a6ff3f9ea885338d19d8690e875f7de7f74f58b27ed35fb4ce34df59e477f0973efcd46f8e9947aa1c0614eabaef6a18aeda16facb66385484c5487150b4 SHA512 ed6d7a39c2cd45482a0c723eb502b3a59f26a273d2388d3019705f55c03e9a7fc7f82a30a7f4389c09d5a0ca9f5973b3bdaebca97c532e31443620e3ab3dbde2
+EBUILD bb-1.3.0_rc1-r5.ebuild 1861 BLAKE2B ceea9b98bf6c306f7ab4aff6eb07fc08835e604d7840d9930899bb1a782a862365fd6d8a487aebcb2a1da25d6f9ccc56837c3b71df1c0cb1bc69bf0f61983fc3 SHA512 32c062f355e1e43ab5f9f4b0e7cd10aacc29523568f473270bf2aa53724dafc559a5b9aec8ba7c0e63539a2ee63807ad1d2dc536b87237ea5180258cf6459106
 MISC metadata.xml 331 BLAKE2B cc3fc6a0098a1ff90cc8805de2c65f68e003a2f707f88567962821295a7a0be3d9e970ea1271f931a46107b034e5dcbd46f254d816525d79f3bac8ee22855082 SHA512 12b5d682065c1178989edc16c08b82bd57833e161e647fa81dfee06a55c2147b5229093196b2157bc8ca421c9fd459ce015fb5dac2de1e35e1ad908d2120e0ed
diff --git a/app-misc/bb/bb-1.3.0_rc1-r3.ebuild b/app-misc/bb/bb-1.3.0_rc1-r3.ebuild
deleted file mode 100644
index 467732903e63..000000000000
--- a/app-misc/bb/bb-1.3.0_rc1-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils versionator
-
-MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)"
-
-DESCRIPTION="Demonstration program for visual effects of aalib"
-HOMEPAGE="http://aa-project.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mikmod"
-
-DEPEND="media-libs/aalib:=
-	dev-libs/lzo:=
-	mikmod? ( media-libs/libmikmod:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-noattr.patch"
-	epatch "${FILESDIR}/${P}-fix-protos.patch"
-	epatch "${FILESDIR}"/${P}-messager-overlap.patch
-	epatch "${FILESDIR}"/${P}-zbuff-fault.patch
-	epatch "${FILESDIR}"/${P}-printf-cleanup.patch
-	epatch "${FILESDIR}"/${P}-m4-stuff.patch
-
-	# unbundle lzo, #515286
-	rm -v README.LZO minilzo.{c,h} mylzo.h || die
-	sed -e 's/minilzo.c//' \
-	    -e 's/minilzo.h//' \
-	    -e 's/README.LZO//' \
-		-i Makefile.am || die
-	echo 'bb_LDADD = -llzo2' >> Makefile.am || die
-	# update code
-	sed -e 's,#include "minilzo.h",#include <lzo/lzo1x.h>,' \
-	    -e 's,int size = image,lzo_uint size = image,' \
-		-i image.c || die
-
-	# rename binary and manpage bb -> bb-aalib
-
-	mv bb.1 bb-aalib.1 || die
-	sed -e 's/bb/bb-aalib/' \
-		-i bb-aalib.1
-	sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
-	    -e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/'     \
-	    -e 's/bb_SOURCES/bb_aalib_SOURCES/'               \
-	    -e 's/bb_LDADD/bb_aalib_LDADD/'                   \
-		-i Makefile.am || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-pkg_postinst() {
-	elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with sys-apps/busybox."
-}
diff --git a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
index 668b4f4df30b..793a64d7de56 100644
--- a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
+++ b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils versionator
+inherit autotools
 
-MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)"
+MY_P="${PN}-$(ver_cut 1-2)$(ver_cut 4-5)"
 
 DESCRIPTION="Demonstration program for visual effects of aalib"
 HOMEPAGE="http://aa-project.sourceforge.net/"
@@ -23,17 +23,21 @@ DEPEND="media-libs/aalib:=
 # media-libs/libmikmod[openal] is due to bug #516964
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noattr.patch
+	"${FILESDIR}"/${P}-fix-protos.patch
+	"${FILESDIR}"/${P}-messager-overlap.patch
+	"${FILESDIR}"/${P}-zbuff-fault.patch
+	"${FILESDIR}"/${P}-printf-cleanup.patch
+	"${FILESDIR}"/${P}-m4-stuff.patch
+	"${FILESDIR}"/${P}-protos.patch
+	"${FILESDIR}"/${P}-disable-pulse.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-noattr.patch
-	epatch "${FILESDIR}"/${P}-fix-protos.patch
-	epatch "${FILESDIR}"/${P}-messager-overlap.patch
-	epatch "${FILESDIR}"/${P}-zbuff-fault.patch
-	epatch "${FILESDIR}"/${P}-printf-cleanup.patch
-	epatch "${FILESDIR}"/${P}-m4-stuff.patch
-	epatch "${FILESDIR}"/${P}-protos.patch
-	epatch "${FILESDIR}"/${P}-disable-pulse.patch
+	default
 
 	# unbundle lzo, #515286
 	rm -v README.LZO minilzo.{c,h} mylzo.h || die
@@ -58,7 +62,8 @@ src_prepare() {
 	    -e 's/bb_LDADD/bb_aalib_LDADD/'                   \
 		-i Makefile.am || die
 
-	AT_M4DIR="m4" eautoreconf
+	mv -v configure.{in,ac} || die
+	eautoreconf
 }
 
 pkg_postinst() {
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
index dcc00c642335..3d7889101b93 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
@@ -1,6 +1,4 @@
 https://bugs.gentoo.org/516964
-diff --git a/main.c b/main.c
-index c0648b4..a9fac57 100644
 --- a/main.c
 +++ b/main.c
 @@ -160,6 +160,17 @@ main (int argc, char *argv[])
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
index 577f306c8169..a85166b01309 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
@@ -1,8 +1,6 @@
 Fixes warning:
 main.c: In function 'load_song':
 main.c:56:23: warning: incompatible implicit declaration of built-in function 'strlen'
-diff --git a/main.c b/main.c
-index ae852a7..417ff62 100644
 --- a/main.c
 +++ b/main.c
 @@ -21,6 +21,7 @@
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
index 0fa98f8162f5..843d839908f7 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
@@ -6,9 +6,6 @@ Date:   Tue Feb 7 10:59:09 2012 +0300
 
     bb-1.3.0_rc1: bundle m4 source
 
-diff --git m4/aalib.m4 m4/aalib.m4
-new file mode 100644
-index 0000000..991fbda
 --- /dev/null
 +++ m4/aalib.m4
 @@ -0,0 +1,169 @@
@@ -181,9 +178,6 @@ index 0000000..991fbda
 +  AC_SUBST(AALIB_LIBS)
 +  rm -f conf.aalibtest
 +])
-diff --git m4/libmikmod.m4 m4/libmikmod.m4
-new file mode 100644
-index 0000000..18feebe
 --- /dev/null
 +++ m4/libmikmod.m4
 @@ -0,0 +1,207 @@
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch b/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
index e46b75fd5815..378e6b7798b6 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
@@ -8,8 +8,6 @@ messager.c: fix memory overlap (fixes artefacts in scrolling text)
 ==363==    by 0x403009: bb (bb.c:258)
 ==363==    by 0x407C06: main (main.c:202)
 
-diff --git a/messager.c b/messager.c
-index 95cc410..964080b 100644
 --- a/messager.c
 +++ b/messager.c
 @@ -40,8 +40,8 @@ static void newline()
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch b/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
index 7a6f9474a71e..a4768ab75e28 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
@@ -1,7 +1,7 @@
 # remove __attribute__
 
---- timers.h	Thu Apr 26 18:04:22 2001
-+++ timers.h	Sun Dec  9 18:44:31 2007
+--- a/timers.h	Thu Apr 26 18:04:22 2001
++++ b/timers.h	Sun Dec  9 18:44:31 2007
 @@ -49,8 +49,8 @@
  extern tl_group *syncgroup, *asyncgroup;
  void tl_sleep (int);
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch b/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
index da113795124b..b11b2333d1d6 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
@@ -8,8 +8,6 @@ zoom.c:260:113: warning: format '%i' expects type 'int', but argument 3 has type
 zoom.c: In function 'moveoldpoints':
 zoom.c:590:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
 zoom.c:596:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
-diff --git a/zoom.c b/zoom.c
-index 7450095..b86cc8b 100644
 --- a/zoom.c
 +++ b/zoom.c
 @@ -241,13 +241,13 @@ static /*INLINE */ void mkrealloc_table(register number_t * pos, realloc_t * rea
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-protos.patch b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
index aa3fc021e5c1..40f77a0f20cd 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
@@ -1,13 +1,9 @@
-diff --git a/bb.c b/bb.c
-index 95850ef..a394d00 100644
 --- a/bb.c
 +++ b/bb.c
 @@ -27,2 +27,3 @@
  #include <aalib.h>
 +#include <time.h>
  #include "bb.h"
-diff --git a/main.c b/main.c
-index 417ff62..c0648b4 100644
 --- a/main.c
 +++ b/main.c
 @@ -23,2 +23,3 @@
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch b/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
index b3e882ed55e9..7b6eda327d18 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
@@ -20,8 +20,6 @@ Valgrind says:
 ==4525==    by 0x4031BC: bb (bb.c:325)
 ==4525==    by 0x407C56: main (main.c:202)
 
-diff --git a/tex.c b/tex.c
-index 9f2f99d..b390510 100644
 --- a/tex.c
 +++ b/tex.c
 @@ -92,7 +92,7 @@ void unset_zbuff()