Fix double installation of .desktop files, bug 170816

Package-Manager: portage-2.1.2.2

7 files changed, 51 insertions, 28 deletions

diff --git a/net-p2p/ghostwhitecrab/Manifest b/net-p2p/ghostwhitecrab/Manifest
index f42a6ae761e4..15abf505aaa7 100644
--- a/net-p2p/ghostwhitecrab/Manifest
+++ b/net-p2p/ghostwhitecrab/Manifest
@@ -3,14 +3,19 @@ MD5 c03b01a8867a131e348d42fbeffde6f5 files/gwc.init 522
 RMD160 5a9997928c2a9301cc16c29f5fca9a7a55794a3a files/gwc.init 522
 SHA256 59ae67ea0cc76636a1cff377a2b6270e2950b7253e87a6ecd789cc9ec95c1f7e files/gwc.init 522
 DIST gwc-0.9.7r2.tar.bz2 167041 RMD160 de917d9dfd7ffb9d9c950e87d34544f0ef297fac SHA1 32241bb17c14d9d2f744619fabbe845f876e30c2 SHA256 d2714022541c6ba168f0ab2d8827b028debe05d8f4aae938438680c55bdef8a7
+DIST gwc-0.9.9.tar.bz2 177226 RMD160 95f97a1398a4f1f99554d9ff43281ef21d3f3790 SHA1 4aac38ba0a3e9752ed383db95f60d28f7a575913 SHA256 bb910b5f524d21c3191414568c963af259d2b6298fe87fa09a468ca2be86ffce
 EBUILD ghostwhitecrab-0.9.7.2.ebuild 2632 RMD160 23ffc69b3068fd151c5c972f6eecc76e79f9cecb SHA1 b6e9424c9c68151b37b832ca0f344fc582e97647 SHA256 bc458751421d24434d6b496fcac670b911f2ed6665bd8abb0271afcb319de059
 MD5 917c21817b7e05630aef2528b3a47668 ghostwhitecrab-0.9.7.2.ebuild 2632
 RMD160 23ffc69b3068fd151c5c972f6eecc76e79f9cecb ghostwhitecrab-0.9.7.2.ebuild 2632
 SHA256 bc458751421d24434d6b496fcac670b911f2ed6665bd8abb0271afcb319de059 ghostwhitecrab-0.9.7.2.ebuild 2632
-MISC ChangeLog 1635 RMD160 460259ae1744b7ea4b347c88eb57429b6a33ebe0 SHA1 e8b3144f02f31fb9ca3e853049716f04bf5a457e SHA256 2e6506ef61291defe312cb8e7f27c9cc70afdd0162798a4fe00ccfa424f1e9c6
-MD5 a6e523797388000f0d9b7ba3c562daf0 ChangeLog 1635
-RMD160 460259ae1744b7ea4b347c88eb57429b6a33ebe0 ChangeLog 1635
-SHA256 2e6506ef61291defe312cb8e7f27c9cc70afdd0162798a4fe00ccfa424f1e9c6 ChangeLog 1635
+EBUILD ghostwhitecrab-0.9.9.ebuild 2600 RMD160 7f8fa2daeec5711147cfaa5a9520ea53f2ffea9d SHA1 a3e9047fe9da3c61a3e8da3d6a09d1241c4c9e60 SHA256 54478de4e614bab7b3bfe5689459a3ec3c3c0595245fea5d3ccfeba7ea4df4ed
+MD5 ac1d25c9a87013d3f4c755fae86dba83 ghostwhitecrab-0.9.9.ebuild 2600
+RMD160 7f8fa2daeec5711147cfaa5a9520ea53f2ffea9d ghostwhitecrab-0.9.9.ebuild 2600
+SHA256 54478de4e614bab7b3bfe5689459a3ec3c3c0595245fea5d3ccfeba7ea4df4ed ghostwhitecrab-0.9.9.ebuild 2600
+MISC ChangeLog 1848 RMD160 721fc93da7b59d3e41364ca7d867115d00da290a SHA1 84cb3b8bdcf057b49c0a5d9e061a844dfb1112ec SHA256 38b57dda747446b6c43e1aaad59492e5d8aca16ff3bbb5d21bf530bf2b432d7e
+MD5 07a59bc539d481e210fc19cb2f1d7169 ChangeLog 1848
+RMD160 721fc93da7b59d3e41364ca7d867115d00da290a ChangeLog 1848
+SHA256 38b57dda747446b6c43e1aaad59492e5d8aca16ff3bbb5d21bf530bf2b432d7e ChangeLog 1848
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
@@ -18,3 +23,6 @@ SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata
 MD5 3d95bd4552d547c3dc41d134f30fced0 files/digest-ghostwhitecrab-0.9.7.2 238
 RMD160 476d19955ac9f13cb10c2d6c2d1b384d130f1e83 files/digest-ghostwhitecrab-0.9.7.2 238
 SHA256 8a31ef17bf604f48314cddde4633b9f4ea41ef9ee4e3b00dba48d97f5ca4a76e files/digest-ghostwhitecrab-0.9.7.2 238
+MD5 788500be0cbdbb9996fe377a77c6934b files/digest-ghostwhitecrab-0.9.9 232
+RMD160 eb2736c1b39c9b768630e540f606effdde163354 files/digest-ghostwhitecrab-0.9.9 232
+SHA256 2b8bf15ffd6468ceedcf0a01b7a84278673eae7e298c4a7bf7e54e20c7266d92 files/digest-ghostwhitecrab-0.9.9 232
diff --git a/net-p2p/nicotine+/ChangeLog b/net-p2p/nicotine+/ChangeLog
index 1c47320db4fb..64f2c987a4cc 100644
--- a/net-p2p/nicotine+/ChangeLog
+++ b/net-p2p/nicotine+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/nicotine+
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.11 2007/03/07 21:49:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.12 2007/03/15 12:46:26 armin76 Exp $
+
+  15 Mar 2007; Raúl Porcel <armin76@gentoo.org> nicotine+-1.2.6.ebuild,
+  nicotine+-1.2.7.ebuild, nicotine+-1.2.7.1.ebuild:
+  Fix double installation of .desktop files, bug 170816
 
 *nicotine+-1.2.7.1 (07 Mar 2007)
 
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 96606614e142..789d77cb9ddb 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -9,22 +9,22 @@ SHA256 18f5380b571622b3fa1368ffeb44ad98635a4087284dfc2cb62f75aa7c5a9420 files/ni
 DIST nicotine+-1.2.6.tar.bz2 611707 RMD160 6a35394440aa2ec96efa3408cba35874860081dd SHA1 ad6d682634b6ec8a676aafdbe17fe78fd981524a SHA256 de390a7ac759dbff766f9fb668610a1bdaf6b8fe46c7982790bee6e0fd766654
 DIST nicotine+-1.2.7.1.tar.bz2 746571 RMD160 70ad020d01ad1daa15626a1bb0956a6e7bdf3c8b SHA1 289c1aae513ab06ab8f3924ced3716acf8bd686a SHA256 2c128dc7b09d5b7b07146e18784120b64c14510b7abfb8d087fc78081cb9a4cf
 DIST nicotine+-1.2.7.tar.bz2 721490 RMD160 fa51f5ef635a9bff3a503d44fc4b58e2a8f465d7 SHA1 25d4918da5374f587f324a9b70fa83114f00ab10 SHA256 739dc783bb749d0d0933ffae2bf9337a71628283158728dc2eaf5da7c034c3cc
-EBUILD nicotine+-1.2.6.ebuild 1262 RMD160 bfba72a943c111785c41046dca642f8b487f5cbe SHA1 2cc78c34fb77569f99385a3351549c195da068cd SHA256 027568b2a178a04b0a550ec981f4e6eed4f6f2c40298ef323c871acb290d68b6
-MD5 9498bb986c9e98176cb1381bab5c948c nicotine+-1.2.6.ebuild 1262
-RMD160 bfba72a943c111785c41046dca642f8b487f5cbe nicotine+-1.2.6.ebuild 1262
-SHA256 027568b2a178a04b0a550ec981f4e6eed4f6f2c40298ef323c871acb290d68b6 nicotine+-1.2.6.ebuild 1262
-EBUILD nicotine+-1.2.7.1.ebuild 1267 RMD160 a12141e201fcf9e799511c7a68eca9f17977c1c8 SHA1 d7c29b4169b7a4af38ce92cf7e159396c89e8b68 SHA256 eeb218f66e9f732ee471e624c4e4a1d1a226ee91c103117e22f5d068515c3a03
-MD5 9a60762a281de2ce48799c11de96f816 nicotine+-1.2.7.1.ebuild 1267
-RMD160 a12141e201fcf9e799511c7a68eca9f17977c1c8 nicotine+-1.2.7.1.ebuild 1267
-SHA256 eeb218f66e9f732ee471e624c4e4a1d1a226ee91c103117e22f5d068515c3a03 nicotine+-1.2.7.1.ebuild 1267
-EBUILD nicotine+-1.2.7.ebuild 1265 RMD160 c45d24f3f02e1c606da58f4d204274e2c5a040fc SHA1 b64d3714d9f9f46f02bb6d502bbb8a63addc602a SHA256 b70b682d94de5745718cbefa831ed03e9315015765f430548ec64a2025ded04c
-MD5 c89f6dfad6f866514bb709122a04392b nicotine+-1.2.7.ebuild 1265
-RMD160 c45d24f3f02e1c606da58f4d204274e2c5a040fc nicotine+-1.2.7.ebuild 1265
-SHA256 b70b682d94de5745718cbefa831ed03e9315015765f430548ec64a2025ded04c nicotine+-1.2.7.ebuild 1265
-MISC ChangeLog 1668 RMD160 43f29a2fcd124d7516dd627d6a19776b41773f65 SHA1 4c21918a3220ca374e449220670913661db69c13 SHA256 dd3444aa3b505b63c4ef7db702181bdefa7ab3eee909d79de0644ff572eb3bb3
-MD5 fe58e5eee07983ebd5b7ad261d69e43a ChangeLog 1668
-RMD160 43f29a2fcd124d7516dd627d6a19776b41773f65 ChangeLog 1668
-SHA256 dd3444aa3b505b63c4ef7db702181bdefa7ab3eee909d79de0644ff572eb3bb3 ChangeLog 1668
+EBUILD nicotine+-1.2.6.ebuild 1413 RMD160 a27b27c40b82dae98927e8505f39fabc7c82ac59 SHA1 a716651bf351f1f114f242cf880dcad56d1195b1 SHA256 15b85ad0ba986a9c74169c0f1a171d1459ba782536fa3c9bd23786104724d7f3
+MD5 7434a5f1f4777ea10413e27f66a0a2c1 nicotine+-1.2.6.ebuild 1413
+RMD160 a27b27c40b82dae98927e8505f39fabc7c82ac59 nicotine+-1.2.6.ebuild 1413
+SHA256 15b85ad0ba986a9c74169c0f1a171d1459ba782536fa3c9bd23786104724d7f3 nicotine+-1.2.6.ebuild 1413
+EBUILD nicotine+-1.2.7.1.ebuild 1417 RMD160 fe04e11ba99b26885a1802c13eedadfc0da8ca49 SHA1 84168a10e472d76931265901f85df1d279505862 SHA256 bf2d78384b69ddf0bb11a4682266b704b86703e8141db9d95464e1b9a4dbb3b4
+MD5 80b9b4a3a49b64f69a0d7614a9905294 nicotine+-1.2.7.1.ebuild 1417
+RMD160 fe04e11ba99b26885a1802c13eedadfc0da8ca49 nicotine+-1.2.7.1.ebuild 1417
+SHA256 bf2d78384b69ddf0bb11a4682266b704b86703e8141db9d95464e1b9a4dbb3b4 nicotine+-1.2.7.1.ebuild 1417
+EBUILD nicotine+-1.2.7.ebuild 1415 RMD160 31b530a09ee672d6eba725361b074df57403a345 SHA1 126c6554ab5d38276bf27b6f17258ce2f046fe7f SHA256 3671f0f5f6b14f00fde9db475ecbae181533d474ecc4d000efaf60dfdedf01b3
+MD5 076e808d3224fe4f6898854516b63105 nicotine+-1.2.7.ebuild 1415
+RMD160 31b530a09ee672d6eba725361b074df57403a345 nicotine+-1.2.7.ebuild 1415
+SHA256 3671f0f5f6b14f00fde9db475ecbae181533d474ecc4d000efaf60dfdedf01b3 nicotine+-1.2.7.ebuild 1415
+MISC ChangeLog 1850 RMD160 8f0f6d932a417786024720d4e84136787e755048 SHA1 7fd4c4125dd5e3ddddc5140f3c0837f60b84e58b SHA256 49ce58497c70bfac256a668b36653fe1a9cfaa594fad6145610cd15fee8e6dec
+MD5 211f8b2ab556537e1f179e6af2a64961 ChangeLog 1850
+RMD160 8f0f6d932a417786024720d4e84136787e755048 ChangeLog 1850
+SHA256 49ce58497c70bfac256a668b36653fe1a9cfaa594fad6145610cd15fee8e6dec ChangeLog 1850
 MISC metadata.xml 221 RMD160 f0771cc4f1f6f3c792d95e7a29f261f757042b58 SHA1 f419a40290febaecf91b849cada041c09d44249a SHA256 1bf5787e57f7fa447ffe8ea45f8be8f66a5878076e9b9e65c4f911bdaa136ea4
 MD5 952583dc0fcffc549febb7c754168574 metadata.xml 221
 RMD160 f0771cc4f1f6f3c792d95e7a29f261f757042b58 metadata.xml 221
@@ -32,9 +32,9 @@ SHA256 1bf5787e57f7fa447ffe8ea45f8be8f66a5878076e9b9e65c4f911bdaa136ea4 metadata
 MD5 b9cddca4b2602ad66928ad20bc2c1de7 files/digest-nicotine+-1.2.6 250
 RMD160 556e312311ff870aa460229525d48f25994fe6e7 files/digest-nicotine+-1.2.6 250
 SHA256 058e14a0ee143ea5227779c3b3b4ba87dcee82e05b395157d34435c6c302f7ea files/digest-nicotine+-1.2.6 250
-MD5 0ed8a75dd276ac62ab0d278ba4c2a7ba files/digest-nicotine+-1.2.7 250
-RMD160 8c1b903fd1654bfeb038bfa10d8dc463632a5d59 files/digest-nicotine+-1.2.7 250
-SHA256 c5af3b98aa3d70e26b95421e9282adaf6c39f574fd897eb823125ec5a72de7ce files/digest-nicotine+-1.2.7 250
+MD5 1b75f9201ec29ba08319da9f09bcd9ad files/digest-nicotine+-1.2.7 182
+RMD160 525c8830c396ad01b437b1c73b73db7d5afa5786 files/digest-nicotine+-1.2.7 182
+SHA256 a118eacfe11c9b089be8a7f9f9e2e73ca500297b8e1a99a0dac18526a956bcdf files/digest-nicotine+-1.2.7 182
 MD5 c0ce1f58e6e15537a325afef08044262 files/digest-nicotine+-1.2.7.1 256
 RMD160 a89b83b4e572d8f474c92cb0a9e1c43bf4293ec5 files/digest-nicotine+-1.2.7.1 256
 SHA256 b61d3224aecd15f4a991e44598eb5b0e8c0c6a268c7951766acf81a2e0376f17 files/digest-nicotine+-1.2.7.1 256
diff --git a/net-p2p/nicotine+/files/digest-nicotine+-1.2.7 b/net-p2p/nicotine+/files/digest-nicotine+-1.2.7
index 7d77fc95d14d..7de23acf1d72 100644
--- a/net-p2p/nicotine+/files/digest-nicotine+-1.2.7
+++ b/net-p2p/nicotine+/files/digest-nicotine+-1.2.7
@@ -1,3 +1,2 @@
-MD5 09c41ba320f61b70ee1ee8840fbf1a1d nicotine+-1.2.7.tar.bz2 721490
 RMD160 fa51f5ef635a9bff3a503d44fc4b58e2a8f465d7 nicotine+-1.2.7.tar.bz2 721490
 SHA256 739dc783bb749d0d0933ffae2bf9337a71628283158728dc2eaf5da7c034c3cc nicotine+-1.2.7.tar.bz2 721490
diff --git a/net-p2p/nicotine+/nicotine+-1.2.6.ebuild b/net-p2p/nicotine+/nicotine+-1.2.6.ebuild
index 98d289dd2576..076714de392a 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.6.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.2.6.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/net-p2p/nicotine+/nicotine+-1.2.6.ebuild,v 1.3 2007/02/18 14:37:36 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.6.ebuild,v 1.4 2007/03/15 12:46:26 armin76 Exp $
 
 inherit distutils eutils multilib toolchain-funcs
 
@@ -42,6 +42,10 @@ src_install() {
 	cd "${S}"/trayicon/
 	emake DESTDIR="${D}" install || die "emake install failed"
 
+	# Remove the .desktop file installed by setup.py
+	rm ${D}/usr/share/applications/nicotine.desktop \
+		${D}/usr/share/pixmaps/nicotine-plus-32px.png
+
 	doicon ${FILESDIR}/nicotine-n.png
 	domenu ${FILESDIR}/${PN}.desktop
 }
diff --git a/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild b/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild
index 06ccbb1dd548..dea38d024b17 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.2.7.1.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/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild,v 1.1 2007/03/07 21:49:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild,v 1.2 2007/03/15 12:46:26 armin76 Exp $
 
 inherit distutils eutils multilib toolchain-funcs
 
@@ -42,6 +42,10 @@ src_install() {
 	cd "${S}"/trayicon/
 	emake DESTDIR="${D}" install || die "emake install failed"
 
+	# Remove the .desktop file installed by setup.py
+	rm ${D}/usr/share/applications/nicotine.desktop \
+		${D}/usr/share/pixmaps/nicotine-plus-32px.png
+
 	doicon ${FILESDIR}/nicotine-n.png
 	domenu ${FILESDIR}/${PN}.desktop
 }
diff --git a/net-p2p/nicotine+/nicotine+-1.2.7.ebuild b/net-p2p/nicotine+/nicotine+-1.2.7.ebuild
index d81906173574..fdf5b4acdeab 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.7.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.2.7.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/net-p2p/nicotine+/nicotine+-1.2.7.ebuild,v 1.1 2007/02/26 15:55:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.7.ebuild,v 1.2 2007/03/15 12:46:26 armin76 Exp $
 
 inherit distutils eutils multilib toolchain-funcs
 
@@ -42,6 +42,10 @@ src_install() {
 	cd "${S}"/trayicon/
 	emake DESTDIR="${D}" install || die "emake install failed"
 
+	# Remove the .desktop file installed by setup.py
+	rm ${D}/usr/share/applications/nicotine.desktop \
+		${D}/usr/share/pixmaps/nicotine-plus-32px.png
+
 	doicon ${FILESDIR}/nicotine-n.png
 	domenu ${FILESDIR}/${PN}.desktop
 }