Drop old; fix SLOT operators; Bump EAPI

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

9 files changed, 105 insertions, 202 deletions

diff --git a/dev-tcltk/tclxml/ChangeLog b/dev-tcltk/tclxml/ChangeLog
index 94cf71ca7c8a..3038dbb0e698 100644
--- a/dev-tcltk/tclxml/ChangeLog
+++ b/dev-tcltk/tclxml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-tcltk/tclxml
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.49 2014/08/10 21:26:19 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.50 2015/03/20 11:06:52 jlec Exp $
+
+*tclxml-3.2-r2 (20 Mar 2015)
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/tclxml-3.2-format-security.patch, +tclxml-3.2-r2.ebuild,
+  -tclxml-2.4.ebuild, -tclxml-3.0-r1.ebuild, -tclxml-3.1-r2.ebuild,
+  metadata.xml, tclxml-3.2-r1.ebuild:
+  Drop old; fix SLOT operators; Bump EAPI
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> tclxml-2.4.ebuild,
   tclxml-3.0-r1.ebuild, tclxml-3.1-r2.ebuild, tclxml-3.2-r1.ebuild:
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index 94da5b00527c..d181592fee29 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,24 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tclxml-3.1-test.patch 1639 SHA256 1c944940f0ad72be30641221a0fb08ad540b42eb5c84ada8ae988178d40db252 SHA512 eb718e514149c32c219a46713c7dec2dbaab00bbda5cb4a4bfc2a0f9e2031420e4ee77e25126ca7d4d273f9006555a32ad63827258fcac03e5febff18e17e073 WHIRLPOOL 3fad49d02b2b2addbcdcaf39368d8910fd401660fbd5ccd68b4cd8c23d0207e40eaccf4628e80c5950cdfd5c583133c85df248b93131d7d19e66752a4abfae8d
 AUX tclxml-3.2-fix-implicit-declarations.patch 488 SHA256 13028681e6a4a272f0fb579c744189b95ca6ae56ab39869421af27e9282f8eec SHA512 9f8a0c55886c01324e318aec70c99b85f845567a486daddbb897900f242d8a9fec99026c8f6ec7d73e5dca8ee22bf851dc64eab2a83a3a2c959828a24e79e4ca WHIRLPOOL 79c3fc4532bfc04317ef6e3d8583ece18ec4668f8999927e6c0823fe66e045cf74494e734c1e332ee47ccea86fae02d1467af9ba2b4e7ee963a09526aa229067
+AUX tclxml-3.2-format-security.patch 647 SHA256 093b73a367804592bce492ff263009e47b9d2a556f635049200e6ae935f90ae8 SHA512 2b76363f015400642f00ce24ef67fd8f7607cd6ed0a63a5768aa343fbe9d6a8af50e15ccebecff813aa0c6d0714d65626c31e2edc860b6b826e52952bb47d435 WHIRLPOOL 87ebea841487a14a7d190da3a22de82836355c9a024318c40ca6596eccbfaf43108ea9ebdbf169bba2ebe93b73914c5066fed4e9543487c7268df30e4c9b3ff5
 AUX tclxml-3_configure.patch 2939 SHA256 99e5bfc332973a666183f60d6839084da49e9082fe4bcc4134b763e7b9e8b07e SHA512 3f1e87b789d8e1a20e1e402bbbc395da2a752af41583e745aa853f101247fbdd0b9690649f93d05fa803868b8e6a007bdf8a96ffd9ec8a9cd8d5b69d1e22a302 WHIRLPOOL 0bf73f91cf2a8aabccc3e8f2620e72bc9497ff027850074e8aa265943a7deb07afb1a12f79ac3310cfee538f90a43107ae3ca9f111ea4466b2234425bcef4bdc
 AUX tclxml-3_include_path.patch 329 SHA256 7b2496096b0813f91275ca3c69cdd6ff6819945be6b7b7d8a59664c7ae6147fc SHA512 a76a01d894e92c4dc1a4933a374dd074730192616b138b3a5b0b3558abfc8e7d229317ad46a2dda484c21e1d5ea4c8452f6dca582e55b95363fa60292608465e WHIRLPOOL fcdfd12fc1c6dd0372d8463def4230e750a0b9598a4c41b9bd0505c1ad2046d6649ec9c5643d84b71fd3d79ed70f25ef594efcb386ceb2b190f89b2343af9200
-DIST tclxml-2.4.tar.gz 405119 SHA256 eaf6850bb29eeab6958e09f3b0649b0b9b3bce874177d8ef56d4345f4bbffba1 SHA512 16e237a49f2a7168e9ed0d70c04dda493a3dca62d4cb9bb5faf9c9d2ae5add9a13e90a4b980ca752ad2d6861fb9a0521041fbd47b9f644d58443eafcd78c3e46 WHIRLPOOL 1d094f6a1bc2bf133619d793fa5588ac5e88cde3bec314a701b4f2ec89199faa4166864af760ad9762ec0f5ac8b9ea6ea3def6f9415ceda2afbba6d7958f28fe
-DIST tclxml-3.0.tar.gz 480461 SHA256 0bc233e1e4de333c9235ea541da0f7c087f9989f446551c81a1d8c4eeef411bc SHA512 2dece10bd13d538a97e5367a53ca67a3f4675743b1dde5f7c2e68f61e2be0f9338afb38848fe9679dfb86e04d10e202a88da8f49f6a0780797464207d1e6bf1c WHIRLPOOL 92ed0de4c7a7143df445d097e69c50d75b5fe7cc8d9953262e0de5dfbeaf9a066e30a8137491a460827c237d09c7d26b7191f97d553c00268e7208a3bddb52f6
-DIST tclxml-3.1.tar.gz 489568 SHA256 9b017f29c7a06fa1a57d1658bd1d3867297c26013604bdcc4d7b0ca2333552c9 SHA512 a7f87762342e80aa8bb17a25a5d4e4fedd9ead2c29d031e90c53765b716fc161280e1f08f6962b65ba32d4433742956fcd254c1f1c2cec9e6bf270db6e5d02cd WHIRLPOOL b65da09b795fed95aece8c28e0eba0ec917f45357322519b763e9eb6b8d2e0b73d51c5a0d23232c5015365f402172cbb3be417d7a96ccf2d91af6802e2270b5a
 DIST tclxml-3.2.tar.gz 757594 SHA256 f4116b6680b249ce74b856a121762361ca09e6256f0c8ad578d1c661b822cb39 SHA512 5e7d45063c1a311d49ecc42f664bf7d88862fc19a46b64f52d038e2adfcc5b6964ae74d61b40bcf8eb4e1440f849339095fd8712bd39f0cb57e279acea58a3da WHIRLPOOL 6b0b04e2a0e27bc73bbcd595642c8ec024a36eb25d12a8f324835de95afd64dd25fa58c3109be1dec03b379852e14a79db81b3ea7f0f1c6896b07054dd9c8d13
-EBUILD tclxml-2.4.ebuild 811 SHA256 9d65afd6a59d2bfce15794fdd3af161087b876bd3194190edabcc9682e5cfda2 SHA512 7434bcc64b746719745e3140823681cd552ba08d922208ce3f9339a1e2c929c0908ac33aa86321ef19735e634371fbe2ed9fb7efb7d246149b137c7c36891db2 WHIRLPOOL 0fc3aade01ea3705024766cbcef63559ed63b39ce841b3ee485e27a60dcce30b9ba46a93e666d28c3de583f5a516ef485927191039f73b7b54730637a022f269
-EBUILD tclxml-3.0-r1.ebuild 1385 SHA256 e522d3aecfa324b1783d5ba8e947c9adae93f19ff174885206b5e971d8dd9264 SHA512 25c28a70b60c219e96bf9ef017fe7c1d1842885cd910b85c637be3d4cba61171d09e03576880cc89c18a053da152a203c514967bd12fcaf5e6a04005244208e7 WHIRLPOOL c8b7c1020f9d7b4455cb0ac9c497306ecc2246dc010bb9153e24763f1fc18b2ecd85f568c3a67ae0891b58b0ff92e0d3a9a90ba8002d2b609fd3705254779966
-EBUILD tclxml-3.1-r2.ebuild 1702 SHA256 94a9cc52850367eed844cce08ee194c507a2e05a268809bf8cbab861b4a6f7e8 SHA512 73e853c682e08c1499a3dfdd098796de19d207f4fec5032f309fc9d18351a414ff617ba8929b13d49c744e3ffd92ed3f38007bc89cc0802e97dfd58b540146b1 WHIRLPOOL 48011d0a75a72839530896a92b2dbfbd457faffd34892df7ef84756197efa8d583cdf5d3494ccd2240ccc6bd7e8994a814dbaf84ee0d39e921de4c3df83fd983
-EBUILD tclxml-3.2-r1.ebuild 1260 SHA256 4d31bc8618fa2fee3b1ac25a49a76344664b6070704c46643ef950f3ef583e34 SHA512 1038ac6e6c2e3646b03119cb105a7f3bc399ce632470f4de2e26ee46f9bcf61f5e5cba4a021782409317014292f8561afe94cc67b67687998824afed3b637ba9 WHIRLPOOL 1ceec02b13e1a174ae15c8787298160d33fefa22635432e478725e23434ae4c17e93ef373f5953663fdfe200cbb075a9469592c90a6f4fe574e5d3658a367255
-MISC ChangeLog 5934 SHA256 b98f4839db0c5bf169d4b53ebda65f64beb3d3dcb34ebc6b4c143c6706ba3791 SHA512 702efdfad9c182b9fbffae0593092ace774e2bec72a85f132186bd133bda7d60d7bbeff3c689de3514851fef28551b1c6fc86d8df604418626da0de2f147abf5 WHIRLPOOL 3d172524ef9c643f2d21553e50ab9b64b0ad766af13102173c3f640b74060663f2983b34b74de9d3cbea743ec21ff2734dff49cc352d7524f1fdb36c5a704cc8
-MISC metadata.xml 158 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 SHA512 60ffb8f937083ebfa2a70b1a3ac90bd9ca29cae6194ab77341a78c17d44123cedf5bf740611910e9a2f65585d0973e489bb6062471d26d0a5107e1e8b7f267ae WHIRLPOOL ef7a6760bc24a47df7eb857c63984981cf6b92fc52ce6cb4f71d937308dbbb94590841c5870bf0d6d550084f8dbe59707be14e61e3482267c5268c8f7d3a1080
+EBUILD tclxml-3.2-r1.ebuild 1260 SHA256 2edb3c3c7e792e41a1439e9374cd1b3ec0287b04a4907a484ca8a5b60261dab7 SHA512 abb7ac5b805e2ac7da9629699b98de31549979602adfed35178f262914d4651f8a3da9c2463d18a3b9ee206543396be8ca7d02a5e5f404300adc0e4e0333c1ee WHIRLPOOL 20fc073c6da4f824d8a7d4f5806bebb965d2bf6496dfe0a82b6bd07bafb2ec1fd41aca593d9ac952787cf7ae61f9dae6df01cca95cb7ae0e7c27fd630e91506c
+EBUILD tclxml-3.2-r2.ebuild 1240 SHA256 ff42e1cc78c4f28de021a0efa752f90a0c4c93d025da60d668da1cf17cbcda7e SHA512 7fe0110c718a0fa823002d2f7bc13436f97a73deca29d942baa2c377b2bf5b556c74bea1f4cb31ba401b3f399919525c2bb78b4bced7bbb6a4cd9025480be866 WHIRLPOOL b3b1bdd78bef83e552da99d2f36c01a64b635503281bb4b0bfdba1076fd509b1c91262f9e581401bcfa920c8b44632dda594cfbf4ea12d2ebd469dfe28095bc3
+MISC ChangeLog 6224 SHA256 49c51617197be90c3f2582755fa57a296b223eeeb8a7fd94969ab5c09d0df547 SHA512 eb423afed87f7d1e87b1bf6bb674df755a08481079be1795066eb4a8455d01a42913a18d9b7a559a43b9bba0339304919ada8133cca25bb6d5dfe124a88c893b WHIRLPOOL fde3c404a13c55fa40e5d050da27ac78bf59e6f074b9695c8b68266b1824079d701101dea5fd11a8ae4028da8dd467a661938bd4d8a2b87fab3b20a85e19b8a8
+MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn43wACgkQcaHudmEf86q/igCeKuY+oalJWPI4qVkEO+D/UM83
-7H0AnRtkFoFFKfTRBsNKDNrf1TnYJn3n
-=0vTe
+iQJ8BAEBCgBmBQJVC/9NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirxwIP/R5SnAoEnSt+Rw7GsNICDEtZ
+CN2SBrKC7AxeyOZLLBMSluv/EA0bWSQHMtsNtC+rVaE3qcx9p8H6qPNL7RUj3AEI
+hsileXqg8D+3sR8KuhUMpMH8R8gY4Q5Xl3/AuhdgEokgCvuPKVXyTqahojjZ7yzb
+MaJQgc/tr2KRaGKWRLP3rL7Z6GRWuhWpRA19dSM7INycms27HCFu0QFz6t/LuMfN
+eNKWBexkSYKPDNflQg1XDjPQjsI2n4Ng61BcRQzIxanVJL425gipB4Bdezs7A6rf
+D4HjcYPFgi1nZuqGgospxf6cTHBzwB4LkeviejvqtcwOJxv4NwAq6yr/uogIKbzS
+nENQ9K8GF+o22IBTPgRExe6l11VvgKdEd0Uj9NxfSfV1SMtwzeOFZGDu4zi8Zdpt
+vCkW57dCo4Kp50WkvnGiOkNaisMrfxc7rS2UOAT47wU+r9mtCpTUJd+jTcF1+8iQ
+Fj1q+4CRJy7s6V46dzN1kB3A3STmrfBZarxGM01i30QQ7o3AP3H+KgdnTjUPL4k1
+memFxWvVDhZk2eKzKQh36WU7pTRQcnziN9qepq7ZlQrD9YzEuh6LbA0/u5h5nHEv
+umgK7x491bp2Ak65vINraij9IMwpbPgZKja9NRFvYIoMJqj8XcB6r6aI/ZHz56+C
+ayPKG234Tx3UtJQfD/OQ
+=dmJy
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch b/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
new file mode 100644
index 000000000000..2d13c6575ea6
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
@@ -0,0 +1,16 @@
+ tclxslt-libxslt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tclxslt-libxslt.c b/tclxslt-libxslt.c
+index d943bf7..d18f645 100644
+--- a/tclxslt-libxslt.c
++++ b/tclxslt-libxslt.c
+@@ -1506,7 +1506,7 @@ TclXSLTExtFunction(xpathCtxt, nargs)
+     obj = TclXSLT_ConvertTclObjToXPathObj(extinfo->interp, resultPtr);
+     valuePush(xpathCtxt, obj);
+   } else {
+-    xmlGenericError(xmlGenericErrorContext,
++    xmlGenericError(xmlGenericErrorContext, "%s",
+ 		    Tcl_GetStringFromObj(resultPtr, NULL));
+     /* Need to define a new error code - this is the closest in meaning */
+     xpathCtxt->error = XPATH_UNKNOWN_FUNC_ERROR;
diff --git a/dev-tcltk/tclxml/metadata.xml b/dev-tcltk/tclxml/metadata.xml
index d9408d8ab078..70ac40499556 100644
--- a/dev-tcltk/tclxml/metadata.xml
+++ b/dev-tcltk/tclxml/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+  <herd>tcltk</herd>
 </pkgmetadata>
diff --git a/dev-tcltk/tclxml/tclxml-2.4.ebuild b/dev-tcltk/tclxml/tclxml-2.4.ebuild
deleted file mode 100644
index b6b9d1cf34f3..000000000000
--- a/dev-tcltk/tclxml/tclxml-2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 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.20 2014/08/10 21:26:19 slyfox 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"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/relid'/relid/" \
-		configure tcl.m4 tclconfig/tcl.m4 expat/configure || die
-}
-
-src_compile() {
-	econf
-	make || die
-
-	# Need to hack the config script.
-	sed -i 's:NONE:/usr:' TclxmlConfig.sh || die
-}
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog README RELNOTES || die
-}
diff --git a/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild b/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild
deleted file mode 100644
index 601793617c6f..000000000000
--- a/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 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.9 2014/08/10 21:26:19 slyfox 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 )"
-RDEPEND="${DEPEND}"
-
-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}
-	emake || die
-
-	if use xml ; then
-		cd "${S}"/libxml2
-		econf ${myconf} --with-Tclxml=..
-		emake || die
-	fi
-	if use expat ; then
-		cd "${S}"/expat
-		econf ${myconf} --with-Tclxml=..
-		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.1-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild
deleted file mode 100644
index 0dd2fa69edfc..000000000000
--- a/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 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.9 2014/08/10 21:26:19 slyfox Exp $
-
-inherit autotools eutils toolchain-funcs
-
-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 )"
-#	test? ( dev-tcltk/tclparser )
-RDEPEND="${DEPEND}"
-
-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() {
-	export LDFLAGS_OPTIMIZE="${LDFLAGS}"
-	tc-export CC
-
-	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=..
-		emake || die
-	fi
-	if use expat ; then
-		cd "${S}"/expat
-		econf ${myconf} --with-Tclxml=..
-		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
index 41aa5979d3a2..6ebe787be3d1 100644
--- a/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild
+++ b/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.11 2014/08/10 21:26:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild,v 1.12 2015/03/20 11:06:52 jlec Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 
 DEPEND="
-	>=dev-lang/tcl-8.2
+	>=dev-lang/tcl-8.2:0
 	dev-libs/libxslt
 	>=dev-tcltk/tcllib-1.2
 	>=dev-libs/libxml2-2.6.9
diff --git a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
new file mode 100644
index 000000000000..03f3bdb80801
--- /dev/null
+++ b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild,v 1.1 2015/03/20 11:06:52 jlec Exp $
+
+EAPI=5
+
+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:0
+	>=dev-libs/libxml2-2.6.9
+	dev-libs/libxslt
+	>=dev-tcltk/tcllib-1.2
+	dev-libs/expat
+	!dev-tcltk/tcldom"
+#	test? ( dev-tcltk/tclparser )
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fix-implicit-declarations.patch \
+		"${FILESDIR}"/${P}-format-security.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() {
+	default
+	dohtml doc/*.html
+}