dev-tcltk/blt: add --with-gentoo-libdir config-arg

Although this is a bit of a dirty hack, it is less so than injecting the
libdir via sed-script.  This will come in handy later for multilib
support.

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

3 files changed, 81 insertions, 7 deletions

diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 0215b4b..4d71d9e 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -2,6 +2,7 @@ AUX blt-2.4z-aclocal.patch 1705 SHA256 7b9b496f68ee8215b7404e1750955cb03e9188d19
 AUX blt-2.4z-darwin.patch 1186 SHA256 3cbdbbf123aeb4b4a727704c2daabddb7a4a44e23c2d0bd7652c0b0b0aa8d297 SHA512 31941da432004eec1837fda164365327e39f44345581c8f87d6c37e95ed609b61ee6420e832c67b91277418ff232cc1b6c7ee85cd5e9a8859bf8530e16d354c5 WHIRLPOOL 33a3fce0e6066e975ee2d564ae7176cfb4220f3371576531e4be3821a7cc43c96cd80892bb138006f5ce4dc38e1c970e68640b0e565a45634cc12427454730ac
 AUX blt-2.4z-deprecated-ac-output.patch 881 SHA256 746a12a929178259b367dbd129eec902055a61e30ddee76195174c29f9376269 SHA512 c90154c39a58d4a6b4957ba275bff1910ebaa602006cd0b688da5ce68ec6165bd5fd86420e6d2382759a9a6aaf31fc9ef98e762bac40c08ae4a0bd6fa27c23ca WHIRLPOOL f672c3bcf45b93e2b51804d32d1c89f92216d60d9e65f634a75e6495941f29896428d38f39ac16030bf2c19971e04ac2e6484a137598d881868cf3432fc5a39d
 AUX blt-2.4z-gbsd.patch 1980 SHA256 b020b0043847bc05bda1b5c4c96c888dc0075ba3ef397bbb4af8181c20c69ce9 SHA512 9e3b833445f998af5c070d755c4c6904d78175640b771abc020289c857bb12ab82fdd504eebc16771c3b057b94643d20acf4eb5952184ca2d2f9233ecd55f92c WHIRLPOOL f2c43489ee0edf9fda259e4d9f03deac98432ece74fb01c9d97ef2b294d0d52b86d7601a754e004b859a0f0965a403ff98f657f360a06b07b75a51f72872da6a
+AUX blt-2.4z-gentoo-libdir.patch 2621 SHA256 3483f95a1d4f549413c3964fa5b9b7fbbe20605ddcfb14de58436671cb3d2e49 SHA512 314fa9aec46eea98c822e9316e08b69fd702bdd7e46f351ca9fb583b87e0e361bc8e95efef10be075bfba6b5ced871c66633d1f7b5e4baad9708ce4b2927319d WHIRLPOOL b29347bb911c7eed84c42db6e26c3d6272a1bae42e8e38e2caa16834fa05ebacc76259f5bec221a45a63757fc9598782009b73d1291d06066936c080932344d9
 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
@@ -15,6 +16,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 3614 SHA256 baca938e0a08fd53fa85251ec5220f132ea0ed9f1bcacb6749caa98bd81d5b44 SHA512 11492b11c9552160a55d6ffae573192a9333c9e8d6f52d772e972aee09511cd58708fc78fd3b900d7ec76f121c9837c4d0611c9e50f72b5ee364600c6beb9e66 WHIRLPOOL cd2d75dd75392362249ac0626e44ddc0415b06e7662cdbe6be935c07ca5dbf8376a255d7028b49d5df80b398b7e83f679674443963eddf1f56eb39bd4d253e1c
+EBUILD blt-2.4z-r13.ebuild 3493 SHA256 f23fe1236f76cd1edc8417aa6d99d947293254ac1590b6b38cce0ea532b5f1ff SHA512 5292ff223c54ecc33187ce359fd80929b05c8a617c3813bcf8f128a4619a513cc9c8193695cb214720bd04e68cedd44a89917602945f42ab963858307eb3009c WHIRLPOOL 3c737471033cf16b632594f7346eebdca1b65b6380c2406c27d4fad6f8321ca8861f9af3b932b6c57d75107c8a553d22460ec4d43daac5e976773717234a33f8
 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 6276aa9..a39703f 100644
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild
@@ -43,14 +43,10 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-ldflags-v2.patch
 
-	# Set the correct libdir and drop RPATH
+	# drop RPATH
 	sed \
-		-e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
 		-e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":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" \
@@ -63,7 +59,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-tk8.6.patch \
 		"${FILESDIR}"/${P}-tcl8.6.patch \
 		"${FILESDIR}"/${P}-aclocal.patch \
-		"${FILESDIR}"/${P}-deprecated-ac-output.patch
+		"${FILESDIR}"/${P}-deprecated-ac-output.patch \
+		"${FILESDIR}"/${P}-gentoo-libdir.patch
 
 	append-cflags -fPIC
 
@@ -84,6 +81,7 @@ src_configure() {
 		--with-tkincls="${EPREFIX}/usr/include" \
 		--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
 		--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
+		--with-gentoo-libdir="$(get_libdir)" \
 		--with-cc="$(tc-getCC)" \
 		--with-cflags="${CFLAGS}" \
 		--with-gnu-ld \
diff --git a/dev-tcltk/blt/files/blt-2.4z-gentoo-libdir.patch b/dev-tcltk/blt/files/blt-2.4z-gentoo-libdir.patch
new file mode 100644
index 0000000..9f7917c
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-gentoo-libdir.patch
@@ -0,0 +1,75 @@
+diff -urpN blt2.4z-8.5.2.orig/Makefile.in blt2.4z-8.5.2/Makefile.in
+--- blt2.4z-8.5.2.orig/Makefile.in	2013-12-31 09:48:06.185969353 -0800
++++ blt2.4z-8.5.2/Makefile.in	2013-12-31 09:49:33.268046638 -0800
+@@ -13,7 +13,8 @@ bindir =	@bindir@
+ includedir =	@includedir@
+ libdir =	@libdir@
+ version =	@BLT_VERSION@
+-scriptdir =	$(prefix)/lib/blt$(version)
++gentoo_libdir = @GENTOO_LIBDIR@
++scriptdir =	$(prefix)/$(gentoo_libdir)/blt$(version)
+ 
+ instdirs =	$(prefix) \
+ 		$(exec_prefix) \
+diff -urpN blt2.4z-8.5.2.orig/configure.in blt2.4z-8.5.2/configure.in
+--- blt2.4z-8.5.2.orig/configure.in	2013-12-31 09:48:06.356979323 -0800
++++ blt2.4z-8.5.2/configure.in	2013-12-31 09:49:33.269046697 -0800
+@@ -35,6 +35,7 @@ blt_with_tk_includes=""
+ blt_with_tcl_libraries=""
+ blt_with_tk_libraries=""
+ blt_with_scriptdir=""
++blt_with_gentoo_libdir="lib"
+ 
+ AC_ARG_WITH(blt,	[  --with-blt=DIR          Install BLT scripts in DIR],
+   blt_with_scriptdir=$withval) 
+@@ -64,6 +66,8 @@ AC_ARG_WITH(cflags,	[  --with-cflags=FLA
+   blt_with_cflags="$with_cflags")
+ AC_ARG_WITH(gnu_ld,	[  --with-gnu-ld           Use GNU linker],
+   blt_with_gnu_ld="yes")
++AC_ARG_WITH(gentoo_libdir, [  --with-gentoo-libdir=GENTOOLIBDIR  dirty hack],
++  blt_with_gentoo_libdir=$withval)
+ 
+ AC_CANONICAL_SYSTEM
+ AC_PREFIX_PROGRAM(wish)
+@@ -943,8 +949,10 @@ BLT_MINOR_VERSION=${blt_cv_minor_version
+ 
+ BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
+ 
++gentoo_libdir=${blt_with_gentoo_libdir}
++
+ # Add BLT to the run path
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/${gentoo_libdir}
+ 
+ if test "x${libdir}" != "x"  -a \
+ 	"${libdir}" != "/usr/lib" -a  \
+@@ -1354,6 +1362,8 @@ fi
+ 
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(LD_RUN_PATH)
++GENTOO_LIBDIR=${gentoo_libdir}
++AC_SUBST(GENTOO_LIBDIR)
+ 
+ LIBS=${LIB_SPECS}
+ AC_SUBST(LIB_SPECS)
+@@ -1400,6 +1413,7 @@ echo "Directories where BLT is to be ins
+ echo ""
+ echo "  \"\$prefix\" is $prefix"
+ echo "  \"\$exec_prefix\" is $exec_prefix"
++echo "  \"\$gentoo_libdir\" is $gentoo_libdir"
+ echo ""
+ echo "  bltwish      to be installed in  $bindir"
+ echo "  libBLT.a     to be installed in  $libdir"
+diff -urpN blt2.4z-8.5.2.orig/demos/Makefile.in blt2.4z-8.5.2/demos/Makefile.in
+--- blt2.4z-8.5.2.orig/demos/Makefile.in	2008-04-15 08:31:26.000000000 -0700
++++ blt2.4z-8.5.2/demos/Makefile.in	2013-12-31 09:49:33.268046638 -0800
+@@ -6,7 +6,8 @@ prefix =	@prefix@
+ exec_prefix =	@exec_prefix@
+ version =	@BLT_VERSION@
+ libdir =	@libdir@
+-scriptdir =	$(prefix)/lib/blt$(version)
++gentoo_libdir = @GENTOO_LIBDIR@
++scriptdir =	$(prefix)/$(gentoo_libdir)/blt$(version)
+ destdir =	$(scriptdir)/demos
+ srcdir =	@srcdir@
+