Revision bump, patch from Mike Lundy <novas007@gmx.net> closes bug #103825. Linking fix from azarah. ipv6 patch is back.

(Portage version: 2.0.51.22-r2)

6 files changed, 174 insertions, 9 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index dca373fa2398..f28574d16c6b 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.64 2005/08/24 19:46:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.65 2005/08/26 23:32:10 chainsaw Exp $
+
+*beep-media-player-0.9.7-r8 (26 Aug 2005)
+
+  26 Aug 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.9.7-link-gconf.patch, +files/0.9.7-volume-crash.patch,
+  +beep-media-player-0.9.7-r8.ebuild:
+  Revision bump, patch from Mike Lundy <novas007@gmx.net> closes bug #103825.
+  Linking fix from azarah. ipv6 patch is back.
 
   24 Aug 2005; Aron Griffis <agriffis@gentoo.org>
   beep-media-player-0.9.7-r6.ebuild:
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index c446ce3c6151..82649647d776 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,16 +1,20 @@
+MD5 ce8c0101520de38dfa531388e8e249bc beep-media-player-0.9.7-r4.ebuild 2657
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 MD5 a800ca30a8f2d9edd743528ed89b7780 ChangeLog 11602
-MD5 ce8c0101520de38dfa531388e8e249bc beep-media-player-0.9.7-r4.ebuild 2657
 MD5 83dfdc442b40bed5f13b36d4efc2ec82 beep-media-player-0.9.7-r6.ebuild 2770
-MD5 4fe36295e02a77ccc81d9f710ebcc9fb files/0.9.7-bogus-songinfo.patch 517
+MD5 6b5e4ee4711fddd5367f6cbc8e302774 beep-media-player-0.9.7-r8.ebuild 3146
 MD5 d14dde91067c784f210c19e1e4024650 files/0.9.7-desktop-icon.patch 535
 MD5 bea6e241ce4dae7a01125836fda25fcc files/0.9.7-bigendian.patch 315
-MD5 533bcd69c3357e3b6dd5b3a49afbb6bf files/0.9.7-noclick-resize.patch 974
-MD5 e0224d7dcc5a2cb1af6ea6b18a6daea8 files/beep-config 3347
-MD5 07dd84987f30f2cbb9ca16ec80cb6962 files/0.9.7-playlist-deadfile-delete.patch 540
-MD5 893b0d5bce79831b0f71aae51af7440d files/0.9.7-vorbis-date.patch 637
 MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r6 62
-MD5 539d031b4930b4ce080fbe0804edfc28 files/0.9.7-window-focus.patch 850
+MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r8 62
+MD5 07dd84987f30f2cbb9ca16ec80cb6962 files/0.9.7-playlist-deadfile-delete.patch 540
+MD5 4fe36295e02a77ccc81d9f710ebcc9fb files/0.9.7-bogus-songinfo.patch 517
 MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r4 62
-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 e279329d65732e4ce62f2ea78badc901 files/0.9.7-volume-crash.patch 600
+MD5 539d031b4930b4ce080fbe0804edfc28 files/0.9.7-window-focus.patch 850
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7-r8.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7-r8.ebuild
new file mode 100644
index 000000000000..5932dc015ecb
--- /dev/null
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7-r8.ebuild
@@ -0,0 +1,116 @@
+# 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-r8.ebuild,v 1.1 2005/08/26 23:32:10 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="~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}/${PV}-noclick-resize.patch
+	epatch ${FILESDIR}/${PV}-desktop-icon.patch
+	epatch ${FILESDIR}/${PV}-vorbis-date.patch
+	epatch ${FILESDIR}/${PV}-hidden-window.patch
+	epatch ${FILESDIR}/${PV}-playlist-deadfile-delete.patch
+	epatch ${FILESDIR}/${PV}-window-focus.patch
+	epatch ${FILESDIR}/${PV}-bogus-songinfo.patch
+	epatch ${FILESDIR}/${PV}-ipv6.patch
+	epatch ${FILESDIR}/${PV}-link-gconf.patch
+	epatch ${FILESDIR}/${PV}-volume-crash.patch
+
+	ebegin "Rebuilding configure script (this will take a while)"
+	autoreconf &> /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.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-link-gconf.patch b/media-sound/beep-media-player/files/0.9.7-link-gconf.patch
new file mode 100644
index 000000000000..4cf938ef5e72
--- /dev/null
+++ b/media-sound/beep-media-player/files/0.9.7-link-gconf.patch
@@ -0,0 +1,22 @@
+--- bmp-0.9.7/libbeep/Makefile.am	2005-08-27 00:29:03.000000000 +0200
++++ bmp-0.9.7.az/libbeep/Makefile.am	2005-08-27 00:29:27.000000000 +0200
+@@ -6,7 +6,7 @@
+ lib_LTLIBRARIES = libbeep.la
+ 
+ libbeep_la_LDFLAGS = -export-dynamic -version-info $(LIBBEEP_MAJOR_VERSION):$(LIBBEEP_MINOR_VERSION):$(LIBBEEP_MICRO_VERSION)
+-libbeep_la_LIBADD = @GTK_LIBS@
++libbeep_la_LIBADD = @GTK_LIBS@ @GCONF_LIBS@ @GNOMEVFS_LIBS@
+ INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ @GNOMEVFS_CFLAGS@ -I$(top_srcdir)/../intl -I$(top_srcdir)/..
+ 
+ if HAVE_GCONF
+--- bmp-0.9.7/libbeep/Makefile.in	2005-08-27 00:29:13.000000000 +0200
++++ bmp-0.9.7.az/libbeep/Makefile.in	2005-08-27 00:29:33.000000000 +0200
+@@ -301,7 +301,7 @@
+ beepincludedir = $(includedir)/bmp
+ lib_LTLIBRARIES = libbeep.la
+ libbeep_la_LDFLAGS = -export-dynamic -version-info $(LIBBEEP_MAJOR_VERSION):$(LIBBEEP_MINOR_VERSION):$(LIBBEEP_MICRO_VERSION)
+-libbeep_la_LIBADD = @GTK_LIBS@
++libbeep_la_LIBADD = @GTK_LIBS@ @GCONF_LIBS@ @GNOMEVFS_LIBS@
+ INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ @GNOMEVFS_CFLAGS@ -I$(top_srcdir)/../intl -I$(top_srcdir)/..
+ @HAVE_GCONF_FALSE@CONF_SRC = configdb_rcfile.c
+ @HAVE_GCONF_TRUE@CONF_SRC = configdb_gconf.c
diff --git a/media-sound/beep-media-player/files/0.9.7-volume-crash.patch b/media-sound/beep-media-player/files/0.9.7-volume-crash.patch
new file mode 100644
index 000000000000..672f1ad1677d
--- /dev/null
+++ b/media-sound/beep-media-player/files/0.9.7-volume-crash.patch
@@ -0,0 +1,14 @@
+diff -u bmp-0.9.7/beep/controlsocket.c bmp-0.9.7-mod/beep/controlsocket.c
+--- bmp-0.9.7/beep/controlsocket.c	2004-12-04 07:05:16.000000000 -0500
++++ bmp-0.9.7-mod/beep/controlsocket.c	2005-08-21 05:52:05.000000000 -0400
+@@ -364,7 +364,9 @@
+             break;
+         case CMD_GET_BALANCE:
+             input_get_volume(&v[0], &v[1]);
+-            if (v[0] > v[1])
++            if (v[0] < 0 || v[1] < 0)
++                b = 0;
++            else if (v[0] > v[1])
+                 b = -100 + ((v[1] * 100) / v[0]);
+             else if (v[1] > v[0])
+                 b = 100 - ((v[0] * 100) / v[1]);
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r8 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r8
new file mode 100644
index 000000000000..c8dccff861f8
--- /dev/null
+++ b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r8
@@ -0,0 +1 @@
+MD5 5d74113f5de3d11a400d1d6c118d41c0 bmp-0.9.7.tar.gz 1974397