Remove panel-plugin/xfce4-mixer.desktop because make install creates it again for...

Package-Manager: portage-2.1.2-r9

diff --git a/xfce-extra/xfce4-mixer/ChangeLog b/xfce-extra/xfce4-mixer/ChangeLog
index ee5a6e39dc6c4fc948feddea91c3effc249c4a27..559b9bbd3902a2d8f521bca687aeb8dc246d1112 100644 (file)
--- a/xfce-extra/xfce4-mixer/ChangeLog
+++ b/xfce-extra/xfce4-mixer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-mixer
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.75 2007/02/03 02:28:45 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.76 2007/02/10 15:18:40 drac Exp $
+
+  10 Feb 2007; Samuli Suominen <drac@gentoo.org>
+  xfce4-mixer-4.4.0-r1.ebuild:
+  Remove panel-plugin/xfce4-mixer.desktop because make install creates it
+  again for bug 166167.
 
   03 Feb 2007; Joshua Nichols <nichoj@gentoo.org>
   -xfce4-mixer-4.3.99.2.ebuild, -xfce4-mixer-4.4.0.ebuild:

diff --git a/xfce-extra/xfce4-mixer/Manifest b/xfce-extra/xfce4-mixer/Manifest
index e7c3f54a6258e1f42329359ebfe6b82fc17c44d4..f55d2f8ca61a1d5afa86a021759c1826b0aeda7d 100644 (file)
--- a/xfce-extra/xfce4-mixer/Manifest
+++ b/xfce-extra/xfce4-mixer/Manifest
@@ -4,14 +4,14 @@ EBUILD xfce4-mixer-4.2.3.ebuild 634 RMD160 784eee621d3469d424bcb0fb45949e0bf5f6b
 MD5 43b34acf465659f9e17a294306a6f3e0 xfce4-mixer-4.2.3.ebuild 634
 RMD160 784eee621d3469d424bcb0fb45949e0bf5f6b23b xfce4-mixer-4.2.3.ebuild 634
 SHA256 52701d87ac7f617a4acc51bdf17d3e713ca872be7b1bf3663d55087f095f6520 xfce4-mixer-4.2.3.ebuild 634
-EBUILD xfce4-mixer-4.4.0-r1.ebuild 894 RMD160 d4d4103ca62d60861317cf3aad186701ba597883 SHA1 dade5882ab82c0237d09fd5346bd9deacea6feaa SHA256 0460e1aa287beab027437cedbad49a29a9ad484020b114e631ba9f7d7410e8ae
-MD5 87f6e1f0ba12c801fbf656a685e969b3 xfce4-mixer-4.4.0-r1.ebuild 894
-RMD160 d4d4103ca62d60861317cf3aad186701ba597883 xfce4-mixer-4.4.0-r1.ebuild 894
-SHA256 0460e1aa287beab027437cedbad49a29a9ad484020b114e631ba9f7d7410e8ae xfce4-mixer-4.4.0-r1.ebuild 894
-MISC ChangeLog 9285 RMD160 881e3a8dfd3027e1f428857ae23c5e54a64b7677 SHA1 529311eb2730b9e875a2579f5042268092140a7f SHA256 11fc9a75892cee3e444a2f5e135e926d2bcf9ba613420b30a850bd290d39c49b
-MD5 eee05e83242191c1f674388d3db3b01f ChangeLog 9285
-RMD160 881e3a8dfd3027e1f428857ae23c5e54a64b7677 ChangeLog 9285
-SHA256 11fc9a75892cee3e444a2f5e135e926d2bcf9ba613420b30a850bd290d39c49b ChangeLog 9285
+EBUILD xfce4-mixer-4.4.0-r1.ebuild 1043 RMD160 fec7fd581bd6a1d9d4c8bc26a53ebe415c7c41eb SHA1 0f7a97f7d8cefc01a987b777d158e27fe97979a5 SHA256 ae9f85728e1d816821846e8c1697e97030e1d4fba8ad5cbda0486bad2d37d3fe
+MD5 9a12026bf118ff8584ba61202ff7e8c7 xfce4-mixer-4.4.0-r1.ebuild 1043
+RMD160 fec7fd581bd6a1d9d4c8bc26a53ebe415c7c41eb xfce4-mixer-4.4.0-r1.ebuild 1043
+SHA256 ae9f85728e1d816821846e8c1697e97030e1d4fba8ad5cbda0486bad2d37d3fe xfce4-mixer-4.4.0-r1.ebuild 1043
+MISC ChangeLog 9462 RMD160 6da880915eeb8244a1f05d75def24213fc4d80ae SHA1 d1fcc0b71c0e8fb2214f9ab358d7ed4e7efddbdf SHA256 2943c70841123ac5c6d9ea67e33f5137bd07eccc68642ad54149b6242e81fd2d
+MD5 98b1a5312da1532cfe48b35cf134083e ChangeLog 9462
+RMD160 6da880915eeb8244a1f05d75def24213fc4d80ae ChangeLog 9462
+SHA256 2943c70841123ac5c6d9ea67e33f5137bd07eccc68642ad54149b6242e81fd2d ChangeLog 9462
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157

diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild
index c82a5a155e1c701dd5aaee34f3956237a16a6809..80229c74eaeba2d94dbf01c43f3655f7a4303429 100644 (file)
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.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/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild,v 1.1 2007/01/31 16:36:25 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild,v 1.2 2007/02/10 15:18:40 drac Exp $
 
 inherit eutils xfce44
 
@@ -28,6 +28,9 @@ fi
 DOCS="AUTHORS ChangeLog NEWS NOTES README TODO"
 
 src_install() {
+       # .desktop file has allready been created by upstrean
+       # and make install tries to create it again. Bug 166167
+       rm panel-plugin/xfce4-mixer.desktop
        xfce44_src_install
        make_desktop_entry ${PN} "Volume control" ${PN} AudioVideo
 }