Fixed the desktop icon mess, more specifically bug #50296.

Package-Manager: portage-2.0.51.19

4 files changed, 21 insertions, 12 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index ca3770388658..936671a1d507 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,10 @@
 # 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.28 2005/03/28 14:11:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.29 2005/03/28 15:49:20 chriswhite Exp $
+
+  29 Mar 2005; Chris White <chriswhite@gentoo.org> gxine-0.3.3-r1.ebuild,
+  gxine-0.4.1.ebuild:
+  Fixed the desktop icon mess, more specifically bug #50296.
 
   28 Mar 2005; Chris White <chriswhite@gentoo.org> gxine-0.4.1.ebuild:
   Fixed bug #85964 and a couple of other ones.
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 62c1faa308bf..ce60733efda0 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d5367593dd0f0961b67359d962e87470 ChangeLog 3588
-MD5 c30eeaab4f2b0af32ab3fbf53b7b275e gxine-0.3.3-r1.ebuild 1323
-MD5 e4b36868c2f5e0d1d2519bf766be8bc0 gxine-0.4.1.ebuild 1338
+MD5 1e8b3416ff217b64e083c785a1496146 ChangeLog 3746
+MD5 e7e292bd9b33c877797d54c58b4db1b1 gxine-0.3.3-r1.ebuild 1377
+MD5 cafe249a3ad39fdbb4a2e3991dc00f91 gxine-0.4.1.ebuild 1338
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 a0134d60cfc89d88f7f76826e3728379 files/digest-gxine-0.3.3-r1 64
 MD5 69140a1cb8cc6acb6ffdca76e9301493 files/digest-gxine-0.4.1 64
@@ -13,7 +13,7 @@ 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
+iD8DBQFCSB/wFdQwWVoAgN4RApeAAJ9Tv/74xwsfKPJt7vCG+QUgvOfxpACbBYPB
+PUy1Fj3E6URY+qFI128g+OI=
+=PCwH
 -----END PGP SIGNATURE-----
diff --git a/media-video/gxine/gxine-0.3.3-r1.ebuild b/media-video/gxine/gxine-0.3.3-r1.ebuild
index 19767d5ac3ff..5ddcdee0b01c 100644
--- a/media-video/gxine/gxine-0.3.3-r1.ebuild
+++ b/media-video/gxine/gxine-0.3.3-r1.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.3.3-r1.ebuild,v 1.4 2005/01/23 10:40:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.3.3-r1.ebuild,v 1.5 2005/03/28 15:49:20 chriswhite Exp $
 
 inherit eutils nsplugins
 
@@ -53,7 +53,10 @@ src_install() {
 		docsdir=/usr/share/doc/${PF} \
 		install || die
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	insinto /usr/share/pixmaps
+	doins pixmaps/gxine-logo.png
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
 
 	inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
 }
diff --git a/media-video/gxine/gxine-0.4.1.ebuild b/media-video/gxine/gxine-0.4.1.ebuild
index 13292c3ebda7..924c066b4429 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.3 2005/03/28 14:11:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.1.ebuild,v 1.4 2005/03/28 15:49:20 chriswhite Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -27,7 +27,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-menu-fix.patch
-	sed -i -e 's:gxine_logo.png:gxine:' gxine.desktop
 }
 
 src_compile() {
@@ -44,11 +43,14 @@ src_install() {
 		docsdir=/usr/share/doc/${PF} \
 		install || die
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
 
 	insinto /usr/share/icons/hicolor/48x48/apps
 	newins pixmaps/gxine-logo.png gxine.png
 
+	insinto /usr/share/pixmaps
+	doins pixmaps/gxine-logo.png
+
 	use mozilla && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
 }