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

(Portage version: 2.2.0_alpha84_p18/cvs/Linux x86_64)

5 files changed, 73 insertions, 41 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/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>