Fixed compilation with tcl-8.6 (bug #451112)

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 58 insertions, 36 deletions

diff --git a/sys-fs/hfsutils/ChangeLog b/sys-fs/hfsutils/ChangeLog
index 760cfdb7035a..8b395932a9c0 100644
--- a/sys-fs/hfsutils/ChangeLog
+++ b/sys-fs/hfsutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/hfsutils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/ChangeLog,v 1.18 2009/09/11 11:34:55 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/ChangeLog,v 1.19 2013/01/26 09:56:30 polynomial-c Exp $
+
+  26 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> hfsutils-3.2.6-r5.ebuild,
+  +files/hfsutils-3.2.6-fix-tcl-8.6.patch:
+  Non-maintainer commit: Fixed compilation with tcl-8.6. Thanks to Vicente
+  Olivert Riera for providing a fix and an ebuild patch in bug #451112.
 
   11 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   hfsutils-3.2.6-r5.ebuild:
diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest
index f40b6ef161f5..bc348227162a 100644
--- a/sys-fs/hfsutils/Manifest
+++ b/sys-fs/hfsutils/Manifest
@@ -1,16 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX hfsutils-3.2.6-errno.patch 377 RMD160 7898819eb877e487babc2c1b41199011b6a7153d SHA1 043bfc91d484de3ac65aae57c542ae3177678999 SHA256 06d374f92d3535d770b63c6cc98fa2e9ea942685e8f90c13270c2908ed98c735
-AUX largerthan2gb.patch 348 RMD160 a7fd6a37057acab3d556eed28e8257dcbebd1650 SHA1 b09b40382feb44cea6e11a4267d3a537aedc67e6 SHA256 b2952800d805852f7b1fa42a4cb32d4243fed648e62154145a90c95bc6ab2e29
-DIST hfsutils-3.2.6.tar.gz 207697 RMD160 a8b8c0c6556f3be2b701baab80b933dc6691a6ea SHA1 6d71dfb2c93c0d8082972d39f3f75ae53a438d5d SHA256 bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840
-EBUILD hfsutils-3.2.6-r5.ebuild 1243 RMD160 e0184a85278653ec18a873a90b0eb1b00380a283 SHA1 152de906e18dab016d92467ee6155b62e8c4f24b SHA256 7f5903ea7214f2c083c9e6247b4241e3f62c0231435cd287df547c62b96b0611
-MISC ChangeLog 3717 RMD160 517e0972404fea015e71026e7c2836735acfd4c8 SHA1 f6cb6e11ed1b4317ab0e1904548fc3785bc801c2 SHA256 7095e3988fc8e1f68f8f2e417727aab4f6dbd7d12deec24470fecdf4ec3d9afa
-MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851
+AUX hfsutils-3.2.6-errno.patch 377 SHA256 06d374f92d3535d770b63c6cc98fa2e9ea942685e8f90c13270c2908ed98c735 SHA512 564eb03f85299c3fddd5f61d1563b38951a866daeca1bd1ba020a4e1fe8603ae22f1f764be54ecb1fdc47f97bbca68a512936fff21b2a359050ddebef978eb1b WHIRLPOOL 458861f268ae0a0ef7c02c488d3392294322113090a0c4c377f976603ff25b2601faca1b8b3caa998fe6287a47cbc25e010cc57c0b87372460097328c2eb11ce
+AUX hfsutils-3.2.6-fix-tcl-8.6.patch 184 SHA256 bfa6dfcf2fe62d9be52094adff12d79780304a62db815219086d46dfcf093ee0 SHA512 0868c22b49f5cae7602982f71a0ea8e9c1f4cd350a27b7bb8d810db8d1d4b2396358f410875e21cc2b0611d127960384dc152a93abc0ec63128efaaf5d81a0f2 WHIRLPOOL 9ecd14402ed26b0ab979793ceeaf9e9b09dd814021b952f40ed42b9d24bea70cd83182cb889ce6ffa52d4dffae7fa9c57f22e65a3fd50dd57600dcaf90cf66e7
+AUX largerthan2gb.patch 348 SHA256 b2952800d805852f7b1fa42a4cb32d4243fed648e62154145a90c95bc6ab2e29 SHA512 5a810c79e23ee9b24f77abebedeb58f13c520ca1d6fe0b8eb974c0cd12c6857b704c41da0a312f14d95aabe4706cc8a696efda96a1424150596d2a92e57dfdad WHIRLPOOL a15122a745afc317a00802aee1bfbfbc50b44a39d167d7aa7d6bce40493c0d951fffc051dafe3a60f13311b4a93a299a64880b77091499c8427f8acfc718dd5d
+DIST hfsutils-3.2.6.tar.gz 207697 SHA256 bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840
+EBUILD hfsutils-3.2.6-r5.ebuild 1167 SHA256 040a7892ffac879453388f6875edfb50585ccebb76ba19185a4bff33f762e9f6 SHA512 110514c312719625fb4ec1309f0a93cd47451461a3c68ef5133fa455d6bdf25983849412d48d11d657dcb1badd741bb679c8bce132085e888ed7709c5b3cbb8c WHIRLPOOL 4771e1fab0b298c01550a93dc4b4244eb6772bc8bd844cac948a9f254e6bb12c5f06d1e089acd3639493d53c009748774358b7ae7fed184dbda2596ccd5d29ae
+MISC ChangeLog 3991 SHA256 aaeae79825e4c6319968caf04f1107c0bef1409b894be087fa10bffeeccbb74a SHA512 9373d78945f140c622a1df6cabbbc84676d1ffd5c859a82d0454da11bfa2e8a5c66054a93c71801615b7d68bce6bd871f4f592475cb4859c853427eb89a9759f WHIRLPOOL fed829643ddf2daa02c94cef18f08498ca1fc2dae97356f4a031a41d41c1c8c9d57518f8bebf6f9fc358a7618c10a1de87f2149984e9a47b617ec2bc0f5fa0ff
+MISC metadata.xml 156 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851 SHA512 548ef79e66b1c56bc3252243bc6e6570ad3565974c44c96d942b203019cbb41743dc682eccc056eb21257163182bf4c1bac305b91c7ab5dc99da289f71919c3f WHIRLPOOL d2421da96c721b6cfd747e0e857e541d7add0997cd0a862ebeaf0d5d576a19c275d1c407a9c06a546d9b8a672d7c5fa0f6dab47ec5574c8ed5eb7290f2a85e46
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkqqNeQACgkQAiZjviIA2XjcDwCg5MtnDHJAMtTax43Ush2HE7b0
-eOAAniG2U7xuHx4BE5KGuf6BSH+9ESGk
-=Amce
+iQIcBAEBCAAGBQJRA6hPAAoJEPiazRVxLXTFLhQQAN/FUZWFu1EPI8RGHouucYKP
+vYVet7sjBpaWdhVwX8k+ugR2CmYhJg00cCKjuj6F3P7ktmqmcB8flMyojS1kHZJL
+2iaQZ4MbOLgwjv5maoUmY705rNkMxTz9RZp33dhWFOubWJ+Knqld4IXsg1xlyJ05
+AfphhbRcAjkOhA7+ZLBeNEXUBismjJz7qaqy4q1PFXmXovbBoLSjZZEaogEoNvvz
+DMQcjYouHQgKIqwKgSH4j3PVtveFZIzKS5a7bVeUephR0WZaZfCIu1KzQ+xMOFYh
+5G7UQ4CqOp+SdHaVUB0g2Ot/gkK7gNVhW/vUhdO6TdaDZdiQAnl2RjbI63DOojYu
+MWz+wDRZcJxMlLJIMHJ/cxRvA0TFdylhuuoKCoejmgIKpaW8Tj8zRwiH4TXG8Bh5
+GxoI2nXq/73nYOiutYTuMUqODnYoj2VISidXIFsaDsvAPWUKOYZ6lcb2ucHLswNl
++V7Z7/VwceVCwK4/ltwI68K6Hy9/2edVdjDFBzXCx23vevwREFa1cXKUjBSO9bDd
+1Jsvybxg7Rh/U/UHp3cRb6p2TDN3pvSuXkEzs0uyLDNABntosw7cWiO9QC1g28bB
+2kRareOV4m32GjokBoYdRGNpE+IXlszmpd1ByrzSJ/svDXqCmUB/KNXlibax45BV
+uJu/ywazsJJ2LZbt3rGL
+=EFeu
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch
new file mode 100644
index 000000000000..19f15424543c
--- /dev/null
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch
@@ -0,0 +1,8 @@
+--- hfsutils-3.2.6/config.h.in
++++ hfsutils-3.2.6/config.h.in
+@@ -91,3 +91,5 @@
+ # ifndef HAVE_STRTOL
+ long strtol(const char *, char **, int);
+ # endif
++
++#define USE_INTERP_RESULT 1
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
index ec755bbce410..c4c090b80b7c 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild,v 1.5 2009/09/11 11:34:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild,v 1.6 2013/01/26 09:56:30 polynomial-c Exp $
+
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -14,38 +16,34 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="tcl tk"
 
 DEPEND="tcl? ( dev-lang/tcl )
-		tk? ( dev-lang/tk )"
+	tk? ( dev-lang/tk )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/hfsutils-3.2.6-errno.patch
-	epatch "${FILESDIR}"/largerthan2gb.patch
+# use tk requires tcl - bug #150437
+REQUIRED_USE="tk? ( tcl )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-errno.patch \
+		"${FILESDIR}"/largerthan2gb.patch \
+		"${FILESDIR}"/${P}-fix-tcl-8.6.patch
+}
+
+src_configure() {
+	econf $(use_with tcl) $(use_with tk)
 }
 
 src_compile() {
-	tc-export CC CPP LD RANLIB
-	### use tk implies --with-tcl - bug #150437
-	if use tk; then
-		econf --with-tcl --with-tk || die
-	else
-		econf \
-			$(use_with tcl) \
-			$(use_with tk) \
-			|| die
-	fi
-	emake PREFIX=/usr MANDIR=/usr/share/man || die
-	emake -C hfsck PREFIX=/usr MANDIR=/usr/share/man || die
+	emake AR="$(tc-getAR) rc" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
+	emake CC="$(tc-getCC)" -C hfsck
 }
 
 src_install() {
 	dodir /usr/bin /usr/lib /usr/share/man/man1
-	make \
+	emake \
 		prefix="${D}"/usr \
 		MANDEST="${D}"/usr/share/man \
 		infodir="${D}"/usr/share/info \
-		install || die
-	dobin hfsck/hfsck || die
+		install
+	dobin hfsck/hfsck
 	dodoc BLURB CHANGES README TODO doc/*.txt
 }