Remove old, not working version (bug #119814 and #123974); Version bump

(Portage version: 2.1_pre7-r4)

8 files changed, 222 insertions, 10 deletions

diff --git a/dev-tcltk/tclxml/ChangeLog b/dev-tcltk/tclxml/ChangeLog
index b60cb5e44c9c..b2b89ba6ee61 100644
--- a/dev-tcltk/tclxml/ChangeLog
+++ b/dev-tcltk/tclxml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-tcltk/tclxml
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.19 2005/06/26 02:23:31 matsuu Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.20 2006/04/08 10:45:13 reb Exp $
+
+*tclxml-3.1 (08 Apr 2006)
+*tclxml-3.0-r1 (08 Apr 2006)
+
+  08 Apr 2006; <reb@gentoo.org> +files/tclxml-3_configure.patch,
+  +files/tclxml-3_include_path.patch, -tclxml-3.0.ebuild,
+  +tclxml-3.0-r1.ebuild, +tclxml-3.1.ebuild:
+  Remove old, not working version (bug #119814 and #123974); Version bump
 
 *tclxml-3.0 (26 Jun 2005)
 
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index 1994ba95c429..7f2e1fda78e5 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,10 +1,45 @@
-MD5 0680263db758c241e75e1b68bb341155 tclxml-2.6.ebuild 666
-MD5 b9e3fee00ff91ad4d5b7540170956aaf tclxml-2.5.ebuild 739
-MD5 6ee1f2138e7a1b6be00662c4b7290b1f tclxml-3.0.ebuild 1238
-MD5 a9e27e2c5dd500dd2595b09a2b81b756 tclxml-2.4.ebuild 663
-MD5 c01aef3e13a9563b1bf2a746724f51f9 ChangeLog 1935
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 f6f50fe416c16d19976349a81bc634a1 ChangeLog 2234
+RMD160 f69438c4d1389c7ed1c053a02a7385e5c799e6f6 ChangeLog 2234
+SHA256 f2692b26b91e7f4c269d7a37fb988b8891aae68ea37aa9804e2878fbe0c076ec ChangeLog 2234
 MD5 0a225320340157ce509a1645988f1a10 files/digest-tclxml-2.4 62
+RMD160 2c3d45f3388502789f6842bec3b6d750223eb1cc files/digest-tclxml-2.4 62
+SHA256 a27608eb2209078a1716ac499ce8e81f8ff24fb6a45a78f98d3271930d3bd395 files/digest-tclxml-2.4 62
 MD5 2770e7494e3f147c5a80579ff7334250 files/digest-tclxml-2.5 62
+RMD160 bc694c06d0b365bb0a06c605d6706881912b0373 files/digest-tclxml-2.5 62
+SHA256 a5137cacdbaf3c40ae22c7cb420a7945f617e41cd26f81087923cd30b53e895f files/digest-tclxml-2.5 62
 MD5 157b44d2d7c3d7a31afd230b30a9c2e0 files/digest-tclxml-2.6 62
+RMD160 7760811a40ccd4094c973c8b6d80e78b30b5a235 files/digest-tclxml-2.6 62
+SHA256 59bbd3fd6df5c2bf5ce47c1f1853e642a5dba00584aba9dc196cc653469d943b files/digest-tclxml-2.6 62
 MD5 6eb6e38f444683548455f7ba86a4b8ff files/digest-tclxml-3.0 62
+RMD160 d1ad4450478643dfdb2d529f09560525fdb7ddcb files/digest-tclxml-3.0 62
+SHA256 6a025eff5144fc79feac23c84245a285e54eed0dfc8d2d210e342ef31cfbb768 files/digest-tclxml-3.0 62
+MD5 993681771b97d352b24953676557a0c0 files/digest-tclxml-3.0-r1 232
+RMD160 ba1879faa96391671fa325a5e3bb3081e5e81b31 files/digest-tclxml-3.0-r1 232
+SHA256 75db892c2094889f50c061ff4ac247d4a130fe570ae04ca17e8fc17782965581 files/digest-tclxml-3.0-r1 232
+MD5 88f3bd6790808eb56b5157b84600aece files/digest-tclxml-3.1 232
+RMD160 88cbd6ae8e832f11dda50a673947e9071403f706 files/digest-tclxml-3.1 232
+SHA256 18d09dd7b4ff1582d32672646f26b86cddde8ae15d7028ff11e64f7aa582b297 files/digest-tclxml-3.1 232
+MD5 513c6988810bb01044074a46b6f7b7d2 files/tclxml-3_configure.patch 2939
+RMD160 5b1c865b214c09545c6c6502cfe6a89396233320 files/tclxml-3_configure.patch 2939
+SHA256 99e5bfc332973a666183f60d6839084da49e9082fe4bcc4134b763e7b9e8b07e files/tclxml-3_configure.patch 2939
+MD5 91e5a045dff81ff746c91b88d831448a files/tclxml-3_include_path.patch 329
+RMD160 797f2f7db5c0000b641ada16e77910e42a7ea2cd files/tclxml-3_include_path.patch 329
+SHA256 7b2496096b0813f91275ca3c69cdd6ff6819945be6b7b7d8a59664c7ae6147fc files/tclxml-3_include_path.patch 329
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
+SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
+MD5 a9e27e2c5dd500dd2595b09a2b81b756 tclxml-2.4.ebuild 663
+RMD160 0eccb7a155bc2da1b64ed47dc961edea46994292 tclxml-2.4.ebuild 663
+SHA256 4b89ba79db7e83bad748ed712e583d8621444e9d1e0983db9e7bc7b4fda96aeb tclxml-2.4.ebuild 663
+MD5 b9e3fee00ff91ad4d5b7540170956aaf tclxml-2.5.ebuild 739
+RMD160 d527e0890599b65c316f6d0852217b1a68b9d2fe tclxml-2.5.ebuild 739
+SHA256 ef300f2e6a51cf25c60bfa17503020bf478c2fa0e6217783232f324a6d5821c0 tclxml-2.5.ebuild 739
+MD5 0680263db758c241e75e1b68bb341155 tclxml-2.6.ebuild 666
+RMD160 f15e80aebfd6b876622b1b9f84841aa3d5d86c5a tclxml-2.6.ebuild 666
+SHA256 9d5a64422784ce2abbc705dc0816d04b1ce50e342ac72f467b6fea3f8e84ac16 tclxml-2.6.ebuild 666
+MD5 d9ac02d15b8195811f52571b72ef3dc6 tclxml-3.0-r1.ebuild 1386
+RMD160 8848d19a7b1ff60ad8980dc35baea47a47015ecf tclxml-3.0-r1.ebuild 1386
+SHA256 2b23929591c4ef65e165737aa4e8c8536101fba9c85576ac835e43a75e5baded tclxml-3.0-r1.ebuild 1386
+MD5 c26fb7c2d110bf13db5c6ff54daee78f tclxml-3.1.ebuild 1290
+RMD160 ec52223ac90a767442c7a485455f06f7b3d639be tclxml-3.1.ebuild 1290
+SHA256 527e4a1c5b9db0b848a0b5459db703193b42158b46a75dbe162c9b3df9d22615 tclxml-3.1.ebuild 1290
diff --git a/dev-tcltk/tclxml/files/digest-tclxml-3.0-r1 b/dev-tcltk/tclxml/files/digest-tclxml-3.0-r1
new file mode 100644
index 000000000000..e11cd2c26f99
--- /dev/null
+++ b/dev-tcltk/tclxml/files/digest-tclxml-3.0-r1
@@ -0,0 +1,3 @@
+MD5 d94d2b7990bf8c7f412018a4765eeb24 tclxml-3.0.tar.gz 480461
+RMD160 0147850065e29229e77d12c0589e4d3980cfaf6e tclxml-3.0.tar.gz 480461
+SHA256 0bc233e1e4de333c9235ea541da0f7c087f9989f446551c81a1d8c4eeef411bc tclxml-3.0.tar.gz 480461
diff --git a/dev-tcltk/tclxml/files/digest-tclxml-3.1 b/dev-tcltk/tclxml/files/digest-tclxml-3.1
new file mode 100644
index 000000000000..0eb591441778
--- /dev/null
+++ b/dev-tcltk/tclxml/files/digest-tclxml-3.1
@@ -0,0 +1,3 @@
+MD5 35de63a4ceba7a6fdb85dd1a62f2e881 tclxml-3.1.tar.gz 489568
+RMD160 91a5025bf555a5ade5cb13be5ce746e015b2463b tclxml-3.1.tar.gz 489568
+SHA256 9b017f29c7a06fa1a57d1658bd1d3867297c26013604bdcc4d7b0ca2333552c9 tclxml-3.1.tar.gz 489568
diff --git a/dev-tcltk/tclxml/files/tclxml-3_configure.patch b/dev-tcltk/tclxml/files/tclxml-3_configure.patch
new file mode 100644
index 000000000000..58de6b1db4a8
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3_configure.patch
@@ -0,0 +1,74 @@
+Tkanhs to Matteo Pillon <matteo.pillon@gmail.com>
+--- tcl.m4	2006-02-24 21:04:37.000000000 +0100
++++ tcl.m4.1	2006-02-24 21:04:54.000000000 +0100
+@@ -588,7 +588,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+@@ -1454,7 +1454,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+--- configure	2004-07-11 05:43:18.000000000 +0200
++++ configure.1	2006-02-24 21:14:04.000000000 +0100
+@@ -3771,7 +3771,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+--- tclconfig/tcl.m4	2003-12-03 21:06:35.000000000 +0100
++++ tclconfig/tcl.m4.1	2006-02-24 21:16:04.000000000 +0100
+@@ -759,7 +759,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+@@ -2026,7 +2026,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+--- expat/configure	2004-07-11 05:43:29.000000000 +0200
++++ expat/configure.1	2006-02-24 21:16:31.000000000 +0100
+@@ -3860,7 +3860,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+--- libxml2/configure	2004-07-11 14:11:03.000000000 +0200
++++ libxml2/configure.1	2006-02-24 21:16:50.000000000 +0100
+@@ -3912,7 +3912,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
diff --git a/dev-tcltk/tclxml/files/tclxml-3_include_path.patch b/dev-tcltk/tclxml/files/tclxml-3_include_path.patch
new file mode 100644
index 000000000000..c270d5762986
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3_include_path.patch
@@ -0,0 +1,12 @@
+--- expat/Makefile.in.orig	2006-04-08 12:28:11.594940750 +0200
++++ expat/Makefile.in	2006-04-08 12:28:26.927899000 +0200
+@@ -175,7 +175,8 @@
+ INCLUDES	= @TCL_INCLUDES@ \
+ 	-I$(srcdir)/xmltok	\
+ 	-I$(srcdir)/xmlparse	\
+-	-I$(srcdir)/xmlwf
++	-I$(srcdir)/xmlwf	\
++	-I../include
+ 
+ EXTRA_CFLAGS	= $(MEM_DEBUG_FLAGS) @EXTRA_CFLAGS@
+ 
diff --git a/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild b/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild
new file mode 100644
index 000000000000..bd48f3052759
--- /dev/null
+++ b/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild,v 1.1 2006/04/08 10:45:13 reb Exp $
+
+inherit eutils
+
+DESCRIPTION="Pure Tcl implementation of an XML parser."
+HOMEPAGE="http://tclxml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
+
+IUSE="expat threads xml2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+DEPEND=">=dev-lang/tcl-8.2
+	>=dev-tcltk/tcllib-1.2
+	xml2? ( >=dev-libs/libxml2-2.6.9 )
+	expat? ( dev-libs/expat )
+	!dev-tcltk/tclxml-expat"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-3_configure.patch
+	epatch ${FILESDIR}/${PN}-3_include_path.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	use threads && myconf="${myconf} --enable-threads"
+
+	econf ${myconf} || die
+	emake || die
+
+	if use xml2 ; then
+		cd ${S}/libxml2
+		econf ${myconf} --with-Tclxml=.. || die
+		emake || die
+	fi
+	if use expat ; then
+		cd ${S}/expat
+		econf ${myconf} --with-Tclxml=.. || die
+		emake || die
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	if use xml2 ; then
+		cd ${S}/libxml2
+		make DESTDIR=${D} install || die
+	fi
+	if use expat ; then
+		cd ${S}/expat
+		make DESTDIR=${D} install || die
+	fi
+
+	cd ${S}
+	dodoc ANNOUNCE ChangeLog LICENSE README RELNOTES
+	dohtml doc/*.html
+}
diff --git a/dev-tcltk/tclxml/tclxml-3.0.ebuild b/dev-tcltk/tclxml/tclxml-3.1.ebuild
index 2a5e573da7b4..3bc64c9508d5 100644
--- a/dev-tcltk/tclxml/tclxml-3.0.ebuild
+++ b/dev-tcltk/tclxml/tclxml-3.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.0.ebuild,v 1.1 2005/06/26 02:23:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.1.ebuild,v 1.1 2006/04/08 10:45:13 reb Exp $
+
+inherit eutils
 
 DESCRIPTION="Pure Tcl implementation of an XML parser."
 HOMEPAGE="http://tclxml.sourceforge.net/"
@@ -19,6 +21,14 @@ DEPEND=">=dev-lang/tcl-8.2
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-3_configure.patch
+	epatch ${FILESDIR}/${PN}-3_include_path.patch
+}
+
 src_compile() {
 	local myconf=""