Restore 2.6.6, bug 176975

Package-Manager: portage-2.1.2.5

5 files changed, 128 insertions, 15 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index d4d4c25646e0..ec63c99071df 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.241 2007/05/03 13:52:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.242 2007/05/04 09:38:43 armin76 Exp $
+
+  04 May 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/xchat-2.6.6-suffix.patch, +xchat-2.6.6.ebuild:
+  Restore 2.6.6, bug 176975
 
   03 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.8.2.ebuild:
   Stable on sparc
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index dd61f82479d6..a8833330e2fe 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.8.2-fe-text-vartype.patch 474 RMD160 8bd762050a97abcc0b2441dd4c47cf9bd7b95234 SHA1 3f8407f37316373412600f657ca6d047d961cde1 SHA256 40ee51d248682d18f9fd543863cb4c1a3b02affd4e620f631da9185605224da8
 MD5 7833847ce839c0aafb6623d7dc096528 files/2.8.2-fe-text-vartype.patch 474
 RMD160 8bd762050a97abcc0b2441dd4c47cf9bd7b95234 files/2.8.2-fe-text-vartype.patch 474
@@ -13,9 +10,18 @@ AUX xc280-fix-ja.diff 408 RMD160 92117513969886c5b882cea7594f09bb789cfd33 SHA1 1
 MD5 e6795d111f0185592da8b0f3eafc305b files/xc280-fix-ja.diff 408
 RMD160 92117513969886c5b882cea7594f09bb789cfd33 files/xc280-fix-ja.diff 408
 SHA256 3d7728fb3913a12765de778fe1f7db065f6a310c35c290d1c10439f7108fe771 files/xc280-fix-ja.diff 408
+AUX xchat-2.6.6-suffix.patch 647 RMD160 e0c40ec9eec26d9509b27f29c7b850b7d128ab98 SHA1 73be1b06841031f6033d059ccc4eca3d959735b0 SHA256 0ff0f4efb59a2ca4df872fd4bf4550cd063b8d5df8f823d1a83e0b790f604419
+MD5 4ecf29fb5fa64661ca72b43126974480 files/xchat-2.6.6-suffix.patch 647
+RMD160 e0c40ec9eec26d9509b27f29c7b850b7d128ab98 files/xchat-2.6.6-suffix.patch 647
+SHA256 0ff0f4efb59a2ca4df872fd4bf4550cd063b8d5df8f823d1a83e0b790f604419 files/xchat-2.6.6-suffix.patch 647
+DIST xchat-2.6.6.tar.bz2 1098934 RMD160 27cef034342dc831e2ddb11f8bd5f6cb727e8f93 SHA1 ba674165ad9f8e48acd2c0437bea6b1acc2871b9 SHA256 c4b38d29e6a9872c8ffde27c8866d8c3b9f1fe6e227cef5fed39bc79f983d44c
 DIST xchat-2.8.0.tar.bz2 1257232 RMD160 a65329728c050c5448b2cbab2ea6c68ba72a0c95 SHA1 80248b4fcd45261c686557eb243fec6ce459bd60 SHA256 f417891d2405980875fd3ce03eb78f8e2ad3ea7354df8b7bb0a2939a55e20906
 DIST xchat-2.8.2.tar.bz2 1331148 RMD160 62f9ffeb77243e1c20d81f0543ea8ccc7d3cd225 SHA1 5cff7a974819ad8788962742df785aabfe844af0 SHA256 9f6c22e7116afea4c00d90346b0522069f1c2197e8d0ad2f1545da01329750fe
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
+EBUILD xchat-2.6.6.ebuild 2563 RMD160 46cb78b18bf9f262ecb39af34bbc3d69b119505d SHA1 304ed7ddfd14b1d366ab3538be35da5bdccf6c13 SHA256 05789ea5a179c4344870c8062ad6e57f6449c93803e35513188faf650d044d29
+MD5 49c0649a0bd12a379685c0ef9d479f35 xchat-2.6.6.ebuild 2563
+RMD160 46cb78b18bf9f262ecb39af34bbc3d69b119505d xchat-2.6.6.ebuild 2563
+SHA256 05789ea5a179c4344870c8062ad6e57f6449c93803e35513188faf650d044d29 xchat-2.6.6.ebuild 2563
 EBUILD xchat-2.8.0.ebuild 2668 RMD160 f21bb9fade88ed8c423074f916a0e4e409fe8088 SHA1 0fc2b57f7445027341484df83eb2e2997dd876db SHA256 ab52c98efa4f2c227dd95ca691fc65c4eb49ae1ea73e888f5bbf181ffc700022
 MD5 86366d437db7db1d576ab85c082b7b56 xchat-2.8.0.ebuild 2668
 RMD160 f21bb9fade88ed8c423074f916a0e4e409fe8088 xchat-2.8.0.ebuild 2668
@@ -24,24 +30,20 @@ EBUILD xchat-2.8.2.ebuild 2642 RMD160 3aa8b7080fbc73f5fac65072ed5def8bea791712 S
 MD5 16abfaca9e9b6c8fa36d98b4ff685f9b xchat-2.8.2.ebuild 2642
 RMD160 3aa8b7080fbc73f5fac65072ed5def8bea791712 xchat-2.8.2.ebuild 2642
 SHA256 8452dc31de8e0b4d7bde4c259ea46b38cc55a2abe86ae17703681746fae8f3a3 xchat-2.8.2.ebuild 2642
-MISC ChangeLog 35686 RMD160 506e1ee455b09fc3d4c25bafc4453b6ad929083a SHA1 f552c3526832a41debd8a4b9d9e3cadad23be422 SHA256 fa7f60a8f31421398f87ed26cfc2806366863d01426b2020dbec519e96e9e8e0
-MD5 23d8f07e69d738721247d1f939dfe343 ChangeLog 35686
-RMD160 506e1ee455b09fc3d4c25bafc4453b6ad929083a ChangeLog 35686
-SHA256 fa7f60a8f31421398f87ed26cfc2806366863d01426b2020dbec519e96e9e8e0 ChangeLog 35686
+MISC ChangeLog 35819 RMD160 27221ea6ce5af75baa9ba44f06d98065fb82107f SHA1 985d7cd8fb1504906be8d94ada6e12baf581c411 SHA256 49ad2bb6e3fcde54dba03d3d3e9ee44ac8ea8613dbf9f16aabdaf4583cd0529b
+MD5 89f380c5d4f3621050976f6d245c3c3b ChangeLog 35819
+RMD160 27221ea6ce5af75baa9ba44f06d98065fb82107f ChangeLog 35819
+SHA256 49ad2bb6e3fcde54dba03d3d3e9ee44ac8ea8613dbf9f16aabdaf4583cd0529b ChangeLog 35819
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
+MD5 072a9a81fd0f387bfb6d2865d02e6cc8 files/digest-xchat-2.6.6 433
+RMD160 18b7db0105aaf81c312a4e183d8652c20ca67bcf files/digest-xchat-2.6.6 433
+SHA256 861e8ab1bdb87f0916e2ba037a0598796f7e1b1006fe047cf4341363591be70d files/digest-xchat-2.6.6 433
 MD5 7305ba3f28f483b99b85bd38378b50b2 files/digest-xchat-2.8.0 433
 RMD160 f1988ea6b308aed1bd66d6afd1edf479cb144290 files/digest-xchat-2.8.0 433
 SHA256 e95175e719f9adcf81a2eb67a76f8e1e935a5a89c55df4ac65e1d14f96d298ef files/digest-xchat-2.8.0 433
 MD5 a1aaee75a6c7f58dd8a58e707a17067d files/digest-xchat-2.8.2 433
 RMD160 d6ad9156ac9f2afbf9832b97ac77773db9b65f44 files/digest-xchat-2.8.2 433
 SHA256 1fdc240bf06d802fd0b97299626477a83c4aed268d4ccaa8c8ae2ae78da4b7b3 files/digest-xchat-2.8.2 433
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFGOekMKRy60XGEcJIRApzPAJ93tY/00j5UsMvI+/o6qPcHPC6fpACdFYVm
-lOhJ248KWJanKY90q7kOa2Y=
-=+OA8
------END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/digest-xchat-2.6.6 b/net-irc/xchat/files/digest-xchat-2.6.6
new file mode 100644
index 000000000000..a1bad7599800
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.6.6
@@ -0,0 +1,5 @@
+MD5 43c187582beb31e744c4c5a833a022b5 xchat-2.6.6.tar.bz2 1098934
+RMD160 27cef034342dc831e2ddb11f8bd5f6cb727e8f93 xchat-2.6.6.tar.bz2 1098934
+SHA256 c4b38d29e6a9872c8ffde27c8866d8c3b9f1fe6e227cef5fed39bc79f983d44c xchat-2.6.6.tar.bz2 1098934
+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/xchat-2.6.6-suffix.patch b/net-irc/xchat/files/xchat-2.6.6-suffix.patch
new file mode 100644
index 000000000000..bf5ac2fafcc0
--- /dev/null
+++ b/net-irc/xchat/files/xchat-2.6.6-suffix.patch
@@ -0,0 +1,12 @@
+diff -Nur xchat-2.6.6.orig/plugins/dbus/xchat-remote.c xchat-2.6.6/plugins/dbus/xchat-remote.c
+--- xchat-2.6.6.orig/plugins/dbus/xchat-remote.c	2006-07-15 08:27:21.000000000 +0000
++++ xchat-2.6.6/plugins/dbus/xchat-remote.c	2006-10-13 14:16:57.801263851 +0000
+@@ -110,7 +110,7 @@
+         if (fork() == 0)
+         {
+           gchar *url = g_strdup_printf ("--url=%s", opt_open_url);
+-          execl (PREFIX"/bin/"PACKAGE_TARNAME, PACKAGE_TARNAME, "-a", url, NULL);
++          execl (PREFIX"/bin/"PACKAGE_TARNAME"-2", PACKAGE_TARNAME"-2", "-a", url, NULL);
+         }
+       } else
+         write_error (_("Failed to complete command"), error);
diff --git a/net-irc/xchat/xchat-2.6.6.ebuild b/net-irc/xchat/xchat-2.6.6.ebuild
new file mode 100644
index 000000000000..7529b743083d
--- /dev/null
+++ b/net-irc/xchat/xchat-2.6.6.ebuild
@@ -0,0 +1,90 @@
+# 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.6.6.ebuild,v 1.16 2007/05/04 09:38:43 armin76 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.6-suffix.patch
+
+	# 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) \
+		--program-suffix=-2 \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	# some magic to create a menu entry for xchat 2
+	sed -i \
+		-e "s:^Exec=xchat$:Exec=xchat-2:" \
+		-e "s:Name=XChat IRC:Name=XChat 2 IRC:" \
+		xchat.desktop
+
+	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"
+}