Makefile allready installs both pixmap and desktop file so stop doing that inside ebuild.

Package-Manager: portage-2.1.3_rc5

3 files changed, 15 insertions, 25 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 4134865a650d..d136b63d95c6 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.490 2007/06/23 18:22:17 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.491 2007/06/24 17:01:02 drac Exp $
+
+  24 Jun 2007; Samuli Suominen <drac@gentoo.org>
+  mplayer-1.0.20070622.ebuild:
+  Makefile allready installs both pixmap and desktop file so stop doing that
+  inside ebuild.
 
   23 Jun 2007; Christoph Mende <angelos@gentoo.org>
   mplayer-1.0.20070622.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index e4c78113db68..f01eb5f130eb 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mplayer-1.0_rc1-asmrules.patch 1450 RMD160 370877b45b314c9deb2d89739f8067a4a77c0844 SHA1 84412f4bd85d64a92586ca4db7e8585d16cd1acd SHA256 3f71e6f4e07940d4d55084d0df12404371bc4e534a3a6b0756ca73e44ddbc3c4
 MD5 f0b71c38b1207c1d604be091876ac051 files/mplayer-1.0_rc1-asmrules.patch 1450
 RMD160 370877b45b314c9deb2d89739f8067a4a77c0844 files/mplayer-1.0_rc1-asmrules.patch 1450
@@ -41,18 +38,18 @@ EBUILD mplayer-1.0.20070427.ebuild 17353 RMD160 24046021addce9f819bb1cb7b3eff4f1
 MD5 652e1c61ca9773037c62b3971ba6f989 mplayer-1.0.20070427.ebuild 17353
 RMD160 24046021addce9f819bb1cb7b3eff4f1a26a78dd mplayer-1.0.20070427.ebuild 17353
 SHA256 39d410de28bc40bd01841b91c359ac5af561fc7190e5da79f6ea953a3f85ddbc mplayer-1.0.20070427.ebuild 17353
-EBUILD mplayer-1.0.20070622.ebuild 16870 RMD160 0b080f5913a9bd508487359241bbf64ee560f8d3 SHA1 189767f9c288facfcb3ab093fb186d4d9a87a8b5 SHA256 634b733f2678f346b9cd4549f412ede6d3949b3a96ee5711b376f77a5d9dc539
-MD5 c9a489d0379b9dc32137a139e144f50d mplayer-1.0.20070622.ebuild 16870
-RMD160 0b080f5913a9bd508487359241bbf64ee560f8d3 mplayer-1.0.20070622.ebuild 16870
-SHA256 634b733f2678f346b9cd4549f412ede6d3949b3a96ee5711b376f77a5d9dc539 mplayer-1.0.20070622.ebuild 16870
+EBUILD mplayer-1.0.20070622.ebuild 16712 RMD160 fdc5445453dbbbb5de9a0e7c74635e1c0b9ac1e1 SHA1 48366c209dbdba1e89c95625aedd5cde57e08f84 SHA256 23f90ddd29abedbbf2afd29a8998083ec898f0e5787ee5f249919f05ca4e0f8e
+MD5 f4eabb311ede06f8e062270602faf50f mplayer-1.0.20070622.ebuild 16712
+RMD160 fdc5445453dbbbb5de9a0e7c74635e1c0b9ac1e1 mplayer-1.0.20070622.ebuild 16712
+SHA256 23f90ddd29abedbbf2afd29a8998083ec898f0e5787ee5f249919f05ca4e0f8e mplayer-1.0.20070622.ebuild 16712
 EBUILD mplayer-1.0_rc1-r2.ebuild 16352 RMD160 57f141c7024127ef5b8f6f8cccf42048b8af0495 SHA1 9445b50c292914115b37e50824a0bbef5a9b3795 SHA256 76e51ecdbc5f226c539a5c6badf1267c615084779bd555ccb9da07c9fafa2e88
 MD5 03d03c34d77877d5e6cc3f4a26f1c204 mplayer-1.0_rc1-r2.ebuild 16352
 RMD160 57f141c7024127ef5b8f6f8cccf42048b8af0495 mplayer-1.0_rc1-r2.ebuild 16352
 SHA256 76e51ecdbc5f226c539a5c6badf1267c615084779bd555ccb9da07c9fafa2e88 mplayer-1.0_rc1-r2.ebuild 16352
-MISC ChangeLog 87029 RMD160 52bd11bea84e1ab1797332efe1bd7f72e93195a3 SHA1 78c44ca5c0e0eeccbce8becf9ace16964fc40bd1 SHA256 b6185b00a82416fa4ed74cf23c7e931d40dd3f3ba2ff94428f4415338a4835f1
-MD5 24f02be1928269b099c609177771dbd3 ChangeLog 87029
-RMD160 52bd11bea84e1ab1797332efe1bd7f72e93195a3 ChangeLog 87029
-SHA256 b6185b00a82416fa4ed74cf23c7e931d40dd3f3ba2ff94428f4415338a4835f1 ChangeLog 87029
+MISC ChangeLog 87201 RMD160 c6daf22e40d806a35d6db3b5a7c0e07c564406db SHA1 7f658f387b9c58f8e1a5e215cbbfd8b38f5682f9 SHA256 0ba6b210da575633942dc33cfce348bc3f050039cffab7dc52298bea08423265
+MD5 0c3e7292bcfbec878587f3a33d8d4e94 ChangeLog 87201
+RMD160 c6daf22e40d806a35d6db3b5a7c0e07c564406db ChangeLog 87201
+SHA256 0ba6b210da575633942dc33cfce348bc3f050039cffab7dc52298bea08423265 ChangeLog 87201
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -72,10 +69,3 @@ SHA256 0201774682322220ee404f4c2d31dcedaa258d113f8bf3f638794eb97cdc58d5 files/di
 MD5 d7bbbcb7a88505edca78e82546995d4f files/digest-mplayer-1.0_rc1-r2 1997
 RMD160 95a72a90b4c19fc9063c6fab3bdb9647c6c5686f files/digest-mplayer-1.0_rc1-r2 1997
 SHA256 b0f6ba62381548cffb2eb17179cdb5927605e273c5d5b834b225cff495e9136a files/digest-mplayer-1.0_rc1-r2 1997
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGfWTNKhnDs22gwa8RAs2iAKDTkb8mrzvkOhgwTygb0EedTg6QxgCgo7mw
-djYA0HqGKG4uKPbZn8pmQIE=
-=J/n/
------END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.0.20070622.ebuild b/media-video/mplayer/mplayer-1.0.20070622.ebuild
index 1c2236b08d0b..2b34201d937a 100644
--- a/media-video/mplayer/mplayer-1.0.20070622.ebuild
+++ b/media-video/mplayer/mplayer-1.0.20070622.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20070622.ebuild,v 1.5 2007/06/23 18:22:17 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20070622.ebuild,v 1.6 2007/06/24 17:01:02 drac Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -465,11 +465,6 @@ src_install() {
 		# Fix the symlink
 		rm -rf ${D}/usr/bin/gmplayer
 		dosym mplayer /usr/bin/gmplayer
-
-		insinto /usr/share/pixmaps
-		newins ${D}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/applications
-		doins ${FILESDIR}/mplayer.desktop
 	fi
 
 	if ! use srt && ! use truetype; then