Added RESTRICT="test".

Package-Manager: portage-2.1.3.19

9 files changed, 144 insertions, 95 deletions

diff --git a/dev-tcltk/tclxml/ChangeLog b/dev-tcltk/tclxml/ChangeLog
index ca3363ffb099..64fa866cac63 100644
--- a/dev-tcltk/tclxml/ChangeLog
+++ b/dev-tcltk/tclxml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-tcltk/tclxml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.29 2007/05/18 22:06:54 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.30 2007/12/24 04:44:07 matsuu Exp $
+
+*tclxml-3.1-r1 (24 Dec 2007)
+
+  24 Dec 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/tclxml-3.1-test.patch, -tclxml-2.4.ebuild, -tclxml-2.6.ebuild,
+  +tclxml-3.1-r1.ebuild:
+  Added RESTRICT="test"
+  Removed old versions.
 
   18 May 2007; Peter Weller <welp@gentoo.org> tclxml-3.0-r1.ebuild,
   tclxml-3.1.ebuild:
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index 3dbb74412941..51473b1fac42 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,3 +1,7 @@
+AUX tclxml-3.1-test.patch 1639 RMD160 71568fde07e9fdb1186362b121f66ddee9579e00 SHA1 4cc17600e8c8bd5279e32092b2a34795dac83dc4 SHA256 1c944940f0ad72be30641221a0fb08ad540b42eb5c84ada8ae988178d40db252
+MD5 1ac38755b7cd5a32bc5e98018a57d9bb files/tclxml-3.1-test.patch 1639
+RMD160 71568fde07e9fdb1186362b121f66ddee9579e00 files/tclxml-3.1-test.patch 1639
+SHA256 1c944940f0ad72be30641221a0fb08ad540b42eb5c84ada8ae988178d40db252 files/tclxml-3.1-test.patch 1639
 AUX tclxml-3_configure.patch 2939 RMD160 5b1c865b214c09545c6c6502cfe6a89396233320 SHA1 478a9faf3b2982431b3f9c4324c62b39d8deffef SHA256 99e5bfc332973a666183f60d6839084da49e9082fe4bcc4134b763e7b9e8b07e
 MD5 513c6988810bb01044074a46b6f7b7d2 files/tclxml-3_configure.patch 2939
 RMD160 5b1c865b214c09545c6c6502cfe6a89396233320 files/tclxml-3_configure.patch 2939
@@ -6,43 +10,34 @@ AUX tclxml-3_include_path.patch 329 RMD160 797f2f7db5c0000b641ada16e77910e42a7ea
 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
-DIST tclxml-2.4.tar.gz 405119 RMD160 46d0ca8ade99d6072a30a005c377c4f84feec34f SHA1 e9f483f552cf3e3f10782e50fa171c2ddf92dea8 SHA256 eaf6850bb29eeab6958e09f3b0649b0b9b3bce874177d8ef56d4345f4bbffba1
-DIST tclxml-2.6.tar.gz 423406 RMD160 de4478b10257b168d970fb13ac945f7aa148807c SHA1 b57f88ff775d67227b16ff5974fd85b13a689b4e SHA256 50cce1212cb496fa27bb2ad8950fef726317cee762665fdfd08e352bd6a76bcd
 DIST tclxml-3.0.tar.gz 480461 RMD160 0147850065e29229e77d12c0589e4d3980cfaf6e SHA1 6dcb1aa0a77c8e79b7b09beebaef9d0bae0b3389 SHA256 0bc233e1e4de333c9235ea541da0f7c087f9989f446551c81a1d8c4eeef411bc
 DIST tclxml-3.1.tar.gz 489568 RMD160 91a5025bf555a5ade5cb13be5ce746e015b2463b SHA1 d850ab7cd0457d60acbbfc4ab6be7f68827cdb1b SHA256 9b017f29c7a06fa1a57d1658bd1d3867297c26013604bdcc4d7b0ca2333552c9
-EBUILD tclxml-2.4.ebuild 790 RMD160 dfd226c2f82b0b113f275ac6d4bf35d7ba915356 SHA1 83e58aa77609947ba063bbe510a74e2b1f414a4b SHA256 f80611e3e710fffbe9cc63d41d52ee76040e8a1d3c407dd4348a25bd33afe8ce
-MD5 79557a5ef53564951716a199a857185b tclxml-2.4.ebuild 790
-RMD160 dfd226c2f82b0b113f275ac6d4bf35d7ba915356 tclxml-2.4.ebuild 790
-SHA256 f80611e3e710fffbe9cc63d41d52ee76040e8a1d3c407dd4348a25bd33afe8ce tclxml-2.4.ebuild 790
-EBUILD tclxml-2.6.ebuild 811 RMD160 1cf08677a0855cecf4e63fda2a2ebbcf5a87e331 SHA1 506e35a4c3d8b7bb1cc54e107b3a8d76d44d4f69 SHA256 a32e6a5f312ff4712efd147d3a649ab6d3253944c9527ad02a7fb52f0d3507da
-MD5 633c72e5e3bbb10b9b7ca8ee9aa0fc77 tclxml-2.6.ebuild 811
-RMD160 1cf08677a0855cecf4e63fda2a2ebbcf5a87e331 tclxml-2.6.ebuild 811
-SHA256 a32e6a5f312ff4712efd147d3a649ab6d3253944c9527ad02a7fb52f0d3507da tclxml-2.6.ebuild 811
 EBUILD tclxml-3.0-r1.ebuild 1379 RMD160 769db9068835fe72ee49a7e927b2af4656f2f8e8 SHA1 e2a3e159ea6d31afee33eddd00200d1c59edb516 SHA256 338f88519187edc8cf9e426b027d162f0499ed4592d86952ee5c2fa94f2c3744
 MD5 51fe03653758968882050c98d6a095dd tclxml-3.0-r1.ebuild 1379
 RMD160 769db9068835fe72ee49a7e927b2af4656f2f8e8 tclxml-3.0-r1.ebuild 1379
 SHA256 338f88519187edc8cf9e426b027d162f0499ed4592d86952ee5c2fa94f2c3744 tclxml-3.0-r1.ebuild 1379
+EBUILD tclxml-3.1-r1.ebuild 1489 RMD160 248f748ff035736b2862794c5d72dbba96e79563 SHA1 af16cd01609dce4e1fdda2aad15ebafc8713e9bd SHA256 23421cbf9296918254004c81575f5e0d88ab8ad720565b3e47eef7f96519168a
+MD5 f42651cfa1019f1863abc4e252cb2ffb tclxml-3.1-r1.ebuild 1489
+RMD160 248f748ff035736b2862794c5d72dbba96e79563 tclxml-3.1-r1.ebuild 1489
+SHA256 23421cbf9296918254004c81575f5e0d88ab8ad720565b3e47eef7f96519168a tclxml-3.1-r1.ebuild 1489
 EBUILD tclxml-3.1.ebuild 1380 RMD160 0c66a6a6fc25a20ca30b2271a01802d4334e01bc SHA1 8e283c430f1f9f9c62e98702e5508363aef21d33 SHA256 ec9b478298827d06e295b194705904a8454ce83bd578fc612fb657e17f37cf86
 MD5 10eac8f953bfd99b4fd443817e102725 tclxml-3.1.ebuild 1380
 RMD160 0c66a6a6fc25a20ca30b2271a01802d4334e01bc tclxml-3.1.ebuild 1380
 SHA256 ec9b478298827d06e295b194705904a8454ce83bd578fc612fb657e17f37cf86 tclxml-3.1.ebuild 1380
-MISC ChangeLog 3170 RMD160 b86c63c623611e346351c34f4a7de7822d0d4f58 SHA1 01f157b57d5dbe69591f13192e67b090e7b0442d SHA256 60c494fa072a275dbfe4d260d70910086c8f25bff0c702cdaf66208cf9ac4838
-MD5 655a65f818707fbaf14198194c0dc158 ChangeLog 3170
-RMD160 b86c63c623611e346351c34f4a7de7822d0d4f58 ChangeLog 3170
-SHA256 60c494fa072a275dbfe4d260d70910086c8f25bff0c702cdaf66208cf9ac4838 ChangeLog 3170
+MISC ChangeLog 3397 RMD160 8d3c932375065213293f61c7015f5357b431079a SHA1 1726c3b0bcb44d4c8b36bc9406a63863fce4eb15 SHA256 00c6bb55ef2f4c519f5d39fa39e43077955ba9bdd7efbc1fd80d344c5e2b5caf
+MD5 7f40ee5c64a24a75c030447f429274bc ChangeLog 3397
+RMD160 8d3c932375065213293f61c7015f5357b431079a ChangeLog 3397
+SHA256 00c6bb55ef2f4c519f5d39fa39e43077955ba9bdd7efbc1fd80d344c5e2b5caf ChangeLog 3397
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158
 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158
 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 metadata.xml 158
-MD5 9b33705cdcf380f29cd6d5fbfcc9e78f files/digest-tclxml-2.4 232
-RMD160 bfa7f4f8e162a24fb14c3028572bc771b7d9ae6d files/digest-tclxml-2.4 232
-SHA256 c14eaed51c885d9a69af9e5a04cd2510c3f8fa266f7a306b3f09f0e8d0e25029 files/digest-tclxml-2.4 232
-MD5 653b28fa91f4c848418a58fe5b7bc64e files/digest-tclxml-2.6 232
-RMD160 92b3a7bdd560e9c222f02361eee1e2c073f51045 files/digest-tclxml-2.6 232
-SHA256 75d5e2335b134f39def838d0f7512cf97c403a597ae379a703ffa3dbdf502cb8 files/digest-tclxml-2.6 232
 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 88f3bd6790808eb56b5157b84600aece files/digest-tclxml-3.1-r1 232
+RMD160 88cbd6ae8e832f11dda50a673947e9071403f706 files/digest-tclxml-3.1-r1 232
+SHA256 18d09dd7b4ff1582d32672646f26b86cddde8ae15d7028ff11e64f7aa582b297 files/digest-tclxml-3.1-r1 232
diff --git a/dev-tcltk/tclxml/files/digest-tclxml-2.4 b/dev-tcltk/tclxml/files/digest-tclxml-2.4
deleted file mode 100644
index abf689ace5e7..000000000000
--- a/dev-tcltk/tclxml/files/digest-tclxml-2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4c5106de3269c8a54ff42a5cc66f40f2 tclxml-2.4.tar.gz 405119
-RMD160 46d0ca8ade99d6072a30a005c377c4f84feec34f tclxml-2.4.tar.gz 405119
-SHA256 eaf6850bb29eeab6958e09f3b0649b0b9b3bce874177d8ef56d4345f4bbffba1 tclxml-2.4.tar.gz 405119
diff --git a/dev-tcltk/tclxml/files/digest-tclxml-2.6 b/dev-tcltk/tclxml/files/digest-tclxml-2.6
deleted file mode 100644
index 4abd36f3ec8e..000000000000
--- a/dev-tcltk/tclxml/files/digest-tclxml-2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a54d1d6965e2123529e80d2a7ed251ec tclxml-2.6.tar.gz 423406
-RMD160 de4478b10257b168d970fb13ac945f7aa148807c tclxml-2.6.tar.gz 423406
-SHA256 50cce1212cb496fa27bb2ad8950fef726317cee762665fdfd08e352bd6a76bcd tclxml-2.6.tar.gz 423406
diff --git a/dev-tcltk/tclxml/files/digest-tclxml-3.1-r1 b/dev-tcltk/tclxml/files/digest-tclxml-3.1-r1
new file mode 100644
index 000000000000..0eb591441778
--- /dev/null
+++ b/dev-tcltk/tclxml/files/digest-tclxml-3.1-r1
@@ -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.1-test.patch b/dev-tcltk/tclxml/files/tclxml-3.1-test.patch
new file mode 100644
index 000000000000..f312f4c897a5
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3.1-test.patch
@@ -0,0 +1,46 @@
+diff -Naur tclxml-3.1.orig/Makefile.in tclxml-3.1/Makefile.in
+--- tclxml-3.1.orig/Makefile.in	2005-05-20 21:02:01.000000000 +0900
++++ tclxml-3.1/Makefile.in	2007-12-24 13:28:55.000000000 +0900
+@@ -267,7 +267,7 @@
+ #		-testdir $(srcdir)/tea.tests
+ 
+ test: binaries libraries
+-	(cd $(srcdir)/tests; $(bindir)/tclsh8.4 all.tcl)
++	(cd $(srcdir)/tests; $(bindir)/tclsh all.tcl)
+ 
+ shell: binaries libraries
+ 	@$(TCLSH) $(SCRIPT)
+diff -Naur tclxml-3.1.orig/examples/README tclxml-3.1/examples/README
+--- tclxml-3.1.orig/examples/README	2000-12-28 15:07:12.000000000 +0900
++++ tclxml-3.1/examples/README	2007-12-24 13:29:21.000000000 +0900
+@@ -31,7 +31,7 @@
+ REC-xml-20001006.xml 
+         The W3C XML spec in XML format. A handy file to run xmlwc over
+         to test your build. You should get this output with the command
+-             tclsh8.3 xmlwc REC-xml-20001006.xml 
++             tclsh xmlwc REC-xml-20001006.xml 
+         :
+  
+            2929   14978  116827 REC-xml-20001006.xml 
+diff -Naur tclxml-3.1.orig/examples/flatten.tcl tclxml-3.1/examples/flatten.tcl
+--- tclxml-3.1.orig/examples/flatten.tcl	2000-05-20 08:56:20.000000000 +0900
++++ tclxml-3.1/examples/flatten.tcl	2007-12-24 13:29:29.000000000 +0900
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # -*- tcl -*- \
+-exec tclsh8.3 "$0" "$@"
++exec tclsh "$0" "$@"
+ 
+ # flatten.tcl --
+ #
+diff -Naur tclxml-3.1.orig/examples/xmlwc tclxml-3.1/examples/xmlwc
+--- tclxml-3.1.orig/examples/xmlwc	2000-12-28 14:53:38.000000000 +0900
++++ tclxml-3.1/examples/xmlwc	2007-12-24 13:29:09.000000000 +0900
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # \
+-exec tclsh8.3 "$0" "$@"
++exec tclsh "$0" "$@"
+ 
+ package require xml
+ 
diff --git a/dev-tcltk/tclxml/tclxml-2.4.ebuild b/dev-tcltk/tclxml/tclxml-2.4.ebuild
deleted file mode 100644
index ba90733dace8..000000000000
--- a/dev-tcltk/tclxml/tclxml-2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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-2.4.ebuild,v 1.16 2006/08/15 07:02:22 matsuu Exp $
-
-DESCRIPTION="Pure Tcl implementation of an XML parser."
-HOMEPAGE="http://tclxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 alpha sparc ~amd64"
-DEPEND=">=dev-lang/tcl-8.3.3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i -e "s/relid'/relid/" \
-		configure tcl.m4 tclconfig/tcl.m4 expat/configure || die
-}
-
-src_compile() {
-	econf || die
-	make || die
-
-	# Need to hack the config script.
-	sed -i 's:NONE:/usr:' TclxmlConfig.sh
-}
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog LICENSE README RELNOTES
-}
diff --git a/dev-tcltk/tclxml/tclxml-2.6.ebuild b/dev-tcltk/tclxml/tclxml-2.6.ebuild
deleted file mode 100644
index cc673c2f775c..000000000000
--- a/dev-tcltk/tclxml/tclxml-2.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-2.6.ebuild,v 1.10 2006/06/04 02:30:46 matsuu 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=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha ~amd64"
-DEPEND=">=dev-lang/tcl-8.3.3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i -e "s/relid'/relid/" \
-		configure tcl.m4 tclconfig/tcl.m4 expat/configure || die
-}
-
-src_compile() {
-	econf || die
-	make || die
-
-	# Need to hack the config script.
-	sed -i 's:NONE:/usr:' TclxmlConfig.sh
-}
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog LICENSE README RELNOTES
-}
diff --git a/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild b/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild
new file mode 100644
index 000000000000..8bc0e0464fe9
--- /dev/null
+++ b/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild,v 1.1 2007/12/24 04:44:07 matsuu 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 xml"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+
+DEPEND=">=dev-lang/tcl-8.2
+	>=dev-tcltk/tcllib-1.2
+	xml? ( >=dev-libs/libxml2-2.6.9 )
+	expat? ( dev-libs/expat )
+	!dev-tcltk/tclxml-expat"
+#	test? ( dev-tcltk/tclparser )
+RESTRICT="test"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-3_configure.patch
+	epatch "${FILESDIR}"/${PN}-3_include_path.patch
+	epatch "${FILESDIR}"/${P}-test.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	use threads && myconf="${myconf} --enable-threads"
+
+	econf ${myconf} || die
+	emake || die
+
+	if use xml ; 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() {
+	emake DESTDIR="${D}" install || die
+
+	if use xml ; then
+		cd "${S}"/libxml2
+		emake DESTDIR="${D}" install || die
+	fi
+	if use expat ; then
+		cd "${S}"/expat
+		emake DESTDIR="${D}" install || die
+	fi
+
+	cd "${S}"
+	dodoc ANNOUNCE ChangeLog README RELNOTES
+	dohtml doc/*.html
+}