From 01d0d8a573e3b871da3b6d00521de7c2fa1e54e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sun, 15 Mar 2015 17:45:38 +0000 Subject: [PATCH] Add conditional bindist restriction and remove bindist USE flag, bug 541594. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8! --- media-video/mplayer/ChangeLog | 7 +++- media-video/mplayer/Manifest | 37 +++++++++---------- media-video/mplayer/metadata.xml | 3 +- media-video/mplayer/mplayer-1.1.1-r1.ebuild | 7 ++-- .../mplayer/mplayer-1.2_pre20130729.ebuild | 6 +-- .../mplayer/mplayer-1.2_pre20141011.ebuild | 6 +-- .../mplayer/mplayer-1.2_pre20150214.ebuild | 6 +-- media-video/mplayer/mplayer-9999.ebuild | 6 +-- 8 files changed, 40 insertions(+), 38 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index d1a59ae3d54e..0dd881783867 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.935 2015/03/02 09:21:49 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.936 2015/03/15 17:45:19 ulm Exp $ + + 15 Mar 2015; Ulrich Müller mplayer-1.1.1-r1.ebuild, + mplayer-1.2_pre20130729.ebuild, mplayer-1.2_pre20141011.ebuild, + mplayer-1.2_pre20150214.ebuild, mplayer-9999.ebuild, metadata.xml: + Add conditional bindist restriction and remove bindist USE flag, bug 541594. 02 Mar 2015; Agostino Sarubbo mplayer-1.2_pre20130729.ebuild: Stable for ppc, wrt bug #517692 diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index d7f3b809c923..cb2d9db1694a 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -20,28 +20,25 @@ DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c0 DIST mplayer-1.2_pre20130729.tar.xz 5358436 SHA256 9928cd6d0d765eb38f2824c501b94e5b6e0a2ec6e39a0c788654c5508c9eb9ab SHA512 e76ae7a1aeca9e853edf5403f3e3ae60dace980076a12160c501e18d019184af08256829f8e657b9fdbf549126bf518cf5dbe2860eda906e6fcd3ccc44a5f5a5 WHIRLPOOL b4007e4a00fd8b0b2d75a6d375f3b334b3251ea8dd677a5c1d562e4997fbbee81981bbbde9a88a61dc83bfc2d3e5dac6f93e7ff882088ba8b0c3df7c2cd9a6bd DIST mplayer-1.2_pre20141011.tar.xz 5357084 SHA256 5657720f44602e5fef04b215ce4116014d08934772cf9011038327b9e413d14d SHA512 9d7497b9ca0ea6f260251f410020b40be8cd9baa95e06d6f6d3d8e299a87ae3a56d8451bd078ca4077de38f7e8907da1763e3dbd21357769e282f91241f650da WHIRLPOOL 39903730b0d9eb8ea17730f282a1ba70c923ffa3f5c31a9ad9b8d56cc5e7bef75531159f06ded141e08581171df4016e8486892067bad2c82086d4c6147731b4 DIST mplayer-1.2_pre20150214.tar.xz 5240936 SHA256 1b252ad20a77bc1ade022deaeb5e13f88422f9c1a9eeee646334107a35e8bdd3 SHA512 9cfa28ce6d8ec6c9d070e4573744d788dde9df63c24525667a0144c436bbb9336f01f3a4b9a5d22114decd7772151d3c0a7d6a902d2528092e374572d5d793e4 WHIRLPOOL bb05b6712b0e0e9db475e4845c7dde728722a7ec7ed442a33d0f5af43f2922c2883bc71916a0f4006bfd3ec29e165903c6e46668afb6e0c9832791be725d81d7 -EBUILD mplayer-1.1.1-r1.ebuild 18462 SHA256 36dca2cc8bb7b177ed8dd3fa8b8a2ab9b270246ffd8eb32238dcff5a08ade827 SHA512 e293842a172eb6f3c1f014b551f857aaa522ef015fb2af53ee647df7e956a17ca1d889a0c0362dc38b19bbaa32ab381d417a4e1296782c76431a2582159499dc WHIRLPOOL bb820d62d91c385dd3fff0d7232b81248f0f3952cd70c96f80b2bb4b3b46e95226f0e00ba38a8aa9fdae114992699618e2876651cf7749d954015c09620b834e -EBUILD mplayer-1.2_pre20130729.ebuild 17533 SHA256 07994b5eb5b41eda34f0a1076e9f65cdf39ba0c95cd92fab2bd8b9d316e29482 SHA512 1e70515eba1191d2a4cc79728d59665985fafdd37e49b029d5dc1a8f76f63109afc57e054a041f0e1f4a698f761a1c885e83185ae1ed633ca32149016102dcb4 WHIRLPOOL 796044a950f40eb1c4cce55c686dcc2bdd5e65c6f06cbea79251b3331cefac4a4ef935de473d402557a1a87f6c1a0c36bf026a9b345c0a32e5d238e02215350e -EBUILD mplayer-1.2_pre20141011.ebuild 17386 SHA256 5b470c922df18c08d7b6e198e1a3ffc64bc28a41fc74434fee117923db0213e1 SHA512 68fcdf71a17f139e318f5037ba1dd183f0b58739387d6342283f968ee1838a3ff340d307a79ce40a6f75b37ad81aba94f94aecf2812747625531e78223a6cee1 WHIRLPOOL 593d47eaddd2c818a13b628a2672f247d308a173f08218b3074c31f9faa4d1368eef9f70199b7e314bfef07b7c75f39bc3ba528a020431d5547ffe3eff328be5 -EBUILD mplayer-1.2_pre20150214.ebuild 17312 SHA256 802851cfa3d2bb81f671a47a523e409403ace6216843ca011626231defbd2299 SHA512 bbaf196929b013dcbf8f79cc1dc5a8822025c95ef84341eb27137ac39aaedce5d2c3270b79346c23d620a8f115fc2a8f7cecaac684b0d4d5c28ca8d3d9a80798 WHIRLPOOL ff2aa6cd28b47a3e731f893f29e9df1c9b132c6659af840e447c49164fb210069ef26e53bf2fb0d7e4c5e0139dc18615d948850de2067ee91bab98d5dd0b5b76 -EBUILD mplayer-9999.ebuild 17309 SHA256 e0126a0eaa0d3792725d99b59515fbcb33ef465cbb0c1e6160993bfe34a6fe80 SHA512 07e122487289c6883538ca96828aad4eab4535b614fc02fdb540abbbe3c2aca160c35051cdc0bc1a2eb1907669286c0940c595bd66a544503d64145d15cb7658 WHIRLPOOL d5c76bda4e5b9148e5b30c5383eee74618efbdc961377d33e56f6b63f85fafbb7604ca378c2be51d8ebd4990abc233154720022bc00026acde0223f93a1bcb15 -MISC ChangeLog 54763 SHA256 83a28125c5007a9872ed1f2f30dd0a6b0b3d6ccb91b41a0be4e1a7548b37082c SHA512 feb484fb2c2d0748b6ff5fbe5869be222ae0e72a5ffd72d47913a16c9133e6595ea9f7609c793b9836febdd71ecc43cdf1819844869f4275c5fb333319a9f505 WHIRLPOOL 7d0eb2d1f35347e515e8ba719f2f7ee326ded9e85f77c7363a8322bfbcc43d7ecf8f32c311944e8a91db55dc1cd3f77af3e3a440f6e3de85be0fb8ddb30d5ea5 +EBUILD mplayer-1.1.1-r1.ebuild 18462 SHA256 ded60f7a077b3ba72f79c5e55ab4c3f7bb4ed2193cc7b768ea430c4b132eac8f SHA512 1dd5bfc4ae154f2a9069e294ade5d101b5453cdb2b7f01e8bab86074e9297283916169f8d089b4eb09f17e367ad32df159237eae6d0a3817a377dd85efba9b60 WHIRLPOOL 20e69aa53fffce5ed840ae997b9e580260d26848acf4b8d10370d3f0c20f88241998c1df84fcc4cbfaf2bebb6002b35aee1db4545c6bef82af25736e4b4235a6 +EBUILD mplayer-1.2_pre20130729.ebuild 17534 SHA256 18e9551bbe74620899145650431863100ce67e5a5dac6d21f4dc9c6b1fe94837 SHA512 fc5efd2dda5f8b7152ae0dc7c9047a6b94a9c552878f5ccae735551a9c4c72617e9e20d76ef7d1e41424e6cb1804c50a8023df11da5ba6b1a580c83704205e13 WHIRLPOOL dbaab301c0f192609a82f23bd986b564e241e46640326111074a9198205106e40d4034306b027d29dedcf0b54ac8de49cdf406cf6797d7270c14a9ef9fb9ff93 +EBUILD mplayer-1.2_pre20141011.ebuild 17384 SHA256 fa1304335d694507f685cb87024dfd42ad3fa1a3d8adebecc6eb9d0d850cba16 SHA512 2b45978dcc2183f4a1cda1ee0b3a5edaab03753f6092ed2976ffad0df7ada8299d5e49e5c86d442c9cb6d2d1104bdf55cebb9887a2c4a88ccc5f7f482e354634 WHIRLPOOL b85d5326a11db4943e23c51cb371632c7beb60b619823eda1ae2b5d4456a6f92fe642669235714127a95dcfae0a739efa7ccde0fd1ee23b376d96bb39b81ff2a +EBUILD mplayer-1.2_pre20150214.ebuild 17308 SHA256 085123dbd57828ae2ba5c5576cde4d6e7306a2967ffbc37364b4ff3c492c61b9 SHA512 023d820d9086b5896bf726d824c7ba74776422af0882bb049d739d50d87effc62e3d9884692dd2d144f77eb4e5a6fdcaf6cc900ee0d1ea1b2fde739dd98b6f73 WHIRLPOOL 1063e280b9b69e7d5bcdb466221a7c25ff92823164bd090ee4ff287982ccab139b785cfa49f975620033f45af79fe66d879f0657cbc0b5f646e4baf8657f946f +EBUILD mplayer-9999.ebuild 17305 SHA256 d4a695dea61e7f446b4b0683d349d941b8b9d6b7a37f948c2004a1bd821d46f5 SHA512 70db2a61d8ffc061d98016b1f1dd34f9f4ba84d6bb2095a7e670198cbb8f25682a766124afac8b03369891333ddaba3edc9488ed02a4176d641c82aadc44e0fe WHIRLPOOL e6eb0bd8bf6fb99de2e31f3d6b6ddaa514863e66211313a371948095ad7afb2c299eaad5c5901297427a050ab303f04e5e42b41c34fd873816909381c1bfdba0 +MISC ChangeLog 55050 SHA256 9f62381a411d4fd50cf2fd6746fab7030ad194f7c8c2e1d22710f09cc9c5f1d9 SHA512 20816082f6680ce3fa8aec2af468fbb1f9ff5c03e13f33af873a374ce2ac9550466e906b0fb65e28435f1561177a14205f5944f5d708b18cbf41637de0957de5 WHIRLPOOL ba9aa2275dcecd3b30609dfbe81dee7d294403db90ab409bf38495ebc5269392e91b3837e4be8de2c4b1e1b049a76e435306abd57f650dafcd6fa670fa43de22 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74 -MISC metadata.xml 2587 SHA256 6e73e451f391153d0f686fc2afed9e2b846f9a70fd7be2d00a07a961d069aff4 SHA512 e82c5d3465d4b8d7206eea6e5614f547374581330557a9c76c281502ce5837c97847d2007df49c6727924cdaca1fb7ef297194d2ddbe1ccfae944aad251c6696 WHIRLPOOL c5618151508c3020c44f655cec0e6ee2e76ea4262165e78373386f926836a0b2377725545667a9b22261e905d72b4ed4b1696218aee9a7d80787c63c71eef224 +MISC metadata.xml 2494 SHA256 42d5b15b5dc7dba48769422e47023ede8909df10939cded423925888391bfcd6 SHA512 536240119b02f03666aeb2e4f21c01b6c1da55b740dbcdea868de2adacc09725b57baa84d20df3c5665b7d074ece67790134f63b4119d759c09a2e588c857c4f WHIRLPOOL 7275bd0762ef93bfb29953fc4e7d7c5df4b76bc816a9fe64696c265e1a9330cba34e117356ee2af746c1d06b3f0004d10e8c10ef6d49239b009b01a6179fbe53 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU9CuuAAoJELp701BxlEWfWdsP/iSoH8EkcddVj9eH8wyXKw6r -pEPAVJsm1CeM8BQz2erzHCchrXW7rIq7HCUu7ewiopAcdySH1MOxRNMYm2bYEU0N -RKoZ6RZk6CwG5D5BGWyK0sWoRwq1InMxd1momu4RjNC11/a95Alm9bfXc/NgK9Tc -ec+PIJIrNgJTtnnNyO6N3TdqoRHp+rXXAmgZPXEYerD1xnfWXhBMfNlSO4f7YVIi -pxgWqQKoPockUmSA3FK2ZLUNRlpI07oXGRCXlTIMJFynQ3ZekEzW2QZYmn6aeRmy -wdswgcuWnThwUgGanNUbECeRxmbEp2ampuW5mGubkUsY1S5xsCJdC2sjKShKp5Iy -5GreiJjxNqS0a1iD6mC0a/xNQdqUmfsYjU0HbFw9TwzkiKliPxbpSdhaFgo9wotr -rMXVAJ00lSNGHZDMHp/xYMWgZWfAhSV1qUNAWTH+ywpuH89IUR/+SMBsCOUgQFfk -wjJk5JoDH1WzKb2tcjBDqyVSt3pxrF/37YvioVb47y2bzVaQ8RqBDchDR0sEvdGz -lkxc1ZPPmakcSqJNpNM++lx9K7jtqLnUGxxWm4SdS0tw9b8bXJaivaTXn7ztq2Lg -A49cxbgq7xiFrU/lbp5f4qlMiKoRlR4xwOLTnAxUfKIh7tMt0lUKJWfU8WjHMqOF -Ug2HjShYXgL9Xrr8vLW6 -=ny74 +iQGcBAEBCAAGBQJVBcU/AAoJEJQzkH1pP7W4hfEL/2PGIy8192R8WVRtBxO6RN0N +Z8CL5VSQCkS40j/a6th6Ei+FcMykbKi9/UcaHvPbZvlTukC3xEK7Xw/Gf5dMAeaK +gKcRke6kjv+ycEjn4qvl+J2a6E6um8Gd0ODcWl/EPfdYovNuu1rJCkyuLRKzMjr+ +64wjsIo7T9E3TpMvOqvTwjTKq++kJby4iiSCOPChRJHZgYnxtgO2KURjR28zgNDI +IHpVYH8fdsTlXxU1AaVfLWDNB6zsr4X5L/HoLfzr+gh+42f6lGBb47dlesOA/x0l +7JbKXv/d92eJWO+cj5i9QEmHONsxwAufn5N6tYgPVac1cMjCiHCouw/AMBMLPuKz +aHkQoyBYWQqiZ5FE+JN7atg1y0TDYzHUIS0gc7d7p7TeoFpLoFQ1fiLUxvPk1Zmx +0XQhvbvnoSbzoONX9+fYL0rblv3MikzF+3lSsZ4pzGLCtZ5/QOb52W3LEZyaM3dj +smvDI9343v93YHYKMOlZQLUbc/iUzpTHV+r2vMqang== +=cdll -----END PGP SIGNATURE----- diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml index 472986b34967..0e3701050a08 100644 --- a/media-video/mplayer/metadata.xml +++ b/media-video/mplayer/metadata.xml @@ -6,12 +6,11 @@ media-video@gentoo.org - Enforces license compatibility constraints via REQUIRED_USE. Blinkenlights video output Enable playback of Blu-ray filesystems Enable Bauer stereophonic-to-binaural headphone filter Use libcdio for CD support (instead of cdparanoia) - Enables runtime CPU detection (useful for bindist, compatibility on other CPUs) + Enables runtime CPU detection (useful for binpkgs, compatibility on other CPUs) Use forked libdvdnav, navigate menus in GUIs Enables support for charset discovery and conversion Use external faac library for AAC encoding diff --git a/media-video/mplayer/mplayer-1.1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1.1-r1.ebuild index bac881d5293d..5860f2f749e9 100644 --- a/media-video/mplayer/mplayer-1.1.1-r1.ebuild +++ b/media-video/mplayer/mplayer-1.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild,v 1.15 2015/01/30 17:15:57 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild,v 1.16 2015/03/15 17:45:19 ulm Exp $ EAPI=4 @@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} -IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray +IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext +a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc +dts +dv dvb +dvd +dvdnav +enca +encode faac +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa @@ -169,7 +169,7 @@ fi # libvorbis require external tremor to work # radio requires oss or alsa backend # xvmc requires xvideo support -REQUIRED_USE="bindist? ( !faac ) +REQUIRED_USE=" dvdnav? ( dvd ) libass? ( truetype ) truetype? ( iconv ) @@ -183,6 +183,7 @@ REQUIRED_USE="bindist? ( !faac ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )" +RESTRICT="faac? ( bindist )" PATCHES=( "${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch" diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild index 14aec3611742..afeec13fc72a 100644 --- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild +++ b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.18 2015/03/02 09:21:49 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.19 2015/03/15 17:45:19 ulm Exp $ EAPI=5 @@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} -IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray +IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa @@ -172,7 +172,6 @@ fi # radio requires oss or alsa backend # xvmc requires xvideo support REQUIRED_USE=" - bindist? ( !faac ) dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) @@ -187,6 +186,7 @@ REQUIRED_USE=" xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )" +RESTRICT="faac? ( bindist )" PATCHES=( "${FILESDIR}/${P}-compat.patch" ) diff --git a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild index 96fbff9463ef..50ccdbfbd350 100644 --- a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild +++ b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild,v 1.5 2015/01/30 17:15:57 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild,v 1.6 2015/03/15 17:45:19 ulm Exp $ EAPI=5 @@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} -IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray +IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa @@ -172,7 +172,6 @@ fi # radio requires oss or alsa backend # xvmc requires xvideo support REQUIRED_USE=" - bindist? ( !faac ) dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) @@ -187,6 +186,7 @@ REQUIRED_USE=" xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )" +RESTRICT="faac? ( bindist )" pkg_setup() { if [[ ${PV} == *9999* ]]; then diff --git a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214.ebuild index f2e56992c17f..a6c2494fdf4d 100644 --- a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild +++ b/media-video/mplayer/mplayer-1.2_pre20150214.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20150214.ebuild,v 1.2 2015/02/14 20:44:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20150214.ebuild,v 1.3 2015/03/15 17:45:19 ulm Exp $ EAPI=5 @@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} -IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray +IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa @@ -172,7 +172,6 @@ fi # radio requires oss or alsa backend # xvmc requires xvideo support REQUIRED_USE=" - bindist? ( !faac ) dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) @@ -187,6 +186,7 @@ REQUIRED_USE=" xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )" +RESTRICT="faac? ( bindist )" pkg_setup() { if [[ ${PV} == *9999* ]]; then diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 53ab7a7937df..2428b9f6c791 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.167 2015/02/14 20:44:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.168 2015/03/15 17:45:19 ulm Exp $ EAPI=5 @@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} -IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray +IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa @@ -172,7 +172,6 @@ fi # radio requires oss or alsa backend # xvmc requires xvideo support REQUIRED_USE=" - bindist? ( !faac ) dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) @@ -187,6 +186,7 @@ REQUIRED_USE=" xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )" +RESTRICT="faac? ( bindist )" pkg_setup() { if [[ ${PV} == *9999* ]]; then -- 2.26.2