Drop mplayer-bin, bug #233394.

Package-Manager: portage-2.1.4.4

6 files changed, 22 insertions, 27 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 00e0f93d93c7..8d479acf1935 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.114 2008/04/26 22:33:53 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.115 2008/07/31 20:27:20 carlo Exp $
+
+  31 Jul 2008; Carsten Lohrke <carlo@gentoo.org> kmplayer-0.9.4a-r1.ebuild,
+  kmplayer-0.10.0.ebuild, kmplayer-0.10.0a.ebuild, kmplayer-0.10.0c.ebuild:
+  Drop mplayer-bin, bug #233394.
 
   26 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> ChangeLog:
   Manifest.
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index b0edc032986d..6f760714f351 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kmplayer-0.10.0-prtypes.patch 843 RMD160 3da261a5e254beaf20c340e06952d8065d20bf28 SHA1 4fbb734b2f0490b9adebd9a4e2553c0be9512230 SHA256 a192d8569abae303feb9c47842fde4bb2dd95cf535d318820c3017e538239c43
 AUX kmplayer-0.9.4a-vop2vf.patch 3636 RMD160 9f435e2003ad0bc855a698964814fa90bb7ca88c SHA1 017911852e58dcd50772ae9cc8ebc45c84eeee4a SHA256 71b74ae6812912ab8f4c825cd0407236b5fc76c520974eb8677a1a2ebd258af3
 DIST kmplayer-0.10.0.tar.bz2 1046079 RMD160 79ffac84e28f719582233e1a72ceb61927a28056 SHA1 b99ecdff0c77b8db549579ef45538750aa0dc1d4 SHA256 94e8068c5a1b7205e01079213c025fc2f70f521c7d72e5d9ee8cd914325436c7
 DIST kmplayer-0.10.0a.tar.bz2 1054675 RMD160 28fd5d736eac6568d2b08cd7eab1ca3d95f0be36 SHA1 e8dd9b21ed876c49aa728261b86c23ae9c835220 SHA256 300d996bdccd0733d695be5be0806d0a5f0646600b674c7782149cd71e9e6e78
 DIST kmplayer-0.10.0c.tar.bz2 1047729 RMD160 4f7f291733f9a73f5838e028af5e5268d1a0ee10 SHA1 52bfa017e1360fdc60c10445090c867039da4830 SHA256 f9a699fa7bf53c7130ce6aff56e4bc53f957c5d86d3d1d23d791cca8f1cf3820
 DIST kmplayer-0.9.4a.tar.bz2 970527 RMD160 74d8fe2b2fd2c9e18518ff73b66b254b974291be SHA1 27d78793d6e9ac37a5810b8e742ffa0f55317488 SHA256 1c5d705818bca7cb00384991498fe020b70bc0f55622185e63905551793aaa9c
-EBUILD kmplayer-0.10.0.ebuild 2976 RMD160 b29fce5a03b7e441605288321e17badfb1012eb2 SHA1 89997e2d6c6c6cf8bf881b31ac5508c6ae88532f SHA256 2951e17f7a113e3c76037047eece85c6272f9ff99ee155d065aca734dd7cb5d0
-EBUILD kmplayer-0.10.0a.ebuild 3113 RMD160 b85bfeb962cd932cfda12c05104966df01d5a31c SHA1 52da2e3d9ab81689db57852fac657e971d57bd30 SHA256 a86594ddd79b01340b37f536cabc70a4556f218ed2c68533e2379243e6be59e4
-EBUILD kmplayer-0.10.0c.ebuild 3033 RMD160 26518aa73b18794ca79ff27e42be0c7c7b779eec SHA1 15e59498c19fdb90702c8739045736266eebe36b SHA256 ea69bd78c86aed1e90fd8bdcd7d817ebccc8fc83b4f5166f75b2da4e738df030
-EBUILD kmplayer-0.9.4a-r1.ebuild 2395 RMD160 27ebfb0c0b048a097c448d561408115b1332620e SHA1 4c21f7881f149b4c8e8a7976eaeda0b29ed44dae SHA256 2e4260caf9081497a8e86a0bf8caf70a661ac703b1ce373569b824d5212c59db
-MISC ChangeLog 15836 RMD160 783cd7dc5ca5cd3513a9aec43b81186837f7abda SHA1 8fba24d0c0d42e8d0082c5c48325b79096894e9a SHA256 a6fe3cd68632e74dfbbda1429e504c18e8e8ca9146885fe904a4ef8850e2461d
+EBUILD kmplayer-0.10.0.ebuild 2940 RMD160 b95bd3f466e4402c7cf87cec77c811f6ad4c8bd5 SHA1 152a076ffeba8fb1c2d2e498765240d4e0029a76 SHA256 60a25bc32f3c7389d1d7d48483c4af043ddfee3d07e27f52cc030ee80f0b21ac
+EBUILD kmplayer-0.10.0a.ebuild 3077 RMD160 d20249da66d5fb75ea69a1405b76798673e973d9 SHA1 14da885585a3a266e379bc5d41c653719c19cb9c SHA256 64850212de79473a922954ab72db4beb67a298dff8c7a01f530fe3dad1b845dc
+EBUILD kmplayer-0.10.0c.ebuild 3001 RMD160 da889ddae77310d28e9d3efe495d9c7935dedbaa SHA1 93e8f44c741921a12cc432080d18da876a76404f SHA256 5f47dc7814bdd73a482197edeb3caf1746ac1ffe6d44f52f5b1ecf94ac4ef0f0
+EBUILD kmplayer-0.9.4a-r1.ebuild 2365 RMD160 eaba9fe9e98f01d7a98f71f99451e961d12d430d SHA1 af3b7109ead14f3926ba45c5f989fcf1e10c4e3c SHA256 586346e2cd2cbc82007853e538c4d689551970efa0fa6814b6d4212cc04781e9
+MISC ChangeLog 16021 RMD160 2e49b203512375c83ca02d48b42e2cf85042c782 SHA1 eda00aba9b99eac56d780e2c1e1ed9f400392749 SHA256 c1a9672417d78d22ffbb448cefa87ca5902563a83ed9659352ad0659585ddfc6
 MISC metadata.xml 299 RMD160 04f079c7ddd3dd03985594b98ccd597c441b4936 SHA1 7fa98ecc59e4619ccfa94157248170c555cdf914 SHA256 98642d6f078488706652aee6d7606ae02aad82b7692df8ff4f0d19e0df6de596
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgTrc8ACgkQB18eXLOpYdmAfwCgg/P2ftBuBlSrF4CAPr4wJjh2
-0KQAn1hVOKFmDHlXLkOO0P/Dzou9qftV
-=PoRd
------END PGP SIGNATURE-----
+MISC tags 146 RMD160 484973d725a6df2642d26557fc79e021e9629456 SHA1 9d75468ff68aac7596d0c2954e8bd4632be9a404 SHA256 26d2e69111d26903e1104bbe1bbe53c54a6195e286cf8634f4455897b00d9ea6
diff --git a/media-video/kmplayer/kmplayer-0.10.0.ebuild b/media-video/kmplayer/kmplayer-0.10.0.ebuild
index 68897189e9b0..1df8b0f42c9a 100644
--- a/media-video/kmplayer/kmplayer-0.10.0.ebuild
+++ b/media-video/kmplayer/kmplayer-0.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0.ebuild,v 1.2 2007/10/03 22:14:47 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0.ebuild,v 1.3 2008/07/31 20:27:20 carlo Exp $
 
 inherit kde eutils
 
@@ -26,7 +26,7 @@ DEPEND="x11-libs/libXv
 							>=dev-libs/dbus-qt3-old-0.70 ) )
 		npp? ( >=dev-libs/nspr-4.6.7 )"
 RDEPEND="${DEPEND}
-		mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )"
+		mplayer? ( media-video/mplayer )"
 
 LANGS="ar be br bs ca csb cs cy da de el en_GB es et fi fr ga gl he hi hu is it
 ja ka lt mt nb nl nn pa pl pt_BR pt ro ru rw sk sr@Latn sr sv ta tr uk zh_CN"
diff --git a/media-video/kmplayer/kmplayer-0.10.0a.ebuild b/media-video/kmplayer/kmplayer-0.10.0a.ebuild
index 5184178fe4f6..87dd989af238 100644
--- a/media-video/kmplayer/kmplayer-0.10.0a.ebuild
+++ b/media-video/kmplayer/kmplayer-0.10.0a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0a.ebuild,v 1.1 2007/11/02 19:43:56 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0a.ebuild,v 1.2 2008/07/31 20:27:20 carlo Exp $
 
 inherit kde eutils
 
@@ -27,7 +27,7 @@ DEPEND="x11-libs/libXv
 		npp? ( >=dev-libs/nspr-4.6.7
 				>=x11-libs/gtk+-2.10.14 )"
 RDEPEND="${DEPEND}
-		mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )"
+		mplayer? ( media-video/mplayer )"
 
 LANGS="ar be br bs ca csb cs cy da de el en_GB es et fi fr ga gl he hi hu is it
 ja ka lt mt nb nl nn pa pl pt_BR pt ro ru rw sk sr@Latn sr sv ta tr uk zh_CN"
diff --git a/media-video/kmplayer/kmplayer-0.10.0c.ebuild b/media-video/kmplayer/kmplayer-0.10.0c.ebuild
index eaa9018b8e94..f058bcdab330 100644
--- a/media-video/kmplayer/kmplayer-0.10.0c.ebuild
+++ b/media-video/kmplayer/kmplayer-0.10.0c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0c.ebuild,v 1.6 2008/04/26 16:48:35 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0c.ebuild,v 1.7 2008/07/31 20:27:20 carlo Exp $
 
 inherit kde eutils
 
@@ -27,7 +27,7 @@ DEPEND="x11-libs/libXv
 		npp? ( >=dev-libs/nspr-4.6.7
 				>=x11-libs/gtk+-2.10.14 )"
 RDEPEND="${DEPEND}
-		mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )"
+		mplayer? ( media-video/mplayer )"
 
 LANGS="ar be br bs ca csb cs cy da de el en_GB es et fi fr ga gl he hi hu is it
 ja ka lt mt nb nl nn pa pl pt_BR pt ro ru rw sk sr@Latn sr sv ta tr uk zh_CN"
diff --git a/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild b/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild
index fb5575f7a491..7cac119a6054 100644
--- a/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild
+++ b/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild,v 1.8 2007/08/30 17:03:18 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild,v 1.9 2008/07/31 20:27:20 carlo Exp $
 
 inherit kde eutils
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="mplayer xine cairo"
 
-RDEPEND="mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )
+RDEPEND="mplayer? ( media-video/mplayer )
 	xine? ( >=media-libs/xine-lib-1.1.1 )
 	cairo? ( x11-libs/cairo )"
 DEPEND="x11-libs/libXv