Don't install a desktop entry when gtk USE flag is disabled. Warn the user that there's not GUI available as well

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 59 insertions, 33 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index b209f46dc91f..f9ccc8864e35 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.301 2011/07/11 13:29:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.302 2011/07/12 07:39:59 polynomial-c Exp $
+
+  12 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
+  xchat-2.8.8-r2.ebuild:
+  Don't install a desktop entry when gtk USE flag is disabled. Warn the user
+  that there's not GUI available as well.
 
   11 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
   xchat-2.8.8-r2.ebuild, +files/xchat-2.8.8-dbus.patch:
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 7951cdb6fee3..1326ce07c1b9 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -12,24 +12,24 @@ DIST xchat-2.8.8.tar.bz2 1509993 RMD160 1bc3e0ff00e15c83588dd21a3ef3e8e34f953331
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
 DIST xchat_irc_icon_by_half_left-d3bjxuo.zip 71179 RMD160 8ef69f0b38ab9327e860829b4d72c1eead16dfe9 SHA1 200985a88b7a7bd51ccc2efdba521e3f373162f5 SHA256 1005f40a375da6806700485cd4db4a8681cd141020e9102e92f8ada075e7bf6b
 EBUILD xchat-2.8.6-r2.ebuild 2820 RMD160 481d2d4473a694624d8efea25060c437f5b764d5 SHA1 84d28917226ec041bf75e2e20c95ae77590202ba SHA256 2ee299e5405af604fd84b136e57224a9d58b561c4d5ee200bc7d06e5fe94e14b
-EBUILD xchat-2.8.8-r1.ebuild 2865 RMD160 18bf0bbc640db435ec30e91d8e7d13a8bbdcbbc9 SHA1 3c16fbcc79b6adc33d01564174561993d0867786 SHA256 5987054639f352192dfc0c6c2f4e71f6443aa6a50424c31e1ad13c1ecd6e41ab
-EBUILD xchat-2.8.8-r2.ebuild 3740 RMD160 c7d30bc7457abedbc26f853bcdedcb23040df237 SHA1 2bbcb9309ca369c73d0cf25cdae16d6967d3ff72 SHA256 18b921e79f9e5e12eee6fd5fe2ec754c62e6fcf43ebbb1844118fe5df1f5aa7f
-MISC ChangeLog 45243 RMD160 819142b86426a488b504b4c697d9a4f383e48ad6 SHA1 fb82fb89face736ed8c3844a07974ab07bb36d81 SHA256 7355158cf1a085ab4339984639ca3c5c7437c2075029845f6433251fd068ce8f
+EBUILD xchat-2.8.8-r1.ebuild 3177 RMD160 4434ebf6b391494fc8e28807f6e385b7edfde467 SHA1 8fc156a0362a2c44c2d24eccb52c556e3c3a1015 SHA256 1ce9c2f7ea9466c93a1704fb702b6601fd089ee8c6b433772f3d1e032f480c45
+EBUILD xchat-2.8.8-r2.ebuild 4054 RMD160 9706b01cf806ea90fa06ab343baf5f7fc0216dc7 SHA1 fcc68ea1abd43d2fbf3a33fcaa7ab6c6854554d3 SHA256 9fbe4271eb1f565846333b92db52b81dc29092fa90693f5040fbb7d71ef4fbcb
+MISC ChangeLog 45465 RMD160 2f29ea3d196ba70694f116bd0642a8b23c841b7d SHA1 d4ea8ee36e2bb461bd5a651a154189e770c45f76 SHA256 2863a95998536cbbd4edaa16b4a769a367d31aafb03cf888f325b95c837fa4e1
 MISC metadata.xml 712 RMD160 6eafa9bf2fe298a612764b37b39a007b38697862 SHA1 1ee0d2206d19cce1955d2acef6022e6d32069790 SHA256 a92843c55c72b49ed2b0b282ed989ea4a58b81629f26ecd7e6320bd4c5531723
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOGvqsAAoJEPiazRVxLXTFsEoP/2MJ0qj8G9rRb0EZZ7I4e5xy
-entEfggmrYUsZd1LEQxdlGxwjxzZY1gJ7C3FL7zcSxzzeOniOVzH0gK7bpMwJN84
-r7d6TjQvjh8p5deU4Hh4DgHesdaWLDpgxZNJUkS7H2rJafdSoW50W4a8LLJ/m+5T
-AQfUh9oiotHHZaeD6+JfURFPaCEeg/1kk0WjdtuszCVQuAFWLouhcjQVatZ3tpGD
-SwhT6vlL5Xz4CcSMZaDxT6uiNhpr7qN5fgkrsXHhj9O0c8UOkjFwxBjb8rVNWURQ
-bHwp62NS+szDGjyT03+pdRZgOUErxlhgZFVdoyFguip9UpRspcE1LAabNGHoqltS
-gP+zh1abmV04+I80QYQkYOzkq94eCIK9q0niY/dyVOpVgjn5vm6to8Dh+o0tce9R
-q7XFD4J/pp9+IHTK1pDa0URfcpXhdYBVYGkokMDPZClUA5slHx8ip+wJz8M6xJ/Q
-lpISV/0oCQXev59ZEHeTbkeE5dXZQ9jqCgw1YKAdM1TXLCGDNi7nhRbZfSNFCwVe
-UWRSXKm3l45SncmmhE9OHzxz4D/TkelFrs5vkxrHwhvOkFASE8aua73i7qyqD6Dg
-OT2UBiVG+hbM+4MYwBHLD64Vm2uDSv+2mpXkTvLKjAAQSpP1b1ogvggDZQ2ON273
-b1p4qTmrUIsDkH8tK+0r
-=2y1b
+iQIcBAEBCgAGBQJOG/pWAAoJEPiazRVxLXTFqwIP/3JaqJzljBIn2NJQF+NDVzq3
+bYVWd52QjmXuk7J/W3ZpJcTZMT5iE+J3AGCYYF/7SUXE/Dq9cvZxCkc+AYQCTzMX
+yijnHpiDlSjMlIX+XtHf0U9W/TQA7gm+qp98otTSC1jCNdKxHwXV+UvIrPIWcmoK
+3+if6uqw7ljwL9MPqTzUocRWX25+xuC6HTH1oUgmLGat7+6pYgpdyEKP2kIqZWCt
+fWqcQrzWdH7bLI1iVr8n0aPNJy4foG0O3jT3f7EU4Z4db00AnrSSAFbkzeMzPFGI
+/zO7qqeYt8Khk4x3w/P6BMw9XHaSAugtwCKV2gDzlQeA4tL1yc74JTT3ZhkA6ixj
+JEqDkv8H0f0OFZ2vXHqQUwDzUOYqOVMWqX2WdVEZx2va+snxNeppR7SYVElVvUSC
+y0WDbcLDEQM3YUPBP8U2I2oi8a2THkcdYwX8ugG97K0pDYTZ3+qiNoaZLf+W5dS9
+1U+Cy9NFqr1+37wVODoHHkU2DUaLwuwTyMDppnRozKV6gjXkAVuLKHTjUayWGk9C
+KYA3CmrPCBBuXDvUll7Lb2DheW8sKisD8oVf8nsT3CYTUs3AjtI7SfNTvsZHHQi5
+25r7L/3WQzvCWkU9dXg20XjT5RNq/nGcNlILVh6BjluQZa7jTjZ0UK6ojJguSv2C
+wDeElIUmWNvfD0/BeZ0Z
+=4Qmt
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/xchat-2.8.8-r1.ebuild b/net-irc/xchat/xchat-2.8.8-r1.ebuild
index 1667ef978059..ba2b954d0998 100644
--- a/net-irc/xchat/xchat-2.8.8-r1.ebuild
+++ b/net-irc/xchat/xchat-2.8.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.8 2011/07/11 13:29:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.9 2011/07/12 07:39:59 polynomial-c Exp $
 
 EAPI=2
 
@@ -90,16 +90,26 @@ src_install() {
 	doins src/common/xchat-plugin.h || die "doins failed"
 
 	dodoc ChangeLog README* || die "dodoc failed"
+
+	# remove useless desktop entry when gtk USE flag is unset
+	if ! use gtk ; then
+		rm "${D}"/usr/share/applications -rf
+	fi
 }
 
 pkg_postinst() {
-	elog
-	elog "XChat binary has been renamed from xchat-2 to xchat."
-	elog
-
-	if has_version net-irc/xchat-systray
-	then
-		elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
+	if use gtk ; then
 		elog
+		elog "XChat binary has been renamed from xchat-2 to xchat."
+		elog
+
+		if has_version net-irc/xchat-systray
+		then
+			elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
+			elog
+		fi
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for xchat but only a text interface called \"xchat-text\"."
 	fi
 }
diff --git a/net-irc/xchat/xchat-2.8.8-r2.ebuild b/net-irc/xchat/xchat-2.8.8-r2.ebuild
index ed7338f3ad97..61bc6bc0b401 100644
--- a/net-irc/xchat/xchat-2.8.8-r2.ebuild
+++ b/net-irc/xchat/xchat-2.8.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.6 2011/07/11 13:29:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.7 2011/07/12 07:39:59 polynomial-c Exp $
 
 EAPI=3
 
@@ -111,17 +111,28 @@ src_install() {
 		# Replace default pixmap icon
 		cp "48x48/xchat.png" "${D}/usr/share/pixmaps" || die
 	fi
+
+	# remove useless desktop entry when gtk USE flag is unset
+	if ! use gtk ; then
+		rm "${ED}"/usr/share/applications -rf
+	fi
 }
 
 pkg_postinst() {
-	elog
-	elog "XChat binary has been renamed from xchat-2 to xchat."
-	elog
-
-	if has_version net-irc/xchat-systray
-	then
-		elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
+	if use gtk ; then
 		elog
+		elog "XChat binary has been renamed from xchat-2 to xchat."
+		elog
+
+		if has_version net-irc/xchat-systray
+		then
+			elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
+			elog
+		fi
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for xchat but only a text interface called \"xchat-text\"."
 	fi
+
 	gnome2_icon_cache_update
 }