fixed multilib problems (bug #64580). Fixed mime options in .desktop (bug #65918). Fixed DEPEND (bug #65510).

5 files changed, 56 insertions, 23 deletions

diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog
index 29353f01fa18..693faee51fef 100644
--- a/media-sound/beep-media-player/ChangeLog
+++ b/media-sound/beep-media-player/ChangeLog
@@ -1,6 +1,11 @@
 # 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.15 2004/09/15 19:33:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.16 2004/10/05 19:38:38 eradicator Exp $
+
+  05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  beep-media-player-0.9.7_rc2-r1.ebuild:
+  fixed multilib problems (bug #64580). Fixed mime options in .desktop (bug
+  #65918). Fixed DEPEND (bug #65510).
 
   15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   beep-media-player-0.9.6.1-r1.ebuild:
diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest
index 76dc52b3aedc..1a4f79f3aa94 100644
--- a/media-sound/beep-media-player/Manifest
+++ b/media-sound/beep-media-player/Manifest
@@ -1,9 +1,20 @@
-MD5 19ebc3ad0e7f92b4a3cea46cc6e1508b ChangeLog 3123
+-----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 2b0e9087ef8939ab0578160c97b115e0 metadata.xml 215
-MD5 db16eb99eb87115d5f17b73b4931600d beep-media-player-0.9.7_rc2-r1.ebuild 2513
 MD5 49ac6fbcf87a9de0e4fb7f349c53805c files/beep-media-player.desktop 281
 MD5 063233d8fba29761b83b023b6a367489 files/digest-beep-media-player-0.9.6.1-r1 64
 MD5 e80bc03ebda5e6071f584a50638e9630 files/beep-media-player-0.9.6.1-gcc34.patch 552
 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-----
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-r1.ebuild
index 4c7de6f5f859..9f1a86659088 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-r1.ebuild
@@ -1,11 +1,14 @@
 # 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.2 2004/08/31 19:07:43 chainsaw Exp $
+# $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 $
 
-inherit flag-o-matic
+IUSE="nls gnome opengl oggvorbis mikmod alsa oss esd mmx"
+
+inherit flag-o-matic eutils
 
 MY_PN="bmp"
 MY_P=bmp-${PV/_/}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Beep Media Player"
 HOMEPAGE="http://beepmp.sourceforge.net/"
@@ -15,22 +18,29 @@ LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="nls gnome opengl oggvorbis mikmod alsa oss esd mmx"
 
 RDEPEND="app-arch/unzip
-	>=x11-libs/gtk+-2.2
+	>=x11-libs/gtk+-2.4
 	>=x11-libs/pango-1.2
 	>=dev-libs/libxml-1.8.15
-	>=gnome-base/libglade-2.0.1
+	>=gnome-base/libglade-2.3.1
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	esd? ( >=media-sound/esound-0.2.29 )
+	esd? ( >=media-sound/esound-0.2.30 )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0 )"
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	gnome? ( >=gnome-base/gnome-vfs-2.6.0
+	         >=gnome-base/gconf-2.6.0 )"
+
 DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )"
 
-S=${WORKDIR}/${MY_P}
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mime.patch
+}
 
 src_compile() {
 	local myconf=""
@@ -68,19 +78,15 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "install failed"
+	make DESTDIR="${D}" install || die
 
 	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
+	# 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
 
diff --git a/media-sound/beep-media-player/files/beep-media-player-0.9.7_rc2-mime.patch b/media-sound/beep-media-player/files/beep-media-player-0.9.7_rc2-mime.patch
new file mode 100644
index 000000000000..fddc076a1d45
--- /dev/null
+++ b/media-sound/beep-media-player/files/beep-media-player-0.9.7_rc2-mime.patch
@@ -0,0 +1,11 @@
+--- beep/bmp.desktop.in.old	2004-09-30 15:00:52.054890304 +0200
++++ beep/bmp.desktop.in	2004-09-30 15:02:01.054400784 +0200
+@@ -3,7 +3,7 @@
+ Comment=Play music
+ Exec=beep-media-player
+ Icon=bmp.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
++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;application/ogg;audio/x-flac;application/x-flac
+ Categories=Application;GTK;AudioVideo;Player;
+ Terminal=false
+ Type=Application
diff --git a/media-sound/daapd/Manifest b/media-sound/daapd/Manifest
index eb371bef126b..d7a18e23db16 100644
--- a/media-sound/daapd/Manifest
+++ b/media-sound/daapd/Manifest
@@ -5,7 +5,7 @@ MD5 930ab8747282832850cf476d00aad168 ChangeLog 1633
 MD5 a536a4ad7975642df2a610dc11163dde daapd-0.2.1d.ebuild 1277
 MD5 67fa7232a65762eb47d8773c5fb33811 metadata.xml 592
 MD5 eb70a6530ad16b705eea4b7f95a56163 daapd-0.2.3b.ebuild 1381
-MD5 fb83dc0a500317b84678bd5f347ee948 daapd-0.2.3d.ebuild 1399
+MD5 c9adb332586642b59ff2ef59db397ff5 daapd-0.2.3d.ebuild 1306
 MD5 6a94f39460d57008cfec35d65b784951 files/0.2.1d-makefile-gentoo.patch 343
 MD5 71d5acf0144c38a510d37e388e6f4b4d files/0.2.1d-zeroconf-gentoo.patch 5182
 MD5 3beda326653c14c1fbd33c762af01e2e files/daapd.conf.d 673
@@ -19,7 +19,7 @@ MD5 c25c564a55bdc585c844929ca710971a files/digest-daapd-0.2.3d 61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBYmBCArHZZzCEUG0RAqdnAJ0VGQYejzB1t0LgA5G1XKMfwdPOswCfVJW/
-Y6S5Q+1pSBqusV2/BtMZL20=
-=68B/
+iD4DBQFBYvlFArHZZzCEUG0RAutGAJdIGUDntAnww9GhSzMLd0J0mYWLAJ9DIdnL
+K5w/GF33qWMYpZz1wp7v9w==
+=m36c
 -----END PGP SIGNATURE-----