Version bump. Final release from upstream. Deleted obsolete patch. Install gentoo_ice skin, closes bug #109772.

(Portage version: 2.0.53_rc6)

5 files changed, 135 insertions, 32 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index 642709ebd2a3..1ca979f3601d 100644
--- a/media-sound/beep-media-player/ChangeLog
+++ b/media-sound/beep-media-player/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/beep-media-player
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.67 2005/09/14 19:14:37 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.68 2005/10/22 12:38:33 chainsaw Exp $
+
+*beep-media-player-0.9.7.1 (22 Oct 2005)
+
+  22 Oct 2005; Tony Vroon <chainsaw@gentoo.org>
+  -files/0.9.7-bigendian.patch, +beep-media-player-0.9.7.1.ebuild:
+  Version bump. Final release from upstream. Deleted obsolete patch. Install
+  gentoo_ice skin, closes bug #109772.
 
   14 Sep 2005; <chainsaw@gentoo.org> -beep-media-player-0.9.7-r4.ebuild:
   Remove old ebuild.
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index 89f946102051..2015ed68c8fe 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,28 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
-MD5 5f0d5d812cb19c3f1dd91bab090008bd ChangeLog 12138
+MD5 9461bbca1e460e102969c8ea5381da63 ChangeLog 12412
 MD5 3e970dc883c7abdd6bf77e8ee07f6ad3 beep-media-player-0.9.7-r6.ebuild 2769
 MD5 9af2ef1afbca5de81d3767bd710a8c29 beep-media-player-0.9.7-r8.ebuild 2999
-MD5 d14dde91067c784f210c19e1e4024650 files/0.9.7-desktop-icon.patch 535
-MD5 bea6e241ce4dae7a01125836fda25fcc files/0.9.7-bigendian.patch 315
-MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r6 62
-MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r8 62
-MD5 07dd84987f30f2cbb9ca16ec80cb6962 files/0.9.7-playlist-deadfile-delete.patch 540
+MD5 6e9bdb6bc71da07a86715123520dd57f beep-media-player-0.9.7.1.ebuild 2754
 MD5 4fe36295e02a77ccc81d9f710ebcc9fb files/0.9.7-bogus-songinfo.patch 517
+MD5 d14dde91067c784f210c19e1e4024650 files/0.9.7-desktop-icon.patch 535
+MD5 32c2097467512370b951158b88abbeda files/0.9.7-hidden-window.patch 658
 MD5 3f601435320f38af453b506ced22e342 files/0.9.7-ipv6.patch 10063
 MD5 0e011dce894959d58bb98199a10b9a6a files/0.9.7-link-gconf.patch 1173
 MD5 533bcd69c3357e3b6dd5b3a49afbb6bf files/0.9.7-noclick-resize.patch 974
-MD5 893b0d5bce79831b0f71aae51af7440d files/0.9.7-vorbis-date.patch 637
-MD5 32c2097467512370b951158b88abbeda files/0.9.7-hidden-window.patch 658
-MD5 e0224d7dcc5a2cb1af6ea6b18a6daea8 files/beep-config 3347
+MD5 07dd84987f30f2cbb9ca16ec80cb6962 files/0.9.7-playlist-deadfile-delete.patch 540
 MD5 e279329d65732e4ce62f2ea78badc901 files/0.9.7-volume-crash.patch 600
+MD5 893b0d5bce79831b0f71aae51af7440d files/0.9.7-vorbis-date.patch 637
 MD5 539d031b4930b4ce080fbe0804edfc28 files/0.9.7-window-focus.patch 850
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDKHbBp5vW4rUFj5oRAkbuAKCl7/9YqQA0YNnsT5pXXokYFiOxLACghVa8
-V7QmaqdxnrRVYSoOID1gkNs=
-=G5Kn
------END PGP SIGNATURE-----
+MD5 e0224d7dcc5a2cb1af6ea6b18a6daea8 files/beep-config 3347
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r6 62
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r8 62
+MD5 18a0c44ab6e0927dc058a0f43f0795f4 files/digest-beep-media-player-0.9.7.1 135
+MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7.1.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7.1.ebuild
new file mode 100644
index 000000000000..612a55b30133
--- /dev/null
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.7.1.ebuild,v 1.1 2005/10/22 12:38:33 chainsaw Exp $
+
+IUSE="nls gnome mp3 oggvorbis alsa oss esd mmx old-eq"
+
+inherit flag-o-matic eutils libtool
+
+MY_PN="bmp"
+MY_P=bmp-${PV/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Beep Media Player"
+HOMEPAGE="http://www.sosdg.org/~larne/w/BMP_Homepage"
+SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# beep-config has a runtime depend on pkg-config
+RDEPEND="app-arch/unzip
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
+	>=gnome-base/libglade-2.3.1
+	>=dev-util/pkgconfig-0.9.0
+	esd? ( >=media-sound/esound-0.2.30 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
+	gnome? ( >=gnome-base/gconf-2.6.0 )
+	mp3? ( media-libs/id3lib )"
+
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )"
+
+src_unpack() {
+	if ! useq mp3; then
+		ewarn "MP3 support is now optional and you have not enabled it."
+	fi
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/0.9.7-hidden-window.patch
+	epatch ${FILESDIR}/0.9.7-window-focus.patch
+	epatch ${FILESDIR}/0.9.7-ipv6.patch
+
+	ebegin "Rebuilding configure script (this will take a while)"
+	autoreconf -f -i &> /dev/null
+	eend $?
+
+	elibtoolize
+}
+
+src_compile() {
+	# Bug #42893
+	replace-flags "-Os" "-O2"
+	# Bug #86689
+	is-flag "-O*" || append-flags -O
+
+	econf \
+		--with-dev-dsp=/dev/sound/dsp \
+		--with-dev-mixer=/dev/sound/mixer \
+		--includedir=/usr/include/beep-media-player \
+		`use_with old-eq xmms-eq` \
+		`use_enable mmx simd` \
+		`use_enable gnome gconf` \
+		`use_enable oggvorbis vorbis` \
+		`use_enable esd` \
+		`use_enable mp3` \
+		`use_enable nls` \
+		`use_enable oss` \
+		`use_enable alsa` \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins icons/bmp.png
+
+	insinto /usr/share/pixmaps
+	doins beep/beep_logo.xpm
+
+	dosym /usr/include/beep-media-player/bmp /usr/include/beep-media-player/xmms
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/bmp/Skins/gentoo_ice
+	doins ${WORKDIR}/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc ${WORKDIR}/README
+
+	# XMMS skin symlinking; bug 70697
+	for SKIN in /usr/share/xmms/Skins/* ; do
+		dosym "$SKIN" /usr/share/bmp/Skins/
+	done
+
+	# Plugins want beep-config, this wasn't included
+	dobin ${FILESDIR}/beep-config
+
+	dodoc AUTHORS FAQ NEWS README
+}
+
+pkg_postinst() {
+	echo
+	einfo "Your XMMS skins, if any, have been symlinked."
+	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
+	echo
+}
diff --git a/media-sound/beep-media-player/files/0.9.7-bigendian.patch b/media-sound/beep-media-player/files/0.9.7-bigendian.patch
deleted file mode 100644
index 4032a81fd2f3..000000000000
--- a/media-sound/beep-media-player/files/0.9.7-bigendian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur bmp-0.9.7rc2.orig/configure.ac bmp-0.9.7rc2/configure.ac
---- bmp-0.9.7rc2.orig/configure.ac	2004-11-24 22:28:04.180907736 +0900
-+++ bmp-0.9.7rc2/configure.ac	2004-11-24 22:28:25.374880832 +0900
-@@ -52,6 +52,7 @@
- AC_DISABLE_STATIC
- AC_ENABLE_SHARED
- AC_PROG_LIBTOOL
-+AC_C_BIGENDIAN
- 
- 
- dnl Path settings
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7.1 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7.1
new file mode 100644
index 000000000000..8b688a805ebe
--- /dev/null
+++ b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7.1
@@ -0,0 +1,2 @@
+MD5 c25d5a8d49cc5851d13d525a20023c4c bmp-0.9.7.1.tar.gz 2056564
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839