[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

[Pacho Ramos]

commit:     68e86a40756665dfa11d171dcefcf4e373c53759
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 19:27:53 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 20:04:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e86a40

media-libs/xine-lib: Drop directfb support (#642500), slot operator needed for libva (#641634), really drop .la files and COPYING file.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...e-lib-1.2.9999.ebuild => xine-lib-1.2.9-r1.ebuild} | 19 ++++++++++---------
 media-libs/xine-lib/xine-lib-1.2.9999.ebuild          | 15 ++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
similarity index 89%
copy from media-libs/xine-lib/xine-lib-1.2.9999.ebuild
copy to media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
index 8e2f4aec796..1b7e31b6ffc 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
@@ -37,7 +37,6 @@ RDEPEND="${NLS_RDEPEND}
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( >=media-libs/libbluray-0.2.1:= )
 	css? ( >=media-libs/libdvdcss-1.2.10 )
-	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
@@ -76,7 +75,7 @@ RDEPEND="${NLS_RDEPEND}
 		media-libs/freetype:2
 		)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva[X,opengl] )
+	vaapi? ( x11-libs/libva:0=[X,opengl] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:0=[-minimal]
@@ -118,6 +117,10 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
 src_prepare() {
 	default
 
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
+	fi
+
 	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
 
 	if [[ "${PV}" = *9999* ]] ; then
@@ -143,6 +146,7 @@ src_configure() {
 	fi
 
 	local myconf=(
+		--disable-directfb
 		--disable-gnomevfs
 		--disable-optimizations
 		--disable-real-codecs
@@ -158,7 +162,6 @@ src_configure() {
 		$(use_enable aalib)
 		$(use_enable altivec)
 		$(use_enable bluray)
-		$(use_enable directfb)
 		$(use_enable dts)
 		$(use_enable dvb)
 		$(use_enable dxr3)
@@ -218,9 +221,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f \
-		"${ED%/}"usr/lib*/libxine*.la \
-		"${ED%/}"usr/share/doc/${PF}/COPYING
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}"usr/share/doc/${PF}/COPYING
 }

diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 8e2f4aec796..7938ae7f0b1 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
@@ -37,7 +37,6 @@ RDEPEND="${NLS_RDEPEND}
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( >=media-libs/libbluray-0.2.1:= )
 	css? ( >=media-libs/libdvdcss-1.2.10 )
-	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
@@ -76,7 +75,7 @@ RDEPEND="${NLS_RDEPEND}
 		media-libs/freetype:2
 		)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva[X,opengl] )
+	vaapi? ( x11-libs/libva:0=[X,opengl] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:0=[-minimal]
@@ -143,6 +142,7 @@ src_configure() {
 	fi
 
 	local myconf=(
+		--disable-directfb
 		--disable-gnomevfs
 		--disable-optimizations
 		--disable-real-codecs
@@ -158,7 +158,6 @@ src_configure() {
 		$(use_enable aalib)
 		$(use_enable altivec)
 		$(use_enable bluray)
-		$(use_enable directfb)
 		$(use_enable dts)
 		$(use_enable dvb)
 		$(use_enable dxr3)
@@ -218,9 +217,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f \
-		"${ED%/}"usr/lib*/libxine*.la \
-		"${ED%/}"usr/share/doc/${PF}/COPYING
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}"usr/share/doc/${PF}/COPYING
 }