aqua is also sufficient for opengl and osdmenu

Package-Manager: portage-2.2.01.20757-prefix/cvs/SunOS i386

3 files changed, 40 insertions, 27 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index ed331c91a726..82681339813c 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.854 2012/06/21 08:10:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.855 2012/08/01 10:43:48 grobian Exp $
+
+  01 Aug 2012; Fabian Groffen <grobian@gentoo.org> mplayer-1.1-r1.ebuild:
+  aqua is also sufficient for opengl and osdmenu
 
   21 Jun 2012; Ben de Groot <yngwin@gentoo.org>
   mplayer-1.0_rc4_p20120405.ebuild, mplayer-1.1-r1.ebuild, mplayer-9999.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c03338b133ce..157052d4c84d 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,23 +1,33 @@
-AUX dump_ffmpeg.sh 2489 RMD160 730700e9fdb63a27aa5ea51ba76c25919b0ce8df SHA1 bfb6dc19100793b4fc0e7e8f1104f30d3b620ff6 SHA256 c714e2faa2128f1c94ac046ff106a5f845347d18e1099f6aeab90aff2326e98e
-AUX ffmpeg.patch 650 RMD160 1eff7d1cb9b39a3add2754cadba9441853ee7219 SHA1 280a253b707c4da5b1e3055c0502530a995160de SHA256 70170f747f6f26700394a7646c8258aab5dcd9b96c17cb797d9d6e7d7bb02f52
-AUX ffmpeg2.patch 805 RMD160 e9517f235640729eb88d68167bc1d6c5df3e2121 SHA1 302a8a6b158cd590e7b607b0ac2f1e148be5a9ef SHA256 41a7602b579bdfc8ea3078e1023fcb73de017354dd40148255411ad55bdbc3fa
-AUX mplayer-1.0_rc4-pkg-config.patch 2751 RMD160 1c7ca44ebd71fd22be44961e8a47769c6f4c57d1 SHA1 69c9bc5ac6964d5c1c375bfccd963d38412b67b4 SHA256 9c0e5654ef05d64ae8bb91e3204433559a1f576b663217c6119bd61cec2ae51c
-AUX mplayer-1.0_rc4_p20110322-gcc46.patch 657 RMD160 a327aa565f55102be2d6f73f12e08862418023e9 SHA1 560e41e7c5c147e8656ec0216f4272e1421e887c SHA256 4c57d5c4c79db87796b6b1b4a485f4d0a8ed95f3ae71040592a0bd5f3dc070b2
-AUX mplayer-1.0_rc4_p20110322-sami_subtitle_parsing.patch 417 RMD160 d72bf30164ed6acfac7113ac4c78ff36ebce884e SHA1 4bb165cf52e176201dad512dd4a50cd04a08b228 SHA256 413876d32509c5e09df58b6f833036cb16d1073fcfecb17e0be9dc355d0e7160
-AUX mplayer-1.1-ffmpeg.patch 1452 RMD160 f4bdcdc60d046e2b1f7b9164c63403ab3d957330 SHA1 a310eccef19be2cbc9aef52cb696e8a1c5263f49 SHA256 9c04f0a14f625a41a7bda49c5fc8d2622a85da349799904ec56244e87dd38d26
-AUX prepare_mplayer.sh 758 RMD160 008741cb14819858a7f08ba752d722ee44907666 SHA1 d60af28ae9025b1cd2f468701ab9732329a9ed38 SHA256 d8a92d83db920a3e47b864b24e78407c1ef5b2c523e91dceae2d96f5bcce435e
-DIST MPlayer-1.1.tar.xz 11208088 RMD160 3722aac0847c4e2cd1e704c6ec610784a6b7a477 SHA1 913a4bbeab7cbb515c2f43ad39bc83071b2efd75 SHA256 76cb47eadb52b420ca028276ebd8112114ad0ab3b726af60f07fb2f39dae6c9c
-DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
-DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
-DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
-DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08a4dfafdc17d09 SHA1 3f60cf0ce8c910e3628e425167cb6a46bb4a29a3 SHA256 addaae78cfd7f8cb950370b3b43d82c2f8170830ccc1046b98726d34f3958bf5
-DIST mplayer-1.0_rc4_p20120213.tar.xz 5451168 RMD160 ebfa2e7f4ab5bc180eea0b2206e6194d678befa5 SHA1 846ab4a7624987d30d64a546a78952fe6f36203d SHA256 28080ae63b282d717ad85a30ab8f481c1d965c8400621528ee87c7bc7d6bc890
-DIST mplayer-1.0_rc4_p20120405.tar.xz 5449560 RMD160 e1286c02bda77d7e771cc36d043e1af993a99b6b SHA1 111d3e5e1a89bd9b9143e050bd0ee19e18f8f0ea SHA256 8da4ad1daa5c9b70884f775406c071c508b1bf5227084c895d840d08a115cc86
-EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20417 RMD160 d56b841ac39c9a3e90a00bee8613eb21b25beb61 SHA1 83e03154f1cdbee92501b850697d4b590ad228ee SHA256 6041d8cffc438f974c5dbe4a288c1d1150f4e57580350b157aac331c889a8f5e
-EBUILD mplayer-1.0_rc4_p20120213.ebuild 17809 RMD160 9641e8521689dcb6dc8f6c090249560d18e2ca2b SHA1 791940c7ce510e9ef91553fc70fd150af41ce7db SHA256 6cc016d7af8980f09044137a18e2ae4b698710fc0de16ccd6da8ecd74649b30d
-EBUILD mplayer-1.0_rc4_p20120405.ebuild 17909 RMD160 f312a9160f01b753c4e5c5c13cda2ed9f1c96cf7 SHA1 b2b0b058eed807846ec8c8038e95cae5149fc146 SHA256 b299103dbaa39026133d2e985d61de2b5ea46c692ad8031098e92b34f88beef7
-EBUILD mplayer-1.1-r1.ebuild 18117 RMD160 c1662050e9f4402176ae4f2dad193d3836cbe6a4 SHA1 df47a7d829f8a7e807212b5d7bca44c11ee13e10 SHA256 61c9b4645b8efb1b771055ffa83a73d610f276b7b572af17c6deb278b8d9900e
-EBUILD mplayer-9999.ebuild 18015 RMD160 fb4e93385fb5bb1f0b8afaf9ed4609c1d9e2c244 SHA1 d480886ddffc4a3c76964e85aa6754fa9dbbb541 SHA256 293b6222ee6e7a35cd770fac67ebbf4f5d20b99a3c8e11e856912e67d25390f4
-MISC ChangeLog 42782 RMD160 fd179f62af9d892acf71772ca7869666fc1f6a0c SHA1 22fdc0a878cbb0c8af6b075058ea059dfb74d26c SHA256 34c5fb258fdf9d65bf0d7d8dc39adc0fddc6fb225b204ca65804e955e2331d53
-MISC ChangeLog-2008 107064 RMD160 146604862227a837d1f463a96af6fe94d17421bf SHA1 5a18c910edcf540877f3b803fc85a9b74b503dd2 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b
-MISC metadata.xml 3656 RMD160 279a777fdac5399d578552d03cad2a55d0d44800 SHA1 54441f5e0245ac0a2e9b1c489aa6401be25435ed SHA256 c24294ec6e43cde01922b7b2d705e35a8a85fd2d8aca70a291f00ee0d10b9b1b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX dump_ffmpeg.sh 2489 SHA256 c714e2faa2128f1c94ac046ff106a5f845347d18e1099f6aeab90aff2326e98e SHA512 23a7ead05851f8ce6b9c94326072dd4aff62ee79addffaf67ffd9048895e3721ee83f1e8dd62ea15f6b93bbc963455dcc97cfe0150bc64b9b40e018739a5fa7a WHIRLPOOL 94c8a92c697834e43917e5cbba3880ecada05178ef123a4b2da6998e4f47ca204363451122443aab1f186618d2c43cecad39d94aac35989968d07609ed4900e5
+AUX ffmpeg.patch 650 SHA256 70170f747f6f26700394a7646c8258aab5dcd9b96c17cb797d9d6e7d7bb02f52 SHA512 77627b5433e0dfe2bfd1c0e95fdab96461be6ee0e477a6667eda9147a7040f51e9235384cfb60b600ff76d23cfd225848850dea13c058e59d98b5c475e0f46f4 WHIRLPOOL 8bf98a4b532b083f848880b23749f8b08c1d908a16424d6ba240c99f006515c98a97b1b6381eb333116f4683de8e8163da84dcb2183ac7f5376db2ea229b42cf
+AUX ffmpeg2.patch 805 SHA256 41a7602b579bdfc8ea3078e1023fcb73de017354dd40148255411ad55bdbc3fa SHA512 b1668dea423412f4bf0306bd6658839398979da9e8a641d3748072c235aed801a83602ca83ba65213ce600e8c1b4bc66acf59e40cfa938c5f69b45ec0c89da37 WHIRLPOOL 211cbd1577da6b446d9eeac244d60d9d7bcd4c59dfe0aa09cd3b28cc6479bbcbfe2ccf8dbd512f54414b3795788d19d532850fbc32efb171e7c6865f616945ea
+AUX mplayer-1.0_rc4-pkg-config.patch 2751 SHA256 9c0e5654ef05d64ae8bb91e3204433559a1f576b663217c6119bd61cec2ae51c SHA512 cda6680ce0f02ae211686630e6e036e6432006b8936b0e37a5ceda74d73012d65b9262350aee936057d733e513016071ef41cda283023570c98d822dab866de9 WHIRLPOOL dae658443451ef61906ded5d5d2ba220756f6007a88823bfa52b2ede63cbdf521065cb38b9085f504cabc3a8cdbdb1f4f3d6f647085ac0d8a818885a2301c0db
+AUX mplayer-1.0_rc4_p20110322-gcc46.patch 657 SHA256 4c57d5c4c79db87796b6b1b4a485f4d0a8ed95f3ae71040592a0bd5f3dc070b2 SHA512 ac58403a087712e5151f7c7e39d073a3fd5362356e0ff972f87f619dfdbfe10289eaa32ebf44b99e3d5773d9642619379eb60de2a9d9b8c78704ba24ab55c09d WHIRLPOOL f011ed55bf199b32ea2d8a61ec44a61590d46e1007c945d0e835301f0286a64b2046cebb984056c7bea3410349548ac2ee7380f859033cf527d35612d70814d8
+AUX mplayer-1.0_rc4_p20110322-sami_subtitle_parsing.patch 417 SHA256 413876d32509c5e09df58b6f833036cb16d1073fcfecb17e0be9dc355d0e7160 SHA512 229e2ee01a32aac69299fa02990d924c34008b2116a8fdebf1785b54cc24dc52ec0ec0ecc20cc409a8cd975a3c533653c4ea9ccecd4e311105828605c0fff9d4 WHIRLPOOL f91b5ef9f66e3b68de177a187b03764bdfbbdae473b5d6c0c14c3e9eda14abd31666156df9fe9fc974176e37d234ed61780555b41d9944eb37dd000a4215560c
+AUX mplayer-1.1-ffmpeg.patch 1452 SHA256 9c04f0a14f625a41a7bda49c5fc8d2622a85da349799904ec56244e87dd38d26 SHA512 23aaf6fc85101b92e81e37f39c2929874891387d15e420d524dc7248bcf995273d763b98ecf496e06d89a99b567631c5978adfda1f3ad076fbf980347ccf7e49 WHIRLPOOL 0549d6765bc7f22f325bab4a6a70dfe9827a48fd486aa8acc912e717948f814be695441ca70d38a7d074d38cfd5ce04c14a1bcc37b77475cc059a925b19d0305
+AUX prepare_mplayer.sh 758 SHA256 d8a92d83db920a3e47b864b24e78407c1ef5b2c523e91dceae2d96f5bcce435e SHA512 eea43b7816080b0ffbe48db56fffa4606c98ecf8ce8a44bd02b405b5744c024ef55705f53710b8d7b2750a1b7565905f5fa572c34982e1db66810c392584520c WHIRLPOOL 09b1c09fd5264887c5d59b8dbdb5cd08811f4d952bb254dcb4649e3a55d248b8f43c49c9da9d98caad6a5578f15e0e1b40f1d44826cf60cb338bf7b049c26ddb
+DIST MPlayer-1.1.tar.xz 11208088 SHA256 76cb47eadb52b420ca028276ebd8112114ad0ab3b726af60f07fb2f39dae6c9c
+DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
+DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
+DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
+DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 SHA256 addaae78cfd7f8cb950370b3b43d82c2f8170830ccc1046b98726d34f3958bf5 SHA512 2ca27c46720973ce0982b57e3cf988f39ece82abef7960adc2c8ad7cb2cee8c5929e3a13a2f39fa4ee758f73e04c8a8ec1169311a22b335a29f98d208ec7fe10 WHIRLPOOL ab87e214084c3bfa756c5747e175f34486e1023ff6db5c575c2aa4f2595acca45bade5ca40068f3df26d183423e83031602f4c44db5396dd34f40417559da6a5
+DIST mplayer-1.0_rc4_p20120213.tar.xz 5451168 SHA256 28080ae63b282d717ad85a30ab8f481c1d965c8400621528ee87c7bc7d6bc890
+DIST mplayer-1.0_rc4_p20120405.tar.xz 5449560 SHA256 8da4ad1daa5c9b70884f775406c071c508b1bf5227084c895d840d08a115cc86 SHA512 78bbf9a833a0fc3151c0a7cac14b3dfa52533ae8e50dafa6566de13a1f5a4fd8d3a7a7e78d8fc34c8664f622cd21ebf7f615e9b52c71057e9bd5cb994d65ec2a WHIRLPOOL f0186fe44d304eeb9f48e290dfc26f984ccebe290b2bc6849fb8c5dd8a14f97e7e6099aa0b62c9f267ea0ebe5e66c88ad3e4f512d9224ab7429229de937e4b0e
+EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20417 SHA256 6041d8cffc438f974c5dbe4a288c1d1150f4e57580350b157aac331c889a8f5e SHA512 56cb232cba9a34412f27402f90e92041953f9475e6969eca77f3785bfadf72f9943480adfa2128091f468942237ac85bdfac8667cb581e24af391b2e690041d9 WHIRLPOOL 37630c6cb096da5f2dbfdc4eb016173415a52ca73468b69f5153d174e84feed8ebc1329343d29a8da4796e98bb75f893e583f17ff8b6df2624a7295238ec39f7
+EBUILD mplayer-1.0_rc4_p20120213.ebuild 17809 SHA256 6cc016d7af8980f09044137a18e2ae4b698710fc0de16ccd6da8ecd74649b30d SHA512 15c3f093de1e09fda757618dad9e8bcacec39aa126ab25a4a2afb8704a93a37c1dbe37954218deb103ea46dd9120fec90bb36863348c977a02af5f0b9cbfc952 WHIRLPOOL 64d77e04a94bbc15b2b6e5995f580852f69e4904bf4cd7422e36137f6d33ec41c3aafc99f0981855f6772b8e9d47656f26201deff55af76f460f839e0e93ee11
+EBUILD mplayer-1.0_rc4_p20120405.ebuild 17909 SHA256 b299103dbaa39026133d2e985d61de2b5ea46c692ad8031098e92b34f88beef7 SHA512 79a76c4ddde85c2cf3a4d77bb2530c82f1bd023ea9ec6f25c3700bce542540130a309fcfad5a879910f036b1c739c4628a0d492c7fb479847cc280e3881b1c63 WHIRLPOOL 606cbfc2f8d709e4abb1bfe5a7ce9cccbab3a1354dc8564f9376832855ecb945b2974058c618564e93c5c083ef633e76da53503baff8a342930786efc9a5abe6
+EBUILD mplayer-1.1-r1.ebuild 18142 SHA256 8a5a91f55123d20f1eeb9bad47ea201f673785e2486272e6fd83537021aea4c2 SHA512 7b9e4201367dd159891a2cdaa85102352b618bd764a0cca1f86883270740495fa393a7e3de863f4f3d79c3a6714e4a9dbbf6a2440870670f430ccb559dce25d2 WHIRLPOOL 9af4cc50bcca367d786efeedd2eb4f4674ccd38f38793868c8cb819569ac815ce462a646624c4ffa6a135a695f1ca1d2e595003c3e4390c7ae194e31b63e46a0
+EBUILD mplayer-9999.ebuild 18015 SHA256 293b6222ee6e7a35cd770fac67ebbf4f5d20b99a3c8e11e856912e67d25390f4 SHA512 d74a45b7711cc6cf809c5c623636df1fc48e6bd5644862a100ef48c3b6507e2b5c96c0384f12d8025ca616e2681ae87d2163bd28436bf2e5de02435ba543a3d3 WHIRLPOOL 1d9b73610b3373f3a8a1cbbab12a70b1039f64c0723216cac771b462dac943d5edacb6f7cef774ff4bc4a23aa5fc85ef70d436b7b85d332e1e63e08d7c77b627
+MISC ChangeLog 42907 SHA256 2d70c9abfa01d1e09c3435f7d107448bce7cb63b7559dcf7870a336391614cdd SHA512 1d1f81376f3be82c5e4feaeca41f3b17b7ea119fb882b8ddc8d67409fe6ff132beda2f2e0bc75160802451d44fb263a8826707e60d665284c8c606cdd3d26d32 WHIRLPOOL a2a7dd95970bd44fe629952ad152a281cb74c5d37ddd83aa6aa0cf8029b4a08bbb1b5edec21f6cb6609e67af1d7e765392de3e7309edb9fa9bf928320b4e9f83
+MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
+MISC metadata.xml 3656 SHA256 c24294ec6e43cde01922b7b2d705e35a8a85fd2d8aca70a291f00ee0d10b9b1b SHA512 95ca63129536cbff57226cbaa7cec1a954fa3e562a96df80cf920099896bc207b19967d671f8bbb824751d0fed28f218a2cecd297c6851704cab70bc8d4e06d9 WHIRLPOOL 03a16ba10f4c4ee2995565ea0bb55dd963bc142dac7fb2addd1ce4a71a5ce2d660289cad9d65e1b9eb48649be64359bb74cb1d19ac69aada252c4b769bef4f89
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (SunOS)
+
+iEYEAREKAAYFAlAZCGsACgkQX3X2B8XHTolczQCeMj4heYBOikCuOcbzCWilOltG
+sUMAnAs6KyiKeIfSRwhCG2MABwSV1/1q
+=lDdd
+-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild
index 627e91a9c6c3..52116ec47592 100644
--- a/media-video/mplayer/mplayer-1.1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.3 2012/06/21 08:10:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.4 2012/08/01 10:43:48 grobian Exp $
 
 EAPI=4
 
@@ -183,8 +183,8 @@ REQUIRED_USE="bindist? ( !faac !win32codecs )
 	ggi? ( X )
 	xinerama? ( X )
 	dga? ( X )
-	opengl? ( X )
-	osdmenu? ( X )
+	opengl? ( || ( X aqua ) )
+	osdmenu? ( || ( X aqua ) )
 	vdpau? ( X )
 	vidix? ( X )
 	xscreensaver? ( X )