Drop old; add SONAME SLOT

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

4 files changed, 117 insertions, 20 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index aca47c0ea431..b46a9cdaa479 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.206 2015/03/16 23:07:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.207 2015/03/17 12:12:30 jlec Exp $
+
+*tcl-8.5.17-r100 (17 Mar 2015)
+
+  17 Mar 2015; Justin Lecher <jlec@gentoo.org> +tcl-8.5.17-r100.ebuild,
+  tcl-8.5.17.ebuild:
+  Drop old; add SONAME SLOT
 
   16 Mar 2015; Mike Frysinger <vapier@gentoo.org> tcl-8.5.15-r1.ebuild:
   Mark arm64/m68k/s390/sh stable.
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 80aa79114642..f9e5d3345d69 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tcl-8.4.15-tclm4-soname.patch 477 SHA256 2130b8b5fdddadfca35b74e9432d2651733e4f1c7b13d66ffc87b6995865076b SHA512 280295134a053469defb095ccc447bbdd96b75a415eec099bf8aae8b9e5f271766a0228d6646dea564501f697454eb8ffa32d6f0682825f6073f110aa22644b5 WHIRLPOOL bab6dd5ee47af6498d528a9766ae74ab820156f1f4fea987b1e41e5f01da9e4d1176111e806b2afc5db54bc0a563eae05aa712343424ffe711e363fbe73bc23d
 AUX tcl-8.4.16-multilib.patch 988 SHA256 6df0027ee02c1f458e8ae5f07538e0838317d72d028c6e1af97e8433d866b0ce SHA512 a86803a3d676bdea8c601dde47806ab0516dd421f4cf6a375b16d12bc4a68130dc1d5ec4c8de0088b385a17d8bbc0289b08cded6d1c0fa78f686615b1006865a WHIRLPOOL 1768af16e193aa99f24b868586bf8f4b40b0d76a2cfb403269c63c891c11d3832fca4560cb9c61a3f9a11d431f8d3e59b9ad92e32989550dbd4b5b0333c88db1
@@ -21,25 +21,28 @@ DIST tcl8.5.15-src.tar.gz 4536117 SHA256 f24eaae461795e6b09bf54c7e9f38def025892d
 DIST tcl8.5.17-src.tar.gz 4546317 SHA256 4c7cd8f2e0900cb36dde899b3f9f4d5c471ee3c4f8304cf9ec71fd18cd5e98d6 SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568 WHIRLPOOL 7e97049eb3875bcdc33b2d8ab02b0932173916fbbdfbc7970dd3c3ed1fe520c15ed1d6106215a823b5fc6f5008f12f3ccd1525dd536ec239388e6bf459352ab6
 EBUILD tcl-8.5.13-r1.ebuild 3703 SHA256 eef3815b430316dbefc11c7b3be061e1fb68e00c3b8a8fa652368cb40eab3fba SHA512 bd9631a7deaae6dcad8bc8542fdfe4f8c77b9d75fb156924e2a5f183099b6e11f5d48369c8f998644abace078f68d53d2034a886bb59c4fd31d2d3ff5fa8a18c WHIRLPOOL 8d1079112e9b822d392a8177c4f64aa87e3e6b2a0072cfb7c5c024b80e057b0d93402353ebc39ef4cc9fa115ebe63cd1da878f5bc989351ca925409602d64a90
 EBUILD tcl-8.5.15-r1.ebuild 3843 SHA256 3f580e39dd34b50e013dcc36b2b3a6101d0210d4b3a8f0c50efe628a7907a883 SHA512 9c4d646d04ffaf27f27e6ad847c8ca5ecbd70b1e2c1795eac7328bdc5ddecf7b9f3f3352093d852cd675d61a729b4725ce5583c24ee067d21746535b0845694e WHIRLPOOL 3d79a0c593368edb26a217c6d30ddc2610356a8d15148430067f90c4eb946f64c8e692dd0da508748bb0988abbf62c5e85a136f78668e28a996db5f30f6df86b
-EBUILD tcl-8.5.17.ebuild 3781 SHA256 85d3aa2d16908dda66a4e5f7323c1035c77800ca477f35ae7fdbef8bd4e1781b SHA512 69c041d45b109f0cfce05c773a9993cd5a4879579e5f8ee8d9125f26180d1ecadef0baef66cf8ea7fd0d45e79b942d464ebc9228ccca4ff674ccf8634b4de182 WHIRLPOOL 84523daab6d09698de1cc7c39526001ccd9100a270b7e657a9add6072285424fbe4e43dcbd1df30278caed28b34fa1d10bcc39d4b7af38c8257364086f8a9e5f
+EBUILD tcl-8.5.17-r100.ebuild 2838 SHA256 1c0be2d8d64dda42e81daab83550e8f445acecfe530a4f4766f80ce45fa98bd8 SHA512 d48905e21f43114897cb982fbd7e1c6bf282b2ba1502a070d34ff3939bb4052b96aafc6a6a64fd8585a9e4311058d15c9b00a5810d5ee20a67de3d885a838216 WHIRLPOOL 07ce6e7ba40e079f3802673b98c4cd08ee307c961d9190104b93dce60d0ee6391f402217ccb9dc0eb6b0b2cd18c0cab2524c5286f48e3af153990006479a26bd
+EBUILD tcl-8.5.17.ebuild 3786 SHA256 eb9f496c3f5f5a8a2872c7c4d1526b95b445710fad9213ab52c5ce7facd3d8ba SHA512 0d2f3ad13463a4924eb97a416ce2323526a56c4d1dbe878e2b8163af0177fc1e77a01740bd55d903da6ed10a5faf50bdff74460e959b175e29b9a9c4c93f2da1 WHIRLPOOL 48fa180d23bf7afc688d8ff391700e2c1fc781c1547a665d4e8dcdb51c730c34de159e33238e549673214f893a02ca9669075455b7afc1e8e4b9683e20a048e4
 EBUILD tcl-8.6.3.ebuild 3926 SHA256 9d2df77fae006e1f6b4f77c4fb3abb4446d549e3b44f6ca318f55e48f2d0658b SHA512 9da3d47e83146b6e5348271c97225423c0583b624c528fe17d835db505a72542b963104eb57c32c8632911efa8905e6580554d0b34f61a2fc705aba7d7a2dbb6 WHIRLPOOL fb9a8c9a270743a4878628427375cfd0d997a23e54795d58424aab18aefe90efea09a184cf4ed3f6a614ae449da944a055021a66782b5fe9365193724574e20f
 EBUILD tcl-8.6.4.ebuild 3956 SHA256 01e34fda3ae3aec349a6e12313dcc2ed4d894d5b109015cafd920ab78901ba7e SHA512 f1a20594e5be1c4e590dbfaaa381c5235e59a93565f3edbcd4d954b84d050cac48805464da8c0f52209b3a69424e605e2d087c400ea5cf774d02e772544bd635 WHIRLPOOL 927eb2770dc1cd5d9b07ef7a4a55b5c31abdec402cfb16d9aa0af6e9cf520a45cb0e5e66d792dee96af036be227de213667fcde11501f95062878db9183b9af1
-MISC ChangeLog 27024 SHA256 fcdf299eb2c1ab6d252ed654300d81495aa0361034daac8dd66b9ab59773d83d SHA512 fa5283f1c5653ffc8dd5468aa963e2cfe1c6602de21967539b25223d42743e1546d344844bef0b3087175c45bdf5d377fd1fcf8371cba70a6a3c6af5bc96041f WHIRLPOOL 6a5c01b5e039631cf404f46bc83d4fc97c6be7196ee15afbc9ef19b9c22d717cd06952ab6a790bc89bd976ca18d3c8a980136c86e8fb95c44f44db5ee0e47d97
+MISC ChangeLog 27176 SHA256 0bd1f632cdef8b126ab69ea0804351c6fc5e40ce45b73c4b6ed499ef730b6c0e SHA512 320e0657b816d2e1f419c314317c20a483279d2fc286a8178b960f67eb4e196c4b2e3ee1c6b36e3eb018364524902390c0bbe4a1f9e0c33094656bf2fda21fa2 WHIRLPOOL 0b1373db83680c4f22886d29544e115198058bb2c008eb70ac21ebddb61dc094c15bbd4ddac268429c74b76829111ba57ae8d16b88a94ae684a17a1ebb73a17b
 MISC metadata.xml 271 SHA256 55e82636b02ffc7d7c033812851e6bf197a6e2b797fb8b5ee13c59c31246a0ba SHA512 f667a280785dbd69bfb4a0d78cc197e40196a2017f6f9c7fc3e4ed8846dda9608b2e9c9b01b94ab0d57b445fb3080d5fdcfc48d40def19bf90a5edaf188c5372 WHIRLPOOL 1447b7739ba725f572bb5c713d56867e3c5fc2dbad4bfd708d5b2ca8d50e74ff24bda238a3d30aaebb50457a87a8e9528c573fc3a443b6ee12e85a2b24514eeb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVB2JPAAoJEPGu1DbS6WIAJ5AP/016vi2LfW5dSJ3dsvxfA7qJ
-TRPCUbtjdkcMHq7En7GKzUmTYpw0St6ENtHxuZ6ex5qnCTp1XRWGR/prxgBovo5F
-9DhwgwIQkOzIsP/69g25YppbWNbVy2+o27vzuaThuhQrmQ7FITJsxyQBEZ9iN9Yl
-4ai8etYo9EEadt5kOnsq8LHmIVBlshqC3Xi6g6Ajm5KeuQFxyUZe8pTDe0jXsc5M
-WTtXgFYj8bq/B6O5R9IpjLDfJ2t1L7seTuaD7w2+eEzVhcmrXnnu7dR4gTsnZ8OX
-RHPMt1D+abSUEvAS4XgOnlyB8WJnWmPBwIRFR30N8oUY0i6qN9V3j38lGFY/hbP9
-WzSGrlVfLaTGQW0meOQ5S84JP3MXG/a/fvjhFPzlQQMbp4o7KcIlGiAgtNej4PRw
-eDTtmaQF+xlQhwTYiFKtV5hpMpSxKOCgJwsX6F5kbAcOLYzm18PxRNJqKhmFB1Vl
-xZxgK+8SjWn0vEn4FosLs2kXuIozIA+NSf4cku9oCJuJlTigxMJyWQF5BJOCfPVu
-VXCrOX1gWuYu4Tr8DN+CrzwAlTHpQeLFbT8vtPstQMG8o/vwOMnOrt+7i4JbGzM/
-SzwIpBCEUodvpD1VNwWrbWMEvxBBrVuEBhZovEt616ZtW2BJw+sxyvLtaiM8Bj+j
-SrGtn7RghkA1g6KE5ycg
-=ZNvG
+iQJ8BAEBCgBmBQJVCBovXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirHy0P/33eApVoAMACMU8TGgf23P+A
+XSnOp792wPpiO75onUf4a7I+R0/0ujMKnTBCS+kzemZKHTiCrWLg2ubZHCKYwfEF
+ld4+JU7VvjVdryjM6QNt/3kehFp/5DOkgjSX/k0grB/N0Jc/w6YyqAv8xOyt20xQ
+PeaKM4Tq6T8fXwrwwgfCdcaB7OyQ661eUZJAeTRV0NK1SYY8dszxu+m3ryPw5cuZ
+ejb16vvDil57dUQLqzqdmsc8xWsygq7fhELIaDroj+kVwcWjUQ1g+sSiTANu60G/
+vnKfN6B2CxAkvxzYe+gNin8ZyIvheyQM6hHh1T++gpdU1kqTp++RZ5LAZ32Gy8MO
+Yjw58SzxFSOhCE6cLV2MxBR19bBJa5g4Khb7U+d9yuW0d8hlddywjfDHhyjBqB4W
+1FGFdUXHp6X13qKpcnquqpozzel9LN/CNJoj57qejDPxPWpEBqaNRRzJ3oxpjMbC
+l8CG5CS3EToI+6XXXP7q8OU+KbEc2z5h8AxCzI0IcYtrc+RxUMREbAe5BYINMmaS
+x5SslB49DYU9vkcWdGeoaVthLYeYGiGJyfW0s2WPLmH9CWeKV3SdRmuiV3bf1n4j
+2yFnXWUX75JYsoQxLhp8xTOf2CCPCxJyD8TVth4Y9Xg/yPM4yNfN7UZGdfcLF1JT
+cSxMDwFkPxRxISQpK/c+
+=a0SR
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/tcl-8.5.17-r100.ebuild b/dev-lang/tcl/tcl-8.5.17-r100.ebuild
new file mode 100644
index 000000000000..e57b7e2a8958
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.17-r100.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17-r100.ebuild,v 1.1 2015/03/17 12:12:30 jlec Exp $
+
+# this ebuild is only for the libtcl8.5.so SONAME for ABI compat
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="8.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+DOCS=()
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	dolib.so libtcl8.5.so
+	dolib.a libtclstub8.5.a
+
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i tclConfig.sh || die
+	fi
+
+	insinto /usr/${mylibdir}/tcl${v1}
+	doins tclConfig.sh
+}
diff --git a/dev-lang/tcl/tcl-8.5.17.ebuild b/dev-lang/tcl/tcl-8.5.17.ebuild
index 885f92853627..e306429636b8 100644
--- a/dev-lang/tcl/tcl-8.5.17.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17.ebuild,v 1.2 2015/03/12 10:26:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17.ebuild,v 1.3 2015/03/17 12:12:30 jlec Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.tcl.tk/"
 SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
-SLOT="0"
+SLOT="0/8.5"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"