python-related fixes (try to avoid using the bad 2.2-r6 python)

2 files changed, 2 insertions, 65 deletions

diff --git a/net-irc/xchat/xchat-1.8.8-r1.ebuild b/net-irc/xchat/xchat-1.8.8-r1.ebuild
index d424802eb2a5..78d2af8a5eca 100644
--- a/net-irc/xchat/xchat-1.8.8-r1.ebuild
+++ b/net-irc/xchat/xchat-1.8.8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyrigth 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.8-r1.ebuild,v 1.2 2002/04/17 19:29:44 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.8-r1.ebuild,v 1.3 2002/04/29 15:31:56 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
@@ -9,7 +9,7 @@ SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
 HOMEPAGE="http://www.xchat.org/"
 
 RDEPEND=">=x11-libs/gtk+-1.2.10-r4
-	python? ( >=dev-lang/python-2.2 )
+	python? ( >=dev-lang/python-2.2-r7 )
 	perl?   ( >=sys-devel/perl-5.6.1 )
 	gnome?  ( >=gnome-base/gnome-core-1.4.0.4-r1
 		>=media-libs/gdk-pixbuf-0.11.0-r1 )
diff --git a/net-irc/xchat/xchat-1.8.8.ebuild b/net-irc/xchat/xchat-1.8.8.ebuild
deleted file mode 100644
index 645de8cfe54f..000000000000
--- a/net-irc/xchat/xchat-1.8.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyrigth 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.8.ebuild,v 1.2 2002/03/10 11:31:13 blocke Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X-Chat is an IRC client for UNIX operating systems."
-SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-RDEPEND=">=x11-libs/gtk+-1.2.10-r4
-	python? ( >=dev-lang/python-2.2 )
-	perl?   ( >=sys-devel/perl-5.6.1 )
-	gnome?  ( >=gnome-base/gnome-core-1.4.0.4-r1 
-	          >=media-libs/gdk-pixbuf-0.11.0-r1 )
-	ssl?    ( >=dev-libs/openssl-0.9.6a )"
-
-DEPEND="${RDEPEND}
-	nls?    ( >=sys-devel/gettext-0.10.38 )"
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	cp configure configure.orig
-	if [ "`use python`" ]
-	then
-		local mylibs=`/usr/bin/python-config`
-		sed -e 's:PY_LIBS=".*":PY_LIBS="'"$mylibs"'":' configure.orig > configure
-	fi
-}
-
-src_compile() {
-
-	local myopts myflags
-	use gnome  	&& myopts="--enable-gnome --enable-panel"
-	use gnome  	|| myopts="--enable-gtkfe --disable-gnome --disable-gdk-pixbuf --disable-zvt"
-	use ssl    	&& myopts="$myopts --enable-openssl"
-	use perl   	|| myopts="$myopts --disable-perl"
-
-	use python 	&& myflags="`python-config`"
-	use python 	&& myopts="$myopts --enable-python"
-
-	use nls    	|| myopts="$myopts --disable-nls"
-	use mmx		&& myopts="$myopts --enable-mmx"
-	
-	CFLAGS="$CFLAGS -I/usr/include/orbit-1.0"
-	
-	./configure --prefix=/usr \
-		--host=${CHOST} \
-		--enable-ipv6 \
-		${myopts} || die
-	
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr install || die
-	
-	dodoc AUTHORS COPYING ChangeLog README
-}