7 files changed, 46 insertions, 137 deletions
diff --git a/dev-tcltk/tclxml/ChangeLog b/dev-tcltk/tclxml/ChangeLog
index 6f7f72af0cad..f872543778b3 100644
--- a/dev-tcltk/tclxml/ChangeLog
+++ b/dev-tcltk/tclxml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tcltk/tclxml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.55 2015/04/13 08:20:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.56 2015/04/13 08:30:14 jlec Exp $
+
+  13 Apr 2015; Justin Lecher <jlec@gentoo.org> -tclxml-3.2-r1.ebuild:
+  Drop old
 
   13 Apr 2015; Agostino Sarubbo <ago@gentoo.org> tclxml-3.2-r2.ebuild:
   Stable for alpha, wrt bug #543884
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index e027e02ed540..8d361eae5228 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,5 +1,5 @@
 -----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
@@ -7,24 +7,25 @@ AUX tclxml-3.2-format-security.patch 647 SHA256 093b73a367804592bce492ff263009e4
 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-3.2.tar.gz 757594 SHA256 f4116b6680b249ce74b856a121762361ca09e6256f0c8ad578d1c661b822cb39 SHA512 5e7d45063c1a311d49ecc42f664bf7d88862fc19a46b64f52d038e2adfcc5b6964ae74d61b40bcf8eb4e1440f849339095fd8712bd39f0cb57e279acea58a3da WHIRLPOOL 6b0b04e2a0e27bc73bbcd595642c8ec024a36eb25d12a8f324835de95afd64dd25fa58c3109be1dec03b379852e14a79db81b3ea7f0f1c6896b07054dd9c8d13
-EBUILD tclxml-3.2-r1.ebuild 1260 SHA256 2edb3c3c7e792e41a1439e9374cd1b3ec0287b04a4907a484ca8a5b60261dab7 SHA512 abb7ac5b805e2ac7da9629699b98de31549979602adfed35178f262914d4651f8a3da9c2463d18a3b9ee206543396be8ca7d02a5e5f404300adc0e4e0333c1ee WHIRLPOOL 20fc073c6da4f824d8a7d4f5806bebb965d2bf6496dfe0a82b6bd07bafb2ec1fd41aca593d9ac952787cf7ae61f9dae6df01cca95cb7ae0e7c27fd630e91506c
 EBUILD tclxml-3.2-r2.ebuild 1234 SHA256 d2b367bf00f05e35ce026620f491e040d82d5ce88701bbec126bc051f28f6356 SHA512 509bad8414a634ad342fe6169336e5e5c4f46d6dbaecc153cd9c7365d84848821cafa5c39222ad59ebc086c6c90610d9c2f91cca1d02a9eb2aa866ddc4de8eeb WHIRLPOOL 4c19294ac3836477f2acda6a77f85035ef90783a484eed15a30178f457b3a6378154b030a70989b75b16f9e50ea027645de37736d9425e95b1c58dbbad90b141
-MISC ChangeLog 6759 SHA256 b01360a7f4781fa6796283bff73be6868104cf919545974b6ea41d4a2919cce9 SHA512 13189245e9bb55fcd3d8bce61997c38366dcaa08bea842843d513cd78e1f5585fca02fdee3c230b90f64f57503c355d5224f7ed89cd5cccad2f1420a6d902b33 WHIRLPOOL 06303a2631a92f968cfb44a7a4b61f7fec736084a9c8aa0dd72514389547536bf33ccb14d3fb134a1d2e817fb8de0cf75bead239be7ffe634e0f32074773696a
+MISC ChangeLog 6842 SHA256 7548f5451b8aba1de3c3e326411b8404df3cf0418ec001f659769b8c3fbeeca4 SHA512 5250a8fd61154b73daefee10f29da3b761f9d75e54d11076371ef463c70398f17c24787241a85b40d59309d0bc6c317122b7daf6768665ae63d685d98a59f6e4 WHIRLPOOL 7ac0fa2dc9004d7e641deb6522598a3ed9faccf243b1dd0975a6465efad02a1a10cf8d4ac9a8fd007a23260d25130c04636a6439528c006fc4a64d630cc62877
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVK3xeAAoJELp701BxlEWfUPEP/RhjcMVtijo3jpzKcN0gm1uh
-houvliHmYd5JRO7WcbUx0Q2lFnMXXZ7IVCpCGAuHEiyRl6AU83FfbJn+EKCoBEHA
-l2p25eTeYdkRYuNk9drfz4zz8fSii0p6v/2hsl6N+AhYgrks6U548OJANY+RDZau
-JNXPSL0syj6QGGpU7X0J7uOpK1XlHIdfDLuOdG+8iNrAiLd/99xQ1k0ayUAj2Iht
-334QEzobmFlERsPfNTLoYuxyjPliR85aB+2zbgbdv0C/98KJwbC9HFoWH3S+OEc7
-F0t0M74Imi0oyeamQ9Sv+ffpbNvFvIi69W2Ae/dkPQDk9/Mwf8Ccncar2V+lrNAO
-rUTcWTTmK2fi4aTo6Mp2wng4WYD6u3MYYXof6rUxU8I6D+0rPmBaQNbsaTXEsvTe
-ogdMXkyl1rcftPbooepBaZV/sWyeRkKML0HDUdpb5Cgiq1Xji9SHkRpf0yrCA92N
-ApOKUaHv1X9xLAu8lvOCjdjKiOmO2IW1XzVsQmkt0WX97OLddM+qMCmb7kKCd4R9
-ylHzBFiKERDJd31ecWTv5kZr/tQ/RV9TnSF14tE5I5CwNyt1V5D6DanxEL8ZjvIE
-eGOKXRPQ7LhrEw19Oy9nFwSqnbD1hLDSV/StU4hNq0bNRuNz03wQst4Qv0V6mvrL
-8LneMHNzp8T0vtJzcP+K
-=sKIx
+iQJ8BAEBCgBmBQJVK36WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir0U8QAIwCnVO1qogUvyVP98z3kRTw
+qm5kYWZTeQr27IN8DmWRlcOUTfdhJ5kD/EcCSReU2daIO0AKnel2uv0r+3iJMqQF
+UG6n2xs5F6hPnCwgae5fjO1B6nfU5Kn+vWWT+a3z/2i/sOD5NGciera+fxu88SW8
+kRfRMaOhj3uedBXTveL0I7RJSQFdaaVw8TJAiqmiymgUVROZYM8xqMcFBqeczJIK
+GBN769A8SGQ1PYFNHpBieqo+wW5I+9BH+JJFrYM9V1Ec5cl+i8/XGlCLDxXXQ86R
+rnww/vfqbUHkeZ4P6A1KPnEcJmPxoqWjs+scRa+SgDn9bQ+d4hTryvB3AmGUVI62
+uekRiv25l1PKhyixNavHwIELY1T5E+GJzhobe1Q67b8f6ak0Y0IrwbOZJjqP8Smz
+sfUz0UBBdGnLNvhm7vrAMJ3mFTDMcEqk0VVgCGzeBvOomUvGJwo//W5isBY/xizk
+qsipycejX4EfqP8uVQSCJpF2QboKm0hnmen015i7q565RFULA4MupwSnTACvJbBI
+RD8X1PK+YBDdCnfYSHLuST3zHtMmMWcJ5BHMIr0Lt57ta1KxdI5yvqBQy2VQ/dQ5
+cJkBGGfjWU8UVd5MMDsnxmql99bXEOosbtlBr4J8fE6PC4DzBN8OiXvpku67Vxms
+ln2RWSab6ysnttPsNRsl
+=nJJ8
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild b/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild
deleted file mode 100644
index 6ebe787be3d1..000000000000
--- a/dev-tcltk/tclxml/tclxml-3.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.12 2015/03/20 11:06:52 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:0
-	dev-libs/libxslt
-	>=dev-tcltk/tcllib-1.2
-	>=dev-libs/libxml2-2.6.9
-	dev-libs/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
-}
diff --git a/dev-tcltk/tls/ChangeLog b/dev-tcltk/tls/ChangeLog
index 60c180c50e3a..108ae27e03ae 100644
--- a/dev-tcltk/tls/ChangeLog
+++ b/dev-tcltk/tls/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tcltk/tls
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/ChangeLog,v 1.43 2015/04/13 08:21:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/ChangeLog,v 1.44 2015/04/13 08:29:36 jlec Exp $
+
+  13 Apr 2015; Justin Lecher <jlec@gentoo.org> -tls-1.6-r2.ebuild, metadata.xml:
+  Drop old
 
   13 Apr 2015; Agostino Sarubbo <ago@gentoo.org> tls-1.6-r3.ebuild:
   Stable for alpha, wrt bug #543898
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest
index 9df4de4d4956..0bde9777d582 100644
--- a/dev-tcltk/tls/Manifest
+++ b/dev-tcltk/tls/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tls-1.5.0-bad-version.patch 540 SHA256 175048c3ff600b974c03e24d1451a570d8eda1c86f3ed42714736983978c9b2d SHA512 22985a759f327392a5153bd72dd4a1a812f985b1162d7ee8b653ac131e998da6a9b465df2faa323c73ace33e28ea884151b9968adc065f149412483194f33a45 WHIRLPOOL 59e5c647eee03466304cfff7e072a1f267386b5a19b2369e2c3ea5b42de76a72be61ddb9e081623f6d54955d98139713301f4fdae3a4204b04d3b12c78e6c7f2
 DIST tls1.6-src.tar.gz 168043 SHA256 adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3 SHA512 beaca2653a11924f022e28254cef5071ecb8ab2e2355496d278fcab1bdcc46424aa58d2fe176aea26ec4fbe4416a912b5af8e8e69571c8a5301b7921ecf48383 WHIRLPOOL 5769eccd4df94558d7b5cdaa7234f4b248e3d8108686c3104bfa53a709a444088cdbf51b9660ecaa1f213c9391afbf81108ed330fe41bed3409d3c9364ac9790
-EBUILD tls-1.6-r2.ebuild 1111 SHA256 a47c6fb2f3c2392bf2921039a9f1f282ed7b114108b69194980a4d02fda93a12 SHA512 c324dd5ac260b3364393b6911c7cd65f20824f7d994c1ab6f98da243c00941b720289f6986480f8dba57f75ab3b41f49d8303ae7276ca68cfcc032a2e1a3705e WHIRLPOOL 950365b6738fd12de5dffbe26d4f6d03ec5557048a4d7a6f0b556e328024d9dd03fc6c56b379653d3ecf113c7d15c911260f5d04e6caadaca94d0fa797c6232c
 EBUILD tls-1.6-r3.ebuild 1039 SHA256 a4b795eeacb87fe502579b7038dd406c387c87c0f9b3a227966668c8b4e6d15c SHA512 98a4d3952f56ed7acaf59448157356d6cd9ab69cb252e71bcdde777a0f6e30da8baad09ee52d911f5c834fbf0685b14da5ea3e46b6713d90f6b669a05fafa806 WHIRLPOOL a3106f2d8395aca67d3b5189053ca75e5a7db39d3f461dfcef8e04a5f3327ce14403ce9fe2c500f4f9b008bd28f35e874ab8ec17d2bd2f3018f1a23ba8749c83
-MISC ChangeLog 4544 SHA256 cae9f7be5815594c4c5c9d5452bbe1c2b40c0b21a795399ff13f495874006969 SHA512 f098141c32370a02731d75c8638a8a47c5fad650e64051a87b37787c8aa6595233f139cf61c445bbe9f2111d2756720e73db9ff6b657ff44a5749dd99e07a83d WHIRLPOOL 97283365f36bbff262146ba4e1a7c7525b9054d001946d23f0ea1aa034e553ef1d962cd53e3fbc997742808931d7e0008b603e442333e7841cee1b4bf05ad79e
-MISC metadata.xml 158 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 SHA512 60ffb8f937083ebfa2a70b1a3ac90bd9ca29cae6194ab77341a78c17d44123cedf5bf740611910e9a2f65585d0973e489bb6062471d26d0a5107e1e8b7f267ae WHIRLPOOL ef7a6760bc24a47df7eb857c63984981cf6b92fc52ce6cb4f71d937308dbbb94590841c5870bf0d6d550084f8dbe59707be14e61e3482267c5268c8f7d3a1080
+MISC ChangeLog 4638 SHA256 2e603f3c4c9ef75b9e3c11c80b6445eea492a289467cfd6e5562124bc0acc23f SHA512 8a13135d1b6efab6f0c7ec58e10214def5f9412ea4c380a51426bc120ad2c0e6268aacc3b0ffd89d7c2ab21bf2804bd8d6656d9bf38165c264981c2f02fef630 WHIRLPOOL b50b447f0a04b4c292b5572be17bc61ddfb8b3d6d311b860d0690ad100f7d763a6fae141eebc5fdfe08bd9d472999c8e7c8eb6442c7c3e26a73daf20240531c0
+MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVK3xwAAoJELp701BxlEWfrdoP/17t5BasghbQJkje/HkMcwlC
-8atcZLYuYvRFBV+BRgEJ04VeLCGUrVT1fOXYYe4SJ3Dl8HXsWZOBtiQ62LwV9jdF
-OhRIzAeWtQOJnMeqivCO8c40UsGlRo+LK4GeF3Oun08pkqsFpqKuic5v5DV6tp99
-2o35rm3T+RXN/zv9Y+OU9tSD862E4C/6dk+S8LgdrhzW2Pj5hP990e6JMU5DxZQH
-ez3hHByG7hxmwZ/elC0dOIHSRyxrEVjtn+tz30jPlEXuwuRwj97EkzwwlTr95Ahy
-eKo4rGQpfctNHRVQLjDzu0jIs41M5YMClFhI6cLCkfhkeUaF1Wx3jcgJ60CVEuP+
-xEzVCcSgcb7ANY6dvUckdr9i39fzRpJTI/rvXXZMWYtH/4KeuMkUOJwe1jcPnN3B
-UM8kPE9qSkDsN8c33jeSGIioW+Wm7DylaFGANeqaRWLldh4Z2PH0HFt/k1Ji8X4q
-0tIMOU1r/NsMmEmIuOT9XAB+AKmv/dS91zTufPa80kNi9dIXddUVJtT50YSJ8NK8
-TAHONWa4GckMsLU9OUBiJl3O675hAAkcj7PAzAdo9NtO0ywELmRr/DmZzaPE2VLt
-/ss9jnV/TGhwytvHGOIbrEwWyRcOzv8pCKUMf6Zxcux2gwsihORbYv9sb/Y3u1TD
-aKFK+Ib4XfmgxfC9dwrb
-=mbT2
+iQJ8BAEBCgBmBQJVK35vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirfkAP/RJjmeQnDlsXVU2f1uyU2iFI
+IniFLrj8HcKCFPVWaPRrayj7+zoMijFMhTJMHQANyYHcSpABSXc4u9pS0xKGDouW
+Tdbr3SRpAOADQ6CBFjC4/8ObWmIAsWJ314zFkUvzgYknOlScQ3UpCJIHkbZVojGw
+98oTtCAhf059vJZQ/oMz/ifsVjNe2JBoQN3Ds0XIdhUajqRmw86+g4WfJM/cOLgy
+w3nSy+uPim/eixQvqQvOOa1QFbn0ZjMLvHAFK0lRVOwMZCeg8b0awyIPPASjpZ5i
+VXQRyILw2iHwdZYfQGH3l+uh578vv1do3PCDs9RW9Mm45YFOOdR5e+SP4d8PdI3y
+O51FKEx8XldTUl641wST3uWCWM+U09m05a/uuNUMmOUCsPReyO6At9KsjMP4pt6W
+8T9IADMMcrRiwCTjUb5xPqY79Ww0ff/GzBZ1dcrScc2IX6iVuirGqDi8fhWOJmyy
+KOxUFYck9K6QGw0O4CZo/mFM3SyQubSyM5jPZiydOg0aiKr+qze7DTkE57PgPd1Q
+GVYkMD18Mj/MESsM0mzTW7H+/WIRshWYPHqN9YGYYEyjguPRXwC90l50+k6byllj
+3UGl2cP6Sg3Q487yaU+RsahSN30SvKLBsQRuVEKF1+MP2Uec6KWvLA35oyAKUnm5
+DeilvsvSQDCACVDuBP1l
+=JpIe
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tls/metadata.xml b/dev-tcltk/tls/metadata.xml
index d9408d8ab078..70ac40499556 100644
--- a/dev-tcltk/tls/metadata.xml
+++ b/dev-tcltk/tls/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/tls/tls-1.6-r2.ebuild b/dev-tcltk/tls/tls-1.6-r2.ebuild
deleted file mode 100644
index 6350749972d1..000000000000
--- a/dev-tcltk/tls/tls-1.6-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.6-r2.ebuild,v 1.10 2015/03/20 12:12:41 jlec Exp $
-
-EAPI="3"
-
-inherit eutils multilib
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="TLS OpenSSL extension to Tcl"
-HOMEPAGE="http://tls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tls/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="tk"
-
-DEPEND="
-	dev-lang/tcl:0
-	dev-libs/openssl:0
-	tk? ( dev-lang/tk:0 )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--with-ssl-dir="${EPREFIX}/usr" \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README.txt || die
-	dohtml tls.htm || die
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# this is ugly, but fixing the makefile mess is even worse
-		local loc=usr/$(get_libdir)/tls1.6/libtls1.6.dylib
-		install_name_tool -id "${EPREFIX}"/${loc} "${ED}"/${loc} || die
-	fi
-}