Closes bugs #79608 and #81050.

(Portage version: 2.0.51-r15)

5 files changed, 128 insertions, 15 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index 6aa06d67c0e1..a58cd260e68e 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.40 2005/02/05 22:20:13 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.41 2005/02/12 18:18:22 chainsaw Exp $
+
+*beep-media-player-0.9.7-r3 (12 Feb 2005)
+
+  12 Feb 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-desktop-icon.patch, +beep-media-player-0.9.7-r3.ebuild:
+  Depend on id3lib, closes bug #79608. Install icons differently, closes bug
+  #81050. Run elibtoolize to stop libtool panic in install stage.
 
   05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
   beep-media-player-0.9.7-r2.ebuild:
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index 08a0d64f9cae..23819ed09dd8 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a72c1bd12ff2c4440d2eeb74cdcf0d34 beep-media-player-0.9.7-r2.ebuild 2330
-MD5 4f15025d50d4b2ec7ab3f87d4881859c ChangeLog 7495
-MD5 ac66b2f1affa97ffc408b53daa8a5d2f beep-media-player-0.9.7.ebuild 2070
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
+MD5 ac66b2f1affa97ffc408b53daa8a5d2f beep-media-player-0.9.7.ebuild 2070
+MD5 ff50815b76a3203469e0f7fc4ad2d97d ChangeLog 7801
 MD5 f4f2f6f94fc39c6dc3acddf92a477e91 beep-media-player-0.9.7-r1.ebuild 2275
-MD5 533bcd69c3357e3b6dd5b3a49afbb6bf files/0.9.7-noclick-resize.patch 974
+MD5 a72c1bd12ff2c4440d2eeb74cdcf0d34 beep-media-player-0.9.7-r2.ebuild 2330
+MD5 40dfaad28617e4c7cf08561fb70cdd41 beep-media-player-0.9.7-r3.ebuild 2316
+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-r1 62
 MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r2 62
 MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7 62
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r3 62
+MD5 533bcd69c3357e3b6dd5b3a49afbb6bf files/0.9.7-noclick-resize.patch 974
 MD5 e0224d7dcc5a2cb1af6ea6b18a6daea8 files/beep-config 3347
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCBUapugEuf3OQ0akRAmLBAJ9JPX+ZA2z26oQdCXzZqAqH60BWcgCfSGP2
-weLFsFkwqGfTgJ/ca7eXah4=
-=UdbR
------END PGP SIGNATURE-----
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7-r3.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7-r3.ebuild
new file mode 100644
index 000000000000..941405b5465a
--- /dev/null
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7-r3.ebuild
@@ -0,0 +1,100 @@
+# 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-r3.ebuild,v 1.1 2005/02/12 18:18:22 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~hppa ~mips ~ppc64 ~alpha"
+
+RDEPEND="app-arch/unzip
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
+	>=gnome-base/libglade-2.3.1
+	esd? ( >=media-sound/esound-0.2.30 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	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}/${PV}-noclick-resize.patch
+	epatch ${FILESDIR}/${PV}-bigendian.patch
+	epatch ${FILESDIR}/${PV}-desktop-icon.patch
+
+	elibtoolize
+}
+
+src_compile() {
+	# Bug #42893
+	replace-flags "-Os" "-O2"
+
+	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.svg
+
+	insinto /usr/share/pixmaps
+	doins beep/beep_logo.xpm
+
+	dosym /usr/include/beep-media-player/bmp /usr/include/beep-media-player/xmms
+
+	# 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
+	# Note that this one has a special gentoo modification
+	# to work with xmms-plugin.eclass
+	dobin ${FILESDIR}/beep-config
+
+	dodoc AUTHORS FAQ NEWS README TODO
+}
+
+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-desktop-icon.patch b/media-sound/beep-media-player/files/0.9.7-desktop-icon.patch
new file mode 100644
index 000000000000..8b3a6a59209b
--- /dev/null
+++ b/media-sound/beep-media-player/files/0.9.7-desktop-icon.patch
@@ -0,0 +1,12 @@
+diff -Npaur bmp-0.9.7/beep/bmp.desktop.in bmp-0.9.7-fixdesktop/beep/bmp.desktop.in
+--- bmp-0.9.7/beep/bmp.desktop.in	2004-07-07 09:56:34.000000000 +0200
++++ bmp-0.9.7-fixdesktop/beep/bmp.desktop.in	2005-02-07 02:08:48.639752608 +0100
+@@ -2,7 +2,7 @@
+ Name=Beep Media Player
+ Comment=Play music
+ Exec=beep-media-player
+-Icon=bmp.svg
++Icon=bmp
+ MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
+ Categories=Application;GTK;AudioVideo;Player;
+ Terminal=false
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r3 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r3
new file mode 100644
index 000000000000..c8dccff861f8
--- /dev/null
+++ b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r3
@@ -0,0 +1 @@
+MD5 5d74113f5de3d11a400d1d6c118d41c0 bmp-0.9.7.tar.gz 1974397