Added prefix support, added missing function prototypes. Added myself to manitainers.

Package-Manager: portage-2.2.0_alpha84_p18/cvs/Linux x86_64

6 files changed, 82 insertions, 51 deletions

diff --git a/app-misc/bb/ChangeLog b/app-misc/bb/ChangeLog
index 07b0a5fa5b73..6d2af5dfbbfa 100644
--- a/app-misc/bb/ChangeLog
+++ b/app-misc/bb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/bb
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/bb/ChangeLog,v 1.2 2008/01/05 22:19:48 angelos Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bb/ChangeLog,v 1.3 2012/01/28 19:25:23 slyfox Exp $
+
+*bb-1.3.0_rc1-r1 (28 Jan 2012)
+
+  28 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> +bb-1.3.0_rc1-r1.ebuild,
+  +files/bb-1.3.0_rc1-fix-protos.patch, -bb-1.3.0_rc1.ebuild, metadata.xml:
+  Added prefix support, added missing function prototypes. Added myself to
+  manitainers.
 
   05 Jan 2008; Christoph Mende <angelos@gentoo.org> bb-1.3.0_rc1.ebuild:
   Added ~amd64
diff --git a/app-misc/bb/Manifest b/app-misc/bb/Manifest
index 27088742c76d..e56d86b09160 100644
--- a/app-misc/bb/Manifest
+++ b/app-misc/bb/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX bb-1.3.0_rc1-fix-protos.patch 369 RMD160 9a5d17403261476057d5658049084c342f9444a0 SHA1 900d39d2ab8c4d40382215cf4e2c146b7eaafbb6 SHA256 44fbe09a7ec1dd12f07e99aadec010eaffda8ada7fd836386956979906b49bc2
 AUX bb-1.3.0_rc1-noattr.patch 509 RMD160 2f055793a0319d9dbae210920e4beace56d50308 SHA1 91623c619e2b38d14f5c1c5af9fafae5dc532918 SHA256 53463b5dca4b5b1240a39e4b41055e7583447d6c551131b1012ab559c61a6b29
 DIST bb-1.3rc1.tar.gz 1416292 RMD160 15ea8112bf551ad6a4da2860d01d8f22c6021eba SHA1 e4e87c6079d220d0bd4bdc97428020471a77cf68 SHA256 793d88c872793b6dab444cf5bab24f283ecb2f3502f1479ebbe41dd8e90b81c4
-EBUILD bb-1.3.0_rc1.ebuild 1094 RMD160 5f6b0ab4ffe5f5db65d53b0f571718749a9d4a8d SHA1 da15ce7da92ee2d8bc2e705682bd5a8ae1252fe1 SHA256 ec916dcb7928f805ef785a6063e7b4005b20048211d0d9fb210d3238d1f7959d
-MISC ChangeLog 512 RMD160 8c71ca18a76581085c927bed7d481780ab9a3442 SHA1 6aa4541d73990f7c02645b0e57153511b2699645 SHA256 162a4dd21af26d8596213e47a74e9a51eec990dc7aae874d70e7440e87984669
-MISC metadata.xml 232 RMD160 4ac0294cb9dd42588d67d2161965d8ea2db60b19 SHA1 996716c7a1e0a083d7563c9444f9813dc4e87b8c SHA256 6b5c74c1d72392418bb791869a55fa906b236886730efe2ce4c2f3f87bb0ed3d
+EBUILD bb-1.3.0_rc1-r1.ebuild 1259 RMD160 cc4294e92089378fff620956848423d5937dd8d2 SHA1 1a8c525c9f33b743cb349b89db54e3d04371fe4d SHA256 ea4b993d0060e372c4b7806510c627b418264a559062731b4b24c0d240f75b1b
+MISC ChangeLog 789 RMD160 4675a92dd60a413f9050e345c447696b959d46f4 SHA1 372806f7fd18bb26cbe9d3b0743343a29e24bb54 SHA256 c31893bca326b44d867c45bba8270a27c90572e3251014549fee0b748229a37e
+MISC metadata.xml 330 RMD160 12c9e416f2ee3f470e0c55bffc6ca441035c8645 SHA1 360c646317f35f81e9e2b543432767d2e125101c SHA256 03d9f6686a71868d2b85d59dce05a7dcb7b83cfc14763f7b11d7826c71e0de7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk58/5EACgkQfXuS5UK5QB3SZwP7B+uPRv0O664a+4taObmleOeQ
-V0y4BM7+EB7L8a3FucGR9ypptsLY2wXTylkXntoEuzUraCZlDd0mh6XZFVKnST/n
-JLoVndL8kHShx5r6+KGtQcJG1BojCzBeNCtaRUGb/tVyRmCw4THSKR3Cy76jBzvs
-qnCaU/nd56KYGlpOdRY=
-=ajUD
+iEYEARECAAYFAk8kTK4ACgkQcaHudmEf86oR5gCdHARTs9/8RvVh16Q84G3SVsMm
+t/cAn2iAzmiwgXXBEzYLnSR5nrjPtcWX
+=q8EA
 -----END PGP SIGNATURE-----
diff --git a/app-misc/bb/bb-1.3.0_rc1-r1.ebuild b/app-misc/bb/bb-1.3.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..24340d184524
--- /dev/null
+++ b/app-misc/bb/bb-1.3.0_rc1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bb/bb-1.3.0_rc1-r1.ebuild,v 1.1 2012/01/28 19:25:23 slyfox Exp $
+
+EAPI=4
+
+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
+	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"
+
+	# 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/'               \
+		-i Makefile.am || 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/bb-1.3.0_rc1.ebuild b/app-misc/bb/bb-1.3.0_rc1.ebuild
deleted file mode 100644
index 1cb1dbad7225..000000000000
--- a/app-misc/bb/bb-1.3.0_rc1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/bb/bb-1.3.0_rc1.ebuild,v 1.2 2008/01/05 22:19:48 angelos Exp $
-
-inherit 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
-	mikmod? ( media-libs/libmikmod )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-noattr.patch" || die "epatch failed"
-}
-
-src_install() {
-	newbin bb bb-aalib || die "renaming bb binary failed"
-	newman bb.1 bb-aalib.1 || die "renaming bb manpage failed"
-	insinto /usr/share/bb
-	doins bb.s3m bb2.s3m bb3.s3m
-}
-
-pkg_postinst() {
-	elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with busybox."
-}
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
new file mode 100644
index 000000000000..577f306c8169
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
@@ -0,0 +1,15 @@
+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 @@
+  * 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <string.h>
+ #include <unistd.h>
+ #include "timers.h"
+ #include "bb.h"
diff --git a/app-misc/bb/metadata.xml b/app-misc/bb/metadata.xml
index e552045aca6d..f3d36d3380fa 100644
--- a/app-misc/bb/metadata.xml
+++ b/app-misc/bb/metadata.xml
@@ -5,4 +5,8 @@
 		<email>jokey@gentoo.org</email>
 		<name>Markus Ullmann</name>
 	</maintainer>
+	<maintainer>
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 </pkgmetadata>