Version bump, CVS development snapshot.

Package-Manager: portage-2.0.53_rc5

6 files changed, 28 insertions, 71 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 108b810f08a5..b9b733ca3807 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.170 2005/09/12 00:22:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.171 2005/10/13 14:46:17 swegener Exp $
+
+*xchat-2.5.0_pre20051013 (13 Oct 2005)
+
+  13 Oct 2005; Sven Wegener <swegener@gentoo.org>
+  -files/2.4.4-plugin-fixes.patch, -xchat-2.4.4-r2.ebuild,
+  +xchat-2.5.0_pre20051013.ebuild:
+  Version bump, CVS development snapshot.
 
 *xchat-2.4.5 (12 Sep 2005)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 22c955e3da99..f53ec42faf57 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,12 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bd376642ae985629f764e5e51834131d ChangeLog 25599
-MD5 323192908f52dfb3288ffc92c0efc091 files/2.4.4-plugin-fixes.patch 1351
+MD5 84a785f24aff322195545dbad2f48403 ChangeLog 25826
 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 c5d53c24b3ebfec1f168930213f55fea files/digest-xchat-2.4.5 65
+MD5 055e7c834c44f30b024cb1ae04719f62 files/digest-xchat-2.5.0_pre20051013 77
 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
 MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
 MD5 17073299c8c2c65062ad2e77cd03b841 files/xc245-fix-te-notify.diff 403
@@ -14,12 +13,12 @@ MD5 ee98eba7f1061680d8d0582a10d72cb7 files/xchat-dccserver-0.5.patch 11776
 MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
 MD5 4634f562e01b219d3bcfb0ae6acb8397 xchat-1.8.11-r1.ebuild 2264
 MD5 f70fee92ab2e258ea7be208d0ddfa4b6 xchat-2.4.3.ebuild 2266
-MD5 c591165fd310fdeac6d0176bfe68d777 xchat-2.4.4-r2.ebuild 2452
 MD5 89e57e546fe0b1ffa905b08f20da69a3 xchat-2.4.5.ebuild 2301
+MD5 795889de752b7c47e177346019fcae82 xchat-2.5.0_pre20051013.ebuild 2122
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJMo6I1lqEGTUzyQRAlYwAJsGTdCe1BLtGLM76nF3FMy6OFlWSQCgyUHu
-YwN0whMDC6OjtzYdDJe9dqI=
-=GiUq
+iD8DBQFDTnNRI1lqEGTUzyQRAr8MAKCU32w8Rnr48MbnP2K+81xp4fIkMACfZQNn
+YfOwz8ucolIt5nedQp+5rac=
+=TdrG
 -----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
deleted file mode 100644
index 125c80386eb1..000000000000
--- a/net-irc/xchat/files/2.4.4-plugin-fixes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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-r2 b/net-irc/xchat/files/digest-xchat-2.4.4-r2
deleted file mode 100644
index 4aed3f646520..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.4.4-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-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/files/digest-xchat-2.5.0_pre20051013 b/net-irc/xchat/files/digest-xchat-2.5.0_pre20051013
new file mode 100644
index 000000000000..cae243bf0586
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.5.0_pre20051013
@@ -0,0 +1 @@
+MD5 ff6fd381588910915f1beb7153d69909 xchat-2.5.0_pre20051013.tar.bz2 2016725
diff --git a/net-irc/xchat/xchat-2.4.4-r2.ebuild b/net-irc/xchat/xchat-2.5.0_pre20051013.ebuild
index 262ac66cb4de..29dac7dcc843 100644
--- a/net-irc/xchat/xchat-2.4.4-r2.ebuild
+++ b/net-irc/xchat/xchat-2.5.0_pre20051013.ebuild
@@ -1,19 +1,15 @@
 # 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-r2.ebuild,v 1.1 2005/08/27 17:02:02 swegener Exp $
-
-inherit flag-o-matic eutils versionator
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.5.0_pre20051013.ebuild,v 1.1 2005/10/13 14:46:17 swegener Exp $
 
 DESCRIPTION="Graphical IRC client"
-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"
+SRC_URI="mirror://gentoo/${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"
+IUSE="perl dbus tcltk python ssl mmx ipv6 nls xchattext xchatnogtk"
 
 # Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
 if [ ${ARCH} = "sparc" ]
@@ -21,28 +17,25 @@ then
 	replace-flags "-O[3-9]" "-O2"
 fi
 
-RDEPEND=">=dev-libs/glib-2.0.3
-	!xchatnogtk? ( >=x11-libs/gtk+-2.0.3 )
+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 )
+	python? ( >=dev-lang/python-2.2 )
 	tcltk? ( dev-lang/tcl )
+	dbus? ( >=sys-apps/dbus-0.35 )
 	!net-irc/xchat-gnome"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.7
-	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )"
 
+S="${WORKDIR}"/xchat-2.5.0dev
+
 src_unpack() {
 	unpack ${A}
 	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
 	if [ $(get_libdir) != "lib" ] ; then
 		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
@@ -51,7 +44,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	# xchat's configure script uses sys.path to find library path
 	# instead of python-config (#25943)
 	unset PYTHONPATH
@@ -64,29 +56,27 @@ src_compile() {
 		$(use_enable mmx) \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
+		$(use_enable dbus) \
 		$(use_enable xchattext textfe) \
 		$(use_enable !xchatnogtk gtkfe) \
 		--program-suffix=-2 \
-		|| die "Configure failed"
-
-	emake || die "Compile failed"
+		|| 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
 
-	make DESTDIR="${D}" install || die "Install failed"
+	make DESTDIR="${D}" 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"
-
 }