make the compilation progress still happy when having *old* (aka. stable) library dependencies (libX11/libGL) isntalled.

svn path=/overlay/; revision=27

4 files changed, 66 insertions, 34 deletions

diff --git a/media-libs/libcaptury/Manifest b/media-libs/libcaptury/Manifest
index 306190c..382144e 100644
--- a/media-libs/libcaptury/Manifest
+++ b/media-libs/libcaptury/Manifest
@@ -1,8 +1,8 @@
 DIST captury-0.1.0.tar.bz2 34881 RMD160 ee105288e16cd2dc120adfc533f21d01f9e68528 SHA1 1a0ecc20ee557f25584c0f8799581aa7263ed466 SHA256 74dfb36d8275e1c5e1a893b33a2bdd24080887d8441fd80aa1d450342ff1d9a9
-EBUILD libcaptury-0.1.0.ebuild 1646 RMD160 a14cb0235dc60f9a9e71be8598a7d756cdd9688a SHA1 17f002c2ed1876bf53a65d26fefa15a1f909f776 SHA256 ca153a5c286586c2e8cbefe537c3f9d159c59af32433d14d8b951a1f0b8ff94a
-MD5 7da2c5ae926644bce4d506db2e32cb19 libcaptury-0.1.0.ebuild 1646
-RMD160 a14cb0235dc60f9a9e71be8598a7d756cdd9688a libcaptury-0.1.0.ebuild 1646
-SHA256 ca153a5c286586c2e8cbefe537c3f9d159c59af32433d14d8b951a1f0b8ff94a libcaptury-0.1.0.ebuild 1646
+EBUILD libcaptury-0.1.0.ebuild 1931 RMD160 84b6f88fcd17c9b338a2494d8abdaa8aebcda0bd SHA1 db2731599114d3daba7c00358f725fb7af9eac55 SHA256 488617180a0cd796e0f9adbb4c5063fdbc2bd2a0587b245cfb9a82ce1585e50e
+MD5 98f2a6177ec203d3ddebfbe0b95c7d72 libcaptury-0.1.0.ebuild 1931
+RMD160 84b6f88fcd17c9b338a2494d8abdaa8aebcda0bd libcaptury-0.1.0.ebuild 1931
+SHA256 488617180a0cd796e0f9adbb4c5063fdbc2bd2a0587b245cfb9a82ce1585e50e libcaptury-0.1.0.ebuild 1931
 MISC ChangeLog 186 RMD160 5872ae9a465d4945dc091199477c214f846116d9 SHA1 0ecc2f1b60f1efe824d759767f97403703340417 SHA256 cb1f8827777dff98664829d67a8ca59074a6e4342c751397f2edca2fb758eee1
 MD5 6304595e350b0b4ba1b3c2ee4001b09c ChangeLog 186
 RMD160 5872ae9a465d4945dc091199477c214f846116d9 ChangeLog 186
diff --git a/media-libs/libcaptury/libcaptury-0.1.0.ebuild b/media-libs/libcaptury/libcaptury-0.1.0.ebuild
index 43c3946..79c0225 100644
--- a/media-libs/libcaptury/libcaptury-0.1.0.ebuild
+++ b/media-libs/libcaptury/libcaptury-0.1.0.ebuild
@@ -16,9 +16,9 @@ RDEPEND="media-libs/xvid
 		 x11-libs/libX11
 		 virtual/opengl
 		 amd64? (
-		 	>=app-emulation/emul-linux-x86-xlibs-7.0-r8
-		 	>=app-emulation/emul-linux-x86-medialibs-1.2-r1
-		 )"
+		 	app-emulation/emul-linux-x86-xlibs
+		 	app-emulation/emul-linux-x86-medialibs
+		 )" # enforce old emul pkgs. for testing only!
 
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
@@ -28,15 +28,26 @@ RESTRICT="multilib-pkg-force"
 S="${WORKDIR}/captury-${PV}/${PN}"
 
 setup_env() {
-	use debug && append-flags -O0 -g3
-	use debug || append-flags -DNDEBUG=1
+	LD_LIBRARY_PATH=
+	LDFLAGS=
+
+	# keep backwards compatibility as long as I *have* to.
+	if use amd64 && [[ ${ABI} = "x86" ]]; then
+		if has_version '<app-emulation/emul-linux-x86-xlibs-7.0-r8'; then
+			LDFLAGS="-L/emul/linux/x86/usr/lib"
+			LD_LIBRARY_PATH="/emul/linux/x86/usr/lib"
+		fi
+	fi
 
-#	export LD_LIBRARY_PATH=/usr/$(get_libdir)
-#	append-ldflags -L/usr/$(get_libdir)
+	export LDFLAGS
+	export LD_LIBRARY_PATH
 }
 
 src_compile() {
 	if [[ -z ${OABI} ]] && has_multilib_profile; then
+		use debug && append-flags -O0 -g3
+		use debug || append-flags -DNDEBUG=1
+
 		einfo "Building multilib ${PN} for ABIs: $(get_install_abis)"
 		OABI=${ABI}
 		for ABI in $(get_install_abis); do
@@ -44,17 +55,20 @@ src_compile() {
 			src_compile
 		done
 		ABI=${OABI}
+		return
 	fi
 
+	cd ${S}
+
 	if [[ ! -f configure ]]; then
 		./autogen.sh || die "autogen.sh failed"
 	fi
 
-	mkdir abi-${ABI}
-	pushd abi-${ABI}
-
 	setup_env
 
+	mkdir abi-${ABI}
+	cd abi-${ABI}
+
 	../configure \
 		--prefix="/usr" \
 		--host="$(get_abi_CHOST ${ABI})" \
@@ -62,8 +76,6 @@ src_compile() {
 		|| die "./configure for ABI ${ABI} failed"
 
 	emake || die "make for ABI ${ABI} failed"
-
-	popd
 }
 
 src_install() {
diff --git a/media-video/captury/Manifest b/media-video/captury/Manifest
index 0bd4454..29bf2ec 100644
--- a/media-video/captury/Manifest
+++ b/media-video/captury/Manifest
@@ -1,8 +1,8 @@
 DIST captury-0.1.0.tar.bz2 34881 RMD160 ee105288e16cd2dc120adfc533f21d01f9e68528 SHA1 1a0ecc20ee557f25584c0f8799581aa7263ed466 SHA256 74dfb36d8275e1c5e1a893b33a2bdd24080887d8441fd80aa1d450342ff1d9a9
-EBUILD captury-0.1.0.ebuild 1969 RMD160 f90981c429eb458cfce1915af396a1881e76ce1a SHA1 78935420c5a761467489d82795a0be889305de90 SHA256 c20a2a76857fb641f0bb1a330bc3c98f5a562e3b513413c2dbaa5189ded46a91
-MD5 59b5b451886a9b6b748a71b4db514049 captury-0.1.0.ebuild 1969
-RMD160 f90981c429eb458cfce1915af396a1881e76ce1a captury-0.1.0.ebuild 1969
-SHA256 c20a2a76857fb641f0bb1a330bc3c98f5a562e3b513413c2dbaa5189ded46a91 captury-0.1.0.ebuild 1969
+EBUILD captury-0.1.0.ebuild 2747 RMD160 085acecb7cbecec927929a09060cdb2ce7eb75c0 SHA1 433b4921b33e17e4310341fd7a9c9a79f60586c0 SHA256 101e17e018e354f5102ee095b73b5f94ca6a65b1d76cfecedb3a4c70ae539181
+MD5 87721a4514fb02dc299ed938269df6a7 captury-0.1.0.ebuild 2747
+RMD160 085acecb7cbecec927929a09060cdb2ce7eb75c0 captury-0.1.0.ebuild 2747
+SHA256 101e17e018e354f5102ee095b73b5f94ca6a65b1d76cfecedb3a4c70ae539181 captury-0.1.0.ebuild 2747
 MISC ChangeLog 184 RMD160 4504a05fbcfa1fa6f33f01b9ce278c955c9666a2 SHA1 3844ec1e837a445c8676d5690b763c048d36e50c SHA256 caf3f26d899bb8d0e08a1ded57e845649c467701e7f8500fa3d446bf26055da6
 MD5 cfea2b388da91ee691ebe1506427406a ChangeLog 184
 RMD160 4504a05fbcfa1fa6f33f01b9ce278c955c9666a2 ChangeLog 184
diff --git a/media-video/captury/captury-0.1.0.ebuild b/media-video/captury/captury-0.1.0.ebuild
index 719e7e5..5ae1075 100644
--- a/media-video/captury/captury-0.1.0.ebuild
+++ b/media-video/captury/captury-0.1.0.ebuild
@@ -28,13 +28,37 @@ setup_env() {
 	makeopts=""
 
 	if [[ ${ABI} != ${DEFAULT_ABI} ]]; then
+		# this is a workaround as Gentoo doesn't ship a 32bit version of libelf.so
 		myconf="${myconf} --disable-builtin-strip-soname"
 		makeopts="${makeopts} STRIP_SONAME=$(pwd)/../abi-${DEFAULT_ABI}/src/libGLcaptury/strip-soname"
+
+		# unfortunately, different versions of emul-linux-x86-xlibs do install
+		# their files into different locations, depending on what version you
+		# installed.
+		if [[ -x /emul/linux/x86/usr/lib/libGL.so ]]; then
+			makeopts="${makeopts} NATIVE_LIBGL=/emul/linux/x86/usr/lib/libGL.so"
+		else
+			makeopts="${makeopts} NATIVE_LIBGL=/usr/$(get_libdir)/libGL.so"
+		fi
+		if [[ -x /emul/linux/x86/usr/lib/libX11.so ]]; then
+			makeopts="${makeopts} NATIVE_LIBX11=/emul/linux/x86/usr/lib/libX11.so"
+		else
+			makeopts="${makeopts} NATIVE_LIBX11=/usr/$(get_libdir)/libX11.so"
+		fi
+	else
+		makeopts="${makeopts} NATIVE_LIBGL=/usr/$(get_libdir)/libGL.so"
+		makeopts="${makeopts} NATIVE_LIBX11=/usr/$(get_libdir)/libX11.so"
 	fi
+
+	export makeopts
+	export myconf
 }
 
 src_compile() {
 	if [[ -z ${OABI} ]] && has_multilib_profile; then
+		use debug && append-flags -O0 -g3
+		use debug || append-flags -DNDEBUG=1
+
 		einfo "Building multilib ${PN} for ABIs: $(get_install_abis)"
 		OABI=${ABI}
 		for ABI in $DEFAULT_ABI $(get_install_abis); do
@@ -42,21 +66,21 @@ src_compile() {
 			src_compile
 		done
 		ABI=${OABI}
+		return
 	fi
 
-	use debug && append-flags -O0 -g3
-	use debug || append-flags -DNDEBUG=1
+	cd ${S}
+
+	test -d abi-${ABI} && return
 
 	if [[ ! -f configure ]]; then
 		./autogen.sh || die "autogen.sh failed"
 	fi
 
-	test -d abi-${ABI} && return
-
 	mkdir abi-${ABI}
-	pushd abi-${ABI}
+	cd abi-${ABI}
 
-	einfo "Compiling for ABI ${ABI}..."
+	einfo "Compiling for ABI ${ABI} ..."
 	einfo
 
 	setup_env
@@ -67,21 +91,17 @@ src_compile() {
 		--libdir="/usr/$(get_libdir)" \
 		|| die "./configure for ABI ${ABI} failed"
 
-	emake ${makeopts} \
-		NATIVE_LIBGL="/usr/$(get_libdir)/libGL.so" \
-		NATIVE_LIBX11="/usr/$(get_libdir)/libX11.so" \
-		|| die "make for ABI ${ABI} failed"
-
-	popd
+	einfo "MAKE LINE: emake ${makeopts}"
+	einfo
+	emake ${makeopts} || die "make for ABI ${ABI} failed"
 }
 
 src_install() {
 	for ABI in $(get_install_abis); do
-		pushd abi-${ABI}
+		cd "${S}/abi-${ABI}"
 		setup_env
 		einfo "make ${makeopts} install DESTDIR=\"${D}\""
 		make ${makeopts} install DESTDIR="${D}" || die "make install for ABI ${ABI} failed."
-		popd
 	done
 
 	dodoc AUTHORS ChangeLog* NEWS README* TODO