Fix deps. Per bug #259127. Version bump.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 42 insertions, 6 deletions

diff --git a/media-video/mplayerthumbs/ChangeLog b/media-video/mplayerthumbs/ChangeLog
index a5db5b1fc8e9..71fceb0a2d7e 100644
--- a/media-video/mplayerthumbs/ChangeLog
+++ b/media-video/mplayerthumbs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayerthumbs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/ChangeLog,v 1.9 2009/02/15 17:37:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/ChangeLog,v 1.10 2009/03/03 16:14:28 scarabeus Exp $
+
+*mplayerthumbs-1.2 (03 Mar 2009)
+
+  03 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  mplayerthumbs-1.1.ebuild, +mplayerthumbs-1.2.ebuild:
+  Fix deps. Per bug #259127. Version bump.
 
 *mplayerthumbs-0.5b-r1 (15 Feb 2009)
 
diff --git a/media-video/mplayerthumbs/Manifest b/media-video/mplayerthumbs/Manifest
index 6f153cd86513..11aef2b660a5 100644
--- a/media-video/mplayerthumbs/Manifest
+++ b/media-video/mplayerthumbs/Manifest
@@ -1,8 +1,10 @@
 AUX mplayerthumbs-0.5b-gcc43.patch 295 RMD160 80ac57e01369f59f13bcae99955be2efb7a322b3 SHA1 334bcaac44fa8eae8af1abf6163fbae58a9671c4 SHA256 edc29cebe5da2890fc05b0c7f04d6cb9a59110a1c33c54ea7b0d83207a73f3ad
 DIST 41180-mplayerthumbs-1.1.tar.bz2 207871 RMD160 3350f8856b948b739cddf2d05c5021f898b1d0c6 SHA1 f6b3ebead6c67694a316fe12c384fe9fc99f2d84 SHA256 4f5a128b7ba7d3272fc3878291607f0d9c18cfe008d1241b89f94b27793f3ce9
+DIST 41180-mplayerthumbs-1.2.tar.gz 20492 RMD160 474ffe338b23b31d213d89f1b8f2a856d549b98f SHA1 1baddf9dc7a2b4ff9aff3ce3d479697f6077294a SHA256 af3d9b2af0940b6d58cfb1b9262712744fb565c54bc30a57f94c3e98052b994a
 DIST mplayerthumbs-0.5b.tar.bz2 430037 RMD160 1248162367a181ca1aeaa26e77cb512c64bcdedb SHA1 b956f50493409795ad4776b95739cc611ebda137 SHA256 10f802264ec7cf4bed395534f87951fc31d29690077c57b824eb4e774c83b662
 EBUILD mplayerthumbs-0.5b-r1.ebuild 687 RMD160 0dc64ff3bfb7601b588bbedbba9688c20821f845 SHA1 d74d0201166c298a0842af5149a89177cc66d9a4 SHA256 f2b6f651006d3ff191d63fb6cbb6e3ebb6ad72fe84e217b71a6ec9dfb893ab7e
 EBUILD mplayerthumbs-0.5b.ebuild 711 RMD160 18a08cb515e80746062beccd8cfd14e157df1365 SHA1 1cabcd4a9becc2dcc0b27c4ffe7e22fab666081b SHA256 95bbfb1fe3ede8fcf1a630cfa90f2781a3f687409832ecd9d2f968a7c8eefd28
-EBUILD mplayerthumbs-1.1.ebuild 929 RMD160 98e0873d8fb219d672b383b7f77094101e8c56a9 SHA1 8c5df236b45291eae0ca8476346466435c1d168c SHA256 93a240cf99e18714de2253afa8c6c047321976b12f10a432a7563980b9d0efa4
-MISC ChangeLog 1378 RMD160 9e24e3201eb72080e1cf9390f69fa9211bc654b5 SHA1 8a1d55cded46b6f2746dbb508d62eae68b46c902 SHA256 eb76592c5415e9f3cb2ce96d5c5209bf231131863c06c901a668147d1fee29c9
+EBUILD mplayerthumbs-1.1.ebuild 957 RMD160 cf2b7074c9a9302b7c39ec28e61ca6ffba8b4f86 SHA1 1ab67e8cf914634ddd92b9b924740a3c01ae5061 SHA256 b568c3c05aec39bed7e6f07141d91f6457a0ca31194fe939e0d470c9b0d276bd
+EBUILD mplayerthumbs-1.2.ebuild 769 RMD160 461c18e38a872cce75a36d864492b9532d3fbb51 SHA1 2d817af765f00b871a7a578b0d942b9a861a90cb SHA256 1c2c4c48d9074c89ac29d2bec77794a3b875b1dbeed530d20a35c6c3866a4e67
+MISC ChangeLog 1568 RMD160 68cec7c036d5c41138e29fb45c843d24e00d55ea SHA1 647baf1e07ae91fdcf375aa7d2457b6e679afc1d SHA256 4c34669ed63aa73775486e1ccc4353c09e301dedc433f64637f8471ffe04c329
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild b/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild
index c7909b84d6b9..e1540cc0ffe9 100644
--- a/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild
+++ b/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild,v 1.3 2009/02/10 22:12:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/mplayerthumbs-1.1.ebuild,v 1.4 2009/03/03 16:14:28 scarabeus Exp $
 
 EAPI="2"
 
-KDE_MINIMAL="4.2"
 inherit kde4-base
 
 DESCRIPTION="A Thumbnail Generator for Video Files on Konqueror."
@@ -16,7 +15,8 @@ SLOT="1"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="|| (
+DEPEND="!kdeprefix? ( !media-video/mplayerthumbs:0 )
+	|| (
 		>=kde-base/dolphin-${KDE_MINIMAL}[kdeprefix=]
 		>=kde-base/konqueror-${KDE_MINIMAL}[kdeprefix=]
 	)
diff --git a/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild b/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild
new file mode 100644
index 000000000000..6502a4a71623
--- /dev/null
+++ b/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayerthumbs/mplayerthumbs-1.2.ebuild,v 1.1 2009/03/03 16:14:28 scarabeus Exp $
+
+EAPI="2"
+
+inherit kde4-base
+
+DESCRIPTION="A Thumbnail Generator for Video Files on Konqueror."
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=41180"
+SRC_URI="http://www.kde-apps.org/CONTENT/content-files/41180-${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="!kdeprefix? ( !media-video/mplayerthumbs:0 )
+	|| (
+		>=kde-base/dolphin-${KDE_MINIMAL}[kdeprefix=]
+		>=kde-base/konqueror-${KDE_MINIMAL}[kdeprefix=]
+	)
+	|| (
+		media-video/mplayer
+		media-video/mplayer-bin
+		)
+"
+RDEPEND="${DEPEND}"