6 files changed, 8 insertions, 268 deletions
diff --git a/media-video/captury/Manifest b/media-video/captury/Manifest
index 86a87c1..692450c 100644
--- a/media-video/captury/Manifest
+++ b/media-video/captury/Manifest
@@ -1,28 +1,12 @@
-DIST captury-0.1.0.tar.bz2 34881 RMD160 ee105288e16cd2dc120adfc533f21d01f9e68528 SHA1 1a0ecc20ee557f25584c0f8799581aa7263ed466 SHA256 74dfb36d8275e1c5e1a893b33a2bdd24080887d8441fd80aa1d450342ff1d9a9
-DIST captury-0.2.0.tar.bz2 442433 RMD160 b71d264c2781be6a6a88d30aaaf790f98bc5d1ca SHA1 7137bcfb4d8a366588235e1512f063ede9891bdf SHA256 2b93596c60902a8d87896df2bccfa3d2fafce4ed074e36f71115615354a84373
 DIST captury-0.3.0_pre200706031.tar.bz2 1215736 RMD160 fedb5db4b560a3fcb225a204f2b58f95c61c393c SHA1 ccd84184b37fe4120c82034fbc3d1cff859d7cbf SHA256 51904c4b1183cf77809ff47bbe6b1cdcffabfdefc301ac838de89a0d4d799289
-EBUILD captury-0.1.0.ebuild 3000 RMD160 04d2c979ac3c6d444ac66aff3b750db1cb5dad9b SHA1 88853f62c1e93046b3f7e6f7adfbf8f964b4ac3d SHA256 caf0a01b0679e090ee1f9d22c1aa1fa3da29ca8d5cddebb80b81086f885b4270
-MD5 48d9dd82c8a2c72276824fde41a722ac captury-0.1.0.ebuild 3000
-RMD160 04d2c979ac3c6d444ac66aff3b750db1cb5dad9b captury-0.1.0.ebuild 3000
-SHA256 caf0a01b0679e090ee1f9d22c1aa1fa3da29ca8d5cddebb80b81086f885b4270 captury-0.1.0.ebuild 3000
-EBUILD captury-0.2.0.ebuild 3021 RMD160 457bba1c50e9a502a7a69332046884a9cc30d6f6 SHA1 df091793508053fb91fe3b4a5a35544d604a6086 SHA256 c8666ba9fc603d44f28893a38a9494f566d04111b908e5c35330d9a5723d6ba8
-MD5 973e979ff23a5d19b6356c606624461f captury-0.2.0.ebuild 3021
-RMD160 457bba1c50e9a502a7a69332046884a9cc30d6f6 captury-0.2.0.ebuild 3021
-SHA256 c8666ba9fc603d44f28893a38a9494f566d04111b908e5c35330d9a5723d6ba8 captury-0.2.0.ebuild 3021
-EBUILD captury-0.3.0_pre200706031.ebuild 3054 RMD160 abb8b406ca39dee9450bd9c90c28fc6df816daa9 SHA1 97edf6b3dffe73bc0d744ad8b7c802f1b6a2ab2f SHA256 8831e8f1499af6c10fa7e8b6fb617ed1f5cfbfdb595eafb746c57540dd17fa6c
-MD5 1835797014de2976bc8c433d89d736c5 captury-0.3.0_pre200706031.ebuild 3054
-RMD160 abb8b406ca39dee9450bd9c90c28fc6df816daa9 captury-0.3.0_pre200706031.ebuild 3054
-SHA256 8831e8f1499af6c10fa7e8b6fb617ed1f5cfbfdb595eafb746c57540dd17fa6c captury-0.3.0_pre200706031.ebuild 3054
+EBUILD captury-0.3.0_pre200706031.ebuild 3076 RMD160 8a768c567a7b2cde31837f4438a8caa8c99c5283 SHA1 7b2efb83c0025c2f5aa9e12dd328024393cbd135 SHA256 e31ada993f0b9952fd26bf341bfdc5ebd47b5629e62a5cbd34f52026f5a2c485
+MD5 7340750eac318b0cfde615145f17c3ea captury-0.3.0_pre200706031.ebuild 3076
+RMD160 8a768c567a7b2cde31837f4438a8caa8c99c5283 captury-0.3.0_pre200706031.ebuild 3076
+SHA256 e31ada993f0b9952fd26bf341bfdc5ebd47b5629e62a5cbd34f52026f5a2c485 captury-0.3.0_pre200706031.ebuild 3076
 MISC ChangeLog 586 RMD160 a8024e4c0142e6b56d98cf5fb5e946052135f6c5 SHA1 a753d037c5868c197175cc6b01c1ebe2ed6b4ce8 SHA256 e5f8458736895b8ac4e73af8d0e6be680d0d29402f8c5b79a708be90dc66988d
 MD5 82e8768aaac7236ad912cee23faf0655 ChangeLog 586
 RMD160 a8024e4c0142e6b56d98cf5fb5e946052135f6c5 ChangeLog 586
 SHA256 e5f8458736895b8ac4e73af8d0e6be680d0d29402f8c5b79a708be90dc66988d ChangeLog 586
-MD5 e37e9c7c095af4db338e79e9c9a6bc38 files/digest-captury-0.1.0 241
-RMD160 1842b2fba083b0b32c4ddef69c79c2897072b9a6 files/digest-captury-0.1.0 241
-SHA256 62edd0067c4e5a75810ce6981e1c62934da049eb0f31f9dcc3e8911c9d852366 files/digest-captury-0.1.0 241
-MD5 724e464c9424dda6911e4a7631926988 files/digest-captury-0.2.0 244
-RMD160 e4925a196cd8106bb33d49c1fdba791ac513ea97 files/digest-captury-0.2.0 244
-SHA256 8858ec1f0653da2755927591309704392f7c76e9067deee44f47cd0dc47b40ef files/digest-captury-0.2.0 244
 MD5 1f1a3bd6711b2b55c547d8cc430e47bd files/digest-captury-0.3.0_pre200706031 286
 RMD160 55bc2ad6bbe5354fcb188c2bb0fa2d16ccd7068e files/digest-captury-0.3.0_pre200706031 286
 SHA256 98a25268eff43a13bed753f0aca90340c888b33b891b4311d0b7789e08d9c968 files/digest-captury-0.3.0_pre200706031 286
diff --git a/media-video/captury/captury-0.1.0.ebuild b/media-video/captury/captury-0.1.0.ebuild
deleted file mode 100644
index 9cb78c2..0000000
--- a/media-video/captury/captury-0.1.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib flag-o-matic eutils
-
-DESCRIPTION="Captury Tool - captures the screen from your OpenGL games."
-HOMEPAGE="http://battousai.mylair.de/projects/captury/"
-SRC_URI="http://battousai.mylair.de/dist/${PN}/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="media-libs/libcaptury
-		 x11-libs/libX11
-		 virtual/opengl"
-
-DEPEND="${RDEPEND}
-		|| ( dev-libs/elfutils
-			 dev-libs/libelf )
-		dev-util/pkgconfig"
-
-RESTRICT="multilib-pkg-force"
-
-S="${WORKDIR}/${P}/${PN}"
-
-pkg_setup() {
-	built_with_use --missing die app-emulation/emul-linux-x86-xlibs opengl
-}
-
-setup_env() {
-	myconf=""
-	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
-
-		# fixes missing #define in libGLcaptury.cpp
-		append-flags -DGLX_GLXEXT_PROTOTYPES
-
-		einfo "Building multilib ${PN} for ABIs: $(get_install_abis)"
-		OABI=${ABI}
-		for ABI in $DEFAULT_ABI $(get_install_abis); do
-			export ABI=${ABI}
-			src_compile
-		done
-		ABI=${OABI}
-		return
-	fi
-
-	cd ${S}
-
-	test -d abi-${ABI} && return
-
-	if [[ ! -f configure ]]; then
-		./autogen.sh || die "autogen.sh failed"
-	fi
-
-	mkdir abi-${ABI}
-	cd abi-${ABI}
-
-	einfo "Compiling for ABI ${ABI} ..."
-	einfo
-
-	setup_env
-
-	../configure ${myconf} \
-		--prefix="/usr" \
-		--host="${CHOST}" \
-		--sysconfdir="/etc" \
-		--libdir="/usr/$(get_libdir)" \
-		|| die "./configure for ABI ${ABI} failed"
-
-	einfo "MAKE LINE: emake ${makeopts}"
-	einfo
-	emake ${makeopts} || die "make for ABI ${ABI} failed"
-}
-
-src_install() {
-	for ABI in $(get_install_abis); do
-		cd "${S}/abi-${ABI}"
-		setup_env
-		einfo "make ${makeopts} install DESTDIR=\"${D}\""
-		make ${makeopts} install DESTDIR="${D}" || die "make install for ABI ${ABI} failed."
-	done
-
-	dodoc AUTHORS ChangeLog* NEWS README* TODO
-}
-
-# vim:ai:noet:ts=4:nowrap
diff --git a/media-video/captury/captury-0.2.0.ebuild b/media-video/captury/captury-0.2.0.ebuild
deleted file mode 100644
index da34a17..0000000
--- a/media-video/captury/captury-0.2.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib flag-o-matic eutils
-
-DESCRIPTION="Captury Tool - captures the screen from your OpenGL games."
-HOMEPAGE="http://battousai.mylair.de/projects/captury/"
-SRC_URI="http://battousai.mylair.de/dist/${PN}/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=media-libs/libcaptury-0.2.0
-		 x11-libs/libX11
-		 >=media-libs/libpng-1.2.14
-		 virtual/opengl"
-
-DEPEND="${RDEPEND}
-		|| ( dev-libs/elfutils
-			 dev-libs/libelf )
-		dev-util/pkgconfig"
-
-RESTRICT="multilib-pkg-force"
-
-pkg_setup() {
-	built_with_use --missing die app-emulation/emul-linux-x86-xlibs opengl
-}
-
-setup_env() {
-	myconf=""
-	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
-
-		# fixes missing #define in libGLcaptury.cpp
-		append-flags -DGLX_GLXEXT_PROTOTYPES
-
-		einfo "Building multilib ${PN} for ABIs: $(get_install_abis)"
-		OABI=${ABI}
-		for ABI in $DEFAULT_ABI $(get_install_abis); do
-			export ABI=${ABI}
-			src_compile
-		done
-		ABI=${OABI}
-		return
-	fi
-
-	cd ${S}
-
-	test -d abi-${ABI} && return
-
-	if [[ ! -f configure ]]; then
-		./autogen.sh || die "autogen.sh failed"
-	fi
-
-	mkdir abi-${ABI}
-	cd abi-${ABI}
-
-	einfo "Compiling for ABI ${ABI} ..."
-	einfo
-
-	setup_env
-
-	../configure ${myconf} \
-		--prefix="/usr" \
-		--host="${CHOST}" \
-		--sysconfdir="/etc" \
-		--libdir="/usr/$(get_libdir)" \
-		|| die "./configure for ABI ${ABI} failed"
-
-	einfo "MAKE LINE: emake ${makeopts}"
-	einfo
-	emake ${makeopts} || die "make for ABI ${ABI} failed"
-}
-
-src_install() {
-	for ABI in $(get_install_abis); do
-		cd "${S}/abi-${ABI}"
-		setup_env
-		einfo "make ${makeopts} install DESTDIR=\"${D}\""
-		make ${makeopts} install DESTDIR="${D}" || die "make install for ABI ${ABI} failed."
-	done
-
-	cd ${S}
-
-	dodoc AUTHORS ChangeLog* NEWS README* TODO
-}
-
-# vim:ai:noet:ts=4:nowrap
diff --git a/media-video/captury/captury-0.3.0_pre200706031.ebuild b/media-video/captury/captury-0.3.0_pre200706031.ebuild
index e0c5506..666e17d 100644
--- a/media-video/captury/captury-0.3.0_pre200706031.ebuild
+++ b/media-video/captury/captury-0.3.0_pre200706031.ebuild
@@ -14,6 +14,7 @@ IUSE="debug"
 
 RDEPEND=">=media-libs/libcaptury-0.3.0_pre200706031
 		 x11-libs/libX11
+		 amd64? ( app-emulation/linux-x86-xlibs )
 		 >=media-libs/libpng-1.2.14
 		 virtual/opengl"
 
@@ -27,7 +28,7 @@ RESTRICT="multilib-pkg-force"
 S="${WORKDIR}/captury-${PV}/${PN}"
 
 pkg_setup() {
-	built_with_use --missing die app-emulation/emul-linux-x86-xlibs opengl
+	useq has_multilib_profile && built_with_use --missing die app-emulation/emul-linux-x86-xlibs opengl
 }
 
 setup_env() {
@@ -81,6 +82,8 @@ src_compile() {
 
 	cd ${S}
 
+	ABI=${ABI:-default}
+
 	test -d abi-${ABI} && return
 
 	if [[ ! -f configure ]]; then
diff --git a/media-video/captury/files/digest-captury-0.1.0 b/media-video/captury/files/digest-captury-0.1.0
deleted file mode 100644
index dfd0431..0000000
--- a/media-video/captury/files/digest-captury-0.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1abccc753fc1d68790a6cfe9c5af94fa captury-0.1.0.tar.bz2 34881
-RMD160 ee105288e16cd2dc120adfc533f21d01f9e68528 captury-0.1.0.tar.bz2 34881
-SHA256 74dfb36d8275e1c5e1a893b33a2bdd24080887d8441fd80aa1d450342ff1d9a9 captury-0.1.0.tar.bz2 34881
diff --git a/media-video/captury/files/digest-captury-0.2.0 b/media-video/captury/files/digest-captury-0.2.0
deleted file mode 100644
index 51f4508..0000000
--- a/media-video/captury/files/digest-captury-0.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 53416c138203f8d9e81d17e9a0aa4585 captury-0.2.0.tar.bz2 442433
-RMD160 b71d264c2781be6a6a88d30aaaf790f98bc5d1ca captury-0.2.0.tar.bz2 442433
-SHA256 2b93596c60902a8d87896df2bccfa3d2fafce4ed074e36f71115615354a84373 captury-0.2.0.tar.bz2 442433