Install the desktop file only when the GUI client is built, and fix the name of the client.

Package-Manager: portage-2.1.5

4 files changed, 26 insertions, 11 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 8316b4913478..be7002a7fd2a 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.13 2008/05/15 15:54:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.14 2008/05/18 16:18:08 flameeyes Exp $
+
+  18 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  quassel-0.2.0_beta1.ebuild, quassel-9999.ebuild:
+  Install the desktop file only when the GUI client is built, and fix the
+  name of the client.
 
 *quassel-0.2.0_beta1 (15 May 2008)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index aeba0c68c9bf..f1e970855cd9 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST quassel-0.2.0-beta1.tar.bz2 967029 RMD160 8ae5af27714b60f38b123f6b0bbef9da4c8b1ffe SHA1 36fe1f1352f79f77d824d076add4e9e24c49ba75 SHA256 b57e9736e40f43233902b8903ed9681fda2deadf9a3e31a75d3a7726b0c784ef
-EBUILD quassel-0.2.0_beta1.ebuild 2037 RMD160 fea818c45db7b3ea9bdb4b39a3b527ade09686f8 SHA1 691cd75128274cc8293fe98e2080488dd5702968 SHA256 38934e23f86060ce5514b7b1ae3ca3032e967b7ee62fd1a6c85e139e262a3f5f
-EBUILD quassel-9999.ebuild 2019 RMD160 2efb58ba6bb1dcdffcba6700439068e63540add0 SHA1 1d6cc57c3f5158cadb78e5423205f2483a9e74e1 SHA256 7f4b2a3bca8fff4235daa1bfddd36c0d5d503271878ee790f3bf7c6daaf3fe4d
-MISC ChangeLog 2515 RMD160 0710b0f5007081d3f04d729f0a06fdb728a6c539 SHA1 a3f2823551765bea2e7d83ada6bfa7cf29716f31 SHA256 00392b907606f4d5aa5a52b4e46f12530e6f87ef6c556c700579d80d24ed489e
+EBUILD quassel-0.2.0_beta1.ebuild 2225 RMD160 a5e6fc160138f5fa18cf5c9508772d1b3af8d4d0 SHA1 8cdc8d0e9f38213e2501c3caa94db9d79e172c48 SHA256 c6877e7aedebdaed044566df5cfb6c348e01ab4d9c6b5ec0a5d03d7944a4100c
+EBUILD quassel-9999.ebuild 2207 RMD160 9b3da1b1f08db2f2265ed6c463db4b7030d960d2 SHA1 f755e6bf5aefe977efc425fcb7c20280f1be846e SHA256 7f8dd1e5fd2e33a2dce501cffbde41d5a92834114be07c38022f1182d8448b96
+MISC ChangeLog 2716 RMD160 008d38bfe83f2348f9dc0004485c7c72942bc01e SHA1 5ca53d09f4d72f0ff42509930d195484cac39334 SHA256 dfb4a835db6f48b456a0d53b3f3ec774d0148366fe61a047754a04ba57d7dbd5
 MISC metadata.xml 774 RMD160 010aec105a64c3df2588c730d486141c8a012fde SHA1 4ffb676c8c4fb09165ddb5b4290fc45cc669ceff SHA256 3dc9c83a72739921a5c7197db9f634cfe84dfd49f12fd4804252e3c583ecf799
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgsXM8ACgkQAiZjviIA2Xg28ACfXgHo+N8YseYJS7djByvz5e4B
-qqMAoJQeDDvDoUt2wJXth+yUIy7NMYgR
-=FjC+
+iEYEARECAAYFAkgwVskACgkQAiZjviIA2XilKQCgrvnGxEWy4IeBLxVHZ1z7TmM3
++yUAn2MkDIBP0dEjozgrlRgOmW0l1VOj
+=Mk7d
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-0.2.0_beta1.ebuild b/net-irc/quassel/quassel-0.2.0_beta1.ebuild
index e38d2db4b181..6a49c4f766f3 100644
--- a/net-irc/quassel/quassel-0.2.0_beta1.ebuild
+++ b/net-irc/quassel/quassel-0.2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_beta1.ebuild,v 1.1 2008/05/15 15:54:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_beta1.ebuild,v 1.2 2008/05/18 16:18:08 flameeyes Exp $
 
 EAPI=1
 
@@ -73,7 +73,12 @@ src_install() {
 	use X && targets="${targets} build/targets/quasselclient"
 	dobin $targets  || die "quasselcore install failed"
 
-	domenu ${PN}.desktop || die "desktop file install failed"
+	# Only install the desktop file if the X client was installed
+	if use X; then
+		sed -i -e 's:Exec=quassel:Exec=quasselclient:' ${PN}.desktop \
+			|| die "failed to fix desktop file"
+		domenu ${PN}.desktop || die "desktop file install failed"
+	fi
 
 	dodoc ChangeLog README README.Qtopia || "dodoc failed"
 }
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 6e4812133a13..17acb9c41864 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.3 2008/05/15 15:54:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.4 2008/05/18 16:18:08 flameeyes Exp $
 
 EAPI=1
 
@@ -73,7 +73,12 @@ src_install() {
 	use X && targets="${targets} build/targets/quasselclient"
 	dobin $targets  || die "quasselcore install failed"
 
-	domenu ${PN}.desktop || die "desktop file install failed"
+	# Only install the desktop file if the X client was installed
+	if use X; then
+		sed -i -e 's:Exec=quassel:Exec=quasselclient:' ${PN}.desktop \
+			|| die "failed to fix desktop file"
+		domenu ${PN}.desktop || die "desktop file install failed"
+	fi
 
 	dodoc ChangeLog README README.Qtopia || "dodoc failed"
 }