[gentoo-commits] gentoo-x86 commit in net-irc/xchat: xchat-2.8.8-r2.ebuild ChangeLog xchat-2.8.8-r1.ebuild

[Lars Wendler (polynomial-c)]

polynomial-c    11/07/12 07:39:59

  Modified:             xchat-2.8.8-r2.ebuild ChangeLog
                        xchat-2.8.8-r1.ebuild
  Log:
  Don't install a desktop entry when gtk USE flag is disabled. Warn the user that there's not GUI available as well
  
  (Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  net-irc/xchat/xchat-2.8.8-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild?r1=1.6&r2=1.7

Index: xchat-2.8.8-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xchat-2.8.8-r2.ebuild	11 Jul 2011 13:29:09 -0000	1.6
+++ xchat-2.8.8-r2.ebuild	12 Jul 2011 07:39:59 -0000	1.7
@@ -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 @@
 		# 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
 }



1.302                net-irc/xchat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.302&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?rev=1.302&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/ChangeLog?r1=1.301&r2=1.302

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- ChangeLog	11 Jul 2011 13:29:09 -0000	1.301
+++ ChangeLog	12 Jul 2011 07:39:59 -0000	1.302
@@ -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@g.o> 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@g.o> xchat-2.8.8-r1.ebuild,
   xchat-2.8.8-r2.ebuild, +files/xchat-2.8.8-dbus.patch:



1.9                  net-irc/xchat/xchat-2.8.8-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild?r1=1.8&r2=1.9

Index: xchat-2.8.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xchat-2.8.8-r1.ebuild	11 Jul 2011 13:29:09 -0000	1.8
+++ xchat-2.8.8-r1.ebuild	12 Jul 2011 07:39:59 -0000	1.9
@@ -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 @@
 	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
 }