dev-tcltk/blt: multilib-utize

Also cleans up some documentation cruft that used to end up in libdirs

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

2 files changed, 52 insertions, 24 deletions

diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index b51b797..fdead72 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -18,6 +18,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 3604 SHA256 89ce6aacb697a8d15854c35d9edae266bc582e40d827108c1e0ad631992013bc SHA512 f140a7ea331c06e38edea42005746bb7fbacc86da5d52263be25a7fc3b26ec2ce8d8aa09585c5707eae6b471ae007baf8c922041a3cc3aeec608720d8daed22e WHIRLPOOL 7834f79a07c2f8eab2a411e14304c4ffee7ff9487185defc1cef1a0aa7e4e8c3e4579912b956a886fcfea413e80f5973a5315f79462b5dfe834b949f4772314e
+EBUILD blt-2.4z-r13.ebuild 4221 SHA256 f2d158264ba3e72bfce91e182030c2c2268f9148c0cb9e0e159eb69360b6f552 SHA512 2683ee9241a3aa3fc7cbb9673e9c3ce6837c56df52e58b51ee8f064fe64ef58bfb9aec0b827e0e65f414a3f56ef57a4b32cbb165cc4e877ebdbe4828e529e61c WHIRLPOOL 05d57d121058851c968083374801c8dd7460d9734583c52d10d892b6e8210187ce9b3d2f053a94ebaa0a255f8d92d328f90a7095c7d4b6ca67d2bc86af5f2cd5
 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 2ea01ac..7d8e174 100644
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit autotools-utils eutils flag-o-matic multilib toolchain-funcs
+inherit autotools-multilib eutils flag-o-matic multilib toolchain-funcs
 
 MY_V_SUFFIX="-8.5.2"
 
@@ -19,18 +19,20 @@ SRC_URI="
 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"
+KEYWORDS="~amd64"
 
 DEPEND="
-	dev-lang/tk
-	jpeg? ( virtual/jpeg )
-	X? ( x11-libs/libX11 )"
+	dev-lang/tk[${MULTILIB_USEDEP}]
+	jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
 
 AUTOTOOLS_AUTORECONF=yes
 AUTOTOOLS_NO_AUTO_STATIC_LIBS_CONFARGS=yes
+MULTILIB_WRAPPED_HEADERS=( usr/include/bltHash.h )
+MULTILIB_PARALLEL_PHASES="src_configure src_compile"
 
 src_prepare() {
 	epatch "${FILESDIR}/blt-2.4z-r13-fix-makefile.patch"
@@ -63,31 +65,39 @@ src_prepare() {
 	append-cflags -fPIC
 
 	rm configure || die
-	autotools-utils_src_prepare
+	autotools-multilib_src_prepare
 }
 
 src_configure() {
-	RANLIB="$(tc-getRANLIB)" \
+	local RANLIB
 	LC_ALL=C \
-	autotools-utils_src_configure \
+	autotools-multilib_src_configure \
 		--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)" \
+		--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-gentoo-libdir="$(get_libdir)" \
-		--with-cc="$(tc-getCC)" \
-		--with-ar="$(tc-getAR)" \
-		--with-cflags="${CFLAGS}" \
+		--with-tcllibs="${EPREFIX}/usr/@GET_LIBDIR@" \
+		--with-tklibs="${EPREFIX}/usr/@GET_LIBDIR@" \
+		--with-gentoo-libdir="@GET_LIBDIR@" \
 		--with-gnu-ld \
 		$(use_enable jpeg) \
 		$(use_with X x)
 }
 
+ehook autotools-utils-multilib-per-abi-pre_src_configure abi_pre_src_configure
+abi_pre_src_configure() {
+	myeconfargs+=(
+		--with-cc="${CC:-$(tc-getCC)}"
+		--with-ar="$(tc-getAR)"
+		--with-cflags="${CFLAGS}"
+	)
+	tc-export RANLIB
+	return 0
+}
+
 src_install() {
 	sed \
 		-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
@@ -97,11 +107,10 @@ src_install() {
 		-i demos/{,scripts/}*.tcl || die
 
 	dodir /usr/bin \
-		/usr/$(get_libdir)/blt2.4/demos/bitmaps \
 		/usr/share/man/mann \
 		/usr/include
 
-	autotools-utils_src_install INSTALL_ROOT="${D}"
+	autotools-multilib_src_install INSTALL_ROOT="${D}"
 
 	dodoc NEWS PROBLEMS README
 	dohtml html/*.html
@@ -109,11 +118,30 @@ src_install() {
 		mv "${ED}"usr/share/man/mann/${f} "${ED}"usr/share/man/mann/${f/.n/.nblt}
 	done
 
+	use static-libs || \
+		find "${ED}"usr -name "*.a" -print0 | \
+		xargs -r -0 rm -fv
+}
+
+ehook autotools-multilib-per-abi-pre_src_install abi_pre_src_install
+abi_pre_src_install() {
+	dodir /usr/$(get_libdir)/blt2.4/demos/bitmaps
+	return 0
+}
+
+ehook autotools-multilib-per-abi-post_src_install abi_post_src_install
+abi_post_src_install() {
 	# 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
+	# drop doc files from libdir
+	rm -f ${ED}usr/$(get_libdir)/blt2.4/{NEWS,PROBLEMS,README} || die
+
+	# remove demos from libdirs & install as doc
+	if multilib_is_best_abi ; then
+		docompress -x /usr/share/doc/${PF}/demos
+		dodoc -r "${ED}"usr/$(get_libdir)/blt2.4/demos
+	fi
+	rm -r "${ED}"usr/$(get_libdir)/blt2.4/demos || die
 }