diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-12-17 15:52:03 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-12-17 15:52:03 +0000 |
| commit | 11a068b7c8fc8908e019702c12fe10932c99fb77 (patch) | |
| tree | 35290102b174a0924f5c22337e35c7ca60778c3b /media-video | |
| parent | Version bump. Drop rbx until problems with it have been resolved. (diff) | |
| download | historical-11a068b7c8fc8908e019702c12fe10932c99fb77.tar.gz historical-11a068b7c8fc8908e019702c12fe10932c99fb77.tar.bz2 historical-11a068b7c8fc8908e019702c12fe10932c99fb77.zip | |
remove dead code: faac + bindist is disallowed by REQUIRED_USE
Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/Manifest | 10 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 4eda2a97388e..44a7bd78e1f4 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.819 2011/12/17 13:01:33 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.820 2011/12/17 15:52:03 aballier Exp $ + + 17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild: + remove dead code: faac + bindist is disallowed by REQUIRED_USE 17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-1.0_rc4_p20111215.ebuild, mplayer-9999.ebuild: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 38a282dcc3e8..bdfcf1bdc34f 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -12,13 +12,13 @@ DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08 DIST mplayer-1.0_rc4_p20111215.tar.xz 5209748 RMD160 294a0a6aaf773c0c59e772e059541a315b8134dd SHA1 69f46ffe5b26f1b30a4afbf66bae42f033fca199 SHA256 edb23cae8c49cace3ecb303b6d66490e9a143c5d2d9db803f9ec1bbbbb874635 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20381 RMD160 19bc9b09ce7902b4a7b16d5b5bd2215dc07a7f1e SHA1 08e9ca9249683695feab78ca3644dcfa1cc586b8 SHA256 1322ed59489cec383d7dac04c752cd083132c21711183e5bc02d70b2a525ab94 EBUILD mplayer-1.0_rc4_p20111215.ebuild 19455 RMD160 2eb8087a10021f937cc894ffc840f08471a59f14 SHA1 ac7409811698ad1dac29d45ba8ead0a777891c0d SHA256 28678530fed056e3e826ebbddac5069ccb435adef250bda27fa4f41f85acbc8e -EBUILD mplayer-9999.ebuild 19782 RMD160 0994f7ead833213605b6a9fdd6942aaf1fb03a4f SHA1 5a394837d01682b7c68f5d6cc14ed6353e635920 SHA256 da98e408c0543ca810a79093c96edf5409322fbd53c6beb4f21a0974c09ac00a -MISC ChangeLog 143369 RMD160 cb133ccdf9293acc58d926275bc4878b5909378a SHA1 1999a490f32c78c074a1bab910cac15d445742be SHA256 08c4a3ab224633ed4f9db4a44edff49fee1568151bf9e9073c14249b3e5d1f19 +EBUILD mplayer-9999.ebuild 19621 RMD160 d2c39e37a529cc1c32369e212c8def443d3d1807 SHA1 b4bd724173a18aa50b2b3177f31a3f39c476728c SHA256 6035b5341de469b80c5afbc616accd9da41c9bf8559cb1f9ece3fe6e08282a5c +MISC ChangeLog 143508 RMD160 67c5cb83da4f0abef2fa970bf553c8711e99b255 SHA1 46a5dd3bd5c6aeed9d165f39d80ad36816d0bca9 SHA256 12f3a143144853b91b874b7cfdd998617e07bd111a5355f242817634894520f7 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7skrMACgkQvFcC4BYPU0oz1QCgxDc6tWAqdp9/ha16uG8K8u+o -kCMAmwWbdGn/aZQzjRxFUzgBnWXEfuaw -=F0o3 +iEYEARECAAYFAk7suqkACgkQvFcC4BYPU0pxMQCdHsM5pmFVujkBz0HnqJUR+uO2 +h0kAnjZkA0QnHjmd43bmGj9zsVpyRO/G +=pUXp -----END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index c3409df9d25e..e9cdc1bc5623 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.112 2011/12/17 13:01:33 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.113 2011/12/17 15:52:03 aballier Exp $ EAPI=4 @@ -99,7 +99,7 @@ RDEPEND+=" encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) - faac? ( !bindist? ( media-libs/faac ) ) + faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423 ) xvid? ( media-libs/xvid ) @@ -434,10 +434,6 @@ src_configure() { for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done - if use bindist && use faac; then - ewarn "faac is nonfree and cannot be distributed; disabling faac support." - myconf+=" --disable-faac" - fi else myconf+=" --disable-mencoder" for i in ${uses}; do |