diff options
| -rw-r--r-- | media-video/dvdrip/dvdrip-0.98.11-r3.ebuild | 19 | ||||
| -rw-r--r-- | media-video/dvdrip/dvdrip-0.98.11-r4.ebuild (renamed from media-video/dvdrip/dvdrip-0.98.11-r2.ebuild) | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild index fcf2a6b95b1f..1b3950780616 100644 --- a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild +++ b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,25 +10,22 @@ HOMEPAGE="http://www.exit1.org/dvdrip/" SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid" DEPEND=">=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 - || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] + virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 " RDEPEND="${DEPEND} x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 - ffmpeg? ( - libav? ( media-video/libav ) - !libav? ( media-video/ffmpeg:0 ) - ) + ffmpeg? ( virtual/ffmpeg ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) @@ -40,8 +37,7 @@ RDEPEND="${DEPEND} vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) - >=media-video/lsdvd-0.15 -" + >=media-video/lsdvd-0.15" pkg_setup() { filter-flags -ftracer @@ -55,9 +51,6 @@ src_prepare() { epatch "${FILESDIR}"/${P}-fix_parallel_make.patch # Fix default device for >=udev-180 wrt #224559 sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die - - # Ubuntu patch for supporting libav - use libav && epatch "${FILESDIR}"/${P}-libav.patch } src_install() { diff --git a/media-video/dvdrip/dvdrip-0.98.11-r2.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild index e922eb4a29e4..7e5c026467c8 100644 --- a/media-video/dvdrip/dvdrip-0.98.11-r2.ebuild +++ b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,22 +10,25 @@ HOMEPAGE="http://www.exit1.org/dvdrip/" SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid" DEPEND=">=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/gtk2-perl >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 - || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] + virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 " RDEPEND="${DEPEND} x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + libav? ( media-video/libav ) + !libav? ( media-video/ffmpeg:0 ) + ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) @@ -37,7 +40,8 @@ RDEPEND="${DEPEND} vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) - >=media-video/lsdvd-0.15" + >=media-video/lsdvd-0.15 +" pkg_setup() { filter-flags -ftracer @@ -51,6 +55,9 @@ src_prepare() { epatch "${FILESDIR}"/${P}-fix_parallel_make.patch # Fix default device for >=udev-180 wrt #224559 sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die + + # Ubuntu patch for supporting libav + use libav && epatch "${FILESDIR}"/${P}-libav.patch } src_install() { |