Version bump. Fix build failure with texinfo-5.1, bug 464678. Remove old.

(Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

4 files changed, 39 insertions, 28 deletions

diff --git a/app-emacs/bongo/ChangeLog b/app-emacs/bongo/ChangeLog
index 8cb6d601bd47..d2851eec1a31 100644
--- a/app-emacs/bongo/ChangeLog
+++ b/app-emacs/bongo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/bongo
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/bongo/ChangeLog,v 1.6 2009/10/16 17:48:46 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bongo/ChangeLog,v 1.7 2013/04/05 18:58:32 ulm Exp $
+
+*bongo-20110621 (05 Apr 2013)
+
+  05 Apr 2013; Ulrich Müller <ulm@gentoo.org> -bongo-20070619-r2.ebuild,
+  bongo-20090713.ebuild, +bongo-20110621.ebuild,
+  +files/bongo-20110621-texinfo-5.patch:
+  Version bump. Fix build failure with texinfo-5.1, bug 464678. Remove old.
 
 *bongo-20090713 (16 Oct 2009)
 
diff --git a/app-emacs/bongo/bongo-20090713.ebuild b/app-emacs/bongo/bongo-20090713.ebuild
index 7e87ea45b1cc..2e6e85c4732c 100644
--- a/app-emacs/bongo/bongo-20090713.ebuild
+++ b/app-emacs/bongo/bongo-20090713.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/bongo/bongo-20090713.ebuild,v 1.1 2009/10/16 17:48:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bongo/bongo-20090713.ebuild,v 1.2 2013/04/05 18:58:32 ulm Exp $
 
 NEED_EMACS=22
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.brockman.se/software/bongo/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mplayer? ( mirror://gentoo/${PN}-mplayer-20070204.tar.bz2 )"
 
-LICENSE="GPL-2 FDL-1.2"
+LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mplayer taglib"
diff --git a/app-emacs/bongo/bongo-20070619-r2.ebuild b/app-emacs/bongo/bongo-20110621.ebuild
index 97ff8c1ada6f..6f96cfcba44a 100644
--- a/app-emacs/bongo/bongo-20070619-r2.ebuild
+++ b/app-emacs/bongo/bongo-20110621.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/bongo/bongo-20070619-r2.ebuild,v 1.3 2009/10/16 17:48:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bongo/bongo-20110621.ebuild,v 1.1 2013/04/05 18:58:32 ulm Exp $
 
+EAPI=5
 NEED_EMACS=22
 
 inherit elisp eutils
@@ -10,10 +11,10 @@ DESCRIPTION="Buffer-oriented media player for Emacs"
 HOMEPAGE="http://www.brockman.se/software/bongo/"
 # Darcs snapshot of http://www.brockman.se/software/bongo/
 # MPlayer support from http://www.emacswiki.org/emacs/bongo-mplayer.el
-SRC_URI="mirror://gentoo/${P}.tar.bz2
+SRC_URI="mirror://gentoo/${P}.tar.xz
 	mplayer? ( mirror://gentoo/${PN}-mplayer-20070204.tar.bz2 )"
 
-LICENSE="GPL-2 FDL-1.2"
+LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mplayer taglib"
@@ -22,32 +23,23 @@ IUSE="mplayer taglib"
 # the dependency possibilities are so broad that we refrain from including
 # any media players explicitly in DEPEND/RDEPEND.
 
-DEPEND="app-emacs/volume"
-RDEPEND="${DEPEND}
+RDEPEND="app-emacs/volume"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+RDEPEND="${RDEPEND}
 	taglib? ( dev-ruby/ruby-taglib )"
 
 S="${WORKDIR}/${PN}"
-DOCS="NEWS README"
+DOCS="AUTHORS HISTORY NEWS README.rdoc"
+ELISP_PATCHES="${PN}-20070619-fix-require.patch
+	${P}-texinfo-5.patch"
+ELISP_REMOVE="bongo-emacs21.el"	# Don't bother with Emacs 21
 ELISP_TEXINFO="${PN}.texinfo"
 SITEFILE="50${PN}-gentoo.el"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need Emacs 22 for image-load-path anyway, so don't bother with 21.
-	rm -f bongo-emacs21.el
-
-	epatch "${FILESDIR}/${P}-fix-require.patch"
-}
-
 src_install() {
 	elisp_src_install
-
 	insinto "${SITEETC}/${PN}"
-	doins *.pbm *.png || die "doins failed"
-
-	if use taglib; then
-		dobin tree-from-tags.rb || die "dobin failed"
-	fi
+	doins etc/*.pbm etc/*.png
+	use taglib && dobin contrib/tree-from-tags.rb
 }
diff --git a/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch b/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch
new file mode 100644
index 000000000000..3fa257b97f1c
--- /dev/null
+++ b/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch
@@ -0,0 +1,12 @@
+--- bongo-orig/bongo.texinfo
++++ bongo/bongo.texinfo
+@@ -374,7 +374,8 @@
+ 
+ @item @kbd{C-u C-u C-u b}, @kbd{C-u C-u C-u f}
+ Seek 64 seconds.
+-@end table}.
++@end table
++}.
+ @end table
+ 
+ To seek a specific number of seconds, give a numeric prefix argument to