Added RESTRICT="test".

(Portage version: 2.1.3.19)

8 files changed, 129 insertions, 75 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/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
+}