app-misc/bb: update to EAPI=7

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

9 files changed, 73 insertions, 22 deletions

diff --git a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
new file mode 100644
index 000000000000..793a64d7de56
--- /dev/null
+++ b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+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/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mikmod"
+
+DEPEND="media-libs/aalib:=
+	dev-libs/lzo:=
+	mikmod? ( media-libs/libmikmod:=[openal] )
+"
+# media-libs/libmikmod[openal] is due to bug #516964
+RDEPEND="${DEPEND}"
+
+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() {
+	default
+
+	# 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
+
+	mv -v configure.{in,ac} || die
+	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/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()