dev-tcltk/blt: fix bug #485880

Nobody seems to care about bug 485880 -- anyhow no reason to subject
users of my overlay to it.  I should figure out who to nudge about
getting this merged.

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 17 insertions, 5 deletions

diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 9d409d0..74ad8e6 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -4,6 +4,7 @@ AUX blt-2.4z-gbsd.patch 1980 SHA256 b020b0043847bc05bda1b5c4c96c888dc0075ba3ef39
 AUX blt-2.4z-ldflags-v2.patch 5447 SHA256 e676423ffb20eb6989f373ff71404c732243b4c66a46ed49f8fd3bb622d74333 SHA512 6bd1d638eaa563fac9c44be017dfdf8d5b425b99729bf3c62919273a75c5d43ff9c096084c84bc1248c05e940877e3488d7a9f67cb6ed95262cce45b16985853 WHIRLPOOL b08c8c113b4fa715ab330ca85dfc5714be1dff86f0bda2f0ac1aa6499fd46c3fbd49de7fdbb6b42d9a2f0080a7814f817a29fe7f3651eeda7e51cdf7c5792716
 AUX blt-2.4z-ldflags.patch 1086 SHA256 20245d45dfb0e96afe1127fa40209a7881fbd3f3880ef04af9496809a308f06e SHA512 d2e19fc9caab2ae013c01e66c9674906bda2f01190bf6e9da93c2d22cb4a36a167f7de34649e6d3efc84b0094b1710fc3380347367830dc012873c3845716445 WHIRLPOOL bd0564162e27c97ecca7c8c017345d005871aec2f97bebf8f4a7b2667f4163f051df58379649e40b8c200b4155d2b6049cdf3e2db15753b715a2aa4adabd8467
 AUX blt-2.4z-linking.patch 684 SHA256 cd19df698ca40ce743c81fe2c18dce615a6db385c6a973b9a14201f45e5467a2 SHA512 09ad0d4b43d51b33020a13ecbe31d04d5ddcdf2134d0c0e1275b4de3127adad624d222f492a6d9b0a4f198537afb30d9af70f8685668bf7eba966f020c34368e WHIRLPOOL a5a993a06467a81e1987c04bd709859c725f438b5aa334b2eb1c3806567447dbc290f9a464800919d7fdb5ca0832053d1da9fc91346dc4455ea18ec353e10875
+AUX blt-2.4z-r13-fix-makefile.patch 509 SHA256 0ac21b9e7fc3e9e5bb7a44d195d8d6cdba05216cf2d9d09709bfc4628d371de1 SHA512 77f432a8ae319ae552a0803c949e4de3e4d1ce258d1f41347481f162d084668c125971ccea5e4fc53dd806054596a4d620786aca41275789c393cf499c9a93b4 WHIRLPOOL e16dc72e20e83de59684a0936c2571fa5ea00c7b20e91e54abc6eb3a7e5fdd7c328e9ea2a16a48fa7288dc8642d33b245fad3a4113a14770bc95349f08a2d76a
 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-tcl8.5-fixpkgruntime.patch 1976 SHA256 a44ed43bbb946d8fc11bb8f416680a536ffc7c0d78faf33030ec378d67d3d287 SHA512 036cc9672c6c5f7554ab883d89602f8ead92c7533fb45742a082b97162f32d6442ac52e1e4f7154d669d917915b840cc6191ae544e1261e430222e0a293c0f41 WHIRLPOOL b3089b7ca520990ebd7fd1160342538e086a5414a049f6affa8a67020df889579ef4d0c5c683b75e0cbfc99deb7ca823c96396ddaac024f4ffde8c3ddc02b5c4
@@ -13,6 +14,6 @@ AUX blt2.4z-64bit.patch 891 SHA256 a0a3da1016eea86279d1648f4390b38083484582bdb5b
 AUX blt2.4z-install.diff 1057 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8 SHA512 2786eb7d59ef4f3e0b2e846f906e6f92cece13b8003ed220ddcdd22b42b761fa6aa31905a3a62af54e02db96bda37e21fae2361589d8c393586c37bcd33ef842 WHIRLPOOL a0db9fdc9d2199ac0e217015826a0ffe7b70c619e55e85a13a941202be3a325356cde627714d16d315f1647b5f95d16a6219720048b14560fdf7445c170995b2
 AUX pkgIndex.tcl 146 SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef511ec2f2659d SHA512 fedb327153b670f370773c1b57f7f831c291962fb375e27ba0b31314a94128edc7a4e6b9377e7c19426beb672fcb9b1b10f7e45ca0f197e19863b40d27bef439 WHIRLPOOL b3f6534323e28097656cfd2ff42433e07460d6dc3b247ed666712b7e664e086421640ff2320e8d71e5037e07fcefd690b845c9dd08e54baf0562c8659919bc6d
 DIST blt2.4z-8.5.2.tar.gz 2326234 SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16 SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a WHIRLPOOL a00a029e075916dd7656ca85acb308a48e6d80563a91ada9e9e7df7518ef0d4de2200b54e5d9c8a9602520c03472e73968956c0df30afb8ef7f7b364fdd5524f
-EBUILD blt-2.4z-r13.ebuild 3727 SHA256 7428b9c6eda8fa96b163ab7f2b001980fa09d950a13d1d725055259ecf7abde7 SHA512 19cf314a99af24bb738e9eb63307bef6e788d3a11a33064a5f2cd7aeec95b557e383553920f0405d6d80029f54ab808aa60123c7b2181d090f5a3d4f75b1e7be WHIRLPOOL 557091c0b02880b72fb5dfcf7f4ef5a3e23ec48a32d538f547fe91b82344d9f6dc091acc64157b7baa1ca7a99dce42df5ef175597e6d31ac25f676d54828c932
+EBUILD blt-2.4z-r13.ebuild 3584 SHA256 113466bb679a8028ae1bbc753db9d0b3a41f23fd18cd34188a033f31fd7ed7e7 SHA512 3c7a7871a8d3eb2cf50976225a998891302d3818940e8729dee11b4c94e74bc5244a8ea3d5058cb028dec4afcb66239465e50811930f885977a950bbd5c6998b WHIRLPOOL eca21a3f59e47078e47fbcece81f81f81a3c85683f3eeb464a91adbdf9fce4c679f60df882421bb4bc294fc812f9faddc28c03fca725031e32100ee213186b46
 MISC ChangeLog 9103 SHA256 a0c8bf63e3325dbfc6ac1c0c18b6499c02c3739720ccfe19096a38ca5647b122 SHA512 0997e28c1b3f9a166ba6c94baba7a1e1aa043901251b83d8dd42edbe9d21b7ffe8a19d3a1f555c55f2a8959239c4d3b3fb1693598610428516e7742171fc61e2 WHIRLPOOL 10be00d2671bfade334975ce2405b8eac227aa88c0843fe7bc17fc47b7dfa715166ef58d602d3bd519079c86fd863aa1d5d199cd3875b793018869368239630c
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
index 890ec2a..557bf82 100644
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild
@@ -33,7 +33,7 @@ S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
 MAKEOPTS+=" -j1"
 
 src_prepare() {
-	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
+	epatch "${FILESDIR}/blt-2.4z-r13-fix-makefile.patch"
 	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
 	# From blt-2.4z-6mdk.src.rpm
 	epatch "${FILESDIR}"/blt2.4z-64bit.patch
@@ -111,9 +111,6 @@ src_install() {
 		mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
 	done
 
-	# bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
-	cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
-
 	# 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)
diff --git a/dev-tcltk/blt/files/blt-2.4z-r13-fix-makefile.patch b/dev-tcltk/blt/files/blt-2.4z-r13-fix-makefile.patch
new file mode 100644
index 0000000..c7065df
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-r13-fix-makefile.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 \