Fix osdmenu configuration, bug 274438

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

4 files changed, 12 insertions, 8 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 33561dccb434..e34573db1993 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.648 2009/06/08 03:43:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.649 2009/06/21 19:02:38 beandog Exp $
+
+  21 Jun 2009; Steve Dibb <beandog@gentoo.org>
+  mplayer-1.0_rc2_p20090530.ebuild, mplayer-9999.ebuild:
+  Fix osdmenu configuration, bug 274438
 
   08 Jun 2009; Jeroen Roovers <jer@gentoo.org>
   mplayer-1.0_rc2_p20090322.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 77c39a221e6c..3960a7dedc83 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -13,8 +13,8 @@ DIST mplayer-1.0_rc2_p20090530.tar.bz2 8207308 RMD160 d76dc6475fdd2892190f900d2d
 DIST mplayer-1.0_rc2_p28450.tar.bz2 8159720 RMD160 3c287a1cc63cc82c686abbe985fa4c46e0541fe3 SHA1 97e286c033a6c514a008a017b8bdd3d2e4327036 SHA256 6e8fb85fcf02161d265a7a081ba17df25fd1dd75f2714f97b240e08a8aa67131
 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
 EBUILD mplayer-1.0_rc2_p20090322.ebuild 19353 RMD160 c70cb14fde371c96a4a61157ff3612fac7fa0a9b SHA1 a2884af5484e45079d4343d6475d624f233b3795 SHA256 777e9dd81d85e2a9c13b6ef7e619dca5114599c1712bf72fa1caf1c85ade4328
-EBUILD mplayer-1.0_rc2_p20090530.ebuild 19279 RMD160 637e784f761e3b87621095a2d8ed46c141cfbc21 SHA1 521be6ded1bdb6b1db31ddf27851b0782430565b SHA256 92fca50cf6fb597771b80480e159d01bd0d1c2bc3895455f4c4100dfc85ccd39
+EBUILD mplayer-1.0_rc2_p20090530.ebuild 19279 RMD160 5a113edd7aa58ce80f04c9bd1d9eacf0f0aa3fe0 SHA1 98421d5a76c3039fa8d4448f0978125ecf8ce64a SHA256 dde6e306ab8a431575306ce9a607610d196e67fc2a5a804343ee4a65d65e6d1b
 EBUILD mplayer-1.0_rc2_p28450.ebuild 17803 RMD160 c89f570c099ff5b520a09d4b63e7cbdf233e106a SHA1 e1f3a552776c6e9d83440096dc6e5f14fc0fb872 SHA256 098ae1eb72d0a1d3fb5b87af573008ea54dacc90478b16b66b37de2b094467af
-EBUILD mplayer-9999.ebuild 19702 RMD160 8b1bb107e618470d2f1073e81d5100a06860293f SHA1 478e1dcbd6ac4bb518cc9bcc836fd8657860fa75 SHA256 95d0638a3b06123cf24bf2d85c52807abe0e0c150eaa15182d3358e4502f8475
-MISC ChangeLog 114509 RMD160 9be1f29e4247252b33ec6450cf77dbb2976c57cb SHA1 87f6eba78e33aba69bc3c46b36d9d8ea7aa68f34 SHA256 9a96a7dcc9d19624a3cad890daab4a533de81ad5cf5ea473b9bc7b389dc16994
+EBUILD mplayer-9999.ebuild 19701 RMD160 faefe5e418ddbef3c84420eb5e0c573bc6aab879 SHA1 17e4bf93fc3e8b34094f1c3f326fa7ca50bb5e29 SHA256 39240f54e058cb9a998327540ba98e1d2e40537b5cf502ef7b674b81021afb32
+MISC ChangeLog 114658 RMD160 9f48471bd30b4433e6054f5b41cf0f7894b14644 SHA1 00768a43539028335a3604cdbf339267a082a4c3 SHA256 c4c52c6cd0ab1ca91904fb97c278a76b21708bdfb2e6af3718cd833674063059
 MISC metadata.xml 3593 RMD160 d613446febcde8437b7538d90faa4460564a853f SHA1 daca810ed4b0deff90353a51d090ef968e66a701 SHA256 4e990fc238b931183832494e563a98b81306535c289f1e54cc933237dfa8d846
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
index bcb5c07142d7..f2e4d3cb9d1e 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild,v 1.9 2009/06/04 16:34:46 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild,v 1.10 2009/06/21 19:02:38 beandog Exp $
 
 EAPI="2"
 
@@ -265,7 +265,7 @@ src_configure() {
 		--disable-apple-ir"
 	use nemesi || myconf="${myconf} --disable-nemesi"
 	use nut || myconf="${myconf} --disable-libnut"
-	use osdmenu || myconf="${myconf} --disable-menu"
+	use osdmenu && myconf="${myconf} --enable-menu"
 	use rar || myconf="${myconf} --disable-unrarexec"
 	use rtc || myconf="${myconf} --disable-rtc"
 	use samba || myconf="${myconf} --disable-smb"
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 2448412bdac2..8c46c731dea0 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.7 2009/06/04 16:34:46 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.8 2009/06/21 19:02:38 beandog Exp $
 
 EAPI="2"
 
@@ -306,7 +306,7 @@ src_configure() {
 		--disable-apple-ir"
 	use nemesi || myconf="${myconf} --disable-nemesi"
 	use nut || myconf="${myconf} --disable-libnut"
-	use osdmenu || myconf="${myconf} --disable-menu"
+	use osdmenu && myconf="${myconf} --enable-menu"
 	use rar || myconf="${myconf} --disable-unrarexec"
 	use rtc || myconf="${myconf} --disable-rtc"
 	use samba || myconf="${myconf} --disable-smb"