Removing old version. Marking stable on x86. Moved header files and setup symlinks to make more compatible with xmms plugins in the upcomming xmms-plugin.eclass.

7 files changed, 24 insertions, 49 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index 693faee51fef..ee47bebf68a3 100644
--- a/media-sound/beep-media-player/ChangeLog
+++ b/media-sound/beep-media-player/ChangeLog
@@ -1,6 +1,17 @@
 # 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.16 2004/10/05 19:38:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.17 2004/10/19 21:18:02 eradicator Exp $
+
+*beep-media-player-0.9.7_rc2-r2 (19 Oct 2004)
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/beep-media-player-0.9.6.1-gcc34.patch,
+  -files/beep-media-player.desktop, -beep-media-player-0.9.6.1-r1.ebuild,
+  -beep-media-player-0.9.7_rc2-r1.ebuild,
+  +beep-media-player-0.9.7_rc2-r2.ebuild:
+  Removing old version. Marking stable on x86. Moved header files and setup
+  symlinks to make more compatible with xmms plugins in the upcomming
+  xmms-plugin.eclass.
 
   05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   beep-media-player-0.9.7_rc2-r1.ebuild:
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index 1a4f79f3aa94..7f7e826bfe13 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0c0cbd7ebba3f12f6ef0017b1707f906 ChangeLog 3336
-MD5 76838639f1c8f9370b2edbc907fdbf7b beep-media-player-0.9.6.1-r1.ebuild 2349
-MD5 c2b732e23b494f21a181f1767c96d714 beep-media-player-0.9.7_rc2-r1.ebuild 2616
+MD5 76838639f1c8f9370b2edbc907fdbf7b beep-media-player-0.9.6.1-r2.ebuild 2349
 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 5467c49ed8a5460d21e82e42edab5c99 beep-media-player-0.9.7_rc2-r2.ebuild 2490
 MD5 e80bc03ebda5e6071f584a50638e9630 files/beep-media-player-0.9.6.1-gcc34.patch 552
+MD5 49ac6fbcf87a9de0e4fb7f349c53805c files/beep-media-player.desktop 281
+MD5 063233d8fba29761b83b023b6a367489 files/digest-beep-media-player-0.9.6.1-r2 64
 MD5 bcb43edf11b6364167d8c326ed04f6b0 files/beep-config 3253
-MD5 b7d99875975dc75e79760f82bbeaf790 files/digest-beep-media-player-0.9.7_rc2-r1 65
 MD5 27cf6516ed075a139579b1c439e9bd90 files/beep-media-player-0.9.7_rc2-mime.patch 587
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBYvhKArHZZzCEUG0RAtQRAKCGKOWMMsilb6FQ0szl8pqD4OjYmwCeNWfs
-pRIMp4zFT+kRW4scUhSeT50=
-=AdNh
------END PGP SIGNATURE-----
+MD5 b7d99875975dc75e79760f82bbeaf790 files/digest-beep-media-player-0.9.7_rc2-r2 65
diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7_rc2-r1.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7_rc2-r2.ebuild
index 9f1a86659088..c7f1631535c6 100644
--- a/media-sound/beep-media-player/beep-media-player-0.9.7_rc2-r1.ebuild
+++ b/media-sound/beep-media-player/beep-media-player-0.9.7_rc2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.3 2004/10/05 19:38:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.7_rc2-r2.ebuild,v 1.1 2004/10/19 21:18:02 eradicator Exp $
 
 IUSE="nls gnome opengl oggvorbis mikmod alsa oss esd mmx"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 
 RDEPEND="app-arch/unzip
 	>=x11-libs/gtk+-2.4
@@ -59,13 +59,10 @@ src_compile() {
 	econf \
 		--with-dev-dsp=/dev/sound/dsp \
 		--with-dev-mixer=/dev/sound/mixer \
+		--includedir=/usr/include/beep-media-player \
 		`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` \
@@ -84,15 +81,14 @@ src_install() {
 	doins beep.svg
 	doins beep/beep_mini.xpm
 
+	dosym /usr/include/beep-media-player/bmp /usr/include/beep-media-player/xmms
+
 	# Get the app registered for KDE
 	insinto /usr/share/applnk/Multimedia
 	doins ${D}/usr/share/applications/bmp.desktop
 
-	# We'll use xmms skins / plugins for the time being
-
-	dodir /usr/share/beep
+	# We'll use xmms skins
 	dosym /usr/share/xmms/Skins /usr/share/beep/Skins
-	dosym /usr/share/xmms/Plugins /usr/share/beep/Plugins
 
 	# Plugins want beep-config, this wasn't included
 	dobin ${FILESDIR}/beep-config
@@ -105,6 +101,6 @@ pkg_postinst() {
 	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."
+	einfo "We're using xmms skins for the time being, they have been symlinked."
 	echo
 }
diff --git a/media-sound/beep-media-player/files/beep-media-player-0.9.6.1-gcc34.patch b/media-sound/beep-media-player/files/beep-media-player-0.9.6.1-gcc34.patch
deleted file mode 100644
index 3940451dfe2c..000000000000
--- a/media-sound/beep-media-player/files/beep-media-player-0.9.6.1-gcc34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur bmp-0.9.6.1.orig/Input/vorbis/fileinfo.c bmp-0.9.6.1/Input/vorbis/fileinfo.c
---- bmp-0.9.6.1.orig/Input/vorbis/fileinfo.c	2003-12-24 07:57:29.000000000 -0600
-+++ bmp-0.9.6.1/Input/vorbis/fileinfo.c	2004-07-02 13:00:42.349657696 -0500
-@@ -54,6 +54,8 @@
- static gint init_files(vcedit_state * state);
- static gint close_files(vcedit_state * state);
- 
-+GtkWidget *xmms_show_message_test(gchar *, gchar *, gchar *, gboolean, GtkSignalFunc, gpointer);
-+
- extern GMutex *vf_mutex;
- static GtkWidget *window = NULL;
- static GList *genre_list = NULL;
diff --git a/media-sound/beep-media-player/files/beep-media-player.desktop b/media-sound/beep-media-player/files/beep-media-player.desktop
deleted file mode 100644
index 20a271394f89..000000000000
--- a/media-sound/beep-media-player/files/beep-media-player.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Beep Media Player
-Comment=Beep Media Player
-Encoding=Legacy-Mixed
-Exec=beep-media-player
-Icon=beep.svg
-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
-Terminal=0
-Type=Application
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.6.1-r1 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.6.1-r1
deleted file mode 100644
index fc7fc1fe9f7d..000000000000
--- a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0102233416eb8efaec775c415f5308eb bmp-0.9.6.1.tar.gz 1472078
diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2-r1 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2-r2
index ee9bb0f2a088..ee9bb0f2a088 100644
--- a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2-r1
+++ b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7_rc2-r2