xchat rename binary from xchat-2 to xchat

Package-Manager: portage-2.1.2_rc4-r1

4 files changed, 117 insertions, 8 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 20d519ab506c..b77d545690cd 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # 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.220 2006/12/18 19:31:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.221 2006/12/25 15:02:55 hanno Exp $
+
+*xchat-2.6.8-r3 (25 Dec 2006)
+
+  25 Dec 2006; Hanno Boeck <hanno@gentoo.org> +xchat-2.6.8-r3.ebuild:
+  Rename binary from xchat-2 to xchat.
 
 *xchat-2.6.8-r2 (18 Dec 2006)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 1ac62495c95e..7100ae5f6e71 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -58,14 +58,18 @@ EBUILD xchat-2.6.8-r2.ebuild 2699 RMD160 dc7e9643466db997b39613a0e0bdadc4a493402
 MD5 23254c4c470338299ffc05adafff851c xchat-2.6.8-r2.ebuild 2699
 RMD160 dc7e9643466db997b39613a0e0bdadc4a4934029 xchat-2.6.8-r2.ebuild 2699
 SHA256 77ac446129011967f4111b4a3bfc8f6d55d859c66e35b8540b952280ca23339e xchat-2.6.8-r2.ebuild 2699
+EBUILD xchat-2.6.8-r3.ebuild 2595 RMD160 b36f2a142711329aefabb1ed7cdc3585d741d9af SHA1 2578a759d329f27e419187097ecd0942174ccd3a SHA256 f5e8f26e8b10e9cc8f5bb7c58a7dc96918e365e91b8126177ddae9f3ad1316c1
+MD5 8653674ccd7e0d01dd9a29897460e02b xchat-2.6.8-r3.ebuild 2595
+RMD160 b36f2a142711329aefabb1ed7cdc3585d741d9af xchat-2.6.8-r3.ebuild 2595
+SHA256 f5e8f26e8b10e9cc8f5bb7c58a7dc96918e365e91b8126177ddae9f3ad1316c1 xchat-2.6.8-r3.ebuild 2595
 EBUILD xchat-2.6.8.ebuild 2517 RMD160 a22456b158d74ccfc926230e1c0c39e922297416 SHA1 a737d5d3a9efff83d98e898be5bf604b51318360 SHA256 290539940dd8e3a665d9e02502fc6f642cedf0494b53fc59097e6e7c073ab6b3
 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 32729 RMD160 88c2a00d025dbf8193511ae00361518efecb23f2 SHA1 41fd0f02ef6da84e4d8ef4cf6f6f2069ef468c9e SHA256 c2f2d107fde4088f20c6b3e314254e12490a3b944ee28bb88d3e794e0881e9b3
-MD5 fdcaa95dd757cfb5c6ab3127a063e1b8 ChangeLog 32729
-RMD160 88c2a00d025dbf8193511ae00361518efecb23f2 ChangeLog 32729
-SHA256 c2f2d107fde4088f20c6b3e314254e12490a3b944ee28bb88d3e794e0881e9b3 ChangeLog 32729
+MISC ChangeLog 32867 RMD160 4fce93fa6fcf1d6a84df0678b22105ecdfc35ad4 SHA1 a6b8a4a34f5e00696acc62bb6a859eec03806eb9 SHA256 b31f7875867de3ba054dec5ac2b76cb408fc11dc49ec2aecd873734170974df4
+MD5 0ee88485fbb6f383612bca50d48f2b34 ChangeLog 32867
+RMD160 4fce93fa6fcf1d6a84df0678b22105ecdfc35ad4 ChangeLog 32867
+SHA256 b31f7875867de3ba054dec5ac2b76cb408fc11dc49ec2aecd873734170974df4 ChangeLog 32867
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -85,10 +89,13 @@ SHA256 fd605851afe1faabe72cb2f857d218dc60d0f3b81025691ea5674706ec856c13 files/di
 MD5 4c0561946c0c7bfba57ee07bf3068a80 files/digest-xchat-2.6.8-r2 506
 RMD160 24ff22044247590ac3a256815b6fd38395d6130f files/digest-xchat-2.6.8-r2 506
 SHA256 fd605851afe1faabe72cb2f857d218dc60d0f3b81025691ea5674706ec856c13 files/digest-xchat-2.6.8-r2 506
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFhuyvI1lqEGTUzyQRAvLgAKC3sl0ZbNGCphAQmDes6Ec9O7inqgCgvXb8
-SQC1EMwRsy2hOfM2N8cq6AQ=
-=z1zI
+iD8DBQFFj+fVr2QksT29OyARAve9AJ9OsnNkwgqW/WoDREMpsjD2rGvsuQCgj2S0
+WN3v7U+XHCHj6/mwO8WRsro=
+=PmqB
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/digest-xchat-2.6.8-r3 b/net-irc/xchat/files/digest-xchat-2.6.8-r3
new file mode 100644
index 000000000000..58171d619aec
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.6.8-r3
@@ -0,0 +1,6 @@
+MD5 940fd8560a4e4e5d905e53207c6cbb87 xchat-2.6.8.tar.bz2 1184287
+RMD160 add965c1092c11f565110f127f402c900bedcec0 xchat-2.6.8.tar.bz2 1184287
+SHA256 7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f xchat-2.6.8.tar.bz2 1184287
+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/xchat-2.6.8-r3.ebuild b/net-irc/xchat/xchat-2.6.8-r3.ebuild
new file mode 100644
index 000000000000..af6f88e91109
--- /dev/null
+++ b/net-irc/xchat/xchat-2.6.8-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.8-r3.ebuild,v 1.1 2006/12/25 15:02:55 hanno 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}"/xchat-2.6.8-fe-text.patch
+	epatch "${FILESDIR}"/xc268-fix-teprivmsg.diff
+	epatch "${FILESDIR}"/xc268-fix-ja.diff
+	epatch "${FILESDIR}"/xc268-sec-url.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."
+}