Add optional hires icons, and fix slot-deps on gnome libs

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

5 files changed, 34 insertions, 15 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index ed2c8230aeef..81ee3f2c255f 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,10 @@
 # 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.295 2011/01/30 17:34:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.296 2011/03/22 09:54:15 nirbheek Exp $
+
+  22 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> xchat-2.8.8-r1.ebuild,
+  xchat-2.8.8-r2.ebuild, metadata.xml:
+  Add optional hires icons, and fix slot-deps on gnome libs
 
   30 Jan 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
   xchat-2.8.8-r2.ebuild:
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 4def8e9aa520..4ffc068768d0 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -5,8 +5,9 @@ AUX xchat-input-box4.patch 1116 RMD160 a5f51ab0505b3f9724a7be6ed0199b60e94b6189
 DIST xchat-2.8.6.tar.bz2 1423645 RMD160 bc199e3b58a9db3dfd9f2af6bac7fb6162c53d6e SHA1 7a7463e65cb26c680ed70dd96cec98bcc05435a4 SHA256 8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d
 DIST xchat-2.8.8.tar.bz2 1509993 RMD160 1bc3e0ff00e15c83588dd21a3ef3e8e34f953331 SHA1 a4ac161e4e40f4bbabc492675a1ff4380dba8d68 SHA256 0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0
 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 2809 RMD160 ef7c11cef8a96acaeb1ebc05a0b6e6c59de738c9 SHA1 45cc0900a12f3b0d1d1a4c15beb65cec21d63bc6 SHA256 a27b5975fba8cffe708a67749fefb6d31361d78ab4cd98423fa7028d9b87e078
-EBUILD xchat-2.8.8-r1.ebuild 2829 RMD160 09eb309a08aaff8b61bf41543ac4be73ab9fa95c SHA1 56b710cc454aeb28641c13e0bcf7ed3760e9b584 SHA256 aa7d737dd11c497d922efc61506cd8a7379c49a9076efcd487d6e71d0de6642c
-EBUILD xchat-2.8.8-r2.ebuild 2883 RMD160 42060bce2d52558b0c8e5f27e7429b64b2c1199e SHA1 37c74fba8eb6138d312dc82d213e39384b040eb4 SHA256 8f1b6438048fff1dc212de9594f958b55e0d8f9cf962d16122c76eb86a69685e
-MISC ChangeLog 44214 RMD160 684fccaa58a28b0ed0227c6528ce56834220f4fc SHA1 52e710f1ec96eaf2faa2cf09e48c5b121d66329c SHA256 0bdc3b54623c71634b6ae1c6214be2647e9f9b504ee1666c23eaecbfe1f0f652
-MISC metadata.xml 616 RMD160 9c8aea431330569cc9ee7d639072aff4373ac976 SHA1 7dc786ec0feca78b6a0cdef18acb28c1c77aa6c0 SHA256 626f8b55f28bfe0c9e0a0ddd953ff7325969beade7f5cd528888ae3ba78d9dcf
+EBUILD xchat-2.8.8-r1.ebuild 2827 RMD160 f635ba51b98c9cae7d4172aa1b1b7cb6b305be18 SHA1 dc113c468fb1b11aadbec1592df64ff37f5604ff SHA256 4956ed377e28037e14cca87c6097951ba83d674e83d7d519c3d2ce0ea61e40f0
+EBUILD xchat-2.8.8-r2.ebuild 3365 RMD160 a980d4f4a0945c4f6d801bbb88707494170ca5e8 SHA1 7a1a38a62ce46101de71fb7b6f8c47b5d7e21f68 SHA256 f37290dd1de0893640bf605d9e1d7618d51c0086312f7a94b145984573d938cc
+MISC ChangeLog 44387 RMD160 defa28e26692f8ae0fb5473db46f972f78bac143 SHA1 9daf2110cb695e2539ddfee5a3e9e441681fe1ab SHA256 8f7ccf5c84ee56cc8ff3b875f48847c812ed07da6a9ae342b9f2115cc64615ce
+MISC metadata.xml 712 RMD160 6eafa9bf2fe298a612764b37b39a007b38697862 SHA1 1ee0d2206d19cce1955d2acef6022e6d32069790 SHA256 a92843c55c72b49ed2b0b282ed989ea4a58b81629f26ecd7e6320bd4c5531723
diff --git a/net-irc/xchat/metadata.xml b/net-irc/xchat/metadata.xml
index 545154386d71..fe04a65ee56e 100644
--- a/net-irc/xchat/metadata.xml
+++ b/net-irc/xchat/metadata.xml
@@ -9,6 +9,7 @@
 <use>
 <flag name='fastscroll'>Make scrolling of large text buffers faster by 
 			circumventing some of pango's overhead</flag>
+<flag name='hires-icons'>Install custom high-resolution icons instead of the default one</flag>
 <flag name='ntlm'>Enable NTLM authentication</flag>
 <flag name='xchatdccserver'>Enables support for the /dccserver command via a patch</flag>
 <flag name='xchatnogtk'>Disables building the GTK front end to XChat</flag>
diff --git a/net-irc/xchat/xchat-2.8.8-r1.ebuild b/net-irc/xchat/xchat-2.8.8-r1.ebuild
index 7a357bd3fe1a..7c7da28ad5ab 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.6 2011/01/30 17:34:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r1.ebuild,v 1.7 2011/03/22 09:54:15 nirbheek Exp $
 
 EAPI=2
 
@@ -17,11 +17,11 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="dbus fastscroll +gtk ipv6 libnotify mmx nls ntlm perl python spell ssl tcl xchatdccserver"
 
-RDEPEND=">=dev-libs/glib-2.6.0
-	gtk? ( >=x11-libs/gtk+-2.10.0 )
+RDEPEND=">=dev-libs/glib-2.6.0:2
+	gtk? ( >=x11-libs/gtk+-2.10.0:2 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.8.0 )
-	python? ( >=dev-lang/python-2.2 )
+	python? ( =dev-lang/python-2* )
 	tcl? ( dev-lang/tcl )
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	spell? ( app-text/gtkspell )
diff --git a/net-irc/xchat/xchat-2.8.8-r2.ebuild b/net-irc/xchat/xchat-2.8.8-r2.ebuild
index 3dc1cdf0d36b..5b6ba9a4b299 100644
--- a/net-irc/xchat/xchat-2.8.8-r2.ebuild
+++ b/net-irc/xchat/xchat-2.8.8-r2.ebuild
@@ -1,27 +1,29 @@
 # 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.2 2011/01/30 17:34:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.3 2011/03/22 09:54:15 nirbheek Exp $
 
 EAPI=2
 
 inherit eutils versionator gnome2 autotools
 
 DESCRIPTION="Graphical IRC client"
+# Icons are from http://half-left.deviantart.com/art/XChat-IRC-Icon-200804640
 SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
 	mirror://sourceforge/${PN}/${P}.tar.bz2
+	hires-icons? ( http://dev.gentoo.org/~nirbheek/dist/xchat_irc_icon_by_half_left-d3bjxuo.zip )
 	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
 HOMEPAGE="http://www.xchat.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 hires-icons? ( GPL-3 )"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus fastscroll +gtk ipv6 libnotify mmx nls ntlm perl python spell ssl tcl xchatdccserver"
+IUSE="dbus fastscroll +gtk hires-icons ipv6 libnotify mmx nls ntlm perl python spell ssl tcl xchatdccserver"
 
-RDEPEND=">=dev-libs/glib-2.6.0
-	gtk? ( >=x11-libs/gtk+-2.10.0 )
+RDEPEND=">=dev-libs/glib-2.6.0:2
+	gtk? ( >=x11-libs/gtk+-2.10.0:2 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.8.0 )
-	python? ( >=dev-lang/python-2.2 )
+	python? ( =dev-lang/python-2* )
 	tcl? ( dev-lang/tcl )
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	spell? ( app-text/gtkspell )
@@ -90,6 +92,16 @@ src_install() {
 	doins src/common/xchat-plugin.h || die "doins failed"
 
 	dodoc ChangeLog README* || die "dodoc failed"
+
+	if use hires-icons; then
+		cd "${WORKDIR}/XChat-Icon/apps"
+		for i in *; do
+			insinto "/usr/share/icons/hicolor/${i}/apps"
+			doins "${i}/xchat.png"
+		done
+		# Replace default pixmap icon
+		cp "48x48/xchat.png" "${D}/usr/share/pixmaps" || die
+	fi
 }
 
 pkg_postinst() {
@@ -102,4 +114,5 @@ pkg_postinst() {
 		elog "XChat now includes it's own systray icon, you may want to remove net-irc/xchat-systray."
 		elog
 	fi
+	gnome2_icon_cache_update
 }