Remove mplayer-bin support, bug #233394

Package-Manager: portage-2.1.4.4

5 files changed, 18 insertions, 36 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 535fb6ef1ee1..21283f551f63 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mplayerplug-in
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.107 2008/06/16 03:13:51 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.108 2008/08/01 20:31:43 armin76 Exp $
+
+  01 Aug 2008; Raúl Porcel <armin76@gentoo.org>
+  -files/mplayerplug-in-mplayer-bin.patch, mplayerplug-in-3.45.ebuild,
+  mplayerplug-in-3.50.ebuild:
+  Remove mplayer-bin support, bug #233394
 
   16 Jun 2008; Joseph Jezak <josejx@gentoo.org> mplayerplug-in-3.50.ebuild:
   Marked ppc/ppc64 stable, fixed has_multilib in global for bug #211440.
diff --git a/net-www/mplayerplug-in/Manifest b/net-www/mplayerplug-in/Manifest
index b41905705ff3..d00d65bc5c5d 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -5,13 +5,12 @@ AUX mplayerplug-in-3.35-seamonkey.patch 2990 RMD160 08c5bfb4400fd06e8e90f924a8b9
 AUX mplayerplug-in-3.40-cflags.patch 662 RMD160 fd888c192db5c19209895d592e9b60be01e07c50 SHA1 6546337c488adb3f22e512e085aa2a80fe7fef20 SHA256 e08de6a6d285defc5644af50a692303fb83b8d14c62f7742764f6773eee5194b
 AUX mplayerplug-in-3.50-seamonkey.patch 678 RMD160 c0e78c924738cd262d2a69021f6861b76feddc56 SHA1 3617ad7aa47a8735f22bdd7fbab14e2c6ec877b8 SHA256 e691dcb0f50f7a0ea5bdc5a8fbb94f90067035c57831140026729179c91dca26
 AUX mplayerplug-in-gcc4.patch 549 RMD160 9768e7ba19d0cbc8c5628d16645ab97208c870b9 SHA1 aca3e9f0a69bac7aaeb6ade07b7cf31509163fd4 SHA256 c3afe1ab9b4eabc099b7400e7a9560a7f50b894fd8e56fee72959bfc7129f94e
-AUX mplayerplug-in-mplayer-bin.patch 375 RMD160 eb27e4694c51bd3c8cc1edad7d084de1d6aaf78e SHA1 831657459e22b332cecb718d00fbef3c3a7619ab SHA256 be0a8393d56ebd0b296127c676c55baa16988f8239ab24ae29d96baff7a93edc
 AUX mplayerplug-in_xulrunner-1.9.patch 1159 RMD160 4999a043cb3b670b93f583c1aac0acf648662d69 SHA1 f1ac5d22f655aa5c10407353b41d660d54d935c6 SHA256 37581f5b52860442ce4e4f58220f193f2488ec2897e0519b4ec41d1aa7a56b98
 DIST mplayerplug-in-3.35.tar.gz 217776 RMD160 fea5640a5931af93cc85907b219a3765f79f4a51 SHA1 462dbda841f41c21cac34a902d8d3477d231368e SHA256 bc91513b874716ee30d73cf48d2571e4537fb6a42498d6ecccc91259ad15ad7f
 DIST mplayerplug-in-3.45.tar.gz 228032 RMD160 6a9700860397a6c7952b8e2ea8a9a610376a1528 SHA1 39a888c6e65b83f862abef83f5e0381ec7a6a6ea SHA256 3fcab891adf1b32374e5f525b0e91e1a2393ba85429f9ec654edadb08f06d431
 DIST mplayerplug-in-3.50.tar.gz 452730 RMD160 6eb61df0c06e1b9f6118be4f75bf05648bb8dbd8 SHA1 54e5d7a3b33f503830183545f7bc278d37cb89d5 SHA256 046b8e65ee4e4568453b7749d7e60f521a87c2f9990f46d021da283e285f4c02
 EBUILD mplayerplug-in-3.35.ebuild 2501 RMD160 2be6e47fac33c1a0a6cffb0a33c44b97e0dd7ed1 SHA1 0b7f8abceefb1f42c6367d5fbb8af4eb437a45ac SHA256 845199d4432ad877b7bc426a431d5b69681916970b7f42bdb042997a82c0929b
-EBUILD mplayerplug-in-3.45.ebuild 2900 RMD160 880a69b96f912a57becffc7ddc04d8a0a7991342 SHA1 f394995823813efd723a153b416c150d8f81f041 SHA256 955d4ff3ac7d193df212c0451ca0b97822b71842676b268d70728be7422d168f
-EBUILD mplayerplug-in-3.50.ebuild 4124 RMD160 cd672cf78d14b743d4104f757a3887aebaad34ae SHA1 c4cf70200597d77178b18dc56cacecbdda569380 SHA256 c050052a8ec52205365118e80c84a645cdcd8189abf2438f252c1c4869872dd4
-MISC ChangeLog 17469 RMD160 4e39c69c26fef7aadef90ff6a7d63364c0fbff18 SHA1 893dfa2f3a3a7475d7f6d17d42f7415197a93ba9 SHA256 39b7b6faf7482dcdaf4da2adae749ff191d36429f5c01c652cdbb58e3a8cd4bd
+EBUILD mplayerplug-in-3.45.ebuild 2694 RMD160 cd57b71b65bcaee68c02bfa9216aefbb6549aebc SHA1 74ad08049bb89929c8db2996f5a4b17a6809ce7f SHA256 10c80e799cc55866cb4fad98319086f0f291053829b63a21b50c58d017e97d8b
+EBUILD mplayerplug-in-3.50.ebuild 3922 RMD160 38331b66e4465a41850d252f8b48b7ed8a774ec4 SHA1 e2a301d9d689d84ca27c352ec1c990b37821a838 SHA256 874a79a7bf010ddb000e7f77808b015dd18ce3e927525edd10bfa1d19722daec
+MISC ChangeLog 17663 RMD160 3d8f870dafd76359ff243e392a70fb3abe2391a9 SHA1 059956245816f000d4834ba7a14def00bce4aa5c SHA256 72f4a1801b30a77816ec1b86e77a0bf5902aa1ae553c647850b3368eb15a6771
 MISC metadata.xml 250 RMD160 b217596057a0f66de68ba60b3aa6c9e7e505c82f SHA1 f2daa68d53d4780a8470a790b1bbc9ae124ef587 SHA256 c2c5efc70c34197524037240b015bbdb5beb3b62883dc2eacb21926c69883324
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-mplayer-bin.patch b/net-www/mplayerplug-in/files/mplayerplug-in-mplayer-bin.patch
deleted file mode 100644
index 2bef76817e7a..000000000000
--- a/net-www/mplayerplug-in/files/mplayerplug-in-mplayer-bin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Source/plugin-threads.cpp.bak	2007-04-27 09:45:14.000000000 -0400
-+++ Source/plugin-threads.cpp	2007-04-27 09:46:10.000000000 -0400
-@@ -364,7 +364,7 @@
-     }
- 
-     i = 0;
--    snprintf(buffer, 1024, "mplayer");
-+    snprintf(buffer, 1024, "mplayer-bin");
-     instance->td->argv[i++] = strdup(buffer);
-     if (instance->novop == 1) {
- 	snprintf(buffer, 1024, "-vop");
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
index f0ce92aad12f..18f91bac8bd5 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.45.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/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild,v 1.10 2008/06/12 18:22:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild,v 1.11 2008/08/01 20:31:43 armin76 Exp $
 
 inherit eutils multilib
 
@@ -11,12 +11,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 -hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="gtk divx gmedia mplayer-bin nls realmedia quicktime wmp"
+IUSE="gtk divx gmedia nls realmedia quicktime wmp"
 
 LANGS="da de en_US es fr hu it ja ko nb pl pt_BR nl ru se zh_CN"
 for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done
 
-RDEPEND="
+RDEPEND=">=media-video/mplayer-1.0_pre5
 		|| ( =www-client/mozilla-firefox-2*
 				=www-client/seamonkey-1*
 				=net-libs/xulrunner-1.8*
@@ -29,9 +29,7 @@ RDEPEND="
 			dev-libs/atk
 			>=dev-libs/glib-2.2.0
 			>=x11-libs/pango-1.2.1
-		)
-		mplayer-bin? ( media-video/mplayer-bin )
-		!mplayer-bin? ( >=media-video/mplayer-1.0_pre5 )"
+		)"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -42,10 +40,6 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
 	epatch "${FILESDIR}/${PN}-gcc4.patch"
-	### Adds support for 32 bit binary mplayer on amd64
-	if use mplayer-bin; then
-		epatch "${FILESDIR}/${PN}-mplayer-bin.patch"
-	fi
 	epatch "${FILESDIR}/${PN}-3.35-seamonkey.patch"
 }
 
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
index 95a943cd5cea..fa19695acae3 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.50.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/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild,v 1.8 2008/06/16 03:13:51 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild,v 1.9 2008/08/01 20:31:43 armin76 Exp $
 
 inherit eutils multilib autotools
 
@@ -11,12 +11,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 -hppa ~ia64 ppc ppc64 ~sparc ~x86"
-IUSE="gtk divx firefox gmedia mplayer-bin multilib nls quicktime realmedia seamonkey wmp xulrunner"
+IUSE="gtk divx firefox gmedia multilib nls quicktime realmedia seamonkey wmp xulrunner"
 
 LANGS="cs da de en_US es fr hu it ja ko nb nl pl pt_BR ru sk se tr wa zh_CN"
 for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done
 
-RDEPEND="xulrunner? ( =net-libs/xulrunner-1.8* )
+RDEPEND=">=media-video/mplayer-1.0_pre5
+		xulrunner? ( =net-libs/xulrunner-1.8* )
 		!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
 		!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
 		x11-libs/libXpm
@@ -26,9 +27,7 @@ RDEPEND="xulrunner? ( =net-libs/xulrunner-1.8* )
 			dev-libs/atk
 			>=dev-libs/glib-2.2.0
 			>=x11-libs/pango-1.2.1
-		)
-		mplayer-bin? ( media-video/mplayer-bin )
-		!mplayer-bin? ( >=media-video/mplayer-1.0_pre7 )"
+		)"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
 		multilib? (
@@ -46,10 +45,6 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
 	epatch "${FILESDIR}/${PN}-gcc4.patch"
-	### Adds support for 32 bit binary mplayer on amd64
-	if use mplayer-bin; then
-		epatch "${FILESDIR}/${PN}-mplayer-bin.patch"
-	fi
 	epatch "${FILESDIR}/${PN}_xulrunner-1.9.patch"
 	epatch "${FILESDIR}/${P}-seamonkey.patch"
 	eautoconf