Version Bump; drop old

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

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 03c053c9aa768093f0700571bac2c126b0b96057..6ace23af07f5c71bbdd3327c2ea0f56f95051b01 100644 (file)
--- 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.204 2015/03/12 10:26:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.205 2015/03/13 08:29:53 jlec Exp $
+
+*tcl-8.6.4 (13 Mar 2015)
+
+  13 Mar 2015; Justin Lecher <jlec@gentoo.org> +tcl-8.6.4.ebuild,
+  -tcl-8.5.16.ebuild, -tcl-8.6.1-r1.ebuild, -tcl-8.6.2.ebuild:
+  Version Bump; drop old
 
   12 Mar 2015; Agostino Sarubbo <ago@gentoo.org> tcl-8.5.17.ebuild:
   Stable for amd64, wrt bug #543022

diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index dbfcbfead00e9c95a8604eb54ad53d9982522683..4169c423c91e33a69e1cf8fde900f0116280cf38 100644 (file)
--- 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
@@ -14,36 +14,34 @@ AUX tcl-8.5_alpha6-multilib.patch 830 SHA256 5686025ce4e685afcf06cafac591a91a5cc
 AUX tcl-8.5_alpha6-tclm4-soname.patch 486 SHA256 af3c3ea0b0d6c37c666d2fb54cd9891c273c90ebaea4a4707583076faffb2925 SHA512 6d884f34672a523c17c55b770bb4c94e360f56109908aa59c4a0721edbff1ab443dbc97a7ce0f2f3b0f7e290de23ace70b337c8b9aea719be4fa8e4d4d698f3e WHIRLPOOL cc651da9d5e10dfe969612c3e25b0e4452da0867348f13fc8c8d61e18bc6c34b855ac789aecc65a0bf9e2438aa59ec9078ec858cf5562a2cffdf34a308a1dbcb
 AUX tcl-8.6.1-conf.patch 518 SHA256 55c4bf1a8e21b9cfc749e4207293c6472f84145082beeecb7fa83f4c334c8f45 SHA512 564779732d4ad1253e4f6fbc760eabf67153e8978c29e434f7796c57a637932bf5d8308edb1e0951e391ec490ea00cd4360b19eae79fc840af02acd4ef03a021 WHIRLPOOL f3d4a9b5ae66a9defb9d0b209fe5b4bc43d7fae2aa3e366f0b54f763488d94a236f226cf445c03623f34793e8e2305a29906e14c4d0e3bda3e8ed27f9eefed9b
 AUX tcl-configure-LANG.patch 1686 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea SHA512 6b097d9406f0faf5d0332c48a72d5654063fe29e37ec2d3bc2f425e98f26d117d39769c43ae39ee731f094a47912bf1dd24259fcc4a5b5326b1e2c4313c89c56 WHIRLPOOL 40cf52a3a9c97012be36a6e11054c3c418c692cb9292350baefecee621ecbff12b65f7b0edcde86e14600aea4c43daf607806c374b650d3f82142870b0da4da2
-DIST tcl-core8.6.1-src.tar.gz 5773335 SHA256 00a25fcd70e0be65f85e996353c2a0717eaaf51dc547cf6e499bb05257e20764 SHA512 d3f4c3200017f3afcc50c19619d79a31cac5441b4aac341524a6dfdda3e6f2eada1e0a70875d24f29afc733998aedf6fa14826cba61fceda496aaf2a2a4a3c5b WHIRLPOOL dbd53216ee28bb9a3fbaa7aa5c07ca5931f098d6761eaa859d74ab5dda409e6dc77a28ee43a312267ceff74d04fb723484b6ea8afccf429c28cea5fd6c64521e
-DIST tcl-core8.6.2-src.tar.gz 5808780 SHA256 8c5142fb275284f7678462a95895b892e64260a76d5fbdc690a6365de72b2667 SHA512 7ff3d3dd4884bb9470a2736b4c0348b957772902f3e6a69ff4a5c81b0927aeb3b1b19ab476c965ceca9eb94606b0936e0895747f4e76e04c265b318eade62b89 WHIRLPOOL 933806a400b4725f5f0ed207ab307bd5e20bd0ed2952d587ccf2ebe8ab041150e830b66450698a8938e3096242298e9191f6b3537b20d0426e9aa18438dda52c
 DIST tcl-core8.6.3-src.tar.gz 5820073 SHA256 7227879e706a3a72b50a53c647904b6eedda216049f255acdc597aaea6131207 SHA512 1ac78eab8a25b8c8e717d630848b5f493c91c345ac31154706a60f1f11c12745c27e91abb67052ff3131189d6c125b7160bb579ee99cb2e479fe7c96d9d1383b WHIRLPOOL e74f70f47bb4b323fe6fcac98a41177f11fff5e3ec73996ca41b312a45582e08d51a9a361c615222647e76f864279205dc06fbe28eaa6d81eb2e2adc27092120
+DIST tcl-core8.6.4-src.tar.gz 5813056 SHA256 373e849067f33159470060f35742110ff23b5fba07e42f01fbd0654d7a9a371f SHA512 cc73248b68528be46dbe1e29fa129bc827850e9a315ccd91bd0ca0afe61b8af633830a8da5706283de1c149df6cbf857da75ebd0f3998bb459e5456a4844a61f WHIRLPOOL 9b14d7dd31b2d8d1ca3bc44d4259514d8ff9df905a165fb7f95af018afffa1b87deeaf51ef602fd3d97a80c399687f842d24b539a301520dfeec172387de23b3
 DIST tcl8.5.13-src.tar.gz 4513204 SHA256 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a SHA512 e1c9f36dd0e1afd81f42d249fe0191f10d6e0eab73042e32c9c0af09063ebf19bc2a24364743fa7b6798c588e77fa81654e6e7eb7591e1aaf4b222e20ecc6c84 WHIRLPOOL f1c1b67508c5d5c85de7d76d075a577ef14b5df05ca5bb0a0d0d78261134e8d85accb82a27f135877585820d52f0d363ebde74cfd890dbfafbf3766985315b61
 DIST tcl8.5.15-src.tar.gz 4536117 SHA256 f24eaae461795e6b09bf54c7e9f38def025892da55f26008c16413cfdda2884e SHA512 44c8a975ffaeca1f954fbc160fed966064340b5de883e53321691c6c457283716c4ab5c87c7c754ff5c1bd293d46eb14bbf356a0bf6a5ed0078d8789703df3df WHIRLPOOL da369146ccc1a449eae6b2fddc7802457c267b1ed047dba665b2684f27105a0763646b6a985e697891b3da9b3531a89f1ffb78168dc386c27889bcdaaa175e1c
-DIST tcl8.5.16-src.tar.gz 4545982 SHA256 a26cbdb0437d05e5a00c993570737e71fa6cc9084e19174d714097b5cbaac1b1 SHA512 58db492fc688c2238db0e8d8fc7d663808e9b7ccf7628b3476e0fac09e7aadd543a5b8dadec1142c485786dec33e308c067a6907902d6454ca01804109542c4f WHIRLPOOL b626399eed2ee7ff53c17eb52f13bfbe230cd8b64199786cdd3e39add8ccfb4d9f928235fd89ad0e9ed0f87b7f8aaf6c2b9537ee3b9fb9e0fdae2c4d15ed2191
 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 3844 SHA256 360828138dface703d1f3c1781d555ace5c6d29c8c8e5b4a9feefc299edf0aab SHA512 774dc089cd19a694635a262ec717793d06f62ccb92eebb3b36cc6d44c3ae6e6cb3cfa23c80c2936fe85f1a94406b3c270dadeb3334247def481e1500c8e14deb WHIRLPOOL c5b558e3aef880a9282cc27229ee3919896597c75437b7a417134f201bbab4445264749b82a389649df45ec07468d835689b92ee9f2dc5f27072111c5079d1af
-EBUILD tcl-8.5.16.ebuild 3783 SHA256 f55a1e30e1415289807af7589199f07e54d4ae0ee9ed92d57ac38fa6b05b28a5 SHA512 de25f3b6ed6141e83d4170d9533009ef87cb5795304dbb69854de806177541ab918e1b03dba9c4b6cd4ec85c9b2333de34bf89cac12c6e6ef450d911cecbc053 WHIRLPOOL db3847288326e399e1423038d11c3d726db24789e4cc110554fd2ba02011910944eebb4bdc901c5375df2bf4940c5da3196cf87c608cb641d57cdc764779b77f
 EBUILD tcl-8.5.17.ebuild 3781 SHA256 85d3aa2d16908dda66a4e5f7323c1035c77800ca477f35ae7fdbef8bd4e1781b SHA512 69c041d45b109f0cfce05c773a9993cd5a4879579e5f8ee8d9125f26180d1ecadef0baef66cf8ea7fd0d45e79b942d464ebc9228ccca4ff674ccf8634b4de182 WHIRLPOOL 84523daab6d09698de1cc7c39526001ccd9100a270b7e657a9add6072285424fbe4e43dcbd1df30278caed28b34fa1d10bcc39d4b7af38c8257364086f8a9e5f
-EBUILD tcl-8.6.1-r1.ebuild 3991 SHA256 5582fad80d1ec7735bac1091182ef36eb99b3a7618711b7679352303e1ad401c SHA512 b6b4d7ff4ea4676e2a9a453b9b21dd59026ce34344353f9d6f223c74536cf98f41687ff6d1b85452e84c86883c9c06a31912db1d0c58a30c203261bb5e31d364 WHIRLPOOL 132c345c8d2e62d17f98a6c015dfbb60170914fb92d5e009bb3150ca5fa125df5534d96059c1138a00de9c5813933c9f934d0793e34fe6361e415cbc38a5c5e6
-EBUILD tcl-8.6.2.ebuild 3926 SHA256 13a620f3d77c838dc3a916d292201c4e439c4c14ea97b3999ac1f89c3374f059 SHA512 d4787ba8b75cea0a12a576fc2c875bf768dfebed3a9699de2a741b9317782909450d7635df80406a0c869ec13aaa1c45a1cf5aa4ab55847da5429934a6a9ea04 WHIRLPOOL 75ba6cbbea891948dde7808a55f4fba3d50e3e364f9534a3bd47eccde7060da32e69af9bb86bfef1e27a5e7235fa6ba1548cb94b93c794ce005401489cd40410
 EBUILD tcl-8.6.3.ebuild 3926 SHA256 9d2df77fae006e1f6b4f77c4fb3abb4446d549e3b44f6ca318f55e48f2d0658b SHA512 9da3d47e83146b6e5348271c97225423c0583b624c528fe17d835db505a72542b963104eb57c32c8632911efa8905e6580554d0b34f61a2fc705aba7d7a2dbb6 WHIRLPOOL fb9a8c9a270743a4878628427375cfd0d997a23e54795d58424aab18aefe90efea09a184cf4ed3f6a614ae449da944a055021a66782b5fe9365193724574e20f
-MISC ChangeLog 26733 SHA256 9dd837f97ab04ae70871633efa2b99177ce7774f1d6e30a531d895f173bd27b6 SHA512 0ca8835f2b696bdb9bcda7d841652d1ef8f44c1197eeb62864eacaccbc51032a58cc99434d23922a77b2f0b488379b09e77d0366def9207d5618736461383eb4 WHIRLPOOL 77dcb5fe742fbdcd62c678e0ce2b193f14a0b5e9d124802a1474573022bc7ab70038236b40d89b69e21ed01f4315ce9b977010f98375ecaa950922f78ccbd6c1
+EBUILD tcl-8.6.4.ebuild 3956 SHA256 01e34fda3ae3aec349a6e12313dcc2ed4d894d5b109015cafd920ab78901ba7e SHA512 f1a20594e5be1c4e590dbfaaa381c5235e59a93565f3edbcd4d954b84d050cac48805464da8c0f52209b3a69424e605e2d087c400ea5cf774d02e772544bd635 WHIRLPOOL 927eb2770dc1cd5d9b07ef7a4a55b5c31abdec402cfb16d9aa0af6e9cf520a45cb0e5e66d792dee96af036be227de213667fcde11501f95062878db9183b9af1
+MISC ChangeLog 26915 SHA256 0a96259a7c246f2e44024fc1343c8020f9855a311a6547fb7bc0e3253b44c0a5 SHA512 abcbe08a90244818bf8b60a6b41b1b5ed635f55472c9932898ac7d130c8185aee3d2736087d9f495a9a8db702e59d4baaf64d67facceedad1b86e4c3e9722680 WHIRLPOOL 8722752b11aca20fc2fc685d7d7115986d429bfe7cab1d1f1f3b3fd3dbce1db7562d8fc603bb9d9e2ec998cb611e5e600e33f68ecd61e6ac3c32615c4a96879d
 MISC metadata.xml 271 SHA256 55e82636b02ffc7d7c033812851e6bf197a6e2b797fb8b5ee13c59c31246a0ba SHA512 f667a280785dbd69bfb4a0d78cc197e40196a2017f6f9c7fc3e4ed8846dda9608b2e9c9b01b94ab0d57b445fb3080d5fdcfc48d40def19bf90a5edaf188c5372 WHIRLPOOL 1447b7739ba725f572bb5c713d56867e3c5fc2dbad4bfd708d5b2ca8d50e74ff24bda238a3d30aaebb50457a87a8e9528c573fc3a443b6ee12e85a2b24514eeb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVAWndAAoJELp701BxlEWffBoQALQKWvG60A0CEYwTWc3/BNbz
-CDh0gnkqhCQLoT6zo09Ca8ac3N5yIwcPk9ouoR1sicCSZMAp611zqgT52v/IEvMI
-N6UtNOhN4ZRilHlkY5M/rtbqJZofpR4rA0Js0La9sq9VjJ3E7b+QYnFa2zBSI/AA
-uJSIVc9pd5uOCHpSuUYqBadBpAED7srn32W/Ww5m3YCnfeBtmWh00lD35c9rTapJ
-ivbuImbj+jMcUfKi/dCyn51nbW2cnVL/pEhOnZepNz78Ofm21QpEbYSTUYRztKZ4
-FgGSw4sb5dCal0WYuuqTZ/YM5d4CDBKFYV9T+FXDziNtPYjJCFCF8CHh2gCBsMog
-QHPxhw1nyKR94AtmnYcdS+oO6Oj6xnUyYgD8sdiSqYZaXB3gTLhm/d6FGLJMRviC
-HyJeSbycu+nNn3tmj3B/QqHNUoeAEQIzlSegvRT7TYH/vt3Zcu0A5bS9oWpaPKvk
-I3eUtmhlcpsMkcJAt6vOxPp+lah8cCAjn57pYndKCVrR+YBh/FmfN/yO+SoiMMtL
-TSEvPc2DKrbfIkoJSWkfdZW8ZqaOQCtDNDg+5joB4lUm8hXGxpJNlDgByRbxWBRF
-B60ecSQEHN19i7nhC6Kv2swT7M3180owSP0Meytsoe3Mw3JwmU2kprcCar9AFxaL
-L2Gk1Oo6ZB0AEUtIJNuD
-=ehgp
+iQJ8BAEBCgBmBQJVAqACXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirP4AQAKGW6tN3NSiiMIOBt/HmvpIR
+iD9P9nDO/+vx01hmqlDrA/bbU2nasn6sV/DVruoz4ZDwphE/2ar2lk7pcfHYZy4l
+PiweJjQ0VGvITg/wC545oVpri1Ou/jGbMilk8nzmfcZndI+k3QIhPj8K/AizbUDZ
+gOW+rvOuALoN1spcFlP5RSN3r9RIH2Fjnal1fzX0jepk1MSOd6leIbfae1FnAHsj
+zwVLgd8I7VAL/rrNnZYYOvcgzoDUb1EdY+Q3vMwD7CYLzjQI2UYhmv8Ztsqt9u0Q
+U5WkGWk12cveY0JjVliVurUKS7aLAu1Nosz5G7/NuFc8qMdfvNR0ZuoM9MDA1yPW
+Wz8CZT4WmzUP+i2XksZYBdVNJthuFK5s5rr18yDWFcZ+AjIM3FzFfMk5kEJxaVZg
+5kzgSUMldtTbh8hrHLk2sMojJQgau8ZTIWOVcSRvwI+FV5sk/6QPkDeqGrAXNtWB
+g1fI/2D9Lg5HFW+p6pMMZbLYfqAanUQZi0amnwLAEr6+ADdqGfO4SJtFf8mGsRzT
+A+ZXTBFgB/zUdGmdFlvcxvUaWasoCEEcJuHZpHkgRJtSGBq5CD0e2stT6jnJhHUf
+L7Ck+uVgK6F3JhcB2rbUvMbZzYaXtOXAt/WuxeS4B1oWp+nVDuLtPKIoNrXZb/l8
+dI+lE6EpHq7cc0biV3u1
+=mC7o
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/tcl/tcl-8.5.16.ebuild b/dev-lang/tcl/tcl-8.5.16.ebuild
deleted file mode 100644 (file)
index 7dfce2f..0000000
--- a/dev-lang/tcl/tcl-8.5.16.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.16.ebuild,v 1.1 2014/09/15 18:28:56 jlec Exp $
-
-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="0"
-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
-
-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() {
-       #short version number
-       local v1=$(get_version_component_range 1-2)
-       local mylibdir=$(get_libdir)
-
-       S= default
-
-       # 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 "${ED}"/usr/${mylibdir}/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 "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-       fi
-
-       # install private headers
-       insinto /usr/${mylibdir}/tcl${v1}/include/unix
-       doins *.h
-       insinto /usr/${mylibdir}/tcl${v1}/include/generic
-       doins "${SPARENT}"/generic/*.h
-       rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
-
-       # install symlink for libraries
-       dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
-       dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-       if multilib_is_native_abi; then
-               dosym tclsh${v1} /usr/bin/tclsh
-               dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-       fi
-}
-
-pkg_postinst() {
-       for version in ${REPLACING_VERSIONS}; do
-               if ! version_is_at_least 8.5 ${version}; then
-                       echo
-                       ewarn "You're upgrading from <${P}, you must recompile the other"
-                       ewarn "packages on your system that link with tcl after the upgrade"
-                       ewarn "completes. To perform this action, please run revdep-rebuild"
-                       ewarn "in package app-portage/gentoolkit."
-                       ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-                       ewarn "upgrade them before this recompilation, too,"
-                       echo
-               fi
-       done
-}

diff --git a/dev-lang/tcl/tcl-8.6.1-r1.ebuild b/dev-lang/tcl/tcl-8.6.1-r1.ebuild
deleted file mode 100644 (file)
index 19bc71b..0000000
--- a/dev-lang/tcl/tcl-8.6.1-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.1-r1.ebuild,v 1.6 2014/06/18 19:07:16 mgorny Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-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 ~arm-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
-
-src_prepare() {
-       find \
-               "${SPARENT}"/compat/* \
-               "${SPARENT}"/doc/try.n \
-               -delete || die
-
-       epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-       # Bug 125971
-       epatch "${FILESDIR}"/${P}-conf.patch
-
-       # Bug 354067
-       epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
-
-       # workaround stack check issues, bug #280934
-       use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
-
-       tc-export CC
-
-       sed \
-               -e 's:-O[2s]\?::g' \
-               -i tcl.m4 || die
-
-       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() {
-       #short version number
-       local v1=$(get_version_component_range 1-2)
-       local mylibdir=$(get_libdir)
-
-       S= default
-       # 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 "${ED}"/usr/${mylibdir}/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 "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-       fi
-
-       # install private headers
-       insinto /usr/${mylibdir}/tcl${v1}/include/unix
-       doins *.h
-       insinto /usr/${mylibdir}/tcl${v1}/include/generic
-       doins "${SPARENT}"/generic/*.h
-       rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
-
-       # install symlink for libraries
-       dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
-       dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-       if multilib_is_native_abi; then
-               dosym tclsh${v1} /usr/bin/tclsh
-               dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-       fi
-}
-
-pkg_postinst() {
-       for version in ${REPLACING_VERSIONS}; do
-               if ! version_is_at_least 8.6 ${version}; then
-                       echo
-                       ewarn "You're upgrading from <${P}, you must recompile the other"
-                       ewarn "packages on your system that link with tcl after the upgrade"
-                       ewarn "completes. To perform this action, please run revdep-rebuild"
-                       ewarn "in package app-portage/gentoolkit."
-                       ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-                       ewarn "upgrade them before this recompilation, too,"
-                       echo
-               fi
-       done
-}

diff --git a/dev-lang/tcl/tcl-8.6.2.ebuild b/dev-lang/tcl/tcl-8.6.4.ebuild
similarity index 93%
rename from dev-lang/tcl/tcl-8.6.2.ebuild
rename to dev-lang/tcl/tcl-8.6.4.ebuild
index 7ccfc49e455423456f28b91e69685472781c153e..f8751360b789a1943de97234663cbb12526c698d 100644 (file)
--- a/dev-lang/tcl/tcl-8.6.2.ebuild
+++ b/dev-lang/tcl/tcl-8.6.4.ebuild
@@ -1,10 +1,10 @@
-# 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-lang/tcl/tcl-8.6.2.ebuild,v 1.1 2014/09/15 18:28:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.4.ebuild,v 1.1 2015/03/13 08:29:53 jlec Exp $
 
 EAPI=5
 
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
 
 MY_P="${PN}${PV}"
 
@@ -43,6 +43,8 @@ src_prepare() {
                -e 's:-O[2s]\?::g' \
                -i tcl.m4 || die
 
+       mv configure.{in,ac} || die
+
        eautoconf
 
        multilib_copy_sources

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index b7a33eb9746c134f7f691b07143caf6ff68c579b..8040e7259f6510361c3d39380c6ba0a611e207ee 100644 (file)
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.211 2015/03/12 10:26:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.212 2015/03/13 08:31:25 jlec Exp $
+
+*tk-8.6.4 (13 Mar 2015)
+
+  13 Mar 2015; Justin Lecher <jlec@gentoo.org> +tk-8.6.4.ebuild,
+  -tk-8.5.16.ebuild, -tk-8.6.1.ebuild, -tk-8.6.2.ebuild:
+  Version Bump; drop old
 
   12 Mar 2015; Agostino Sarubbo <ago@gentoo.org> tk-8.5.17.ebuild:
   Stable for amd64, wrt bug #543022

diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 2ee4bfc765dbbd057a79a3c4baa9d53e5863ac9d..674c623f3362e07a0611b74ec42a723e55b8a9c2 100644 (file)
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tcl-8.5.9-gentoo-fbsd.patch 475 SHA256 5f7c415260c124f7515b8621535ba277add91b584149283543a92f5f2613dc75 SHA512 4cab5fefca03337a9f74e0df330d055ff9ebb930a3a84ef84aa45399faf9685f4a7c5c9f86b1bc71dd8a13b7ed7b42ac4485081f358f5fd28892e6ff277a2a63 WHIRLPOOL 02454a19ac2c1a25306676306b4c13fb882463c577545b65a3e3aaf93f6b3e0eb5b91c6e2c86fae601c5a7b1dc2bf6ec99be75aa4b335a16008a55427cd27d4d
 AUX tk-8.4-lastevent.patch 1095 SHA256 73bdd40b9e04ad705ac8956ea96967aaee5ac8ee9588a43e5c1bf30d50c0996d SHA512 50b804357484e5fb90ad1d3560db107cde8b2b0ae0363c152276fa941a21c19705ccee0e26265264bcd06c0cafb1ed90f6f5b413ff0851d0658ac03250a8aaf6 WHIRLPOOL 2c5a87016a6e7e7bbcd3ef82a70c00c1a152c70fe4409bf4f7a5c17e8b920adddc7d63deb0ac1662dfa882435db3e222311512a3317023a4c96acb4ebbd0510f
@@ -17,34 +17,32 @@ AUX tk-8.5_alpha6-tclm4-soname.patch 540 SHA256 6e6a6d9ae62040cc2f386c92854cb59e
 AUX tk-configure-LANG.patch 1686 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea SHA512 6b097d9406f0faf5d0332c48a72d5654063fe29e37ec2d3bc2f425e98f26d117d39769c43ae39ee731f094a47912bf1dd24259fcc4a5b5326b1e2c4313c89c56 WHIRLPOOL 40cf52a3a9c97012be36a6e11054c3c418c692cb9292350baefecee621ecbff12b65f7b0edcde86e14600aea4c43daf607806c374b650d3f82142870b0da4da2
 DIST tk8.5.13-src.tar.gz 4086092 SHA256 9e83ba2704ad73a65986eb7cdc51e432a5db6eca8d8691e33caceef40ed0c563 SHA512 5b705026d3d80c35bd60311c3df5489a7970c1648f98d843d6ee57c9336de5e63aed488f670f15f2c0bffccbc2402cc98c383c057b7d86f1db4c36340e34e209 WHIRLPOOL e523bfa0ce407f4d5157df7fee93c6d60012bf5b46a4cbd4e4692ad0ce872650563d12db11bfa94ba19b0a5aad1ef9fdd4b02dfb11f0de253839c69adb26a718
 DIST tk8.5.15-src.tar.gz 4086650 SHA256 815c6706d0b4fdd432fe16b82e7b9adfa1f057c44edd11d28f7c4b0ac104323f SHA512 9c8c42135b918f551e3e5ce479f2c8583749d34db5985a21e583c8f0aa2637eaa4ae0f47ce7b395f72ec929edd758c53326c96a23dac5f70a6f86eb63584dca5 WHIRLPOOL 6aca2bfab54155f573bfa9b07ce0767ff8f6da227e2845c03a81d964808e25b9a6483301692934a40ea2d9ddfc7d7193c2131ef775f84c9b164f35a6a0900008
-DIST tk8.5.16-src.tar.gz 4095839 SHA256 fbcbe74d665df7cb286d042552323a051c611c50683beb18fc6fb59ebe293993 SHA512 1a43921a0ea784b562be46f7761853df8f145557016bce477d3957673a4d174f1be2d68409c370bbb23ca9e591df8502170cbd39592e0cdb745e25a09b7ff4cc WHIRLPOOL 64a8f63800b7622aaa3e86954ad0a13c1ad9e2b105124e0fb17cbdad8623ca4ebc7df927a880bbf9c0e14ba76d27113b5cc5b7f06c682cc80a4e6dd3b32192da
 DIST tk8.5.17-src.tar.gz 4095985 SHA256 b517914d076fba047c4bbc02f7dd7f0b0b06d1931826ae440129162d8bba92d3 SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f WHIRLPOOL 431ad2d190755b997b07c8a59046c7f15a7be39cb8b162daccae8eca4c4b6e97a52d5823e7e566380935abefad347d18a28fc3a7e78892b6186ebcefce726fd3
-DIST tk8.6.1-src.tar.gz 4244010 SHA256 b691a2e84907392918665fe03a0deb913663a026bed2162185b4a9a14898162c SHA512 f05879924371bae7059ccf84b49b16748b3c2c1438ddcfbc4797a7552779947b0c733ada8c9abd739b3b00d16e9e76b407269213f87b6fc81bb29796581a8447 WHIRLPOOL 5d95b5ec0d9c778b445c60ac24b056306e7c32086cd073ecaef000327c9c5d6f639ce1c3762b3047192a3859249714f434a0e05ce9275624b1a3f6d5127c905c
-DIST tk8.6.2-src.tar.gz 4246617 SHA256 afb6639043ec38905afe22b61ca54820217f4d4e81e0ad49f839c16d2bf98579 SHA512 bf07fb15972de9e04921a016c8e4a870526b217432b50e64b65365036a5aff2182178f5e3eb1f64dc27eb27b6bf2d5c57bd691307cda79290b2bc42ceca57017 WHIRLPOOL dc526dead634ac825fa1858d5f610332fca0b410234555cc76f473a8ce6144d1816b9e1b0ce0768a6ae38e70eee80670dd5a7c202eba9308d5e0cbfed067e26d
 DIST tk8.6.3-src.tar.gz 4258339 SHA256 ba15d56ac27d8c0a7b1a983915a47e0f635199b9473cf6e10fbce1fc73fd8333 SHA512 3bd577252bb20d1e9caff12dbec66b63c0bbd81bfcaada0e847a9f54608217e698bbf503f722120b9e8a6c27e50a122c50d24f8b01bb2a22735ebef8e2be7b47 WHIRLPOOL ea638143fa1aa96feb55232c802c7eca007b742fafbdacfdad984ef5fb25a8655f85c3a5e43610e42d84442dea04ac6a12a8f39b94ec9b44bdd12841ace64fc6
+DIST tk8.6.4-src.tar.gz 4266426 SHA256 08f99df85e5dc9c4271762163c6aabb962c8b297dc5c4c1af8bdd05fc2dd26c1 SHA512 d0a1d1fd0938af4a9e532aa1bd4488647cff05f98e9e09b5fa16b773364a5d61030b7975541c688c7e0afc0bde60d49ce50a24d842549bab1622a0255e267909 WHIRLPOOL 8660c222d9b32d805d654ca9d9a881ec93705874790186a426fcbddf31e39316bccde4421a949684ba456351aeac619de0b7a27f39c1d3af14157d7553472801
 EBUILD tk-8.5.13-r1.ebuild 3652 SHA256 a1ce6872e84379f287de37dc247d996c8599ec51d14440a85bb6a9b098cb8bde SHA512 60bf657400a6677a8c28ee38da6ef647ec5ffa9b6c7d281268e29563e62ba0d5b331709e53764450bf5bf4adb053ecec6184ff53c0b0549f9078802eb979ff9c WHIRLPOOL b534fb04ae39bca427f4deada2a2cc13dbb90e8d87c6e9330f5bdfefd93460470bc00e485cd0d669a48bd744063eaeb44d6c297de020f729736c56b980302324
 EBUILD tk-8.5.15.ebuild 3691 SHA256 1da8fa62921caeed59688b104d20f7688d9e8b56ce7b1f1b9a170cf0c6a3ef56 SHA512 5634a18d2e3a3eea18a92ced56b9f5ca7363244eb7d99ea1e6aa94f83aa988cd61ce813885d85171a2a8f25532e6ff8e7f03437abc8c178ded678867bd590670 WHIRLPOOL 72b20e2898ca2d4fbdc17d16f7839efcd5df840e0a97e5b115453d995bd012c774c86d0a677fe03e8ab6c52f1fb1f48897154851b95749d1c30e8b7048ff1e8d
-EBUILD tk-8.5.16.ebuild 3548 SHA256 466c011875590155832aea8eda86fc40b921cd0c6b78ebf841a6c16d1fed4e9f SHA512 78b3cdde11c2d1629ac6c12694fd3ab1ecf4d20488bf1097f346274e89edf6a68ebc1773967feaaf4ad315279e15909f7e340b78fe28c953bb23550c7e624d2e WHIRLPOOL c691b22b2c5c2163c1f18cd0d1cb7bfcd1c01c560025adf59fa40215f1fa2b3b8d3ad4fecdb05b01ce7cddd82c1ba72ebf58177675939298501769eb2ea21ac1
 EBUILD tk-8.5.17.ebuild 3546 SHA256 846725733074a8bc0a1aea3263ef40b4f09df40d42e131190e60f94679f61fed SHA512 6b4f1d76b99a5a61664968bbc80572dfcd666a044f3e5a60e993279b30c9a598db12a472e41962fecb5ce48db88cb9650634061fcd0fb1a106a74d6c6fd1a096 WHIRLPOOL 32365f89f8a04819f3f46bcfce830eebf36ffa9af40f1bf8a11d9a2d4bddbaa5a8875f9d28a9ff5e41a6f0333fdf3711b5f5bfb4934ba856f5ed666a02eaaf26
-EBUILD tk-8.6.1.ebuild 3829 SHA256 171b8134eac7e672a1d08a563d6708e46bde4803b0e6688668f81ac0c1bb448a SHA512 b4748b02a114b155babb6ae7dcd992ea5686dc2d893662382b9fb6ac2e483ae9f4f21a57629ca47001a02b07b425ec6baf9b49f34c19f959df5c057933130f97 WHIRLPOOL 6cf3bcd288c601739d2eeeead866747bffe9dd0ea726aba062c0f842a1648ad5595a6d0b505a0e8f1784bd6a4a1d4068a2f9354f69956830d3ff58a00e0af37d
-EBUILD tk-8.6.2.ebuild 3677 SHA256 c29d7caedb688e529eea84cd89a478fe6f2ef7994b6cd0129eb77b0cb4788ee8 SHA512 ff5698893d083d79a0b17bb729ec01be8d0d1e11daee45532fc69419be26d8eec617213b6750da1aa86f6010ef0e82bbf7d636e903e92a27590f6961b63c8195 WHIRLPOOL 7bda1b13394f39e7793b694f1ab9ad360b8a96c9551bd92a1516eebeac446de866f2670c9154071e20de7e5fe8e653c9b7383a7984ed986bf5a3d798f5a1af43
 EBUILD tk-8.6.3.ebuild 3980 SHA256 adf8f5dfc9c7e0e6991d7a8a4f76948f308c4c95d555630040002a04e7b60e3e SHA512 dc3d9b9ab1af819eb93fedf1934b5e490b6ad305243cab9c764b6143585e818c050cb0dff158a50dec15bec1342384ecf53d25c8c451ad25c82c814023d00cfd WHIRLPOOL 25bf1718a1a2498cb73bd446b13ee663bf6d652f6a2cafb05f8838ad79060131c0c85bc24a5962f41449b3c117222543822f64ae245cd5a077e4f206ecb70cc8
-MISC ChangeLog 27984 SHA256 3fae1f27d2ed200c4f30fc1f1a853afa689a0bbf624e002255bbdcd29b97d5f6 SHA512 73cc5736ce9d2c7d657e0044705454d95499fb492c02bd5bab7dcfa51f8cd6b683b7ef5e11883de8e79db6682245f5dc1775c5005164ac666fa4f5cb2aa66043 WHIRLPOOL 86b8fccc569fc46b85f4a541fc3d469550b7dd3ced0d850c5d47d9d4c6eecbebeb027c9d5f81223048bd0e46fc3902556b70a3f8c140ad6d0fc10f994d8b0a0e
+EBUILD tk-8.6.4.ebuild 4010 SHA256 958527860adc18ebf4016144ccc2fc8b135e547f1edd71f054c57606b236fe37 SHA512 71ef13920272d376303fd357052e72b15b3186be6c88865ae2721ec1963487eeb19d7482b484ccd019f3fe5452c52e22757e54388c3a27b17d1bc3620d296958 WHIRLPOOL 32d090db79d00333571f10037c8ca2aa0650f706e87b34ea765618c41ba421e571561398aa775001e6d15cc8c3e45e886401c5bf1e7938d400593806129d40d8
+MISC ChangeLog 28158 SHA256 fdf64ebbe92d546cf8859191581486d6ddb532b446a2d073707d87c46145f3d8 SHA512 a47b061d317e558b46c9d07f59e9399f427eb564d2ff35f99f3066f8adf09d92b61e438a3b9d7f558efffd0938a0b6f00e0b33842151de292d4dd8b9a8e5159d WHIRLPOOL 9fd19434765dc0221c203d1e779b399ed55d842ab21c865ff0208b46b05f0a13b8095baf36aba890de83b0afc7cfe94312e2e70a10188cff3f79565446017f7c
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVAWnhAAoJELp701BxlEWfo70QAIOHSshH5abXNJDUcokgKVc7
-9HhAeDZCCPyhR2kouWbK0TXN0aKjicn3nGEmy5I6SC5511ROucXBxMOrShlr1fh3
-IPUoA5VOHAvxg4G1cxPrJ1AALV2mjxkqchge1J2/jh2G6CDyv4fE9c2SStPi5iAq
-OsrhLz9NSNPeJzWe8C7N+bDCLbrOm/eW5v0znFHKamh1pt24Cd5nhA9w6CABRfwm
-mUlGe4+ULcHX78B6hGgqZIWg8kpLs3PE96A8+1QAy09tr7+R5T0O0XS+0q0ZFN3Y
-vJ8ZLdoeq+GPXAn8ZmNMUGzQEi2fFd3/nmkllspQZ09Czs1QbSsASG7lDSgIubKY
-G7DAcH1tOfrc75CEmrn+E8JEXErwo6Hag6ezGrgTWY25Fn6POILuk07ZUIAXLEoo
-4fmopUFkObaZFR5lWphHAtbhlIgf4++m8iiO4U2nyDUBnjSARczCWkq9+MlO1WHw
-Qkz+Z6AtEfkO3i5wg1CDkV4a4MlgfW5QWAhUP+A6B+i1avyTqKcAN3FQahj0zGHP
-FG2XtyZthzdSaBKHPKGx7o2RDcSvoOlYdVldNujAS0qvyw16bhwUcM1nqK/Vi/ej
-/A35jOWTZryKk3daIVwm+nOc50Prruf20tZYbck6OK5PrY8NYxPAnEqCMJpB1XN2
-rSzpXrTbTdIOOzkhD8C7
-=ZTD1
+iQJ8BAEBCgBmBQJVAqBeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNX4QAKRlvQ2KeT/SRG914oRuVJBQ
+IqpWs0tF+eZZfATHT8intUCwYojKNb/nEbXyP3BKO7vZyRetjiLKXcGYEG3uYxDj
+Uiea8lYHlxkWLube58Korxl5OT/kJdd+QPJdV3p2NAmm1d16F5xJfn8fI5RmP2Bi
+GlbQu1u1iFZ5CtE5/etHA+x74EJptRouUPA/Wm8rT3QeQnYVseE+w+fLNN7ZbWcZ
+i5LR9VBRsrvPTyVNfKrdZtuCqV4fNVSMy4ZQKcQrolb8BOF4fMdNySxvAE7jbEYZ
+KAHP7sWBoBfLxeKs4GhPwtMfj9JvUQo5Xw77WqqPBrGz3bKTvnkMO6EXo9wLHhEy
+CL3pG/40eDfge5VZ9ynoTFHv4Zit9iS3sIjuj8qqQQIU5hNSzlubSfX1mVETIcA+
+NOZZ1z4FeEe9COF0ngvPSV95iHdCp7zVIf8SLlxyUoxNWbLDgadndYspLgA6KuQF
+I17zGAoDXjsB/lDDtcs0R6JaUiyL5Qo5rzYjCifH/EOnUIxl5QbNR6QS49+zA0to
+1wDNKv4iaJbeDa73H4sElQ5OtfLl+juIdGjLPsNDPlt2PRpHfRuD0ynZHoHO380j
+Oz011dwuInBvq6Pzg177HbTdm0plLogZLdgptZl/gCJ8BwzC25GBkBysUswqUStI
+AJOulh6zPQoGzKELoVDq
+=pzzI
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/tk/tk-8.5.16.ebuild b/dev-lang/tk/tk-8.5.16.ebuild
deleted file mode 100644 (file)
index fdf80c0..0000000
--- a/dev-lang/tk/tk-8.5.16.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.16.ebuild,v 1.1 2014/09/15 18:31:13 jlec Exp $
-
-EAPI=5
-
-inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua xscreensaver"
-
-RDEPEND="
-       !aqua? (
-               media-libs/fontconfig
-               media-libs/freetype:2
-               x11-libs/libX11
-               x11-libs/libXt
-               truetype? ( x11-libs/libXft )
-               xscreensaver? ( x11-libs/libXScrnSaver )
-       )
-       ~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-       !aqua? ( x11-proto/xproto )"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
-               "${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-       epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
-       eprefixify Makefile.in
-
-       # Bug 125971
-       epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
-
-       # Make sure we use the right pkg-config, and link against fontconfig
-       # (since the code base uses Fc* functions).
-       sed \
-               -e 's/FT_New_Face/XftFontOpen/g' \
-               -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-               -e 's:xft freetype2:xft freetype2 fontconfig:' \
-               -i configure.in || die
-       rm -f configure || die
-
-       tc-export CC
-
-       eautoconf
-}
-
-src_configure() {
-       local mylibdir=$(get_libdir)
-
-       econf \
-               --with-tcl="${EPREFIX}/usr/${mylibdir}" \
-               $(use_enable threads) \
-               $(use_enable aqua) \
-               $(use_enable truetype xft) \
-               $(use_enable xscreensaver xss) \
-               $(use_enable debug symbols)
-}
-
-src_test() {
-       Xemake test
-}
-
-src_install() {
-       #short version number
-       local v1=$(get_version_component_range 1-2)
-       local mylibdir=$(get_libdir)
-
-       S= default
-
-       # normalize $S path, bug #280766 (pkgcore)
-       local nS="$(cd "${S}"; pwd)"
-
-       # fix the tkConfig.sh to eliminate refs to the build directory
-       # and drop unnecessary -L inclusion to default system libdir
-
-       sed \
-               -e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-               -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-               -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
-               -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-               -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-               -e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
-               -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-               -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-       if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-               sed \
-                       -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-                       -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-                       -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-       fi
-
-       # install private headers
-       insinto /usr/${mylibdir}/tk${v1}/include/unix
-       doins "${S}"/*.h
-       insinto /usr/${mylibdir}/tk${v1}/include/generic
-       doins "${SPARENT}"/generic/*.h
-       rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
-
-       # install symlink for libraries
-       dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-       dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-       dosym wish${v1} /usr/bin/wish
-
-       dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-}

diff --git a/dev-lang/tk/tk-8.6.2.ebuild b/dev-lang/tk/tk-8.6.2.ebuild
deleted file mode 100644 (file)
index ee302aa..0000000
--- a/dev-lang/tk/tk-8.6.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.2.ebuild,v 1.1 2014/09/15 18:31:13 jlec Exp $
-
-EAPI=5
-
-inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug +threads truetype aqua xscreensaver"
-
-RDEPEND="
-       !aqua? (
-               media-libs/fontconfig
-               x11-libs/libX11
-               x11-libs/libXt
-               truetype? ( x11-libs/libXft )
-               xscreensaver? ( x11-libs/libXScrnSaver )
-       )
-       ~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-       !aqua? ( x11-proto/xproto )"
-
-# Not bumped to 8.6
-#RESTRICT=test
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-src_prepare() {
-       find \
-               "${SPARENT}"/compat/* \
-               -delete || die
-
-       epatch \
-               "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
-               "${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-       epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
-       eprefixify Makefile.in
-
-       # Bug 125971
-       epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
-
-       # Make sure we use the right pkg-config, and link against fontconfig
-       # (since the code base uses Fc* functions).
-       sed \
-               -e 's/FT_New_Face/XftFontOpen/g' \
-               -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-               -e 's:xft freetype2:xft freetype2 fontconfig:' \
-               -i configure.in || die
-       rm -f configure || die
-
-       tc-export CC
-
-       sed \
-               -e 's:-O[2s]\?::g' \
-               -i tcl.m4 || die
-
-       eautoconf
-}
-
-src_configure() {
-       local mylibdir=$(get_libdir)
-
-       econf \
-               --with-tcl="${EPREFIX}/usr/${mylibdir}" \
-               $(use_enable threads) \
-               $(use_enable aqua) \
-               $(use_enable truetype xft) \
-               $(use_enable xscreensaver xss) \
-               $(use_enable debug symbols)
-}
-
-src_test() {
-       Xemake test
-}
-
-src_install() {
-       #short version number
-       local v1=$(get_version_component_range 1-2)
-       local mylibdir=$(get_libdir)
-
-       S= default
-
-       # normalize $S path, bug #280766 (pkgcore)
-       local nS="$(cd "${S}"; pwd)"
-
-       # fix the tkConfig.sh to eliminate refs to the build directory
-       # and drop unnecessary -L inclusion to default system libdir
-
-       sed \
-               -e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-               -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-               -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
-               -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-               -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-               -e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
-               -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-               -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-       if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-               sed \
-                       -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-                       -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-                       -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-       fi
-
-       # install private headers
-       insinto /usr/${mylibdir}/tk${v1}/include/unix
-       doins "${S}"/*.h
-       insinto /usr/${mylibdir}/tk${v1}/include/generic
-       doins "${SPARENT}"/generic/*.h
-       rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
-
-       # install symlink for libraries
-       dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-       dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-       dosym wish${v1} /usr/bin/wish
-
-       dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-}

diff --git a/dev-lang/tk/tk-8.6.1.ebuild b/dev-lang/tk/tk-8.6.4.ebuild
similarity index 78%
rename from dev-lang/tk/tk-8.6.1.ebuild
rename to dev-lang/tk/tk-8.6.4.ebuild
index f2229ac5d67c494664c29bf47cde8762f0e1673d..150b6caec2a8192648b40556e8ffcc67eb7c631d 100644 (file)
--- a/dev-lang/tk/tk-8.6.1.ebuild
+++ b/dev-lang/tk/tk-8.6.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.1.ebuild,v 1.1 2013/09/25 15:14:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.4.ebuild,v 1.1 2015/03/13 08:31:25 jlec Exp $
 
 EAPI=5
 
-inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
+inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
 
 MY_P="${PN}${PV/_beta/b}"
 
@@ -19,15 +19,15 @@ IUSE="debug +threads truetype aqua xscreensaver"
 
 RDEPEND="
        !aqua? (
-               media-libs/fontconfig
-               x11-libs/libX11
-               x11-libs/libXt
-               truetype? ( x11-libs/libXft )
-               xscreensaver? ( x11-libs/libXScrnSaver )
+               >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+               >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+               truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
+               xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
        )
-       ~dev-lang/tcl-${PV}"
+       ~dev-lang/tcl-${PV}[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-       !aqua? ( x11-proto/xproto )"
+       !aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )"
 
 # Not bumped to 8.6
 #RESTRICT=test
@@ -50,10 +50,6 @@ src_prepare() {
        # Bug 125971
        epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
 
-       # Bug 354067 : the same applies to tcl, since the patch is about tcl.m4, just
-       # copy the tcl patch
-       epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch
-
        # Make sure we use the right pkg-config, and link against fontconfig
        # (since the code base uses Fc* functions).
        sed \
@@ -69,10 +65,14 @@ src_prepare() {
                -e 's:-O[2s]\?::g' \
                -i tcl.m4 || die
 
+       mv configure.{in,ac} || die
+
        eautoconf
+
+       multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
        local mylibdir=$(get_libdir)
 
        econf \
@@ -84,11 +84,11 @@ src_configure() {
                $(use_enable debug symbols)
 }
 
-src_test() {
+multilib_src_test() {
        Xemake test
 }
 
-src_install() {
+multilib_src_install() {
        #short version number
        local v1=$(get_version_component_range 1-2)
        local mylibdir=$(get_libdir)
@@ -128,7 +128,8 @@ src_install() {
        dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
        dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
 
-       dosym wish${v1} /usr/bin/wish
-
-       dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+       if multilib_is_native_abi; then
+               dosym wish${v1} /usr/bin/wish
+               dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+       fi
 }