version bump and dep string fix

(Portage version: 2.1_rc4-r3)
 (Unsigned Manifest commit)

3 files changed, 28 insertions, 59 deletions

diff --git a/media-video/coriander/Manifest b/media-video/coriander/Manifest
index 8e8df8ba1111..274908eabb29 100644
--- a/media-video/coriander/Manifest
+++ b/media-video/coriander/Manifest
@@ -1,30 +1,40 @@
-MD5 8aa51739a8b4386ae97a64796f6fa449 ChangeLog 2188
-RMD160 7d0ffa8e0947c38e1b4b440ba084a219370bdf07 ChangeLog 2188
-SHA256 0a3a76ca38648c9d56ab1859736992d3f3cc2d0073c568390bd501e2e59c7aca ChangeLog 2188
+DIST coriander-1.0.0.tar.gz 235134 RMD160 87630777533af7585771f73cc9be9bf7a4d8464f SHA1 7740a305001a546f0c547b38220ce0a1b57c6b12 SHA256 9860a531e4ee1e356d6ad9e52a06b83df352ee205405015a0d4943cd13df709e
+DIST coriander-2.0.0-pre3.tar.gz 273463
+DIST coriander-2.0.0-pre5.tar.gz 277406 RMD160 c19ca306946833bf581033059dfdd4698d846163 SHA1 c4e07ca53ffa2aa6302153e698a52b47ec0eca85 SHA256 19e30b81a2a61daaf22585dee2ce28eaa36f90fc807415e5331d3ccfe76e33d0
+DIST coriander-2.0.0-pre6.tar.gz 292206 RMD160 5234b2d1f0d52c090df2da144dd04b003639f311 SHA1 b07ded8cf51db8bbe25e952851968e6a9674ac91 SHA256 c0cfb4fa5545248dff7863005afdcd0b947a941c5bbc91aaeb0ce77d2663cdd4
+EBUILD coriander-1.0.0.ebuild 621 RMD160 735fb408beb5a887a4885ff82a86ca0d78d7519f SHA1 b6c1e9611fd9feb110708946b9b13ad8aed5178e SHA256 06255fbeb0258ffb25a1f04ecf7b19960dc6ea3696b7a50f36c8b4885125acc7
 MD5 b3449a0140ef200d4a7813c58d833cf2 coriander-1.0.0.ebuild 621
 RMD160 735fb408beb5a887a4885ff82a86ca0d78d7519f coriander-1.0.0.ebuild 621
 SHA256 06255fbeb0258ffb25a1f04ecf7b19960dc6ea3696b7a50f36c8b4885125acc7 coriander-1.0.0.ebuild 621
+EBUILD coriander-2.0.0_pre3.ebuild 975 RMD160 c905138624fcd52a343f18d6dfd224ec2204fada SHA1 4262957af2aa6f42bcf8d2d22e4bbae649948864 SHA256 a43620e03e6a29c63319130c2c5704342ba80628138cda2856e3872e9e6d1bc3
 MD5 ee131c63d2d475cc6740240ae59a7695 coriander-2.0.0_pre3.ebuild 975
 RMD160 c905138624fcd52a343f18d6dfd224ec2204fada coriander-2.0.0_pre3.ebuild 975
 SHA256 a43620e03e6a29c63319130c2c5704342ba80628138cda2856e3872e9e6d1bc3 coriander-2.0.0_pre3.ebuild 975
-MD5 73306a063e8261ee6c066c8a4e115d90 coriander-2.0.0_pre4.ebuild 975
-RMD160 0e8b8cfb12a32c27b6a813f87d5dc1c70498729e coriander-2.0.0_pre4.ebuild 975
-SHA256 59933fb35fa550abc5053b7da2826d10d0c17d0b19ca27d530da6d51ac0650cb coriander-2.0.0_pre4.ebuild 975
-MD5 daeffb978392d5ef780fcd168b6d3f5c coriander-2.0.0_pre5.ebuild 975
-RMD160 4bfc41240e83ce3ac59ba1954d9dfe2674084e29 coriander-2.0.0_pre5.ebuild 975
-SHA256 dcd11f9f811270b77dd3d7818f8fd9fccc2bdb294a95a6ed6520e186c58e90dc coriander-2.0.0_pre5.ebuild 975
-MD5 c344d5253d439210e7f818d87596934c files/digest-coriander-1.0.0 67
-RMD160 93015d9a1e51919cecd59de67abab778fbc17d3d files/digest-coriander-1.0.0 67
-SHA256 552629b42f327b48ca420becc0017e8fd83a67bc0b8816b94ad3b11efb00b7f2 files/digest-coriander-1.0.0 67
+EBUILD coriander-2.0.0_pre5.ebuild 975 RMD160 db6e339a19c1121f375c47fa5e93343e666f1b83 SHA1 e9a1c8b0667033ed731422db211a88a0b54996cb SHA256 dbb4320659bc1a6358d039f1001fc2c7d449701980fb991a7bca703a819a236b
+MD5 f506a9ee42a4935156ccfe032a9f9e8c coriander-2.0.0_pre5.ebuild 975
+RMD160 db6e339a19c1121f375c47fa5e93343e666f1b83 coriander-2.0.0_pre5.ebuild 975
+SHA256 dbb4320659bc1a6358d039f1001fc2c7d449701980fb991a7bca703a819a236b coriander-2.0.0_pre5.ebuild 975
+EBUILD coriander-2.0.0_pre6.ebuild 975 RMD160 a1b79ae95cdc92aac083437174db51820e1b95f3 SHA1 3485d4934eea516f40ad416cb5bc121fa52502e2 SHA256 8a4dfec2bc25bad696cf67497920e968a0b202d2db1c76179f7c262ebcb3b648
+MD5 3bb1deaeb8b93a4bddc12fb35d089e75 coriander-2.0.0_pre6.ebuild 975
+RMD160 a1b79ae95cdc92aac083437174db51820e1b95f3 coriander-2.0.0_pre6.ebuild 975
+SHA256 8a4dfec2bc25bad696cf67497920e968a0b202d2db1c76179f7c262ebcb3b648 coriander-2.0.0_pre6.ebuild 975
+MISC ChangeLog 2405 RMD160 917c99bc1c214fc685263e34c047ae06dbedcac0 SHA1 650a4aa8ce1b02105ef3c87bfb3f6146eec0a81f SHA256 b83d03bfef46d9c57c5e5efae7da9eedd385e2ff3a91c88aef58c8b0f2f81366
+MD5 165cc16979a6ec5ec26f9d6ce96a4a69 ChangeLog 2405
+RMD160 917c99bc1c214fc685263e34c047ae06dbedcac0 ChangeLog 2405
+SHA256 b83d03bfef46d9c57c5e5efae7da9eedd385e2ff3a91c88aef58c8b0f2f81366 ChangeLog 2405
+MISC metadata.xml 254 RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c SHA1 3a978a742ce76f4f08724d0956e0e20586063e8e SHA256 10f669506638ebd14d588da05f936dd27b3ffcc7a69e6063cbd77f6439edea0c
+MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254
+RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c metadata.xml 254
+SHA256 10f669506638ebd14d588da05f936dd27b3ffcc7a69e6063cbd77f6439edea0c metadata.xml 254
+MD5 ae42f573df5ebcbe8d2a3a3366a3e151 files/digest-coriander-1.0.0 247
+RMD160 dc04acb61dfb7aa2277410270403f1bddef844cb files/digest-coriander-1.0.0 247
+SHA256 40d145ec8e6433b640f1fce25ac9b5b3ebb7bd923d3a94b0af993c72b94896e9 files/digest-coriander-1.0.0 247
 MD5 ece152bc683f3a8bd90f78386b6cce81 files/digest-coriander-2.0.0_pre3 72
 RMD160 a5b7e86f8c184eff449d3b9595948b3900fbd480 files/digest-coriander-2.0.0_pre3 72
 SHA256 1367570a9230d9d0a8e86a806dd7d554f800d65ddb644c370788fad85a049bbf files/digest-coriander-2.0.0_pre3 72
-MD5 491d4c9441a79bec91c7ae6124b004cc files/digest-coriander-2.0.0_pre4 72
-RMD160 552da7837c4c37f620dde4be5d1c1edf94d1c21a files/digest-coriander-2.0.0_pre4 72
-SHA256 69226c28fc7ff1e600ee9c5b6dcb9a74f565db6c0c9997cb96c8562c3d7f3a6e files/digest-coriander-2.0.0_pre4 72
 MD5 5ef54da5c938694a96f25835acc102cf files/digest-coriander-2.0.0_pre5 262
 RMD160 325f1502e26569b7554ae8fa58b2d8e78cc56997 files/digest-coriander-2.0.0_pre5 262
 SHA256 e9dbd08b155feebc5ddd7bbcc13e385370e03bd33a5743e4316bfaade025992f files/digest-coriander-2.0.0_pre5 262
-MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254
-RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c metadata.xml 254
-SHA256 10f669506638ebd14d588da05f936dd27b3ffcc7a69e6063cbd77f6439edea0c metadata.xml 254
+MD5 a5fdd08eb73556bf41eb926cbcac5863 files/digest-coriander-2.0.0_pre6 262
+RMD160 44ecde35d3a3790e43c867c9bc3e412018f40609 files/digest-coriander-2.0.0_pre6 262
+SHA256 9f37887cf231a3f6728194c5f387ebfe088314b9062c0758332f3dfcd407afb3 files/digest-coriander-2.0.0_pre6 262
diff --git a/media-video/coriander/coriander-2.0.0_pre4.ebuild b/media-video/coriander/coriander-2.0.0_pre4.ebuild
deleted file mode 100644
index 02066b3f6fd6..000000000000
--- a/media-video/coriander/coriander-2.0.0_pre4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation and Pieter Van den Abeele
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/coriander-2.0.0_pre4.ebuild,v 1.1 2005/11/03 16:12:50 seemant Exp $
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A Gnome2 GUI for firewire camera control and capture"
-HOMEPAGE="http://sourceforge.net/projects/coriander/"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ffmpeg"
-
-S=${WORKDIR}/${MY_P}
-
-
-RDEPEND=">=media-libs/libdc1394-2.0.0_pre5
-	ffmpeg? ( media-video/ffmpeg )
-	media-libs/libsdl
-	gnome-base/libgnomeui
-	gnome-base/libbonoboui
-	gnome-base/libgnomecanvas
-	gnome-base/libgnome
-	gnome-base/orbit"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-src_compile() {
-	export SSE_CFLAGS="${CFLAGS}"
-	econf || die
-	emake SSE_CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc NEWS README AUTHORS
-}
diff --git a/media-video/coriander/files/digest-coriander-2.0.0_pre4 b/media-video/coriander/files/digest-coriander-2.0.0_pre4
deleted file mode 100644
index ec8571cdfad7..000000000000
--- a/media-video/coriander/files/digest-coriander-2.0.0_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6bd3bfa525a37856ecac67ee53ceaf64 coriander-2.0.0-pre4.tar.gz 273865