aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-05-06 13:11:20 -0700
committerGregory M. Tuner <gmt@be-evil.net>2014-05-06 13:11:20 -0700
commit4ff17ae8cf4dae0cd405f324c8d61cfbf1ec47aa (patch)
tree7a350020e8691ffb15861014f492d278990c02ef /dev-lang/tk
parentmedia-libs/gstreamer-0.10.36-r1: merge upstream deltas (diff)
downloadgmt-4ff17ae8cf4dae0cd405f324c8d61cfbf1ec47aa.tar.gz
gmt-4ff17ae8cf4dae0cd405f324c8d61cfbf1ec47aa.tar.bz2
gmt-4ff17ae8cf4dae0cd405f324c8d61cfbf1ec47aa.zip
dev-lang/tk: Fix variable scoping bug leading to ebuild crash
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-lang/tk')
-rw-r--r--dev-lang/tk/ChangeLog5
-rw-r--r--dev-lang/tk/Manifest4
-rw-r--r--dev-lang/tk/tk-8.6.1-r1.ebuild4
3 files changed, 8 insertions, 5 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 8209b80..3032224 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for dev-lang/tk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.196 2013/09/25 15:14:20 jlec Exp $
+ 06 May 2014; Gregory M. Turner <gmt@be-evil.net> tk-8.6.1-r1.ebuild:
+ Fix variable scoping bug
+
*tk-8.6.1 (25 Sep 2013)
*tk-8.5.15 (25 Sep 2013)
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 019daac..aca8474 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -13,6 +13,6 @@ AUX tk-8.5.14-conf.patch 569 SHA256 25281a376faebdd61c74d550a9860bdc475e649469a6
AUX tk-8.5_alpha6-tclm4-soname.patch 540 SHA256 6e6a6d9ae62040cc2f386c92854cb59e34f0824abeabdcb5a86d07f3f7eb6a4d SHA512 5159e2092eaecc990ca774b83b288870e35bcc87be57622df0920f105a237da2910e6d9d21d89f376d5e483ed58d6e0580929a8e30d15515a517720fdc0a90e3 WHIRLPOOL 5b939a32f2c37b0620f4b0ba4af358fd5c6df85f3fd861dc5bf1e4459b6a19649b6bc9ef3f1eee827a8f3ede0a39281292127109cc59ca78bac59ce780e954b9
AUX tk-configure-LANG.patch 1686 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea SHA512 6b097d9406f0faf5d0332c48a72d5654063fe29e37ec2d3bc2f425e98f26d117d39769c43ae39ee731f094a47912bf1dd24259fcc4a5b5326b1e2c4313c89c56 WHIRLPOOL 40cf52a3a9c97012be36a6e11054c3c418c692cb9292350baefecee621ecbff12b65f7b0edcde86e14600aea4c43daf607806c374b650d3f82142870b0da4da2
DIST tk8.6.1-src.tar.gz 4244010 SHA256 b691a2e84907392918665fe03a0deb913663a026bed2162185b4a9a14898162c SHA512 f05879924371bae7059ccf84b49b16748b3c2c1438ddcfbc4797a7552779947b0c733ada8c9abd739b3b00d16e9e76b407269213f87b6fc81bb29796581a8447 WHIRLPOOL 5d95b5ec0d9c778b445c60ac24b056306e7c32086cd073ecaef000327c9c5d6f639ce1c3762b3047192a3859249714f434a0e05ce9275624b1a3f6d5127c905c
-EBUILD tk-8.6.1-r1.ebuild 4156 SHA256 a311f2bdad26ebf199706d66d8f579fd4a239155c8c280f4a64af20ad978a6d7 SHA512 62b896ef3327b35630fbe000573bee8198c9c95f84d01441bdb26bc7173ff0f61c9a3ba6aea550a8334c48980d92308281dcec1d113934b31032d0794ba70f53 WHIRLPOOL eeaa35bfd8a36412adf77d9c20162690c3edd59fd7e8a4e10ba4b757cc0b73d9b033260af27f65e30b7f6fd056ac97399bccb4befd742c7a563b53d4e4b03aae
-MISC ChangeLog 26179 SHA256 884854ba0c63e2d479104c92742b370cd6c5012ed4905a2b5b179d0254d37b48 SHA512 f57fad9a1049347497489136323179f38542c7eda9ac40ffe9ae7524f38d1029af3dfa539582c955e60421df91c6e17a009d488ec5ce256981b1a8fe73652253 WHIRLPOOL de9f6f4c0b58f77eb455a96a30abfcc987394e37f0af279d3c517b9113fa601eeb9da07f3f803e4b0dfc07a6e589a3e602656b30c5b8c88971f72b9f811a0ab4
+EBUILD tk-8.6.1-r1.ebuild 4150 SHA256 9922d2f1080eb1eb905440f13d29b5a1efe2257120982608d63c75a1e833603c SHA512 35c452a83f4cf5133b73dd8d1be78132a428dfbb2a1501abe426fe193581881f2fec091a4d82bc49d91293b67e8f7f7e3bde18e7f3f82bfc9df92c649134e316 WHIRLPOOL 36391d502627ff2893eb8fcb02b158c28e385cf90cfd1f7278489640c3c498857f7cf65f4c312e3c992204a74d3dd60f1c35891be074c7cff316b42c4482f86b
+MISC ChangeLog 26278 SHA256 c80806dc97b419da88b6f8b0d81a67c64920ca4ca9c9e5b8264c58be2a5a66cc SHA512 d21708606c891ee7bcb122d91f4e45fe0fe708570d9cb496e735d5fbc5e7f3d97bdcfdabc89062eb32a7e1337912e6e6cfaf6c7972e353fcb279285e5c20fbb4 WHIRLPOOL c5acc72f57b6c331e6e6c3a40eb549a6df27ca1d605e1a44e893786d81079f7b9bc48094bcbdf9720acd3034960efdcba2781c109620398204567b4d7cfbe4dc
MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
diff --git a/dev-lang/tk/tk-8.6.1-r1.ebuild b/dev-lang/tk/tk-8.6.1-r1.ebuild
index 4906f0f..2054705 100644
--- a/dev-lang/tk/tk-8.6.1-r1.ebuild
+++ b/dev-lang/tk/tk-8.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -101,7 +101,7 @@ ehook autotools-multilib-per-abi-post_src_install post_abi_install
post_abi_install() {
#short version number
local mylibdir=$(get_libdir)
- local S="${old_S}"
+ S="${old_S}"
# normalize $S path, bug #280766 (pkgcore)
local nS="$(cd "${S}"; pwd)"