Version bump to 0.9.7rc2. Dropped GCC 3.4 patch, builds fine without.

4 files changed, 110 insertions, 2 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index 7b431908efd6..e9a4ff897d72 100644
--- a/media-sound/beep-media-player/ChangeLog
+++ b/media-sound/beep-media-player/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/beep-media-player
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.9 2004/07/07 21:51:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.10 2004/08/28 21:34:51 chainsaw Exp $
+
+*beep-media-player-0.9.7_rc2 (28 Aug 2004)
+
+  28 Aug 2004; Tony Vroon <chainsaw@gentoo.org>
+  +beep-media-player-0.9.7_rc2.ebuild:
+  Version bump to 0.9.7rc2. Dropped GCC 3.4 patch, no longer needed.
 
   07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   +files/beep-media-player-0.9.6.1-gcc34.patch:
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index d18857e3029f..8fa2bf467382 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,6 +1,8 @@
-MD5 d811a5463ce0f1b7aeb83b590d82413e ChangeLog 2061
+MD5 5fcc4795631dc2b24b865e8845fbf8c6 beep-media-player-0.9.7_rc2.ebuild 2424
 MD5 8a374f72791674dc80b4dee42e2295b4 beep-media-player-0.9.6.1-r1.ebuild 2350
+MD5 984ad640f6632d3069fefcefc42a2774 ChangeLog 2262
 MD5 2b0e9087ef8939ab0578160c97b115e0 metadata.xml 215
 MD5 49ac6fbcf87a9de0e4fb7f349c53805c files/beep-media-player.desktop 281
 MD5 063233d8fba29761b83b023b6a367489 files/digest-beep-media-player-0.9.6.1-r1 64
+MD5 b7d99875975dc75e79760f82bbeaf790 files/digest-beep-media-player-0.9.7_rc2 65
 MD5 e80bc03ebda5e6071f584a50638e9630 files/beep-media-player-0.9.6.1-gcc34.patch 552
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7_rc2.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7_rc2.ebuild
new file mode 100644
index 000000000000..5ecea19c997f
--- /dev/null
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7_rc2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 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_rc2.ebuild,v 1.1 2004/08/28 21:34:51 chainsaw Exp $
+
+inherit flag-o-matic eutils
+
+MY_PN="bmp"
+MY_P=bmp-${PV/_/}
+
+DESCRIPTION="Beep Media Player"
+HOMEPAGE="http://beepmp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-amd64: 0.9.6.1-r1: Segfault on startup; 0.9.7_rc2 not tested yet
+KEYWORDS="~x86 ~sparc -amd64"
+IUSE="nls esd gnome opengl oggvorbis mikmod alsa"
+
+RDEPEND="app-arch/unzip
+	>=x11-libs/gtk+-2.2
+	>=x11-libs/pango-1.2
+	>=dev-libs/libxml-1.8.15
+	mikmod? ( >=media-libs/libmikmod-3.1.10 )
+	esd? ( >=media-sound/esound-0.2.29 )
+	opengl? ( virtual/opengl )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	alsa? ( >=media-libs/alsa-lib-0.9.0 )"
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+# This version compiles fine with GCC 3.4
+#	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	# Bug #42893
+	replace-flags "-Os" "-O2"
+
+	econf \
+		--with-dev-dsp=/dev/sound/dsp \
+		--with-dev-mixer=/dev/sound/mixer \
+		`use_enable oggvorbis vorbis` \
+		`use_enable oggvorbis oggtest` \
+		`use_enable oggvorbis vorbistest` \
+		`use_enable esd` \
+		`use_enable esd esdtest` \
+		`use_enable mikmod` \
+		`use_enable mikmod mikmodtest` \
+		`use_with mikmod libmikmod` \
+		`use_enable opengl` \
+		`use_enable nls` \
+		`use_enable alsa` \
+		${myconf} \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die "install failed"
+
+	insinto /usr/share/pixmaps
+	doins beep.svg
+	doins beep/beep_mini.xpm
+
+	# Get the app registered in gnome
+
+	if use gnome; then
+		dodir /usr/share/gnome/apps
+		insinto /usr/share/gnome/apps/Multimedia
+		doins ${FILESDIR}/beep-media-player.desktop
+	fi
+
+	# We'll use xmms skins / plugins for the time being
+
+	dodir /usr/share/beep
+	dosym /usr/share/xmms/Skins /usr/share/beep/Skins
+	dosym /usr/share/xmms/Plugins /usr/share/beep/Plugins
+
+	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO
+}
+
+pkg_postinst() {
+	echo
+	einfo "This program is unstable on sparc when poking heavily with the GUI."
+	einfo "It's reportedly unstable on some x86 boxes also, YMMV."
+	echo
+	einfo "We're using xmms skins/plugins for the time being, they have been symlinked."
+	echo
+}
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2
new file mode 100644
index 000000000000..ee9bb0f2a088
--- /dev/null
+++ b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2
@@ -0,0 +1 @@
+MD5 1fcf7b7d8964f26cb5c0ebddc95d1a7d bmp-0.9.7rc2.tar.gz 1705197