Install own desktop entry and icon

(Portage version: 2.1.2.9)

5 files changed, 9 insertions, 28 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+/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
 }