snapshot update and cleaned up some older ebuilds

svn path=/overlay/; revision=51

25 files changed, 60 insertions, 608 deletions

diff --git a/media-libs/capseo/ChangeLog b/media-libs/capseo/ChangeLog
index 30662c2..c18c43d 100644
--- a/media-libs/capseo/ChangeLog
+++ b/media-libs/capseo/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jun 2007; Christian Parpart <trapni@gentoo.org> ChangeLog:
+  snapshot bump
+
   07 Mar 2007; <trapni@gentoo.org> ChangeLog:
   snapshot bump
 
diff --git a/media-libs/capseo/Manifest b/media-libs/capseo/Manifest
index bcf669b..c62f14f 100644
--- a/media-libs/capseo/Manifest
+++ b/media-libs/capseo/Manifest
@@ -1,8 +1,7 @@
 DIST capseo-0.1.0.tar.bz2 449046 RMD160 ac2216e6084cbbdbff5595d1cb2406ba9e33211a SHA1 66d303173399f171e2caa7f225ad825480d28e2c SHA256 af10a8f5738dc887da88f698b4016d6be6c37b1bfd184282c5ca055fc5501103
 DIST capseo-0.2.0.tar.bz2 349375 RMD160 1b3a3001dd2672ca0942c9eaf1fb69b081cb6827 SHA1 1f008fc70533ba5659a08eec7374a8bbe473fee1 SHA256 0630a6a74f822e58b7ad741fd46bd31aeeb0714e6078c0ebda3dc8185790d4f2
-DIST capseo-0.2.0_pre200702211.tar.bz2 457145 RMD160 a498ad663140c86ecb593e5dca09b8d6e5d7708e SHA1 53334f94792321d19d9e16c9e7754f6fef658c2e SHA256 a74743efcffee1f7c258c73495d9cbf835ae67b38bc07e8801eebb30ecb7397d
-DIST capseo-0.2.0_pre200702241.tar.bz2 348964 RMD160 abeaf273d609ce1ad31f108fbf5eb2254a9adf5d SHA1 364db2a3ada87724f6bd08f17c9bc0e77a70d409 SHA256 77599762eca6cdafc35c0a16b3249479eb8819821c344acc2c348a54493f3488
 DIST capseo-0.3.0_pre200703071.tar.bz2 349608 RMD160 638812bf1aef16888d313b7a167389a9aad904a0 SHA1 df844d1c366830bf7f4032e988645b95b9658ff2 SHA256 be3bc618a30f8021847a26c4e459fbf399bd0ebe6dc7d6e530c879d16ab94bbb
+DIST captury-0.3.0_pre200706031.tar.bz2 1215736 RMD160 fedb5db4b560a3fcb225a204f2b58f95c61c393c SHA1 ccd84184b37fe4120c82034fbc3d1cff859d7cbf SHA256 51904c4b1183cf77809ff47bbe6b1cdcffabfdefc301ac838de89a0d4d799289
 EBUILD capseo-0.1.0.ebuild 1816 RMD160 50e41d03fbafaf2af59556c25c9091cf0e3db348 SHA1 5572becbe917367c3fe07f96b6481e0ca809ca07 SHA256 aae0e6f1d8204f015e8e94435db2536592017fcd936cde3b6d18292ad1e20d15
 MD5 e7a9483e2944536a1c87bb21a2189bff capseo-0.1.0.ebuild 1816
 RMD160 50e41d03fbafaf2af59556c25c9091cf0e3db348 capseo-0.1.0.ebuild 1816
@@ -11,18 +10,14 @@ EBUILD capseo-0.2.0.ebuild 2075 RMD160 96a3071802cdb064d8b686e182d6afdf37070503
 MD5 75afbc9a3448ab613ce2647c546900b8 capseo-0.2.0.ebuild 2075
 RMD160 96a3071802cdb064d8b686e182d6afdf37070503 capseo-0.2.0.ebuild 2075
 SHA256 0b5bf15da25e95fdaa96d8eb34a993c05da0aa1daf39f3c670a481daa95b7ca2 capseo-0.2.0.ebuild 2075
-EBUILD capseo-0.2.0_pre200702211.ebuild 2062 RMD160 6c7282a2559c61279928e024281a7b5c11c36215 SHA1 a9c262bc0f5766889b944cc97b89291a4c9e4476 SHA256 ed4c921fe0b81454646ad2f812991e3106834446982b36e955177c44d0dc8b2e
-MD5 72508fd5ed26576504ceff0a33339cdd capseo-0.2.0_pre200702211.ebuild 2062
-RMD160 6c7282a2559c61279928e024281a7b5c11c36215 capseo-0.2.0_pre200702211.ebuild 2062
-SHA256 ed4c921fe0b81454646ad2f812991e3106834446982b36e955177c44d0dc8b2e capseo-0.2.0_pre200702211.ebuild 2062
-EBUILD capseo-0.2.0_pre200702241.ebuild 2062 RMD160 6c7282a2559c61279928e024281a7b5c11c36215 SHA1 a9c262bc0f5766889b944cc97b89291a4c9e4476 SHA256 ed4c921fe0b81454646ad2f812991e3106834446982b36e955177c44d0dc8b2e
-MD5 72508fd5ed26576504ceff0a33339cdd capseo-0.2.0_pre200702241.ebuild 2062
-RMD160 6c7282a2559c61279928e024281a7b5c11c36215 capseo-0.2.0_pre200702241.ebuild 2062
-SHA256 ed4c921fe0b81454646ad2f812991e3106834446982b36e955177c44d0dc8b2e capseo-0.2.0_pre200702241.ebuild 2062
 EBUILD capseo-0.3.0_pre200703071.ebuild 2075 RMD160 96a3071802cdb064d8b686e182d6afdf37070503 SHA1 a6bd11cc069af16253603527ad898cd8a8b2ab5a SHA256 0b5bf15da25e95fdaa96d8eb34a993c05da0aa1daf39f3c670a481daa95b7ca2
 MD5 75afbc9a3448ab613ce2647c546900b8 capseo-0.3.0_pre200703071.ebuild 2075
 RMD160 96a3071802cdb064d8b686e182d6afdf37070503 capseo-0.3.0_pre200703071.ebuild 2075
 SHA256 0b5bf15da25e95fdaa96d8eb34a993c05da0aa1daf39f3c670a481daa95b7ca2 capseo-0.3.0_pre200703071.ebuild 2075
+EBUILD capseo-0.3.0_pre200706031.ebuild 2101 RMD160 a16357ede7a579afb14b765d5d0fe52c9456b202 SHA1 d8674b67237f4917b73c2a6b6d933997f20aba19 SHA256 aeb9b14308e1451e3a61d72b03c4c0471451a4b74f03c0a0bb00fb98079d59ff
+MD5 889dd27aa96f5bd9fb64c912f8dad7b5 capseo-0.3.0_pre200706031.ebuild 2101
+RMD160 a16357ede7a579afb14b765d5d0fe52c9456b202 capseo-0.3.0_pre200706031.ebuild 2101
+SHA256 aeb9b14308e1451e3a61d72b03c4c0471451a4b74f03c0a0bb00fb98079d59ff capseo-0.3.0_pre200706031.ebuild 2101
 MISC ChangeLog 736 RMD160 c5cbdf04ddf71d1f7fb801a4c264477ade526c72 SHA1 4a1bb1e55d8c60c9ea3cdcbe25c7c086d9ce295a SHA256 16e4e933dcac8d4a9a17c8d84b0f497afdc49ffee84b3066c8ce9e65f14c37b7
 MD5 78f9429560dcdfb4c00f8047c1141ccd ChangeLog 736
 RMD160 c5cbdf04ddf71d1f7fb801a4c264477ade526c72 ChangeLog 736
@@ -33,12 +28,9 @@ SHA256 fdb8c0c811ac20231eee7c2743c2f30f89b07e25a0d66164749273ffe255acaf files/di
 MD5 9fd5562b1344fb4e0c450bf127b96a01 files/digest-capseo-0.2.0 241
 RMD160 6b9da3dffc338da43d6e72d96eff291adc1df465 files/digest-capseo-0.2.0 241
 SHA256 c4c00a66eee8650b2541058595c5c8b9ff49a9968d9e6035a32a504f70188099 files/digest-capseo-0.2.0 241
-MD5 b6b6701c9463119e13afb601e127bd44 files/digest-capseo-0.2.0_pre200702211 280
-RMD160 b956ae67d3a9c603a79961940cd5851a24e3319f files/digest-capseo-0.2.0_pre200702211 280
-SHA256 7117752530124c71b4260a7894856725773749dfec5d4783541acee92f850924 files/digest-capseo-0.2.0_pre200702211 280
-MD5 662449642b712f909f135f972815a60e files/digest-capseo-0.2.0_pre200702241 280
-RMD160 350530cc4e121636358ee6bd800d218f5c6e83e8 files/digest-capseo-0.2.0_pre200702241 280
-SHA256 b9f3cb74da79ceb08b6edb1a8bc6b45f4b9a22ce9e6b60af75b2ef3768262e40 files/digest-capseo-0.2.0_pre200702241 280
 MD5 a4f0f45ceaea7d1e03e6cfd217632859 files/digest-capseo-0.3.0_pre200703071 280
 RMD160 903a03c07f616665d565720b4a0ec118cf1d12ed files/digest-capseo-0.3.0_pre200703071 280
 SHA256 587508f8a51d6a9ff5576eed5e3869c932ac22e92e94096cc901a6d44b16efce files/digest-capseo-0.3.0_pre200703071 280
+MD5 1f1a3bd6711b2b55c547d8cc430e47bd files/digest-capseo-0.3.0_pre200706031 286
+RMD160 55bc2ad6bbe5354fcb188c2bb0fa2d16ccd7068e files/digest-capseo-0.3.0_pre200706031 286
+SHA256 98a25268eff43a13bed753f0aca90340c888b33b891b4311d0b7789e08d9c968 files/digest-capseo-0.3.0_pre200706031 286
diff --git a/media-libs/capseo/capseo-0.2.0_pre200702241.ebuild b/media-libs/capseo/capseo-0.2.0_pre200702241.ebuild
deleted file mode 100644
index 7f80a74..0000000
--- a/media-libs/capseo/capseo-0.2.0_pre200702241.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib
-
-DESCRIPTION="Capseo Video Codec Library"
-HOMEPAGE="http://battousai.mylair.de/projects/captury/wiki/CapseoCodec"
-SRC_URI="http://battousai.mylair.de/dist/capseo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug theora"
-
-RDEPEND=">=media-libs/libtheora-1.0_alpha6-r1"
-
-DEPEND="${RDEPEND}
-		>=dev-lang/yasm-0.4.0
-		dev-util/pkgconfig"
-
-RESTRICT="multilib-pkg-force"
-
-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
-
-	mkdir abi-${ABI}
-	cd abi-${ABI}
-
-	local myconf=
-	case ${ABI} in
-		amd64|x86)
-			myconf="${myconf} --with-accel=${ABI}"
-			;;
-	esac
-	myconf="${myconf} $(use_enable theora)"
-
-	../configure ${myconf} \
-		--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
-
-	rm "${D}/usr/bin/cpsplay" # currently unsupported
-
-	dodoc AUTHORS ChangeLog* NEWS README* TODO
-}
-
-pkg_postinst() {
-	einfo "Use the following command to re-encode your screen captures to a"
-	einfo "file format current media players do understand:"
-	einfo
-	einfo "    cpsrecode -i capture.cps -o - | mencoder - -o capture.avi \\"
-	einfo "              -ovc lavc -lavcopts vcodec=xvid:autoaspect=1"
-	einfo
-	einfo "or if use-flag theora enabled, create your ogg/theora file inplace:"
-	einfo
-	einfo "    cpsrecode -i capture.cps -o capture.ogg -c theora"
-	echo
-}
-
-# vim:ai:noet:ts=4:nowrap
diff --git a/media-libs/capseo/capseo-0.2.0_pre200702211.ebuild b/media-libs/capseo/capseo-0.3.0_pre200706031.ebuild
index 7f80a74..1f561f5 100644
--- a/media-libs/capseo/capseo-0.2.0_pre200702211.ebuild
+++ b/media-libs/capseo/capseo-0.3.0_pre200706031.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit multilib
+inherit flag-o-matic multilib
 
 DESCRIPTION="Capseo Video Codec Library"
-HOMEPAGE="http://battousai.mylair.de/projects/captury/wiki/CapseoCodec"
-SRC_URI="http://battousai.mylair.de/dist/capseo/${P}.tar.bz2"
+HOMEPAGE="http://rm-rf.in/captury/wiki/CapseoCodec"
+SRC_URI="http://upstream.rm-rf.in/captury/captury-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 
 RESTRICT="multilib-pkg-force"
 
+S="${WORKDIR}/captury-${PV}/${PN}"
+
 src_compile() {
 	if [[ -z ${OABI} ]] && has_multilib_profile; then
 		use debug && append-flags -O0 -g3
@@ -35,7 +37,7 @@ src_compile() {
 		return
 	fi
 
-	cd ${S}
+	cd ${S} || die
 
 	if [[ ! -f configure ]]; then
 		./autogen.sh || die "autogen.sh failed"
diff --git a/media-libs/capseo/files/digest-capseo-0.2.0_pre200702211 b/media-libs/capseo/files/digest-capseo-0.2.0_pre200702211
deleted file mode 100644
index b55d354..0000000
--- a/media-libs/capseo/files/digest-capseo-0.2.0_pre200702211
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fa54a1e4e79b840409fca5a8ef6d8571 capseo-0.2.0_pre200702211.tar.bz2 457145
-RMD160 a498ad663140c86ecb593e5dca09b8d6e5d7708e capseo-0.2.0_pre200702211.tar.bz2 457145
-SHA256 a74743efcffee1f7c258c73495d9cbf835ae67b38bc07e8801eebb30ecb7397d capseo-0.2.0_pre200702211.tar.bz2 457145
diff --git a/media-libs/capseo/files/digest-capseo-0.2.0_pre200702241 b/media-libs/capseo/files/digest-capseo-0.2.0_pre200702241
deleted file mode 100644
index b4cc0d4..0000000
--- a/media-libs/capseo/files/digest-capseo-0.2.0_pre200702241
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2f65d1ad5641319763b2f85d533a4578 capseo-0.2.0_pre200702241.tar.bz2 348964
-RMD160 abeaf273d609ce1ad31f108fbf5eb2254a9adf5d capseo-0.2.0_pre200702241.tar.bz2 348964
-SHA256 77599762eca6cdafc35c0a16b3249479eb8819821c344acc2c348a54493f3488 capseo-0.2.0_pre200702241.tar.bz2 348964
diff --git a/media-libs/capseo/files/digest-capseo-0.3.0_pre200706031 b/media-libs/capseo/files/digest-capseo-0.3.0_pre200706031
new file mode 100644
index 0000000..ebc7613
--- /dev/null
+++ b/media-libs/capseo/files/digest-capseo-0.3.0_pre200706031
@@ -0,0 +1,3 @@
+MD5 ddeebbde3acfe728dd98d100d5423340 captury-0.3.0_pre200706031.tar.bz2 1215736
+RMD160 fedb5db4b560a3fcb225a204f2b58f95c61c393c captury-0.3.0_pre200706031.tar.bz2 1215736
+SHA256 51904c4b1183cf77809ff47bbe6b1cdcffabfdefc301ac838de89a0d4d799289 captury-0.3.0_pre200706031.tar.bz2 1215736
diff --git a/media-libs/libcaptury/ChangeLog b/media-libs/libcaptury/ChangeLog
index 89c1ad0..5c848dd 100644
--- a/media-libs/libcaptury/ChangeLog
+++ b/media-libs/libcaptury/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jun 2007; Christian Parpart <trapni@gentoo.org> ChangeLog:
+  snapshot bump
+
   07 Mar 2007; <trapni@gentoo.org> ChangeLog:
   snapshot bump
 
diff --git a/media-libs/libcaptury/Manifest b/media-libs/libcaptury/Manifest
index 773aa9c..e3de7e5 100644
--- a/media-libs/libcaptury/Manifest
+++ b/media-libs/libcaptury/Manifest
@@ -1,8 +1,6 @@
 DIST captury-0.1.0.tar.bz2 34881 RMD160 ee105288e16cd2dc120adfc533f21d01f9e68528 SHA1 1a0ecc20ee557f25584c0f8799581aa7263ed466 SHA256 74dfb36d8275e1c5e1a893b33a2bdd24080887d8441fd80aa1d450342ff1d9a9
-DIST captury-0.2.0_pre200702201.tar.bz2 32418 RMD160 23040d7f96ebfccb747951b4c4d0e8b9759d7865 SHA1 27ad510e6e9f1c6cdb22e822acdc4e801431aed0 SHA256 45e46f7cec58eebb8fc4be9330bbda98297dac3eb93a2737c01f2433278cce63
-DIST captury-0.2.0_pre200702211.tar.bz2 32288 RMD160 876c42b3c7204be8cf089391e1b4d6d6800b1dd5 SHA1 9cc5dde6d0348733205c7fac22cafe9905e02022 SHA256 6802af166d3defcd92fdffe95fb809bf68996c7cd075d4431df87c74c307bcb9
+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.2.0_pre200702241.tar.bz2 448541 RMD160 870f4aa2934109f107595d0a218aafd54522b7b8 SHA1 f9d5defe6182152b6a051d942ca4c64edfffd5d4 SHA256 2440bc8c23f99aedefeba0d24e23d8247834c7212f36111d8ef8145f5b5a56f7
 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
@@ -12,22 +10,14 @@ EBUILD libcaptury-0.2.0.ebuild 1878 RMD160 8bf5191e3f9167ac5524a0aee91446221a1f4
 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.2.0_pre200702201.ebuild 1890 RMD160 7d8ff9734c84ccac22551b8e63756cb10067a588 SHA1 861e3ccfa738e01c8ff6553a7a618151f0763fcf SHA256 f804279b307967c12a4cc8617ef7c7540d66406650f90947a52108f00bf0abb4
-MD5 1a05188a213e50dd1f3ac1e23112bb79 libcaptury-0.2.0_pre200702201.ebuild 1890
-RMD160 7d8ff9734c84ccac22551b8e63756cb10067a588 libcaptury-0.2.0_pre200702201.ebuild 1890
-SHA256 f804279b307967c12a4cc8617ef7c7540d66406650f90947a52108f00bf0abb4 libcaptury-0.2.0_pre200702201.ebuild 1890
-EBUILD libcaptury-0.2.0_pre200702211.ebuild 1920 RMD160 8a9bef727d2aee251509cc3131111a02a442da5e SHA1 a8d6082358581eb3f0fcdb74e2cb2739b1406a45 SHA256 f8a21c0a35ccf877a35c095549d4a96586b5af7547d4ba9b07d88e698b68c94e
-MD5 09de3b1dd77b2b93bcf7bdd2cc1ed14a libcaptury-0.2.0_pre200702211.ebuild 1920
-RMD160 8a9bef727d2aee251509cc3131111a02a442da5e libcaptury-0.2.0_pre200702211.ebuild 1920
-SHA256 f8a21c0a35ccf877a35c095549d4a96586b5af7547d4ba9b07d88e698b68c94e libcaptury-0.2.0_pre200702211.ebuild 1920
-EBUILD libcaptury-0.2.0_pre200702241.ebuild 1878 RMD160 56d92b3fd7284bee402c9d31449de6b99bc95d32 SHA1 71dd7914d660b33e8256efa9fe3f6c0aa410e86c SHA256 de5d739b7e9d18b4fc69068088b59cc2e9420ff1366bdf988566a4c835facee1
-MD5 c3f5a74c405e4b54c98a456d14541bea libcaptury-0.2.0_pre200702241.ebuild 1878
-RMD160 56d92b3fd7284bee402c9d31449de6b99bc95d32 libcaptury-0.2.0_pre200702241.ebuild 1878
-SHA256 de5d739b7e9d18b4fc69068088b59cc2e9420ff1366bdf988566a4c835facee1 libcaptury-0.2.0_pre200702241.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
 MISC ChangeLog 518 RMD160 3964d558ceb92f77f84baab743a037c8df6ccfc3 SHA1 d7acafd9d7c4b0ba15d008497b0acde55166bad2 SHA256 0273977d8ac4b31e11183b716813d93620e056ad8fba90308af47cbcf9c78942
 MD5 14bc8b6b3398e3f6b850c524c1f9dab3 ChangeLog 518
 RMD160 3964d558ceb92f77f84baab743a037c8df6ccfc3 ChangeLog 518
@@ -38,15 +28,9 @@ SHA256 62edd0067c4e5a75810ce6981e1c62934da049eb0f31f9dcc3e8911c9d852366 files/di
 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 66fb37fefc7a75e3e18eaa62bc391d5e files/digest-libcaptury-0.2.0_pre200702201 280
-RMD160 ae520436c693b6a0b81621c9c04cbdbdb1710866 files/digest-libcaptury-0.2.0_pre200702201 280
-SHA256 1ef15ad7303bd16405813edaae70291ea19e41200240f2f9d1b5e41abac76425 files/digest-libcaptury-0.2.0_pre200702201 280
-MD5 31697df60ddcf9b9ed132068e6e7689e files/digest-libcaptury-0.2.0_pre200702211 280
-RMD160 2ee8cc2a98b88796299a8dd24d72ee8379e3a20b files/digest-libcaptury-0.2.0_pre200702211 280
-SHA256 a732dd23cd1af0192675b1a8fa88439d503d2b0614669443f5982c992563fb08 files/digest-libcaptury-0.2.0_pre200702211 280
-MD5 aff1332e6c53ec2b78673e9b299131c6 files/digest-libcaptury-0.2.0_pre200702241 292
-RMD160 483cb65181b2dab614463d61143fb5f793b888bd files/digest-libcaptury-0.2.0_pre200702241 292
-SHA256 b1803213a1465886e632fee3f5e4f6a0121ab71bf2087db91f759c06fbb2b183 files/digest-libcaptury-0.2.0_pre200702241 292
 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.2.0_pre200702201 b/media-libs/libcaptury/files/digest-libcaptury-0.2.0_pre200702201
deleted file mode 100644
index c6e4024..0000000
--- a/media-libs/libcaptury/files/digest-libcaptury-0.2.0_pre200702201
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a2090955160f73e6ec2c428b3878d32 captury-0.2.0_pre200702201.tar.bz2 32418
-RMD160 23040d7f96ebfccb747951b4c4d0e8b9759d7865 captury-0.2.0_pre200702201.tar.bz2 32418
-SHA256 45e46f7cec58eebb8fc4be9330bbda98297dac3eb93a2737c01f2433278cce63 captury-0.2.0_pre200702201.tar.bz2 32418
diff --git a/media-libs/libcaptury/files/digest-libcaptury-0.2.0_pre200702211 b/media-libs/libcaptury/files/digest-libcaptury-0.2.0_pre200702211
deleted file mode 100644
index a7736ac..0000000
--- a/media-libs/libcaptury/files/digest-libcaptury-0.2.0_pre200702211
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3e3d0444697d3bbdd59b1dec81ed2c7a captury-0.2.0_pre200702211.tar.bz2 32288
-RMD160 876c42b3c7204be8cf089391e1b4d6d6800b1dd5 captury-0.2.0_pre200702211.tar.bz2 32288
-SHA256 6802af166d3defcd92fdffe95fb809bf68996c7cd075d4431df87c74c307bcb9 captury-0.2.0_pre200702211.tar.bz2 32288
diff --git a/media-libs/libcaptury/files/digest-libcaptury-0.2.0_pre200702241 b/media-libs/libcaptury/files/digest-libcaptury-0.2.0_pre200702241
deleted file mode 100644
index 7c632bb..0000000
--- a/media-libs/libcaptury/files/digest-libcaptury-0.2.0_pre200702241
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed7516feff35c87d5b9987db16dedb6d libcaptury-0.2.0_pre200702241.tar.bz2 448541
-RMD160 870f4aa2934109f107595d0a218aafd54522b7b8 libcaptury-0.2.0_pre200702241.tar.bz2 448541
-SHA256 2440bc8c23f99aedefeba0d24e23d8247834c7212f36111d8ef8145f5b5a56f7 libcaptury-0.2.0_pre200702241.tar.bz2 448541
diff --git a/media-libs/libcaptury/files/digest-libcaptury-0.3.0_pre200706031 b/media-libs/libcaptury/files/digest-libcaptury-0.3.0_pre200706031
new file mode 100644
index 0000000..ebc7613
--- /dev/null
+++ b/media-libs/libcaptury/files/digest-libcaptury-0.3.0_pre200706031
@@ -0,0 +1,3 @@
+MD5 ddeebbde3acfe728dd98d100d5423340 captury-0.3.0_pre200706031.tar.bz2 1215736
+RMD160 fedb5db4b560a3fcb225a204f2b58f95c61c393c captury-0.3.0_pre200706031.tar.bz2 1215736
+SHA256 51904c4b1183cf77809ff47bbe6b1cdcffabfdefc301ac838de89a0d4d799289 captury-0.3.0_pre200706031.tar.bz2 1215736
diff --git a/media-libs/libcaptury/libcaptury-0.2.0_pre200702201.ebuild b/media-libs/libcaptury/libcaptury-0.2.0_pre200702201.ebuild
deleted file mode 100644
index 9e170ab..0000000
--- a/media-libs/libcaptury/libcaptury-0.2.0_pre200702201.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/capseo
-		 x11-libs/libX11
-		 virtual/opengl
-		 amd64? (
-		 	app-emulation/emul-linux-x86-xlibs
-		 	app-emulation/emul-linux-x86-medialibs
-		 )"
-
-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_pre200702241.ebuild b/media-libs/libcaptury/libcaptury-0.2.0_pre200702241.ebuild
deleted file mode 100644
index a8d1a66..0000000
--- a/media-libs/libcaptury/libcaptury-0.2.0_pre200702241.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-${PV}
-		 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.2.0_pre200702211.ebuild b/media-libs/libcaptury/libcaptury-0.3.0_pre200706031.ebuild
index 7571b12..d8582d1 100644
--- a/media-libs/libcaptury/libcaptury-0.2.0_pre200702211.ebuild
+++ b/media-libs/libcaptury/libcaptury-0.3.0_pre200706031.ebuild
@@ -5,14 +5,14 @@
 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"
+HOMEPAGE="http://rm-rf.in/projects/captury/"
+SRC_URI="http://upstream.rm-rf.in./captury/captury-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=media-libs/capseo-${PV}
+RDEPEND=">=media-libs/capseo-0.3.0_pre200706031
 		 x11-libs/libX11
 		 x11-libs/libXfixes
 		 virtual/opengl
diff --git a/media-video/captury/ChangeLog b/media-video/captury/ChangeLog
index 412205b..9a69c93 100644
--- a/media-video/captury/ChangeLog
+++ b/media-video/captury/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jun 2007; Christian Parpart <trapni@gentoo.org> ChangeLog:
+  snapshot bump
+
   06 Mar 2007; Christian Parpart <trapni@gentoo.org> ChangeLog:
   version bump
 
diff --git a/media-video/captury/Manifest b/media-video/captury/Manifest
index 3e22bae..86a87c1 100644
--- a/media-video/captury/Manifest
+++ b/media-video/captury/Manifest
@@ -1,8 +1,6 @@
 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.2.0_pre200702201.tar.bz2 32418 RMD160 23040d7f96ebfccb747951b4c4d0e8b9759d7865 SHA1 27ad510e6e9f1c6cdb22e822acdc4e801431aed0 SHA256 45e46f7cec58eebb8fc4be9330bbda98297dac3eb93a2737c01f2433278cce63
-DIST captury-0.2.0_pre200702211.tar.bz2 32288 RMD160 876c42b3c7204be8cf089391e1b4d6d6800b1dd5 SHA1 9cc5dde6d0348733205c7fac22cafe9905e02022 SHA256 6802af166d3defcd92fdffe95fb809bf68996c7cd075d4431df87c74c307bcb9
-DIST captury-0.2.0_pre200702251.tar.bz2 442392 RMD160 ef1e8c87caf71e2344f72f78b3a4c96d94b231cc SHA1 af5c6e708a7497a18aeeadb08fa1945721b51eed SHA256 8f38c12ca7ffc44e5184d104ecae067676be0c185479d8e3c6f6cb88175124e8
+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
@@ -11,34 +9,20 @@ EBUILD captury-0.2.0.ebuild 3021 RMD160 457bba1c50e9a502a7a69332046884a9cc30d6f6
 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.2.0_pre200702201.ebuild 3038 RMD160 ba7f41bf42781441c5ff46c02f44febd8189d727 SHA1 de38c5815273cbd075eaddb09ab779e94def684a SHA256 f6e7b83618e75da3019bf9452b81b3ee4eb7d0183952ce31c3606e8772eec3dd
-MD5 9fb796fb8bb15e17642d7084fe6b7c1e captury-0.2.0_pre200702201.ebuild 3038
-RMD160 ba7f41bf42781441c5ff46c02f44febd8189d727 captury-0.2.0_pre200702201.ebuild 3038
-SHA256 f6e7b83618e75da3019bf9452b81b3ee4eb7d0183952ce31c3606e8772eec3dd captury-0.2.0_pre200702201.ebuild 3038
-EBUILD captury-0.2.0_pre200702211.ebuild 3038 RMD160 ba7f41bf42781441c5ff46c02f44febd8189d727 SHA1 de38c5815273cbd075eaddb09ab779e94def684a SHA256 f6e7b83618e75da3019bf9452b81b3ee4eb7d0183952ce31c3606e8772eec3dd
-MD5 9fb796fb8bb15e17642d7084fe6b7c1e captury-0.2.0_pre200702211.ebuild 3038
-RMD160 ba7f41bf42781441c5ff46c02f44febd8189d727 captury-0.2.0_pre200702211.ebuild 3038
-SHA256 f6e7b83618e75da3019bf9452b81b3ee4eb7d0183952ce31c3606e8772eec3dd captury-0.2.0_pre200702211.ebuild 3038
-EBUILD captury-0.2.0_pre200702251.ebuild 3034 RMD160 d17994c4f954d2acc7b32ef6b858f91ce81e7fdd SHA1 06961c9236db60db29b4cbd1f4dc5cc62e80a77b SHA256 0dc552719b906142b0c6f507e7d371ac0477b6e3b855fb92b3d5794a7c321595
-MD5 b82474a912a26930e3c0fcff5cb84676 captury-0.2.0_pre200702251.ebuild 3034
-RMD160 d17994c4f954d2acc7b32ef6b858f91ce81e7fdd captury-0.2.0_pre200702251.ebuild 3034
-SHA256 0dc552719b906142b0c6f507e7d371ac0477b6e3b855fb92b3d5794a7c321595 captury-0.2.0_pre200702251.ebuild 3034
-MISC ChangeLog 505 RMD160 dbf62507050380e739b3bf5f0666f64fba8ec4c6 SHA1 e8412f6635042fe94b783379e69f6c5cba343d30 SHA256 1e7d57292889727c6a6e0a18f81c6e4647b3082c82830626ea306100a89ceb6c
-MD5 4d5ab598dedc870acaa0be8ab1bc493f ChangeLog 505
-RMD160 dbf62507050380e739b3bf5f0666f64fba8ec4c6 ChangeLog 505
-SHA256 1e7d57292889727c6a6e0a18f81c6e4647b3082c82830626ea306100a89ceb6c ChangeLog 505
+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
+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 66fb37fefc7a75e3e18eaa62bc391d5e files/digest-captury-0.2.0_pre200702201 280
-RMD160 ae520436c693b6a0b81621c9c04cbdbdb1710866 files/digest-captury-0.2.0_pre200702201 280
-SHA256 1ef15ad7303bd16405813edaae70291ea19e41200240f2f9d1b5e41abac76425 files/digest-captury-0.2.0_pre200702201 280
-MD5 31697df60ddcf9b9ed132068e6e7689e files/digest-captury-0.2.0_pre200702211 280
-RMD160 2ee8cc2a98b88796299a8dd24d72ee8379e3a20b files/digest-captury-0.2.0_pre200702211 280
-SHA256 a732dd23cd1af0192675b1a8fa88439d503d2b0614669443f5982c992563fb08 files/digest-captury-0.2.0_pre200702211 280
-MD5 d4267ed72a1d82f3a1071b064e4c77d4 files/digest-captury-0.2.0_pre200702251 283
-RMD160 dafe6d47668a6fcde341c06a9fa015267eec1f5c files/digest-captury-0.2.0_pre200702251 283
-SHA256 3e6191b55f9e84567c8dca82e48437d5678fc24c203d56de0bb0172ea9907da1 files/digest-captury-0.2.0_pre200702251 283
+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.2.0_pre200702201.ebuild b/media-video/captury/captury-0.2.0_pre200702201.ebuild
deleted file mode 100644
index b1ccad8..0000000
--- a/media-video/captury/captury-0.2.0_pre200702201.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-${PV}
-		 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"
-
-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_pre200702211.ebuild b/media-video/captury/captury-0.2.0_pre200702211.ebuild
deleted file mode 100644
index b1ccad8..0000000
--- a/media-video/captury/captury-0.2.0_pre200702211.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-${PV}
-		 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"
-
-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_pre200702251.ebuild b/media-video/captury/captury-0.3.0_pre200706031.ebuild
index 05f054e..e0c5506 100644
--- a/media-video/captury/captury-0.2.0_pre200702251.ebuild
+++ b/media-video/captury/captury-0.3.0_pre200706031.ebuild
@@ -5,14 +5,14 @@
 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"
+HOMEPAGE="http://rm-rf.in/captury/"
+SRC_URI="http://upstream.rm-rf.in/captury/captury-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=media-libs/libcaptury-0.2.0_pre200702241
+RDEPEND=">=media-libs/libcaptury-0.3.0_pre200706031
 		 x11-libs/libX11
 		 >=media-libs/libpng-1.2.14
 		 virtual/opengl"
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 
 RESTRICT="multilib-pkg-force"
 
+S="${WORKDIR}/captury-${PV}/${PN}"
+
 pkg_setup() {
 	built_with_use --missing die app-emulation/emul-linux-x86-xlibs opengl
 }
diff --git a/media-video/captury/files/digest-captury-0.2.0_pre200702201 b/media-video/captury/files/digest-captury-0.2.0_pre200702201
deleted file mode 100644
index c6e4024..0000000
--- a/media-video/captury/files/digest-captury-0.2.0_pre200702201
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a2090955160f73e6ec2c428b3878d32 captury-0.2.0_pre200702201.tar.bz2 32418
-RMD160 23040d7f96ebfccb747951b4c4d0e8b9759d7865 captury-0.2.0_pre200702201.tar.bz2 32418
-SHA256 45e46f7cec58eebb8fc4be9330bbda98297dac3eb93a2737c01f2433278cce63 captury-0.2.0_pre200702201.tar.bz2 32418
diff --git a/media-video/captury/files/digest-captury-0.2.0_pre200702211 b/media-video/captury/files/digest-captury-0.2.0_pre200702211
deleted file mode 100644
index a7736ac..0000000
--- a/media-video/captury/files/digest-captury-0.2.0_pre200702211
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3e3d0444697d3bbdd59b1dec81ed2c7a captury-0.2.0_pre200702211.tar.bz2 32288
-RMD160 876c42b3c7204be8cf089391e1b4d6d6800b1dd5 captury-0.2.0_pre200702211.tar.bz2 32288
-SHA256 6802af166d3defcd92fdffe95fb809bf68996c7cd075d4431df87c74c307bcb9 captury-0.2.0_pre200702211.tar.bz2 32288
diff --git a/media-video/captury/files/digest-captury-0.2.0_pre200702251 b/media-video/captury/files/digest-captury-0.2.0_pre200702251
deleted file mode 100644
index 6407fe2..0000000
--- a/media-video/captury/files/digest-captury-0.2.0_pre200702251
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e01af33121b8ae0ec3e33e4fb0cbaf8 captury-0.2.0_pre200702251.tar.bz2 442392
-RMD160 ef1e8c87caf71e2344f72f78b3a4c96d94b231cc captury-0.2.0_pre200702251.tar.bz2 442392
-SHA256 8f38c12ca7ffc44e5184d104ecae067676be0c185479d8e3c6f6cb88175124e8 captury-0.2.0_pre200702251.tar.bz2 442392
diff --git a/media-video/captury/files/digest-captury-0.3.0_pre200706031 b/media-video/captury/files/digest-captury-0.3.0_pre200706031
new file mode 100644
index 0000000..ebc7613
--- /dev/null
+++ b/media-video/captury/files/digest-captury-0.3.0_pre200706031
@@ -0,0 +1,3 @@
+MD5 ddeebbde3acfe728dd98d100d5423340 captury-0.3.0_pre200706031.tar.bz2 1215736
+RMD160 fedb5db4b560a3fcb225a204f2b58f95c61c393c captury-0.3.0_pre200706031.tar.bz2 1215736
+SHA256 51904c4b1183cf77809ff47bbe6b1cdcffabfdefc301ac838de89a0d4d799289 captury-0.3.0_pre200706031.tar.bz2 1215736