Version bump.

Package-Manager: portage-2.1.2_rc4-r5

5 files changed, 135 insertions, 9 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index b77d545690cd..9e0eb32871ea 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/xchat
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.221 2006/12/25 15:02:55 hanno Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.222 2007/01/04 20:22:32 swegener Exp $
+
+*xchat-2.8.0 (04 Jan 2007)
+
+  04 Jan 2007; Sven Wegener <swegener@gentoo.org>
+  +files/xc280-fix-back.diff, +xchat-2.8.0.ebuild:
+  Version bump.
 
 *xchat-2.6.8-r3 (25 Dec 2006)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 7100ae5f6e71..8e916b64be44 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -21,6 +21,10 @@ AUX xc268-sec-url.diff 427 RMD160 edfc945cdf0d969c8eb3aba5ef84048455b5a303 SHA1
 MD5 10bc7c47147f320f5d3ec835c82a97e8 files/xc268-sec-url.diff 427
 RMD160 edfc945cdf0d969c8eb3aba5ef84048455b5a303 files/xc268-sec-url.diff 427
 SHA256 4bc665937af91d3279d748c9750b8be1e2ece95f296e522fbc49ecb6d9450a28 files/xc268-sec-url.diff 427
+AUX xc280-fix-back.diff 417 RMD160 4ad490abfb3a215509359b1e911557486ca29a98 SHA1 1f00cda52915f50799a987220078e2fcf1233b80 SHA256 00c05695b8e486adef4b1749e79f6f9e6e012f3682fc2f64aff0fe8b1600ebcb
+MD5 f41792f986d2b916630cb7de4bab0bfc files/xc280-fix-back.diff 417
+RMD160 4ad490abfb3a215509359b1e911557486ca29a98 files/xc280-fix-back.diff 417
+SHA256 00c05695b8e486adef4b1749e79f6f9e6e012f3682fc2f64aff0fe8b1600ebcb files/xc280-fix-back.diff 417
 AUX xchat-2.6.4-fix-cursor.patch 573 RMD160 c34576decb09cd2d830364f9596aabb987a59632 SHA1 a91ee61344786514d371d01375a4231e895d0d69 SHA256 11d8772c68e31d9abab9d7de5440ab8db81e2a2dc1e87f525fa0a0c5518e636b
 MD5 2e88d0e5c2d41b8e04e93d41b4dcfa00 files/xchat-2.6.4-fix-cursor.patch 573
 RMD160 c34576decb09cd2d830364f9596aabb987a59632 files/xchat-2.6.4-fix-cursor.patch 573
@@ -40,6 +44,7 @@ SHA256 996b79e6d114bd17ea7b3496da477e1b42402cc2728e52b59ccddd983970f42a files/xc
 DIST xchat-2.4.5.tar.bz2 1324626 RMD160 19d1033d01af784f8b7af5103a7de8cf3a26f3fb SHA1 e027a20caa47b4ffea00896ee68269a7ae885e2d SHA256 44cabb5c31047d5a036495bc7fac64a5b86c8003bd575ea869bcd377032db2db
 DIST xchat-2.6.6.tar.bz2 1098934 RMD160 27cef034342dc831e2ddb11f8bd5f6cb727e8f93 SHA1 ba674165ad9f8e48acd2c0437bea6b1acc2871b9 SHA256 c4b38d29e6a9872c8ffde27c8866d8c3b9f1fe6e227cef5fed39bc79f983d44c
 DIST xchat-2.6.8.tar.bz2 1184287 RMD160 add965c1092c11f565110f127f402c900bedcec0 SHA1 7be12710c7461c8108524b763af83de89ae900f4 SHA256 7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f
+DIST xchat-2.8.0.tar.bz2 1257232 RMD160 a65329728c050c5448b2cbab2ea6c68ba72a0c95 SHA1 80248b4fcd45261c686557eb243fec6ce459bd60 SHA256 f417891d2405980875fd3ce03eb78f8e2ad3ea7354df8b7bb0a2939a55e20906
 DIST xchat-dccserver-0.5.patch.bz2 3814 RMD160 6f6957e78b7236bcacd076d598a81fcbcec27502 SHA1 2975a3fc3c43cd5e0eeb3d8e507ae460f19bc8a4 SHA256 40b3dd9e15c4378ae2fc3c450beaec65ce5302561369f90fa8cead62a0015329
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
 EBUILD xchat-2.4.5-r1.ebuild 2433 RMD160 d8819ff663c3cc4bb2def1978177bf0ff8c5b200 SHA1 b33db7dec7256435c71273c0383bb617ecb1336a SHA256 9e8403f63bcb47252fe7ccd212a9de1735c79355dbec3e3117ba531a9463f09d
@@ -66,10 +71,14 @@ EBUILD xchat-2.6.8.ebuild 2517 RMD160 a22456b158d74ccfc926230e1c0c39e922297416 S
 MD5 38a0255435c4dee30b10ef63d4791755 xchat-2.6.8.ebuild 2517
 RMD160 a22456b158d74ccfc926230e1c0c39e922297416 xchat-2.6.8.ebuild 2517
 SHA256 290539940dd8e3a665d9e02502fc6f642cedf0494b53fc59097e6e7c073ab6b3 xchat-2.6.8.ebuild 2517
-MISC ChangeLog 32867 RMD160 4fce93fa6fcf1d6a84df0678b22105ecdfc35ad4 SHA1 a6b8a4a34f5e00696acc62bb6a859eec03806eb9 SHA256 b31f7875867de3ba054dec5ac2b76cb408fc11dc49ec2aecd873734170974df4
-MD5 0ee88485fbb6f383612bca50d48f2b34 ChangeLog 32867
-RMD160 4fce93fa6fcf1d6a84df0678b22105ecdfc35ad4 ChangeLog 32867
-SHA256 b31f7875867de3ba054dec5ac2b76cb408fc11dc49ec2aecd873734170974df4 ChangeLog 32867
+EBUILD xchat-2.8.0.ebuild 2461 RMD160 b77733a86f9598ce419e2728b2deed707b95977e SHA1 1428c9b17208a418acd9d17d0c69e7a9943d76db SHA256 9611fe3fed6e3e7e390e411450e1fbd4a604959b55568d7d0757d37af538f53d
+MD5 710d8cc7aabff63e887d0e3f4fd88c72 xchat-2.8.0.ebuild 2461
+RMD160 b77733a86f9598ce419e2728b2deed707b95977e xchat-2.8.0.ebuild 2461
+SHA256 9611fe3fed6e3e7e390e411450e1fbd4a604959b55568d7d0757d37af538f53d xchat-2.8.0.ebuild 2461
+MISC ChangeLog 33016 RMD160 65abba6a6c94af8e388a870dfa909ae3d78dea46 SHA1 a39bb97dd1320c9d3cff5d3ea1d8e06e78684a58 SHA256 32f86eb8a8a528542afb8dba0c549943c770e581c41dc4ff8e5c4c573ea88190
+MD5 acd12dc4bd9286ac8644d4e2ce9f87a0 ChangeLog 33016
+RMD160 65abba6a6c94af8e388a870dfa909ae3d78dea46 ChangeLog 33016
+SHA256 32f86eb8a8a528542afb8dba0c549943c770e581c41dc4ff8e5c4c573ea88190 ChangeLog 33016
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -92,10 +101,13 @@ SHA256 fd605851afe1faabe72cb2f857d218dc60d0f3b81025691ea5674706ec856c13 files/di
 MD5 4c0561946c0c7bfba57ee07bf3068a80 files/digest-xchat-2.6.8-r3 506
 RMD160 24ff22044247590ac3a256815b6fd38395d6130f files/digest-xchat-2.6.8-r3 506
 SHA256 fd605851afe1faabe72cb2f857d218dc60d0f3b81025691ea5674706ec856c13 files/digest-xchat-2.6.8-r3 506
+MD5 b3e2949a39f06e663eeef05700d5907e files/digest-xchat-2.8.0 506
+RMD160 ae3ec7e73f9b27754b76e4ee9a07ea10398bda4e files/digest-xchat-2.8.0 506
+SHA256 bdf80ad286d8c86f7ffe7e19a3576f52cd37a6c68d69f6b5e3c50dc8ab441820 files/digest-xchat-2.8.0 506
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFj+fVr2QksT29OyARAve9AJ9OsnNkwgqW/WoDREMpsjD2rGvsuQCgj2S0
-WN3v7U+XHCHj6/mwO8WRsro=
-=PmqB
+iD8DBQFFnWISI1lqEGTUzyQRAivFAJ4+QEoL6nFVC5fHnEVRnafkbqBAXwCg32aT
+WL7ZV7LtwjijiJaTbtucqp0=
+=OBwC
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/digest-xchat-2.8.0 b/net-irc/xchat/files/digest-xchat-2.8.0
new file mode 100644
index 000000000000..dfa385249197
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.8.0
@@ -0,0 +1,6 @@
+MD5 dddb703d1daf9be7a7bc9461cf11ede7 xchat-2.8.0.tar.bz2 1257232
+RMD160 a65329728c050c5448b2cbab2ea6c68ba72a0c95 xchat-2.8.0.tar.bz2 1257232
+SHA256 f417891d2405980875fd3ce03eb78f8e2ad3ea7354df8b7bb0a2939a55e20906 xchat-2.8.0.tar.bz2 1257232
+MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
+RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
+SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/xc280-fix-back.diff b/net-irc/xchat/files/xc280-fix-back.diff
new file mode 100644
index 000000000000..c63316c83707
--- /dev/null
+++ b/net-irc/xchat/files/xc280-fix-back.diff
@@ -0,0 +1,14 @@
+#
+# Fix: /BACK command not working after upgrading from xchat < 2.8.0
+#
+--- xchat-2.8.0/src/common/cfgfiles.c	2 Jan 2007 00:26:40 -0000	1.102
++++ xchat-2.8.0p1/src/common/cfgfiles.c	3 Jan 2007 14:01:00 -0000
+@@ -45,7 +45,7 @@
+ 	int cmd_len = 1, name_len;
+ 
+ 	/* remove <2.8.0 stuff */
+-	if (!strcmp (cmd, "AWAY") & !strcmp (name, "BACK"))
++	if (!strcmp (cmd, "away") & !strcmp (name, "BACK"))
+ 		return;
+ 
+ 	if (cmd)
diff --git a/net-irc/xchat/xchat-2.8.0.ebuild b/net-irc/xchat/xchat-2.8.0.ebuild
new file mode 100644
index 000000000000..d1e27fc42576
--- /dev/null
+++ b/net-irc/xchat/xchat-2.8.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.0.ebuild,v 1.1 2007/01/04 20:22:32 swegener Exp $
+
+inherit eutils versionator gnome2
+
+DESCRIPTION="Graphical IRC client"
+SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
+HOMEPAGE="http://www.xchat.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
+
+RDEPEND=">=dev-libs/glib-2.6.0
+	!xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( >=dev-lang/perl-5.6.1 )
+	python? ( >=dev-lang/python-2.2 )
+	tcl? ( dev-lang/tcl )
+	dbus? ( || ( >=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
+	spell? ( app-text/enchant )
+	!<net-irc/xchat-gnome-0.9"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.7
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
+
+	epatch "${FILESDIR}"/xc280-fix-back.diff
+
+	# use libdir/xchat/plugins as the plugin directory
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
+			"${S}"/configure{,.in} || die
+	fi
+}
+
+src_compile() {
+	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
+	if [[ ${ARCH} = sparc ]] ; then
+		replace-flags "-O[3-9]" "-O2"
+	fi
+
+	# xchat's configure script uses sys.path to find library path
+	# instead of python-config (#25943)
+	unset PYTHONPATH
+
+	econf \
+		--enable-shm \
+		$(use_enable ssl openssl) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable tcl) \
+		$(use_enable mmx) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable dbus) \
+		$(use_enable spell spell static) \
+		$(use_enable xchattext textfe) \
+		$(use_enable !xchatnogtk gtkfe) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	USE_DESTDIR=1 gnome2_src_install || die "make install failed"
+
+	# install plugin development header
+	insinto /usr/include/xchat
+	doins src/common/xchat-plugin.h || die "doins failed"
+
+	dodoc ChangeLog README* || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "XChat binary has been renamed from xchat-2 to xchat."
+}