diff options
author | Patrick Lauer <patrick@gentoo.org> | 2015-06-18 02:29:37 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2015-06-18 02:29:37 +0000 |
commit | 83365cb883b1d6d16e20072f186222393340a831 (patch) | |
tree | 920dd10bd7bdc83e1eff8e749c9e716d32e56a2d /media-tv | |
parent | Bump (diff) | |
download | gentoo-2-83365cb883b1d6d16e20072f186222393340a831.tar.gz gentoo-2-83365cb883b1d6d16e20072f186222393340a831.tar.bz2 gentoo-2-83365cb883b1d6d16e20072f186222393340a831.zip |
Drop directfb useflag as dependencies for it are unsatisfiable #545246
(Portage version: 2.2.20/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-tv')
-rw-r--r-- | media-tv/freevo/ChangeLog | 6 | ||||
-rw-r--r-- | media-tv/freevo/freevo-1.9.0-r1.ebuild | 17 | ||||
-rw-r--r-- | media-tv/freevo/freevo-1.9.0.ebuild | 17 |
3 files changed, 17 insertions, 23 deletions
diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog index 152da9f13343..01c71853603f 100644 --- a/media-tv/freevo/ChangeLog +++ b/media-tv/freevo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-tv/freevo # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.88 2015/03/21 18:45:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.89 2015/06/18 02:29:37 patrick Exp $ + + 18 Jun 2015; Patrick Lauer <patrick@gentoo.org> freevo-1.9.0-r1.ebuild, + freevo-1.9.0.ebuild: + Drop directfb useflag as dependencies for it are unsatisfiable #545246 21 Mar 2015; Justin Lecher <jlec@gentoo.org> freevo-1.9.0-r1.ebuild, freevo-1.9.0.ebuild: diff --git a/media-tv/freevo/freevo-1.9.0-r1.ebuild b/media-tv/freevo/freevo-1.9.0-r1.ebuild index 97fe2609be66..75b6b17950a7 100644 --- a/media-tv/freevo/freevo-1.9.0-r1.ebuild +++ b/media-tv/freevo/freevo-1.9.0-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-tv/freevo/freevo-1.9.0-r1.ebuild,v 1.6 2015/03/21 18:45:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0-r1.ebuild,v 1.7 2015/06/18 02:29:37 patrick Exp $ EAPI=5 @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="directfb cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X" +IUSE="cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X" RDEPEND=" dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] @@ -32,15 +32,14 @@ RDEPEND=" >=dev-python/kaa-imlib2-0.2.3[${PYTHON_USEDEP}] dev-python/kaa-display[${PYTHON_USEDEP}] - media-video/mplayer[directfb?,fbcon?] - >=media-libs/libsdl-1.2.5[directfb?,fbcon?] + media-video/mplayer[fbcon?] + >=media-libs/libsdl-1.2.5[fbcon?] media-libs/sdl-image[jpeg,png] x11-apps/xset cdparanoia? ( media-sound/cdparanoia ) dvd? ( >=media-video/lsdvd-0.10 - directfb? ( media-libs/xine-lib[directfb] ) fbcon? ( media-libs/xine-lib[fbcon] ) encode? ( media-video/dvdbackup ) ) @@ -58,11 +57,11 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${P}-{PIL,distutils-r1}.patch ) pkg_setup() { - if ! { use X || use directfb || use fbcon || use matrox ; } ; then + if ! { use X || use fbcon || use matrox ; } ; then echo ewarn "WARNING - no video support specified in USE flags." ewarn "Please be sure that media-libs/libsdl supports whatever video" - ewarn "support (X11, fbcon, directfb, etc) you plan on using." + ewarn "support (X11, fbcon, etc.) you plan on using." echo fi @@ -119,12 +118,8 @@ src_install() { cd "${S}/src" || die if [ "${PROFILE_ARCH}" == "xbox" ]; then myconf="${myconf} --geometry=640x480 --display=x11" - elif use matrox && use directfb; then - myconf="${myconf} --geometry=768x576 --display=dfbmga" elif use matrox ; then myconf="${myconf} --geometry=768x576 --display=mga" - elif use directfb; then - myconf="${myconf} --geometry=768x576 --display=directfb" elif use X ; then myconf="${myconf} --geometry=800x600 --display=x11" else diff --git a/media-tv/freevo/freevo-1.9.0.ebuild b/media-tv/freevo/freevo-1.9.0.ebuild index 97daa705f172..845ccd40841c 100644 --- a/media-tv/freevo/freevo-1.9.0.ebuild +++ b/media-tv/freevo/freevo-1.9.0.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-tv/freevo/freevo-1.9.0.ebuild,v 1.21 2015/03/21 18:45:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0.ebuild,v 1.22 2015/06/18 02:29:37 patrick Exp $ EAPI="3" PYTHON_DEPEND="2:2.5" @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="directfb cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X" +IUSE="cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X" RDEPEND="dev-python/beautifulsoup:python-2 virtual/python-imaging @@ -29,15 +29,14 @@ RDEPEND="dev-python/beautifulsoup:python-2 >=dev-python/kaa-imlib2-0.2.3 dev-python/kaa-display - media-video/mplayer[directfb?,fbcon?] - >=media-libs/libsdl-1.2.5[directfb?,fbcon?] + media-video/mplayer[fbcon?] + >=media-libs/libsdl-1.2.5[fbcon?] media-libs/sdl-image[jpeg,png] x11-apps/xset cdparanoia? ( media-sound/cdparanoia ) dvd? ( >=media-video/lsdvd-0.10 - directfb? ( media-libs/xine-lib[directfb] ) fbcon? ( media-libs/xine-lib[fbcon] ) encode? ( media-video/dvdbackup ) ) @@ -53,11 +52,11 @@ RDEPEND="dev-python/beautifulsoup:python-2 vorbis? ( media-sound/vorbis-tools )" pkg_setup() { - if ! { use X || use directfb || use fbcon || use matrox ; } ; then + if ! { use X || use fbcon || use matrox ; } ; then echo ewarn "WARNING - no video support specified in USE flags." ewarn "Please be sure that media-libs/libsdl supports whatever video" - ewarn "support (X11, fbcon, directfb, etc) you plan on using." + ewarn "support (X11, fbcon, etc.) you plan on using." echo fi @@ -112,12 +111,8 @@ src_install() { cd "${S}/src" if [ "${PROFILE_ARCH}" == "xbox" ]; then myconf="${myconf} --geometry=640x480 --display=x11" - elif use matrox && use directfb; then - myconf="${myconf} --geometry=768x576 --display=dfbmga" elif use matrox ; then myconf="${myconf} --geometry=768x576 --display=mga" - elif use directfb; then - myconf="${myconf} --geometry=768x576 --display=directfb" elif use X ; then myconf="${myconf} --geometry=800x600 --display=x11" else |