* cleaned out old versions

 * fix non-multilib build (x86)

svn path=/overlay/; revision=56

8 files changed, 6 insertions, 302 deletions

diff --git a/media-libs/libcaptury/Manifest b/media-libs/libcaptury/Manifest
index 8bd64d3..ff2a9aa 100644
--- a/media-libs/libcaptury/Manifest
+++ b/media-libs/libcaptury/Manifest
@@ -1,36 +1,12 @@
-DIST captury-0.1.0.tar.bz2 34881 RMD160 ee105288e16cd2dc120adfc533f21d01f9e68528 SHA1 1a0ecc20ee557f25584c0f8799581aa7263ed466 SHA256 74dfb36d8275e1c5e1a893b33a2bdd24080887d8441fd80aa1d450342ff1d9a9
 DIST captury-0.3.0_pre200706031.tar.bz2 1215736 RMD160 fedb5db4b560a3fcb225a204f2b58f95c61c393c SHA1 ccd84184b37fe4120c82034fbc3d1cff859d7cbf SHA256 51904c4b1183cf77809ff47bbe6b1cdcffabfdefc301ac838de89a0d4d799289
-DIST libcaptury-0.2.0.tar.bz2 448411 RMD160 341995d75292a2f99ef6d57e1f14e0b4b8def582 SHA1 696a831589e8d4f14456bda5bf29d5d272b1f68a SHA256 3c6ea05aa7836e43c4fa860aa977cffffdf083a7ddb8d61147dda5c5fb197284
-DIST libcaptury-0.3.0_pre200703071.tar.bz2 448656 RMD160 8d78cc815be38a44f4747b3855888faba7dc5d6a SHA1 307a62213c2410a7c21356440cdb70eda746a62c SHA256 0589abe1d5f254c1ad01a157792e8c4711222fa4aae5361f3f3aeb20026efea6
-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
-EBUILD libcaptury-0.2.0.ebuild 1878 RMD160 8bf5191e3f9167ac5524a0aee91446221a1f4000 SHA1 8ab5e3b33efffdd4ee2fa056c53b134c1e063921 SHA256 d5744a05f8fdc479d4cd93451c5fdda3e09334d36d0cced695ffe25d604caf57
-MD5 f099721596da523fbc7822c9ef87709e libcaptury-0.2.0.ebuild 1878
-RMD160 8bf5191e3f9167ac5524a0aee91446221a1f4000 libcaptury-0.2.0.ebuild 1878
-SHA256 d5744a05f8fdc479d4cd93451c5fdda3e09334d36d0cced695ffe25d604caf57 libcaptury-0.2.0.ebuild 1878
-EBUILD libcaptury-0.3.0_pre200703071.ebuild 1878 RMD160 8bf5191e3f9167ac5524a0aee91446221a1f4000 SHA1 8ab5e3b33efffdd4ee2fa056c53b134c1e063921 SHA256 d5744a05f8fdc479d4cd93451c5fdda3e09334d36d0cced695ffe25d604caf57
-MD5 f099721596da523fbc7822c9ef87709e libcaptury-0.3.0_pre200703071.ebuild 1878
-RMD160 8bf5191e3f9167ac5524a0aee91446221a1f4000 libcaptury-0.3.0_pre200703071.ebuild 1878
-SHA256 d5744a05f8fdc479d4cd93451c5fdda3e09334d36d0cced695ffe25d604caf57 libcaptury-0.3.0_pre200703071.ebuild 1878
-EBUILD libcaptury-0.3.0_pre200706031.ebuild 1916 RMD160 499c954dbb047c7f2b4014fd17e4b45e4cf8fcba SHA1 e7999c33b1b9dd0a1d09d678a957b8dd7bc1af06 SHA256 7c8cc1f7b6dda105092ce32da698cef531e6399a02b2d8e8c3d26d40c565ef4d
-MD5 b9bc2344cc4d13066092dc41bbbf3abb libcaptury-0.3.0_pre200706031.ebuild 1916
-RMD160 499c954dbb047c7f2b4014fd17e4b45e4cf8fcba libcaptury-0.3.0_pre200706031.ebuild 1916
-SHA256 7c8cc1f7b6dda105092ce32da698cef531e6399a02b2d8e8c3d26d40c565ef4d libcaptury-0.3.0_pre200706031.ebuild 1916
+EBUILD libcaptury-0.3.0_pre200706031.ebuild 1938 RMD160 bdc4f40df6961963641542124d4f58f30f16bb69 SHA1 f4c66202151da21c49b043bf6f4293f39100c5bb SHA256 b7e604117fec08e5ec5cd4f29082b4993ce55437333e6d9ca320401006511e9d
+MD5 5dcc1b923386a17a022730cffbedb107 libcaptury-0.3.0_pre200706031.ebuild 1938
+RMD160 bdc4f40df6961963641542124d4f58f30f16bb69 libcaptury-0.3.0_pre200706031.ebuild 1938
+SHA256 b7e604117fec08e5ec5cd4f29082b4993ce55437333e6d9ca320401006511e9d libcaptury-0.3.0_pre200706031.ebuild 1938
 MISC ChangeLog 599 RMD160 2e941d76d9fd76db17b570413d525522a8066953 SHA1 a76984da751431ff677cba1163bbaed24c9158fc SHA256 f4ffd28f8dd3e5dc7dee667f8ff8c89454a04bf58b56674a80230ce0d7bc2645
 MD5 66732a0f1882a15d73832bdb279ae7cb ChangeLog 599
 RMD160 2e941d76d9fd76db17b570413d525522a8066953 ChangeLog 599
 SHA256 f4ffd28f8dd3e5dc7dee667f8ff8c89454a04bf58b56674a80230ce0d7bc2645 ChangeLog 599
-MD5 e37e9c7c095af4db338e79e9c9a6bc38 files/digest-libcaptury-0.1.0 241
-RMD160 1842b2fba083b0b32c4ddef69c79c2897072b9a6 files/digest-libcaptury-0.1.0 241
-SHA256 62edd0067c4e5a75810ce6981e1c62934da049eb0f31f9dcc3e8911c9d852366 files/digest-libcaptury-0.1.0 241
-MD5 9a8374e59462c7070f04db11e2934bfd files/digest-libcaptury-0.2.0 253
-RMD160 b3cf35608ae371afce5bef31f9e81f77fb9e5850 files/digest-libcaptury-0.2.0 253
-SHA256 6ca52c04ca738f6d4d69d7e7dbd8878ced9dbaf5abfcc106aa8a798a15fcd3b5 files/digest-libcaptury-0.2.0 253
-MD5 cfc2ee654ac8324a4d84b56860f9fbd7 files/digest-libcaptury-0.3.0_pre200703071 292
-RMD160 bb74877e61c1d9bb900330d76ac0e663f348e780 files/digest-libcaptury-0.3.0_pre200703071 292
-SHA256 73edba481501e15134cd3e3e0d9554f56faa191f0181dda997480bfd45160a47 files/digest-libcaptury-0.3.0_pre200703071 292
 MD5 1f1a3bd6711b2b55c547d8cc430e47bd files/digest-libcaptury-0.3.0_pre200706031 286
 RMD160 55bc2ad6bbe5354fcb188c2bb0fa2d16ccd7068e files/digest-libcaptury-0.3.0_pre200706031 286
 SHA256 98a25268eff43a13bed753f0aca90340c888b33b891b4311d0b7789e08d9c968 files/digest-libcaptury-0.3.0_pre200706031 286
diff --git a/media-libs/libcaptury/files/digest-libcaptury-0.1.0 b/media-libs/libcaptury/files/digest-libcaptury-0.1.0
deleted file mode 100644
index dfd0431..0000000
--- a/media-libs/libcaptury/files/digest-libcaptury-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-libs/libcaptury/files/digest-libcaptury-0.2.0 b/media-libs/libcaptury/files/digest-libcaptury-0.2.0
deleted file mode 100644
index 29438f2..0000000
--- a/media-libs/libcaptury/files/digest-libcaptury-0.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 77c832426d6de69c0640a58fe4ee3de1 libcaptury-0.2.0.tar.bz2 448411
-RMD160 341995d75292a2f99ef6d57e1f14e0b4b8def582 libcaptury-0.2.0.tar.bz2 448411
-SHA256 3c6ea05aa7836e43c4fa860aa977cffffdf083a7ddb8d61147dda5c5fb197284 libcaptury-0.2.0.tar.bz2 448411
diff --git a/media-libs/libcaptury/files/digest-libcaptury-0.3.0_pre200703071 b/media-libs/libcaptury/files/digest-libcaptury-0.3.0_pre200703071
deleted file mode 100644
index f4f1cef..0000000
--- a/media-libs/libcaptury/files/digest-libcaptury-0.3.0_pre200703071
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9cbb9461adb970c9f9bda9e4b36d8edc libcaptury-0.3.0_pre200703071.tar.bz2 448656
-RMD160 8d78cc815be38a44f4747b3855888faba7dc5d6a libcaptury-0.3.0_pre200703071.tar.bz2 448656
-SHA256 0589abe1d5f254c1ad01a157792e8c4711222fa4aae5361f3f3aeb20026efea6 libcaptury-0.3.0_pre200703071.tar.bz2 448656
diff --git a/media-libs/libcaptury/libcaptury-0.1.0.ebuild b/media-libs/libcaptury/libcaptury-0.1.0.ebuild
deleted file mode 100644
index 79c0225..0000000
--- a/media-libs/libcaptury/libcaptury-0.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib flag-o-matic
-
-DESCRIPTION="Captury Framework Library"
-HOMEPAGE="http://battousai.mylair.de/projects/captury/"
-SRC_URI="http://battousai.mylair.de/dist/captury/captury-${PV}.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="media-libs/xvid
-		 x11-libs/libX11
-		 virtual/opengl
-		 amd64? (
-		 	app-emulation/emul-linux-x86-xlibs
-		 	app-emulation/emul-linux-x86-medialibs
-		 )" # enforce old emul pkgs. for testing only!
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-RESTRICT="multilib-pkg-force"
-
-S="${WORKDIR}/captury-${PV}/${PN}"
-
-setup_env() {
-	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 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
-			export ABI=${ABI}
-			src_compile
-		done
-		ABI=${OABI}
-		return
-	fi
-
-	cd ${S}
-
-	if [[ ! -f configure ]]; then
-		./autogen.sh || die "autogen.sh failed"
-	fi
-
-	setup_env
-
-	mkdir abi-${ABI}
-	cd abi-${ABI}
-
-	../configure \
-		--prefix="/usr" \
-		--host="$(get_abi_CHOST ${ABI})" \
-		--libdir="/usr/$(get_libdir)" \
-		|| die "./configure for ABI ${ABI} failed"
-
-	emake || die "make for ABI ${ABI} failed"
-}
-
-src_install() {
-	for ABI in $(get_install_abis); do
-		make -C abi-${ABI} 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-libs/libcaptury/libcaptury-0.2.0.ebuild b/media-libs/libcaptury/libcaptury-0.2.0.ebuild
deleted file mode 100644
index af98333..0000000
--- a/media-libs/libcaptury/libcaptury-0.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib flag-o-matic
-
-DESCRIPTION="Captury Framework Library"
-HOMEPAGE="http://battousai.mylair.de/projects/captury/"
-SRC_URI="http://battousai.mylair.de/dist/libcaptury/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=media-libs/capseo-0.2.0
-		 x11-libs/libX11
-		 x11-libs/libXfixes
-		 virtual/opengl
-		 amd64? (
-		 	app-emulation/emul-linux-x86-xlibs
-		 	app-emulation/emul-linux-x86-medialibs
-		 )"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-RESTRICT="multilib-pkg-force"
-
-setup_env() {
-	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 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
-			export ABI=${ABI}
-			src_compile
-		done
-		ABI=${OABI}
-		return
-	fi
-
-	cd ${S}
-
-	if [[ ! -f configure ]]; then
-		./autogen.sh || die "autogen.sh failed"
-	fi
-
-	setup_env
-
-	mkdir abi-${ABI}
-	cd abi-${ABI}
-
-	../configure \
-		--prefix="/usr" \
-		--host="$(get_abi_CHOST ${ABI})" \
-		--libdir="/usr/$(get_libdir)" \
-		|| die "./configure for ABI ${ABI} failed"
-
-	emake || die "make for ABI ${ABI} failed"
-}
-
-src_install() {
-	for ABI in $(get_install_abis); do
-		make -C abi-${ABI} 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-libs/libcaptury/libcaptury-0.3.0_pre200703071.ebuild b/media-libs/libcaptury/libcaptury-0.3.0_pre200703071.ebuild
deleted file mode 100644
index af98333..0000000
--- a/media-libs/libcaptury/libcaptury-0.3.0_pre200703071.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib flag-o-matic
-
-DESCRIPTION="Captury Framework Library"
-HOMEPAGE="http://battousai.mylair.de/projects/captury/"
-SRC_URI="http://battousai.mylair.de/dist/libcaptury/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=media-libs/capseo-0.2.0
-		 x11-libs/libX11
-		 x11-libs/libXfixes
-		 virtual/opengl
-		 amd64? (
-		 	app-emulation/emul-linux-x86-xlibs
-		 	app-emulation/emul-linux-x86-medialibs
-		 )"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-RESTRICT="multilib-pkg-force"
-
-setup_env() {
-	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 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
-			export ABI=${ABI}
-			src_compile
-		done
-		ABI=${OABI}
-		return
-	fi
-
-	cd ${S}
-
-	if [[ ! -f configure ]]; then
-		./autogen.sh || die "autogen.sh failed"
-	fi
-
-	setup_env
-
-	mkdir abi-${ABI}
-	cd abi-${ABI}
-
-	../configure \
-		--prefix="/usr" \
-		--host="$(get_abi_CHOST ${ABI})" \
-		--libdir="/usr/$(get_libdir)" \
-		|| die "./configure for ABI ${ABI} failed"
-
-	emake || die "make for ABI ${ABI} failed"
-}
-
-src_install() {
-	for ABI in $(get_install_abis); do
-		make -C abi-${ABI} 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-libs/libcaptury/libcaptury-0.3.0_pre200706031.ebuild b/media-libs/libcaptury/libcaptury-0.3.0_pre200706031.ebuild
index d8582d1..3d8a630 100644
--- a/media-libs/libcaptury/libcaptury-0.3.0_pre200706031.ebuild
+++ b/media-libs/libcaptury/libcaptury-0.3.0_pre200706031.ebuild
@@ -65,6 +65,8 @@ src_compile() {
 		./autogen.sh || die "autogen.sh failed"
 	fi
 
+	ABI=${ABI:-default}
+
 	setup_env
 
 	mkdir abi-${ABI}