Respecting CC & LDFLAGS #247192, respecting multilib #288799, using new phases in EAP=2/3 #295322, don't try to build subdirs which aren't present, ask maintainer for permission, w/o repsonse for one month

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

4 files changed, 151 insertions, 3 deletions

diff --git a/dev-tcltk/tclxml/ChangeLog b/dev-tcltk/tclxml/ChangeLog
index 4c14ebe92e93..81890dd590ec 100644
--- a/dev-tcltk/tclxml/ChangeLog
+++ b/dev-tcltk/tclxml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-tcltk/tclxml
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.33 2009/06/08 11:18:49 mescalinum Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.34 2010/03/07 08:52:17 jlec Exp $
+
+*tclxml-3.2-r1 (07 Mar 2010)
+*tclxml-3.1-r2 (07 Mar 2010)
+
+  07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org> +tclxml-3.1-r2.ebuild,
+  +tclxml-3.2-r1.ebuild:
+  Respecting CC & LDFLAGS #247192, respecting multilib #288799, using new
+  phases in EAP=2/3 #295322, don't try to build subdirs which aren't present
 
   08 Jun 2009; Federico Ferri <mescalinum@gentoo.org> -tclxml-3.1.ebuild:
   old
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index 18cbb26cb793..94dce0b9b5f6 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tclxml-3.1-test.patch 1639 RMD160 71568fde07e9fdb1186362b121f66ddee9579e00 SHA1 4cc17600e8c8bd5279e32092b2a34795dac83dc4 SHA256 1c944940f0ad72be30641221a0fb08ad540b42eb5c84ada8ae988178d40db252
 AUX tclxml-3.2-fix-implicit-declarations.patch 488 RMD160 164aca393ecb1aee3a472cc1b47346184ed5eb1a SHA1 337669a1b1a6a1734b568ab7990332e1aa5a948f SHA256 13028681e6a4a272f0fb579c744189b95ca6ae56ab39869421af27e9282f8eec
 AUX tclxml-3_configure.patch 2939 RMD160 5b1c865b214c09545c6c6502cfe6a89396233320 SHA1 478a9faf3b2982431b3f9c4324c62b39d8deffef SHA256 99e5bfc332973a666183f60d6839084da49e9082fe4bcc4134b763e7b9e8b07e
@@ -9,6 +12,15 @@ DIST tclxml-3.2.tar.gz 757594 RMD160 618d19c83159e85b1f95e4e8a173280d9ecb647c SH
 EBUILD tclxml-2.4.ebuild 793 RMD160 019634adc2aa238eac0732cc52c35bec627aa4bf SHA1 89abad33053bb620b225526c037866c2baa623bb SHA256 4e2e07265e07bc03f9974d9437631b180071bbd08a82a2da35b7970a2f0be14e
 EBUILD tclxml-3.0-r1.ebuild 1379 RMD160 769db9068835fe72ee49a7e927b2af4656f2f8e8 SHA1 e2a3e159ea6d31afee33eddd00200d1c59edb516 SHA256 338f88519187edc8cf9e426b027d162f0499ed4592d86952ee5c2fa94f2c3744
 EBUILD tclxml-3.1-r1.ebuild 1491 RMD160 730b36eacde10e17f673a9b4b35c546b4029cd83 SHA1 38e0a4d060ce3cc68176df79cf5e825f10d84cbd SHA256 e3d5281c75029fabc297ce8165f3ec5290cd384ae2c886e49903af0c9c1cd149
+EBUILD tclxml-3.1-r2.ebuild 1663 RMD160 ca78a804ef45126c9843584d624e627d6bba49ae SHA1 04369c653301a80897d721605c394f67a4b83318 SHA256 1fb42e861bcab1ec2e572cb45879ea0386e3095467ae9fc7c62f7f720d16240d
+EBUILD tclxml-3.2-r1.ebuild 1288 RMD160 36079efddfe1433da72c140a08c27633f15a8d3d SHA1 be1802c56825179f1eada6a6c0d004489d6bee5e SHA256 ccc010d30c20df15f96a4cefb5a0a9f6d44b8c966d080688a51b7898f9c7d781
 EBUILD tclxml-3.2.ebuild 1380 RMD160 8fb2473fded01fe4eee01abb3201e1b0d3c25445 SHA1 031880fcbbeab6661edbf370116e09c4fdd40f00 SHA256 52df61f253a99ac42f70da50f3b99c6007748252bbfba49ccf34498546dd6bfe
-MISC ChangeLog 3799 RMD160 a4c1074597defae4b988c5260e0f95d9a4f9e865 SHA1 8c89a579b13259c2e1216849590c470d11dcc879 SHA256 8dc69d89625175bcb37e961f6956c4cd7f9de005d6ff16eadf10243a38abcdd8
+MISC ChangeLog 4106 RMD160 91a849b045bf9b75c53a9982344c1124a67fbcdf SHA1 84ea141367e859afe7359d434d4b691d0af8905f SHA256 915d512db78b1dcbf205636dae61a45aa2e611e1d066d4944a05a3f04cf509d7
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuTaUcACgkQgAnW8HDreRZpjgCgqTdys/kaiyZQz9cxXNA5el6c
+1LYAn0HWe+qD6TaO34vZFqGtHp5fj2fR
+=NKgu
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild
new file mode 100644
index 000000000000..c13f9aaa77c4
--- /dev/null
+++ b/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild,v 1.1 2010/03/07 08:52:17 jlec Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Pure Tcl implementation of an XML parser."
+HOMEPAGE="http://tclxml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
+
+IUSE="debug 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
+		virtual/libiconv )
+	!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
+
+	eautoreconf
+}
+
+src_compile() {
+	econf ${myconf} \
+      --with-tclinclude="${EPREFIX}"/usr/include \
+      --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols) \
+		$(use_enable threads)
+
+	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 || die
+	dohtml doc/*.html || die
+}
diff --git a/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild b/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild
new file mode 100644
index 000000000000..7d306d2b7562
--- /dev/null
+++ b/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild,v 1.1 2010/03/07 08:52:17 jlec Exp $
+
+EAPI="3"
+
+inherit eutils multilib
+
+DESCRIPTION="Pure Tcl implementation of an XML parser."
+HOMEPAGE="http://tclxml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
+
+IUSE="debug threads"
+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
+	!dev-tcltk/tcldom"
+#	test? ( dev-tcltk/tclparser )
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${P}"-fix-implicit-declarations.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	use threads && myconf="${myconf} --enable-threads"
+
+	econf ${myconf} \
+		--with-xml2-config="${EPREFIX}"/usr/bin/xml2-config \
+		--with-xslt-config="${EPREFIX}"/usr/bin/xslt-config \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc ANNOUNCE ChangeLog || die
+	dohtml doc/*.html || die
+}