Revision bump to pull in two fixes for plugins from upstream CVS.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 157 insertions, 11 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 25f5cc0534e2..7c36684507f2 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.166 2005/07/12 04:46:23 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.167 2005/07/20 14:36:53 swegener Exp $
+
+*xchat-2.4.4-r1 (20 Jul 2005)
+
+  20 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  +files/2.4.4-plugin-fixes.patch, +xchat-2.4.4-r1.ebuild:
+  Revision bump to pull in two fixes for plugins from upstream CVS.
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> xchat-2.4.3.ebuild:
   stable on mips
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 4e8269a357ba..8fe4478f4860 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,15 +1,28 @@
-MD5 019bde4d409e6898782d3e90cc80a0f5 xchat-2.4.3.ebuild 2265
-MD5 226dfd2adcaa59afe576e0e0c2ea4bfb xchat-2.4.1-r1.ebuild 2123
-MD5 8ebf40ee60968abaf73442bfb9873e93 xchat-1.8.11-r1.ebuild 2267
-MD5 5fc29f259bb2b347e5d03cbe3304b9ed xchat-2.4.4.ebuild 2216
-MD5 a54f3d31fb3c3c34062b663cf9be313c ChangeLog 24762
-MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5ccd12c1b1a9ea848b699e18da9da148 ChangeLog 24973
+MD5 9d213a58f6822d1958b6a5a4ad07ec14 files/2.4.1-close-fds-on-exec.patch 1041
+MD5 e4f52004b3e7ca6598d403f2fa74dcd4 files/2.4.1-fe-text.patch 697
+MD5 323192908f52dfb3288ffc92c0efc091 files/2.4.4-plugin-fixes.patch 1351
+MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11-r1 65
+MD5 4a066f82a7a8ab6fe970340332d70105 files/digest-xchat-2.4.1-r1 134
 MD5 21bc6820aa6d0c8722509a74c7fccb3d files/digest-xchat-2.4.3 134
 MD5 bbbd8d25d261dd3d115ca4fde8be8bce files/digest-xchat-2.4.4 65
+MD5 bbbd8d25d261dd3d115ca4fde8be8bce files/digest-xchat-2.4.4-r1 65
 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
-MD5 e4f52004b3e7ca6598d403f2fa74dcd4 files/2.4.1-fe-text.patch 697
 MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
 MD5 ee98eba7f1061680d8d0582a10d72cb7 files/xchat-dccserver-0.5.patch 11776
-MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11-r1 65
-MD5 9d213a58f6822d1958b6a5a4ad07ec14 files/2.4.1-close-fds-on-exec.patch 1041
-MD5 4a066f82a7a8ab6fe970340332d70105 files/digest-xchat-2.4.1-r1 134
+MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
+MD5 8ebf40ee60968abaf73442bfb9873e93 xchat-1.8.11-r1.ebuild 2267
+MD5 226dfd2adcaa59afe576e0e0c2ea4bfb xchat-2.4.1-r1.ebuild 2123
+MD5 019bde4d409e6898782d3e90cc80a0f5 xchat-2.4.3.ebuild 2265
+MD5 d02e695d17389cd55603845a81ae543d xchat-2.4.4-r1.ebuild 2266
+MD5 5fc29f259bb2b347e5d03cbe3304b9ed xchat-2.4.4.ebuild 2216
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC3mGkI1lqEGTUzyQRAqN0AJ980Tlo20dfjXFcNdcdHRCZqVLUBgCgwS+l
+GUN0S/9hkanMVZRfEEApi5s=
+=mr4J
+-----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/2.4.4-plugin-fixes.patch b/net-irc/xchat/files/2.4.4-plugin-fixes.patch
new file mode 100644
index 000000000000..125c80386eb1
--- /dev/null
+++ b/net-irc/xchat/files/2.4.4-plugin-fixes.patch
@@ -0,0 +1,38 @@
+Index: plugins/perl/perl.c
+===================================================================
+RCS file: /cvsroot/xchat/xchat2/plugins/perl/perl.c,v
+retrieving revision 1.75
+retrieving revision 1.76
+diff -u -B -b -r1.75 -r1.76
+--- plugins/perl/perl.c	12 Jun 2005 23:37:39 -0000	1.75
++++ plugins/perl/perl.c	30 Jun 2005 14:37:35 -0000	1.76
+@@ -1273,7 +1273,9 @@
+ 	}
+ 	initialized = 1;
+ 
+-	xchat_plugin_get_info (plugin_name, plugin_desc, plugin_version, NULL);
++	*plugin_name = "Perl";
++	*plugin_desc = "Perl scripting interface";
++	*plugin_version = VERSION;
+ 
+ 	xchat_hook_command (ph, "load", XCHAT_PRI_NORM, perl_command_load, 0, 0);
+ 	xchat_hook_command (ph, "unload", XCHAT_PRI_NORM, perl_command_unload, 0,
+Index: plugins/python/python.c
+===================================================================
+RCS file: /cvsroot/xchat/xchat2/plugins/python/python.c,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -B -b -r1.18 -r1.19
+--- plugins/python/python.c	29 Mar 2005 06:23:17 -0000	1.18
++++ plugins/python/python.c	25 Jun 2005 14:57:53 -0000	1.19
+@@ -2052,7 +2052,9 @@
+ 	}
+ 	initialized = 1;
+ 
+-	xchat_plugin_get_info (plugin_name, plugin_desc, plugin_version, NULL);
++	*plugin_name = "Python";
++	*plugin_version = VERSION;
++	*plugin_desc = "Python scripting interface";
+ 
+ 	/* Initialize python. */
+ 	Py_SetProgramName("xchat");
diff --git a/net-irc/xchat/files/digest-xchat-2.4.4-r1 b/net-irc/xchat/files/digest-xchat-2.4.4-r1
new file mode 100644
index 000000000000..2edd631e72a6
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.4.4-r1
@@ -0,0 +1 @@
+MD5 c853dbc73c3ba5127388584381bd4dce xchat-2.4.4.tar.bz2 1285259
diff --git a/net-irc/xchat/xchat-2.4.4-r1.ebuild b/net-irc/xchat/xchat-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..442f8cedfa92
--- /dev/null
+++ b/net-irc/xchat/xchat-2.4.4-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.4-r1.ebuild,v 1.1 2005/07/20 14:36:53 swegener Exp $
+
+inherit flag-o-matic eutils versionator
+
+DESCRIPTION="Graphical IRC client"
+SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2"
+HOMEPAGE="http://www.xchat.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="perl tcltk python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
+
+# 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
+
+RDEPEND=">=dev-libs/glib-2.0.3
+	!xchatnogtk? ( >=x11-libs/gtk+-2.0.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( >=dev-lang/perl-5.6.1 )
+	python? ( dev-lang/python )
+	tcltk? ( dev-lang/tcl )
+	!net-irc/xchat-gnome"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.7
+	>=sys-apps/sed-4
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-plugin-fixes.patch
+	use xchatdccserver && epatch "${FILESDIR}"/xchat-dccserver-0.5.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() {
+
+	# xchat's configure script uses sys.path to find library path
+	# instead of python-config (#25943)
+	unset PYTHONPATH
+
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable tcltk tcl) \
+		$(use_enable mmx) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable xchattext textfe) \
+		$(use_enable !xchatnogtk gtkfe) \
+		--program-suffix=-2 \
+		|| die "Configure failed"
+
+	emake || die "Compile 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
+
+	make DESTDIR="${D}" install || die "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"
+
+}