Install own desktop entry and icon

Package-Manager: portage-2.1.2.9

6 files changed, 21 insertions, 48 deletions

diff --git a/net-p2p/nicotine+/ChangeLog b/net-p2p/nicotine+/ChangeLog
index f5e74050da2c..bf7df90bf6d0 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.17 2007/06/08 15:49:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.18 2007/06/10 21:36:30 armin76 Exp $
+
+  10 Jun 2007; Raúl Porcel <armin76@gentoo.org> -files/nicotine+.desktop,
+  -files/nicotine-n.png, nicotine+-1.2.7.1.ebuild, nicotine+-1.2.8.ebuild:
+  Install own desktop entry and icon
 
   08 Jun 2007; Raúl Porcel <armin76@gentoo.org> nicotine+-1.2.7.1.ebuild,
   nicotine+-1.2.8.ebuild:
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 5cd2a37cb14b..2cc7031e0127 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,25 +1,17 @@
-AUX nicotine+.desktop 176 RMD160 5b5527b75cb96c2b4146cc19f9e74a4a3a56bfa6 SHA1 32749cf7b7dfc7e66c3d24a27be290c7ffd9ffb8 SHA256 66dd954eacc52a6bbe1ea6a7ef2fbbc6a973b9127d76891759b3625315f85491
-MD5 c480abc8a1ded5a696e66c9447c88e6b files/nicotine+.desktop 176
-RMD160 5b5527b75cb96c2b4146cc19f9e74a4a3a56bfa6 files/nicotine+.desktop 176
-SHA256 66dd954eacc52a6bbe1ea6a7ef2fbbc6a973b9127d76891759b3625315f85491 files/nicotine+.desktop 176
-AUX nicotine-n.png 6723 RMD160 b31a29f12b0652ba25070ffdb0f12e2f82bad2d0 SHA1 d88f8f2549cc8b38dc6390cefe675b26236d6622 SHA256 18f5380b571622b3fa1368ffeb44ad98635a4087284dfc2cb62f75aa7c5a9420
-MD5 78b6c9a0f315f06a45fb52448ea77c26 files/nicotine-n.png 6723
-RMD160 b31a29f12b0652ba25070ffdb0f12e2f82bad2d0 files/nicotine-n.png 6723
-SHA256 18f5380b571622b3fa1368ffeb44ad98635a4087284dfc2cb62f75aa7c5a9420 files/nicotine-n.png 6723
 DIST nicotine+-1.2.7.1.tar.bz2 746571 RMD160 70ad020d01ad1daa15626a1bb0956a6e7bdf3c8b SHA1 289c1aae513ab06ab8f3924ced3716acf8bd686a SHA256 2c128dc7b09d5b7b07146e18784120b64c14510b7abfb8d087fc78081cb9a4cf
 DIST nicotine+-1.2.8.tar.bz2 790874 RMD160 9be15d3a7304db82c5c302cffda39bdc9addb3e9 SHA1 fdf20cf43d0f183a2c2a5d7b4e9758d51814d694 SHA256 19ad0478a08c736f115506323f04e13a13f4845ac1d27fd216a1e1f2dce536e2
-EBUILD nicotine+-1.2.7.1.ebuild 1423 RMD160 c5a68c226a22573d2e6240bb6e2a82e84db6fcfe SHA1 b271ea5a5139429751cb9e831d6df9cd624da149 SHA256 3167c862a810c26f291c3925c39b837730f06a4367ccb42f3d80743e6b59f935
-MD5 e0c081f6e4b37a94a73a8285b5d6ccc4 nicotine+-1.2.7.1.ebuild 1423
-RMD160 c5a68c226a22573d2e6240bb6e2a82e84db6fcfe nicotine+-1.2.7.1.ebuild 1423
-SHA256 3167c862a810c26f291c3925c39b837730f06a4367ccb42f3d80743e6b59f935 nicotine+-1.2.7.1.ebuild 1423
-EBUILD nicotine+-1.2.8.ebuild 1423 RMD160 c18aa05460fbeffbdc28b6c617ddb0186106c3c5 SHA1 003cbac1dc8aa9b5981faa6161ccf373b203bddf SHA256 f16dea098a0227f5fe1ede01697f6acde39d96d5e32b04bf205bcae8134acaa5
-MD5 ddaa21467c15c3b969bc3bcb547e0552 nicotine+-1.2.8.ebuild 1423
-RMD160 c18aa05460fbeffbdc28b6c617ddb0186106c3c5 nicotine+-1.2.8.ebuild 1423
-SHA256 f16dea098a0227f5fe1ede01697f6acde39d96d5e32b04bf205bcae8134acaa5 nicotine+-1.2.8.ebuild 1423
-MISC ChangeLog 2468 RMD160 4a6d24ca7d939094a5eb688527da94121bc999e3 SHA1 98b403f9b347cf0b07aa2502410f36c10cbce4ee SHA256 530d9af87cf4f8ce1e38bc52f4eed49b29275fa306d4200db5a8f5158204cdeb
-MD5 c21cd941efb4a06926d703918d427397 ChangeLog 2468
-RMD160 4a6d24ca7d939094a5eb688527da94121bc999e3 ChangeLog 2468
-SHA256 530d9af87cf4f8ce1e38bc52f4eed49b29275fa306d4200db5a8f5158204cdeb ChangeLog 2468
+EBUILD nicotine+-1.2.7.1.ebuild 1205 RMD160 6b0b01e8830b0a49d2f63f8afc9b6e1b4fc70ac7 SHA1 45b9ad0583dbc310901fe85fec1f86b00ede8fa9 SHA256 6b76978be1edca734fd2ecfd96bfc0f1c2f1d61abd997bd2b70f56d1d7d652a2
+MD5 7b4a726ec974b0e7e2866807480aed99 nicotine+-1.2.7.1.ebuild 1205
+RMD160 6b0b01e8830b0a49d2f63f8afc9b6e1b4fc70ac7 nicotine+-1.2.7.1.ebuild 1205
+SHA256 6b76978be1edca734fd2ecfd96bfc0f1c2f1d61abd997bd2b70f56d1d7d652a2 nicotine+-1.2.7.1.ebuild 1205
+EBUILD nicotine+-1.2.8.ebuild 1205 RMD160 5ad00a91e9a0c007e1e9939a82283f9fc0d7510d SHA1 e9d96f9d7a15e5b725abb6cd26068e24a3f90b0a SHA256 57c692f22aafb0b4129eb07c05e36a9a5c5f9d32ecdefc851d20169637a52918
+MD5 2c289e8dbb4a095a86f8abffa542b365 nicotine+-1.2.8.ebuild 1205
+RMD160 5ad00a91e9a0c007e1e9939a82283f9fc0d7510d nicotine+-1.2.8.ebuild 1205
+SHA256 57c692f22aafb0b4129eb07c05e36a9a5c5f9d32ecdefc851d20169637a52918 nicotine+-1.2.8.ebuild 1205
+MISC ChangeLog 2656 RMD160 0a082d57e9fb6a0e99bd1b4e71c8d9243bf8e1ee SHA1 0787759b1fb2825313826947ea5d2051b8aea211 SHA256 0eb17026d701d13ea9f2f7a352f310ff8602e7262d69a11cd82da7ac7414c45e
+MD5 13d863e1fe09662742064f1992999253 ChangeLog 2656
+RMD160 0a082d57e9fb6a0e99bd1b4e71c8d9243bf8e1ee ChangeLog 2656
+SHA256 0eb17026d701d13ea9f2f7a352f310ff8602e7262d69a11cd82da7ac7414c45e ChangeLog 2656
 MISC metadata.xml 221 RMD160 f0771cc4f1f6f3c792d95e7a29f261f757042b58 SHA1 f419a40290febaecf91b849cada041c09d44249a SHA256 1bf5787e57f7fa447ffe8ea45f8be8f66a5878076e9b9e65c4f911bdaa136ea4
 MD5 952583dc0fcffc549febb7c754168574 metadata.xml 221
 RMD160 f0771cc4f1f6f3c792d95e7a29f261f757042b58 metadata.xml 221
diff --git a/net-p2p/nicotine+/files/nicotine+.desktop b/net-p2p/nicotine+/files/nicotine+.desktop
deleted file mode 100644
index 3c7265c9fe5d..000000000000
--- a/net-p2p/nicotine+/files/nicotine+.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Nicotine
-Comment=Nicotine SoulSeek Client
-Exec=nicotine
-Icon=nicotine-n.png
-Terminal=false
-Categories=Application;Network;
-Type=Application
diff --git a/net-p2p/nicotine+/files/nicotine-n.png b/net-p2p/nicotine+/files/nicotine-n.png
deleted file mode 100644
index 16817c3c5d8c..000000000000
--- a/net-p2p/nicotine+/files/nicotine-n.png
+++ /dev/null
diff --git a/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild b/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild
index 67063c4d58c5..fb802b3e48d9 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.5 2007/06/08 15:49:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild,v 1.6 2007/06/10 21:36:30 armin76 Exp $
 
 inherit distutils eutils multilib toolchain-funcs
 
@@ -31,7 +31,7 @@ src_compile() {
 	sed -i -e "s:/lib/:/$(get_libdir)/:" \
 		Makefile.in || die "sed failed"
 	./autogen.py
-	emake CC=$(tc-getCC) || die "emake failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
@@ -41,11 +41,4 @@ 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.8.ebuild b/net-p2p/nicotine+/nicotine+-1.2.8.ebuild
index 7d6dd05c9cfc..c7b02a947378 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.8.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.2.8.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.8.ebuild,v 1.2 2007/06/08 15:49:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.8.ebuild,v 1.3 2007/06/10 21:36:30 armin76 Exp $
 
 inherit distutils eutils multilib toolchain-funcs
 
@@ -31,7 +31,7 @@ src_compile() {
 	sed -i -e "s:/lib/:/$(get_libdir)/:" \
 		Makefile.in || die "sed failed"
 	./autogen.py
-	emake CC=$(tc-getCC) || die "emake failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
@@ -41,11 +41,4 @@ 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
 }