1 files changed, 34 insertions, 14 deletions

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