Fix creation of pkgIndex.tcl, bug #485880; thanks Greg Turner for investigation and bringing up the patch

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 165 insertions, 7 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index a7b9175ce61b..6865cad74cc9 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/blt
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.68 2013/04/05 07:01:52 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.69 2015/07/28 12:35:59 jlec Exp $
+
+*blt-2.4z-r13 (28 Jul 2015)
+
+  28 Jul 2015; Justin Lecher <jlec@gentoo.org> +blt-2.4z-r13.ebuild,
+  +files/blt-2.4z-r4-fix-makefile3.patch:
+  Fix creation of pkgIndex.tcl, bug #485880; thanks Greg Turner for
+  investigation and bringing up the patch
 
   05 Apr 2013; Justin Lecher <jlec@gentoo.org> blt-2.4z-r12.ebuild,
   +files/blt-2.4z-tcl8.6.patch:
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index e320b4800f9c..ca663687bda1 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -8,6 +8,7 @@ AUX blt-2.4z-ldflags.patch 1086 SHA256 20245d45dfb0e96afe1127fa40209a7881fbd3f38
 AUX blt-2.4z-linking.patch 684 SHA256 cd19df698ca40ce743c81fe2c18dce615a6db385c6a973b9a14201f45e5467a2 SHA512 09ad0d4b43d51b33020a13ecbe31d04d5ddcdf2134d0c0e1275b4de3127adad624d222f492a6d9b0a4f198537afb30d9af70f8685668bf7eba966f020c34368e WHIRLPOOL a5a993a06467a81e1987c04bd709859c725f438b5aa334b2eb1c3806567447dbc290f9a464800919d7fdb5ca0832053d1da9fc91346dc4455ea18ec353e10875
 AUX blt-2.4z-r4-fix-makefile.patch 817 SHA256 fd8ada3720c85856770f4770a93f4e668a75de3cf68d35d25597215996e023e8 SHA512 c3b9aedc9c0557a10f66f0d1f9e61a028367e190fcb49ae0af8acdacc5a466168f4a1f26012a8b4f6aceb644adc532bcf0e1348cd0231efd821b66107cf5c7b9 WHIRLPOOL 2f54db3233eb62e805d072448d31c5dd7c69d8fb15aec902a1f12c8b7e82aa6ff9604504b1b021a4dbaf3b00cc2ee0974bb0f5bd0f176f475b41c8a6a3fc0e70
 AUX blt-2.4z-r4-fix-makefile2.patch 728 SHA256 aece52e1771d097498cf88bb1fe286ac698a46af0d07163c4b9d184440ab7d39 SHA512 5f9b5ab26101bf89bb7161bd4bfb4974144c61ae692f67b7598fe0c42929f84b14ac459fdfc29a1436b64924085b8047c90a84501c031f9d8575d4dc38c22681 WHIRLPOOL d76b7c2e350e562401a4b247b6f29e4286c35c2ca100e8b28892d63bf5874bfe1e3d8ef817bde66a43c3b2c2d81d6af8b08a87622d97d783c1e1480bb472ce87
+AUX blt-2.4z-r4-fix-makefile3.patch 509 SHA256 0ac21b9e7fc3e9e5bb7a44d195d8d6cdba05216cf2d9d09709bfc4628d371de1 SHA512 77f432a8ae319ae552a0803c949e4de3e4d1ce258d1f41347481f162d084668c125971ccea5e4fc53dd806054596a4d620786aca41275789c393cf499c9a93b4 WHIRLPOOL e16dc72e20e83de59684a0936c2571fa5ea00c7b20e91e54abc6eb3a7e5fdd7c328e9ea2a16a48fa7288dc8642d33b245fad3a4113a14770bc95349f08a2d76a
 AUX blt-2.4z-tcl8.5-fixpkgruntime.patch 1976 SHA256 a44ed43bbb946d8fc11bb8f416680a536ffc7c0d78faf33030ec378d67d3d287 SHA512 036cc9672c6c5f7554ab883d89602f8ead92c7533fb45742a082b97162f32d6442ac52e1e4f7154d669d917915b840cc6191ae544e1261e430222e0a293c0f41 WHIRLPOOL b3089b7ca520990ebd7fd1160342538e086a5414a049f6affa8a67020df889579ef4d0c5c683b75e0cbfc99deb7ca823c96396ddaac024f4ffde8c3ddc02b5c4
 AUX blt-2.4z-tcl8.6.patch 3281 SHA256 efbda5f49d61ac0cc7c03f9fc6990015bfea696e8a50189b9e8ef2b00d6f251f SHA512 38aa7a7f38e4ae98adda97948b3a0adb0747e4b8966b493efb87268717636c47a79ccd31caa73f44fb7e673e3d51b4552a23ad1b1a0360327fb678327814840c WHIRLPOOL 49e578f8a385c3ab7330cf646f8e8609334399063acbb0ea4b670e8a9de1cca10e638f9aa813007ecffd481e1adcb6dd34c5988a90596a6fd1042525277942a5
 AUX blt-2.4z-tk8.6.patch 781 SHA256 3d9b1c70c1b347dd9406993fe99c371c95dae42848ab8f9ec573e585545070da SHA512 429d24edf55668827e638647e51131083b879d068d65c6d5d4f4665b42d7e02b26760bc78b8aaee5e089fa48b674a81d8cf861220493a7390aadba814a789602 WHIRLPOOL 898235c52cb2dab35ece7930d9f8339941cde63e76aca8fb10a4667d1a6d6c5d518aa736e03b75d46d6f47b1bf89aa9d73aeb8d7ef9b6128cc0ee009c6153880
@@ -18,12 +19,25 @@ DIST blt2.4z-8.5.2.tar.gz 2326234 SHA256 e4e60628f79e1899175b51a3398133131fac520
 EBUILD blt-2.4z-r10.ebuild 3762 SHA256 cbbde88fb8433295982c6e22d6fdb6d81ead24555ca743943bbc79376a7eba4d SHA512 ab8231ee769828d8784bbb14c62a2ae64efc38d06b7e2fbdb5e35fc882daf90a41c17826b678f1d21ec9bb03ea7fc04f41b0dbd98a413bde6fbb2617d0a70864 WHIRLPOOL dd5f7126b224c74800aa7348889d145acd36022123371d2bde1908a12642f25bbadcc8285924f1de0e2fd13183e703bd35fd8e3203007f6ca5194130b2d568a5
 EBUILD blt-2.4z-r11.ebuild 3770 SHA256 abd399d6c34c203c6b49e70b3f6d05d475efac75d595ad4f9838fec6eb11d741 SHA512 b5b73db01da09ccdff31681fdab37ddbaf7c6c7f3564ea43a86c30c6d4ff7a3ec4d74c8705086116d5acebb0f470a71f80b2323293fc9e46c9a9becf0a027f6a WHIRLPOOL 6f4ab1b230846b4ac3d3f2d61c30932d44007aca3af5f1c0b69a7c4abf82988a9d3e9fee98b1c29e5f5c8dcc55f708fccfc125a778480751c7cb1e608011ddeb
 EBUILD blt-2.4z-r12.ebuild 3844 SHA256 2dfc467a455c23522941a402ad371bb5259d8fae29e11b7adfcbe66bbfc0e8c4 SHA512 0c8215ada84c5a03edf234ef6e44f2bf7aa55e9794d84fe797f1eaae3b477e07cbdcba44e564f279938f62f7d0a850b69282322dbd6337244dce367bc9dafa6e WHIRLPOOL 26f9d73d700f0ad105f8e39ea78d7186ec9b11c1e652bfb0b3c962aec54b25c07da0a7d371320f25cf6739b94f6aea2b2b071cb049d5cf8565c04c1d7003f055
-MISC ChangeLog 9103 SHA256 a0c8bf63e3325dbfc6ac1c0c18b6499c02c3739720ccfe19096a38ca5647b122 SHA512 0997e28c1b3f9a166ba6c94baba7a1e1aa043901251b83d8dd42edbe9d21b7ffe8a19d3a1f555c55f2a8959239c4d3b3fb1693598610428516e7742171fc61e2 WHIRLPOOL 10be00d2671bfade334975ce2405b8eac227aa88c0843fe7bc17fc47b7dfa715166ef58d602d3bd519079c86fd863aa1d5d199cd3875b793018869368239630c
+EBUILD blt-2.4z-r13.ebuild 3622 SHA256 10580dbb5db5e765763b1e381310fb7149908698700db821cdd76d5d28d45897 SHA512 c16ae6e5e62061ce32177f37df3fea976a9e647560bb406f6046cf00cc6698818e7238623e6cc1f4938f31c0b4bfc7c97f2a722456c99b9eebf7ace120cc75b3 WHIRLPOOL 1e76468d33fdd1ef91e7e090d5d9b13ccd5e11281cccd0538503be15512817368c8e58970be765ee1596881ac3e8ba047ba66ac8922afada94f11f576244f09e
+MISC ChangeLog 9354 SHA256 a18552a22cd479c4ceb42516421a4372c596c15dae02fcb3b2ba0d1914ae34bc SHA512 2419d6fbb0f179202d32710b405075872a682e2cb72cd58339f9ef3fc0653cdafd7b25d23034b233ed81624ae420238c8e2bc75adfd7303df73e5f7d1e8c4604 WHIRLPOOL c3969ae6db09f409f927b1987fcda5a03ba446bfcdcca78b62ca67788202d968ffb5aeb50e5e1f76529b5037cfb73312189acee84fe363158e407732f68a2425
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.1
 
-iEYEAREKAAYFAlFeduIACgkQgAnW8HDreRZJaACguU1jS4MZyHOCnSlEn3u+b9D1
-G3UAn1FkUBf7KHImdrAYDuveQso53jib
-=zUMc
+iQJ8BAEBCgBmBQJVt3cnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmii1kP/0ivKx+KxC60B01RRGoChEwB
+owsOurW8c/Fg8IOv8sLSVUSE7k1+B2WHTaivB9ksO33lpUKAVjughY28ZyX9BmVN
+WFegiVYgpBIRHeM7TkERSIvE7nrXwD57le7GSqLX65EgYSZ66Z7S143DUjW/7WMT
+Vd/24yVUkWu5EF3uDgw1iTjX5Xah0II+DqJ6/8BxOjlCc2zSKxa7BgceAmFfrXQN
+6Lc851FmysvXliIGMQgYEy/YtaiHxiYm3+UBrGK9bIIarXSvNps3Owgiq1ExHiDk
+KLdjOU/EbedQvijlWW1zUUmdTsNSnSXaT5B8KmV7ERIYSIsaJuSKp+UjNBHZhTiM
+BHD+BBRcM+OspHQoF2NjiTY3dHDpVzieP4Ww9i1g0QrOuafmUL3qwRfwKbDdOFbj
+D3zJgxxNkBBl3cI2YAVf6Ju12nr5ngHt4lDx/LyG3PHOjyK9p8ITKmToAE08z8IM
+25rf901uiLCrRVSIGwccbkSCiLkfDIHoDrO1ciXQ4sZx5WndhPG4RcI8LPTqZ6Tw
+GDEPmqmlu88fYfRGzkYUpgnpDpl6vnEaISCLrfJC6rDQSbDXaDVYwmnT1UO6KHyI
+/rXZUJCXCbTDYMpHvXGjqNl61Dy7NDFP5bnTxGhMwz8hbfwWZl7/Y2Am+W+SK0ZY
+m/1eR7jHzjYJ1Hyy7Wty
+=rxJ0
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
new file mode 100644
index 000000000000..bbe53d0a3923
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r13.ebuild,v 1.1 2015/07/28 12:35:59 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs
+
+MY_V_SUFFIX="-8.5.2"
+
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
+HOMEPAGE="
+	http://blt.sourceforge.net/
+	http://jos.decoster.googlepages.com/bltfortk8.5.2"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz
+	http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
+
+IUSE="jpeg static-libs X"
+SLOT="0"
+LICENSE="BSD"
+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"
+
+DEPEND="
+	dev-lang/tk:0=
+	jpeg? ( virtual/jpeg:0= )
+	X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
+	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile3.patch"
+	# From blt-2.4z-6mdk.src.rpm
+	epatch "${FILESDIR}"/blt2.4z-64bit.patch
+
+	epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
+
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+
+	# Set the correct libdir and drop RPATH
+	sed \
+		-e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
+		-e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
+		-e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \
+		-i configure* || die "sed configure* failed"
+	sed \
+		-e "/^scriptdir =/s:lib:$(get_libdir):" \
+		-i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
+
+	sed \
+		-e "/AR/s:ar:$(tc-getAR):g" \
+		-i src/Makefile.in || die
+
+	epatch \
+		"${FILESDIR}"/${P}-linking.patch \
+		"${FILESDIR}"/${P}-darwin.patch \
+		"${FILESDIR}"/${P}-gbsd.patch \
+		"${FILESDIR}"/${P}-tk8.6.patch \
+		"${FILESDIR}"/${P}-tcl8.6.patch \
+		"${FILESDIR}"/${P}-aclocal.patch
+
+	append-cflags -fPIC
+
+	eautoreconf
+}
+
+src_configure() {
+	LC_ALL=C \
+	econf \
+		--x-includes="${EPREFIX}/usr/include" \
+		--x-libraries="${EPREFIX}/usr/$(get_libdir)" \
+		--with-blt="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tk="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tclincls="${EPREFIX}/usr/include" \
+		--with-tkincls="${EPREFIX}/usr/include" \
+		--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
+		--with-cc="$(tc-getCC)" \
+		--with-cflags="${CFLAGS}" \
+		--with-gnu-ld \
+		$(use_enable jpeg) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	sed \
+		-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
+		-i demos/{,scripts/}*.tcl || die
+
+	dodir \
+		/usr/bin \
+		/usr/$(get_libdir)/blt2.4/demos/bitmaps \
+		/usr/share/man/mann \
+		/usr/include
+
+	emake INSTALL_ROOT="${D}" install
+
+	dodoc NEWS PROBLEMS README
+	dohtml html/*.html
+	for f in `ls "${ED}"/usr/share/man/mann` ; do
+		mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt} || die
+	done
+
+	# fix for linking against shared lib with -lBLT or -lBLTlite
+	dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
+	dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
+
+	use static-libs || \
+		find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \
+		xargs -r -0 rm -fv
+}
diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch
new file mode 100644
index 000000000000..c7065df39753
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch
@@ -0,0 +1,14 @@
+Source: mescalinum
+Upstream: N/A
+Reason: fix broken $DESTDIR support in library/Makefile
+--- library/Makefile.in.orig	2008-10-26 14:30:28.000000000 +0100
++++ library/Makefile.in	2008-10-26 14:31:40.000000000 +0100
+@@ -58,7 +58,7 @@ install: mkdirs pkgIndex
+ 	for i in $(miscFiles) ; do \
+ 	    $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
+ 	done 
+-	$(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
++	$(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
+ 
+ mkdirs:
+ 	@for i in $(instdirs) ; do \