Pull in some perl scripting fixes from upstream CVS. Remove old ebuild.

(Portage version: 2.0.51.22-r2)

11 files changed, 30 insertions, 254 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 8c6d61d35e2a..f1bc9f6376f0 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,17 @@
 # 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.168 2005/08/24 23:47:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.169 2005/08/27 17:02:02 swegener Exp $
+
+  27 Aug 2005; Sven Wegener <swegener@gentoo.org>
+  -files/2.4.1-fe-text.patch, -files/2.4.1-close-fds-on-exec.patch,
+  -xchat-2.4.1-r1.ebuild:
+  Remove old ebuild.
+
+*xchat-2.4.4-r2 (27 Aug 2005)
+
+  27 Aug 2005; Sven Wegener <swegener@gentoo.org> -xchat-2.4.4.ebuild,
+  -xchat-2.4.4-r1.ebuild, +xchat-2.4.4-r2.ebuild:
+  Pull in some perl scripting fixes from upstream CVS.
 
   24 Aug 2005; Aron Griffis <agriffis@gentoo.org> xchat-2.4.3.ebuild:
   stable on ia64
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 3566f2c4bd39..dc5f1add8a5e 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,18 +1,12 @@
-MD5 5fc29f259bb2b347e5d03cbe3304b9ed xchat-2.4.4.ebuild 2216
-MD5 8ebf40ee60968abaf73442bfb9873e93 xchat-1.8.11-r1.ebuild 2267
-MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
-MD5 226dfd2adcaa59afe576e0e0c2ea4bfb xchat-2.4.1-r1.ebuild 2123
-MD5 f70fee92ab2e258ea7be208d0ddfa4b6 xchat-2.4.3.ebuild 2266
-MD5 dab205a4682d422ca046997425f59aeb ChangeLog 25061
-MD5 d02e695d17389cd55603845a81ae543d xchat-2.4.4-r1.ebuild 2266
-MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
-MD5 ee98eba7f1061680d8d0582a10d72cb7 files/xchat-dccserver-0.5.patch 11776
-MD5 21bc6820aa6d0c8722509a74c7fccb3d files/digest-xchat-2.4.3 134
-MD5 4a066f82a7a8ab6fe970340332d70105 files/digest-xchat-2.4.1-r1 134
+MD5 283d317f4bb321b05a7f2e41472fd44b ChangeLog 25435
 MD5 323192908f52dfb3288ffc92c0efc091 files/2.4.4-plugin-fixes.patch 1351
-MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
-MD5 9d213a58f6822d1958b6a5a4ad07ec14 files/2.4.1-close-fds-on-exec.patch 1041
-MD5 e4f52004b3e7ca6598d403f2fa74dcd4 files/2.4.1-fe-text.patch 697
-MD5 bbbd8d25d261dd3d115ca4fde8be8bce files/digest-xchat-2.4.4 65
-MD5 bbbd8d25d261dd3d115ca4fde8be8bce files/digest-xchat-2.4.4-r1 65
 MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11-r1 65
+MD5 21bc6820aa6d0c8722509a74c7fccb3d files/digest-xchat-2.4.3 134
+MD5 9ad4dba7e07a9c38f4515bf2acbb9a66 files/digest-xchat-2.4.4-r2 150
+MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
+MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
+MD5 ee98eba7f1061680d8d0582a10d72cb7 files/xchat-dccserver-0.5.patch 11776
+MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
+MD5 8ebf40ee60968abaf73442bfb9873e93 xchat-1.8.11-r1.ebuild 2267
+MD5 f70fee92ab2e258ea7be208d0ddfa4b6 xchat-2.4.3.ebuild 2266
+MD5 75722034c7aa0e0254ed948649623788 xchat-2.4.4-r2.ebuild 2452
diff --git a/net-irc/xchat/files/2.4.1-close-fds-on-exec.patch b/net-irc/xchat/files/2.4.1-close-fds-on-exec.patch
deleted file mode 100644
index 598cfb1cf37b..000000000000
--- a/net-irc/xchat/files/2.4.1-close-fds-on-exec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/common/util.c	28 Feb 2005 10:37:38 -0000	1.36
-+++ src/common/util.c	4 Mar 2005 11:27:21 -0000	1.37
-@@ -1216,6 +1216,7 @@
- 	int pid;
- 	char **argv;
- 	int argc;
-+	int fd;
- 
- 	if (my_poptParseArgvString (cmd, &argc, &argv) != 0)
- 		return -1;
-@@ -1226,6 +1227,8 @@
- 		return -1;
- 	if (pid == 0)
- 	{
-+		/* Now close all open file descriptors except stdin, stdout and stderr */
-+		for (fd = 3; fd < 1024; fd++) close(fd);
- 		execvp (argv[0], argv);
- 		_exit (0);
- 	} else
---- src/common/outbound.c	26 Feb 2005 08:05:33 -0000	1.73
-+++ src/common/outbound.c	4 Mar 2005 11:27:21 -0000	1.74
-@@ -1342,6 +1342,7 @@
- 	int fds[2], pid = 0;
- 	struct nbexec *s;
- 	int shell = TRUE;
-+	int fd;
- 
- 	if (*cmd)
- 	{
-@@ -1411,6 +1412,8 @@
- 			dup2 (fds[1], 2);
- 			/* Also copy it to stdin so we can write to it */
- 			dup2 (fds[1], 0);
-+			/* Now close all open file descriptors except stdin, stdout and stderr */
-+			for (fd = 3; fd < 1024; fd++) close(fd);
- 			/* Now we call /bin/sh to run our cmd ; made it more friendly -DC1 */
- 			if (shell)
- 			{
diff --git a/net-irc/xchat/files/2.4.1-fe-text.patch b/net-irc/xchat/files/2.4.1-fe-text.patch
deleted file mode 100644
index 9c45dbfe294b..000000000000
--- a/net-irc/xchat/files/2.4.1-fe-text.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/fe-text/fe-text.c
-===================================================================
-RCS file: /cvsroot/xchat/xchat2/src/fe-text/fe-text.c,v
-retrieving revision 1.19
-retrieving revision 1.20
-diff -u -b -B -r1.19 -r1.20
---- src/fe-text/fe-text.c	8 Jul 2004 05:03:25 -0000	1.19
-+++ src/fe-text/fe-text.c	23 Nov 2004 02:58:34 -0000	1.20
-@@ -815,3 +815,13 @@
- void fe_confirm (const char *message, void (*yesproc)(void *), void (*noproc)(void *), void *ud)
- {
- }
-+char *fe_get_inputbox_contents (struct session *sess)
-+{
-+	return NULL;
-+}
-+void fe_set_inputbox_contents (struct session *sess, char *text)
-+{
-+}
-+void fe_set_inputbox_cursor (struct session *sess, int delta, int pos)
-+{
-+}
diff --git a/net-irc/xchat/files/digest-xchat-2.4.1-r1 b/net-irc/xchat/files/digest-xchat-2.4.1-r1
deleted file mode 100644
index c09c93cf6a1a..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.4.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aeb2337cc36dd4a9ac0cd6e909f67227 xchat-2.4.1.tar.bz2 1214388
-MD5 4e66cb157c70b8d02f74238dc9a5057c xchat-dccserver-0.4.patch 11767
diff --git a/net-irc/xchat/files/digest-xchat-2.4.4 b/net-irc/xchat/files/digest-xchat-2.4.4
deleted file mode 100644
index 2edd631e72a6..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c853dbc73c3ba5127388584381bd4dce xchat-2.4.4.tar.bz2 1285259
diff --git a/net-irc/xchat/files/digest-xchat-2.4.4-r1 b/net-irc/xchat/files/digest-xchat-2.4.4-r1
deleted file mode 100644
index 2edd631e72a6..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.4.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c853dbc73c3ba5127388584381bd4dce xchat-2.4.4.tar.bz2 1285259
diff --git a/net-irc/xchat/files/digest-xchat-2.4.4-r2 b/net-irc/xchat/files/digest-xchat-2.4.4-r2
new file mode 100644
index 000000000000..4aed3f646520
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.4.4-r2
@@ -0,0 +1,2 @@
+MD5 92f205753e99fb719ad632f7a8656990 xchat-2.4.4-perl-scripting-fixes.patch.bz2 5415
+MD5 c853dbc73c3ba5127388584381bd4dce xchat-2.4.4.tar.bz2 1285259
diff --git a/net-irc/xchat/xchat-2.4.1-r1.ebuild b/net-irc/xchat/xchat-2.4.1-r1.ebuild
deleted file mode 100644
index f8126d6a5ff0..000000000000
--- a/net-irc/xchat/xchat-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.1-r1.ebuild,v 1.3 2005/06/21 13:22:03 swegener Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="mirror://sourceforge/xchat/${P}.tar.bz2
-	xchatdccserver? ( http://dfx.at/xchat/xchat-dccserver-0.4.patch )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 sparc hppa ppc alpha amd64 ia64 mips ppc64"
-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}
-
-	use xchatdccserver && epatch ${DISTDIR}/xchat-dccserver-0.4.patch
-	epatch ${FILESDIR}/${PV}-fe-text.patch
-	epatch ${FILESDIR}/${PV}-close-fds-on-exec.patch
-}
-
-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"
-
-}
diff --git a/net-irc/xchat/xchat-2.4.4-r1.ebuild b/net-irc/xchat/xchat-2.4.4-r2.ebuild
index 442f8cedfa92..262ac66cb4de 100644
--- a/net-irc/xchat/xchat-2.4.4-r1.ebuild
+++ b/net-irc/xchat/xchat-2.4.4-r2.ebuild
@@ -1,11 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.4-r2.ebuild,v 1.1 2005/08/27 17:02:02 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"
+SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
+	mirror://gentoo/${P}-perl-scripting-fixes.patch.bz2
+	http://dev.gentoo.org/~swegener/distfiles/${P}-perl-scripting-fixes.patch.bz2"
 HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
@@ -37,6 +39,8 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PV}-plugin-fixes.patch
+	epatch "${WORKDIR}"/${P}-perl-scripting-fixes.patch
+
 	use xchatdccserver && epatch "${FILESDIR}"/xchat-dccserver-0.5.patch
 
 	# use libdir/xchat/plugins as the plugin directory
diff --git a/net-irc/xchat/xchat-2.4.4.ebuild b/net-irc/xchat/xchat-2.4.4.ebuild
deleted file mode 100644
index 35562ecab325..000000000000
--- a/net-irc/xchat/xchat-2.4.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.ebuild,v 1.2 2005/06/21 13:22:03 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}"
-
-	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"
-
-}