summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-04-29 18:11:44 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-04-29 18:11:44 +0000
commit4d5b7ee47c2dd26c38c822691755b6228ab3da84 (patch)
tree0767f7830a156f70a3b06b6b133b750e4e97226d /media-video
parentDrop extra CFLAGS (diff)
downloadgentoo-2-4d5b7ee47c2dd26c38c822691755b6228ab3da84.tar.gz
gentoo-2-4d5b7ee47c2dd26c38c822691755b6228ab3da84.tar.bz2
gentoo-2-4d5b7ee47c2dd26c38c822691755b6228ab3da84.zip
So long cdparanoia, you served well. Thanks to Nikoli for the headsup. Fixes bug#414013
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer2/ChangeLog6
-rw-r--r--media-video/mplayer2/mplayer2-9999.ebuild9
2 files changed, 8 insertions, 7 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 69c4940cd77a..42965583e6fd 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.44 2012/04/24 15:31:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.45 2012/04/29 18:11:44 scarabeus Exp $
+
+ 29 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+ So long cdparanoia, you served well. Thanks to Nikoli for the headsup. Fixes
+ bug#414013
24 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
Drop removed switch. Thanks to Nikoli.
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index e8ca1205381a..f321a2857430 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.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/mplayer2/mplayer2-9999.ebuild,v 1.28 2012/04/24 15:31:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.29 2012/04/29 18:11:44 scarabeus Exp $
EAPI=4
@@ -33,7 +33,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
fi
IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl
-bluray bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts
+bluray bs2b cddb +cdio cpudetection custom-cpuopts
debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad fbcon ftp
gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc live
mad md5sum +mmx mmxext mng +mp3 nas +network nut +opengl oss png pnm pulseaudio
@@ -49,8 +49,7 @@ done
# bindist does not cope with win32codecs, which are nonfree
REQUIRED_USE="bindist? ( !win32codecs )
- cdio? ( !cdparanoia )
- cddb? ( || ( cdio cdparanoia ) network )
+ cddb? ( cdio network )
dvdnav? ( dvd )
radio? ( || ( dvb v4l ) )
dxr3? ( X )
@@ -100,7 +99,6 @@ RDEPEND+="
bluray? ( media-libs/libbluray )
bs2b? ( media-libs/libbs2b )
cdio? ( dev-libs/libcdio )
- cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
@@ -276,7 +274,6 @@ src_configure() {
########
use cddb || myconf+=" --disable-cddb"
use cdio || myconf+=" --disable-libcdio"
- use cdparanoia || myconf+=" --disable-cdparanoia"
################################
# DVD read, navigation support #