Fixed bug #85964 and a couple of other ones.

Package-Manager: portage-2.0.51.19

3 files changed, 29 insertions, 18 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index 5959c6b807bc..ca3770388658 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.27 2005/01/23 10:45:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.28 2005/03/28 14:11:40 chriswhite Exp $
+
+  28 Mar 2005; Chris White <chriswhite@gentoo.org> gxine-0.4.1.ebuild:
+  Fixed bug #85964 and a couple of other ones.
 
   23 Jan 2005; Markus Rothe <corsair@gentoo.org> gxine-0.4.1.ebuild:
   added mozilla useflag to install plugin
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index f50baa7f8601..62c1faa308bf 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,9 +1,19 @@
-MD5 ccea1694d0ee9daa21110a21de7f3082 ChangeLog 3466
-MD5 feb2fd6577151e760b943fb50a12c061 gxine-0.4.1.ebuild 1373
-MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d5367593dd0f0961b67359d962e87470 ChangeLog 3588
 MD5 c30eeaab4f2b0af32ab3fbf53b7b275e gxine-0.3.3-r1.ebuild 1323
-MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873
-MD5 b18643e0d818679a729863e11852b1ac files/gxine-0.3.3-Makefile.in.patch 360
+MD5 e4b36868c2f5e0d1d2519bf766be8bc0 gxine-0.4.1.ebuild 1338
+MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 a0134d60cfc89d88f7f76826e3728379 files/digest-gxine-0.3.3-r1 64
-MD5 2a140bbbc46a7d9e1117771638ad8d60 files/gxine-0.3.3-http-overflow.patch 484
 MD5 69140a1cb8cc6acb6ffdca76e9301493 files/digest-gxine-0.4.1 64
+MD5 b18643e0d818679a729863e11852b1ac files/gxine-0.3.3-Makefile.in.patch 360
+MD5 2a140bbbc46a7d9e1117771638ad8d60 files/gxine-0.3.3-http-overflow.patch 484
+MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCSAkKFdQwWVoAgN4RAoeoAKDoKdgpwG2X47dUxpZxRu/aFTZxVwCfUj8g
+LXedf/Hvy9uAvXyBa1zcnB0=
+=sWSW
+-----END PGP SIGNATURE-----
diff --git a/media-video/gxine/gxine-0.4.1.ebuild b/media-video/gxine/gxine-0.4.1.ebuild
index e3af5c8bca50..13292c3ebda7 100644
--- a/media-video/gxine/gxine-0.4.1.ebuild
+++ b/media-video/gxine/gxine-0.4.1.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-video/gxine/gxine-0.4.1.ebuild,v 1.2 2005/01/23 10:45:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.1.ebuild,v 1.3 2005/03/28 14:11:40 chriswhite Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -16,7 +16,7 @@ DEPEND="media-libs/libpng
 	X? ( virtual/x11 )"
 RDEPEND="nls? ( sys-devel/gettext )"
 
-IUSE="X nls lirc mozilla"
+IUSE="nls lirc mozilla"
 
 SLOT="0"
 KEYWORDS="~x86 ~ppc sparc ~amd64 ~ppc64"
@@ -27,16 +27,14 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-menu-fix.patch
+	sed -i -e 's:gxine_logo.png:gxine:' gxine.desktop
 }
 
 src_compile() {
-	# Most of these are not working currently, but are here for completeness
-	local myconf
-	use X || myconf="${myconf} --disable-x11 --disable-xv"
-
-	myconf="${myconf} $(use_enable nls)"
-
-	econf ${myconf} || die
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		--disable-dependency-tracking || die
 	emake || die
 }
 
@@ -48,8 +46,8 @@ src_install() {
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
 
-	insinto /usr/share/pixmaps
-	doins pixmaps/gxine-logo.png
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins pixmaps/gxine-logo.png gxine.png
 
 	use mozilla && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
 }