media-libs/lcms-1.19-r2: Fix screwed up ebuild

This was failing due to ehook recursion, and also needed multilib
python header finding.

Unfortunately overlay-only features were required in each case to
resolve the problem.

This one perhaps should be reimplemented as a custom multilib-build
based ebuild instead of a autotools-utils, we'll see how things look
once the ehook -> poly migration happens

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

2 files changed, 42 insertions, 32 deletions

diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index f712984..891d310 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -3,6 +3,6 @@ AUX lcms-1.19-fix-python3.2.patch 1098 SHA256 aee8200bdb7106b5aaa0df92590de5c857
 AUX lcms-1.19-fix-swig-destructor.patch 345 SHA256 ac8ade0b3e45fd934b88925256fe6e729bb4b6b38f3ad896dfef3dc11e8b52a7 SHA512 00d1b2dd2ed32d4848c726e6616a4cb9caccc9ad410c796d400bd8566938854100c0c94e8db6446ab00a3dfef610406b6eca1f7a288a37b7249f3f98e9653a91 WHIRLPOOL 4247ffa55abdec48e98926ee174101bf440d00e81cf7c3fe2940693de04697d692b2538ca5b5d3917a5f1ea8ba72f2d964bcc7b7b49bc484bd18e6e260332484
 AUX lcms-1.19-implicit.patch 1308 SHA256 327eb96faafac582362f57800727896bd5c2206a7bb150f12ef7787e84f3ddd9 SHA512 120db0ea4c5a77563dffef55507a8e7fa172ee73ad3943b6ba55c4a01f4a0a2ae21794f4775d58f0d8ba6b5fbdc28c461622416981683063ff746db9a38c724b WHIRLPOOL df45ecfc6fe36db90c676e25f053b370af466648e36e752acfd9f5c0d5acc25a445bf0a8a476f0913ca5c7f0304940c3af35bf56c021fa34045cfdb1e52419bc
 DIST lcms-1.19.tar.gz 927752 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9 SHA512 85a55ad0673f0df2aaa80d18caa50314319f8da5ee4d84eed919059d0dad9861d684ef6353ce0ec6f9892a4603ce8e8e12f84d46858e23f52846b8aefd3cf449 WHIRLPOOL cb6bcb5497798ff2fa86ff433eae6afea38408306345156da6103aa8af6fc0d48fa1d730c5958c027ba06ea023236328bcb00be60f600d987d060625385c820b
-EBUILD lcms-1.19-r2.ebuild 2883 SHA256 27f1c5792776ed6b4234f5adbf357cb27c248236d9824fc84eaac89c458a4303 SHA512 ccc8324436f7251d685a844e089b160b904702a343ccbdecc9edca351ab770de426297c8d80d42fcf3dd1414ecfa747bb2db88d3995d80435fd6b3a2d6dd5925 WHIRLPOOL effbb17df22259a4e5f67cbf2a59de9453785fbc8fd7d23f1779131867a29ad8d1148a20f9fb596e701a538568ed37cd14378900ac3fa0caa43a90d7d7d7aabc
+EBUILD lcms-1.19-r2.ebuild 3154 SHA256 63ddae254cb83170afece04f6ad2309473f18f79411ca970d2564b57b008f270 SHA512 ec99f51a8af0b690603a41f0fd7f0b010bd47a0da2bd7223c3110486b4c154057b656c938f3ca8d9528052eafce495cb0d34cff7df982edbe7e9a41e9b2b79fa WHIRLPOOL 47f6a8f2ad025f70b79ea801655f1b07a9782a6ed3c0446b99eae807b5b9c2653f642f2dfe1fb1a08a0f62fdcadc039eee4aec1b38e644680e8acb750ccd52f1
 MISC ChangeLog 19908 SHA256 19cbffc7cfb4cceb02c2513e8d8ff6335685dd7bb3d1d3c0613a909c98fa12a8 SHA512 c39938fa796f9e43e17825e889c42a20c36452d818b6a3c000c5b0cb0b66889fa56f1369209907f1b094a547cd723f5d7592123c5168fb07c702a96f88a657b7 WHIRLPOOL 932ac158c8f2fdf432599425f80cb41b1f1897c3c5c0a87dc4c42af64edff44a84decb8e8c0430ab48752c658056fb1fbe75cd5047904d8f08fe88d7c5a82fbd
 MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
diff --git a/media-libs/lcms/lcms-1.19-r2.ebuild b/media-libs/lcms/lcms-1.19-r2.ebuild
index f0b1678..69ab7f6 100644
--- a/media-libs/lcms/lcms-1.19-r2.ebuild
+++ b/media-libs/lcms/lcms-1.19-r2.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
 
-inherit autotools-multilib autotools-utils python-r1
+inherit autotools-multilib python-r1
 
 DESCRIPTION="A lightweight, speed optimized color management engine"
 HOMEPAGE="http://www.littlecms.com/"
@@ -55,6 +55,14 @@ src_prepare() {
 	fi
 }
 
+_pywrap() {
+	local CFLAGS="${CFLAGS} $(python_get_CFLAGS)"
+	local CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+	export CFLAGS CXXFLAGS
+	[[ -d "${BUILD_DIR}" ]] || { mkdir -p "${BUILD_DIR}" || die ; }
+	multilib-build_run_in_build_dir "$@"
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
@@ -63,42 +71,41 @@ src_configure() {
 		$(use_with zlib)
 	)
 
-	ehook autotools-multilib-per-abi-post_src_configure pyconfigure
 	autotools-multilib_src_configure --without-python
 }
 
-pyconfigure() {
-	if use python && multilib_is_native_abi; then
-		python_parallel_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-src_compile() {
-	ehook autotools-multilib-per-abi-post_src_compile pycompile
-	autotools-multilib_src_compile
-}
-
-pycompile() {
-	if use python && multilib_is_native_abi; then
-		# Note: it intentionally passes evaluated 'parent' dir.
-		python_parallel_foreach_impl \
-			autotools-utils_src_compile -C python \
-			top_builddir="$(pwd)"
-	fi
+ehook autotools-multilib-best-abi-post_src_configure bestabi_pyconfigure
+bestabi_pyconfigure() {
+	local othereconfargs=(
+		$(
+			for othereconfarg in "${othereconfargs[@]}" ; do
+				[[ ${othereconfarg} == --without-python ]] || \
+					echo "${othereconfarg}"
+			done
+		)
+	)
+	use python && \
+		python_foreach_impl \
+			_pywrap \
+				econf "${myeconfargs[@]}" "${othereconfargs[@]}" --with-python
 }
 
-src_test() {
-	ehook autotools-multilib-per-abi-pre_src_test cptestbed
-	autotools-multilib_src_test
+ehook autotools-multilib-best-abi-post_src_compile bestabi_pycompile
+bestabi_pycompile() {
+	use python && \
+		python_foreach_impl \
+			_pywrap \
+				emake "${myemakeargs[@]}" "${otheremakeargs[@]}" -C python \
+					top_builddir="${BUILD_DIR}"
 }
 
+ehook autotools-multilib-per-abi-pre_src_test cptestbed
 cptestbed() {
 	cp "${S}"/testbed/*icm ${BUILD_DIR}/testbed/ || die
+	return 0
 }
 
 src_install() {
-	ehook autotools-multilib-per-abi-post_src_install pyinstall
 	autotools-multilib_src_install \
 		BINDIR="${ED}"/usr/bin
 
@@ -108,13 +115,16 @@ src_install() {
 	doins testbed/*.icm
 }
 
-pyinstall() {
-	if use python && multilib_is_native_abi; then
-		# Note: it intentionally passes evaluated 'parent' dir.
+ehook autotools-multilib-best-abi-post_src_install bestabi_pyinstall
+bestabi_pyinstall() {
+	if use python; then
 		python_foreach_impl \
-			autotools-utils_src_install -C python \
-			top_builddir="${BUILD_DIR}"
+			_pywrap \
+				emake "${myemakeinstallargs[@]}" "${otheremakeinstallargs[@]}" \
+					-C python top_builddir="${BUILD_DIR}"
 
-		python_parallel_foreach_impl python_optimize
+		python_foreach_impl \
+			_pywrap \
+				python_optimize
 	fi
 }