Bump, closes bug #82337. -r3 stable on x86.

(Portage version: 2.0.51-r15)

7 files changed, 145 insertions, 15 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index e64c5a55e4b2..21b4a228a5da 100644
--- a/media-sound/beep-media-player/ChangeLog
+++ b/media-sound/beep-media-player/ChangeLog
@@ -1,6 +1,14 @@
 # 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.43 2005/02/28 19:04:15 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.44 2005/02/28 19:47:26 chainsaw Exp $
+
+*beep-media-player-0.9.7-r4 (28 Feb 2005)
+
+  28 Feb 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-hidden-window.patch, +files/0.9.7-vorbis-date.patch,
+  beep-media-player-0.9.7-r3.ebuild, +beep-media-player-0.9.7-r4.ebuild:
+  Added vorbis date-field patch (upstream bug #244) and hidden-window patch
+  (bug #82337). -r3 stable on x86.
 
   28 Feb 2005; Tony Vroon <chainsaw@gentoo.org> metadata.xml,
   -beep-media-player-0.9.7-r1.ebuild, -beep-media-player-0.9.7.ebuild:
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index 3c2d832456b6..faf7f4570f0c 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 020319b9379dd7c7069eb8c1bcd743cc beep-media-player-0.9.7-r4.ebuild 2538
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
-MD5 7cdb15e8042acb07351df6b0cf5fa1ca ChangeLog 8065
+MD5 3c82390f3d27e239becbcfa9ec03d21e ChangeLog 8409
 MD5 a72c1bd12ff2c4440d2eeb74cdcf0d34 beep-media-player-0.9.7-r2.ebuild 2330
-MD5 67e8e728e7d218400dedc65a068b83f1 beep-media-player-0.9.7-r3.ebuild 2447
+MD5 b81aa86615332f0989be15b9cbc3590a beep-media-player-0.9.7-r3.ebuild 2446
 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-r2 62
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r4 62
 MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r3 62
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCI2wdp5vW4rUFj5oRAuclAJ9tJrIPSMFDi1AuV1q6wQvnOqhSUgCghU/i
-qZCWw7nDNNKALT4ibkuaAA4=
-=b69a
------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
index 46d26afb71a5..fc74b0f23f4a 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.3 2005/02/21 17:14:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.7-r3.ebuild,v 1.4 2005/02/28 19:47:26 chainsaw Exp $
 
 IUSE="nls gnome mp3 oggvorbis alsa oss esd mmx old-eq"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~hppa ~mips ~ppc64 ~alpha ~ia64"
+KEYWORDS="~amd64 ~ppc ~sparc x86 ~hppa ~mips ~ppc64 ~alpha ~ia64"
 
 RDEPEND="app-arch/unzip
 	>=x11-libs/gtk+-2.4
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7-r4.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7-r4.ebuild
new file mode 100644
index 000000000000..14d7edb59dd5
--- /dev/null
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7-r4.ebuild
@@ -0,0 +1,103 @@
+# 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-r4.ebuild,v 1.1 2005/02/28 19:47:26 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 ~ia64"
+
+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
+	epatch ${FILESDIR}/${PV}-vorbis-date.patch
+	epatch ${FILESDIR}/${PV}-hidden-window.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-hidden-window.patch b/media-sound/beep-media-player/files/0.9.7-hidden-window.patch
new file mode 100644
index 000000000000..c496aa0b6b11
--- /dev/null
+++ b/media-sound/beep-media-player/files/0.9.7-hidden-window.patch
@@ -0,0 +1,12 @@
+--- beep/vis.c.orig	2004-12-04 10:04:29.000000000 +0100
++++ beep/vis.c	2005-02-17 12:02:25.391044008 +0100
+@@ -223,7 +223,8 @@ vis_draw(Widget * w)
+     /* FIXME: The check "shouldn't" be neccessary? */
+     /*	if (GTK_IS_WINDOW(vis->vs_window)) { */
+     GDK_THREADS_ENTER();
+-    gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
++    if (GDK_IS_DRAWABLE(vis->vs_window))
++        gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
+                            vis->vs_widget.x, vis->vs_widget.y,
+                            vis->vs_widget.width, vis->vs_widget.height,
+                            GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,
diff --git a/media-sound/beep-media-player/files/0.9.7-vorbis-date.patch b/media-sound/beep-media-player/files/0.9.7-vorbis-date.patch
new file mode 100644
index 000000000000..a969352138ae
--- /dev/null
+++ b/media-sound/beep-media-player/files/0.9.7-vorbis-date.patch
@@ -0,0 +1,12 @@
+diff -uNr bmp.orig/Input/vorbis/fileinfo.c bmp/Input/vorbis/fileinfo.c
+--- bmp.orig/Input/vorbis/fileinfo.c	2004-12-04 18:29:06.000000000 +0900
++++ bmp/Input/vorbis/fileinfo.c	2005-01-28 21:45:52.000000000 +0900
+@@ -993,7 +993,7 @@
+     gtk_entry_set_text(GTK_ENTRY(tracknumber_entry),
+                        get_comment(comment, "tracknumber"));
+     gtk_entry_set_text(GTK_ENTRY(date_entry),
+-                       get_comment(comment, "data"));
++                       get_comment(comment, "date"));
+ #ifdef ALL_VORBIS_TAGS
+     gtk_entry_set_text(GTK_ENTRY(version_entry),
+                        get_comment(comment, "version"));
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r4 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r4
new file mode 100644
index 000000000000..c8dccff861f8
--- /dev/null
+++ b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r4
@@ -0,0 +1 @@
+MD5 5d74113f5de3d11a400d1d6c118d41c0 bmp-0.9.7.tar.gz 1974397