Drop xv USE flag as it is not optional, bug #365653 thank Willard Dawson for report.

(Portage version: 2.1.9.46/cvs/Linux x86_64)

4 files changed, 11 insertions, 248 deletions

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 8e0b65423cfb..0bf85d2d4bc8 100644
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mediastreamer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.43 2011/05/14 09:35:07 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.44 2011/05/15 10:48:40 pva Exp $
+
+  15 May 2011; Peter Volkov <pva@gentoo.org> -mediastreamer-2.7.3.ebuild,
+  -mediastreamer-2.7.3-r2.ebuild, mediastreamer-2.7.3-r3.ebuild:
+  Drop xv USE flag as it is not optional, bug #365653 thank Willard Dawson
+  for report.
 
   14 May 2011; Thomas Kahle <tomka@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
   x86 stable per bug 363311
diff --git a/media-libs/mediastreamer/mediastreamer-2.7.3-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.7.3-r2.ebuild
deleted file mode 100644
index d0e55fc07bd9..000000000000
--- a/media-libs/mediastreamer/mediastreamer-2.7.3-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3-r2.ebuild,v 1.1 2011/04/14 07:16:16 pva Exp $
-
-EAPI="4"
-
-inherit eutils autotools multilib
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Many cameras will not work or will crash an application if mediastreamer2 is
-# not built with v4l2 support (taken from configure.ac)
-# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa amr bindist coreaudio debug examples gsm ilbc ipv6 jack oss portaudio
-pulseaudio sdl +speex theora v4l2 video x264 X xv"
-REQUIRED_USE="|| ( oss alsa jack portaudio coreaudio ) theora? ( video ) X? (
-video ) xv? ( X ) v4l2? ( video )"
-
-RDEPEND=">=net-libs/ortp-0.16.2[ipv6?]
-	alsa? ( media-libs/alsa-lib )
-	gsm? ( media-sound/gsm )
-	jack? ( >=media-libs/libsamplerate-0.0.13
-		media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	video? (
-		virtual/ffmpeg
-		v4l2? ( media-libs/libv4l
-			sys-kernel/linux-headers )
-		theora? ( media-libs/libtheora )
-		sdl? ( media-libs/libsdl[video,X] )
-		X? ( x11-libs/libX11
-			xv? ( x11-libs/libXv ) ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	xv? ( x11-proto/videoproto )"
-
-PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
-	ilbc? ( media-plugins/mediastreamer-ilbc )
-	video? ( x264? ( media-plugins/mediastreamer-x264 ) )"
-
-src_prepare() {
-	# respect user's CFLAGS
-	sed -i -e "s:-O2::;s: -g::" configure.ac || die "patching configure.ac failed"
-
-	# change default paths
-	sed -i -e "s:\(\${prefix}/\)lib:\1$(get_libdir):" \
-		-e "s:\(prefix/share\):\1/${PN}:" configure.ac \
-		|| die "patching configure.ac failed"
-
-	# fix html doc installation dir
-	sed -i -e "s:\$(pkgdocdir):\$(docdir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
-	sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
-
-	epatch "${FILESDIR}/${PN}-2.7.3-v4l-automagic.patch"
-	epatch "${FILESDIR}/${P}-sdl-build.patch"
-
-	# linux/videodev.h dropped in 2.6.38
-	sed -i -e 's:msv4l.c::' src/Makefile.am || die
-	eautoreconf
-
-	# don't build examples in tests/
-	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
-		|| die "patching Makefile.in failed"
-}
-
-src_configure() {
-	# Mac OS X Audio Queue is an audio recording facility, available on
-	# 10.5 (Leopard, Darwin9) and onward
-	local macaqsnd="--disable-macaqsnd"
-	if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]];
-	then
-		macaqsnd="--enable-macaqsnd"
-	fi
-
-	# strict: don't want -Werror
-	# external-ortp: don't use bundled libs
-	# arts: arts is deprecated
-	econf \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--datadir="${EPREFIX}"/usr/share/${PN} \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-strict \
-		--enable-external-ortp \
-		--disable-artsc \
-		$(use_enable alsa) \
-		$(use_enable pulseaudio) \
-		$(use_enable coreaudio macsnd) ${macaqsnd} \
-		$(use_enable debug) \
-		$(use_enable gsm) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable speex) \
-		$(use_enable theora) \
-		$(use_enable video) \
-		$(use_enable v4l2 v4l) \
-		$(use_enable v4l2 libv4l) \
-		$(use_enable sdl) \
-		$(use_enable X x11) \
-		$(use_enable xv)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tests/*.c
-	fi
-}
diff --git a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild b/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild
index a34f67478f90..4ae36109ef05 100644
--- a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.7.3-r3.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-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild,v 1.4 2011/05/14 09:35:07 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild,v 1.5 2011/05/15 10:48:40 pva Exp $
 
 EAPI="4"
 
@@ -17,12 +17,11 @@ KEYWORDS="amd64 x86"
 # not built with v4l2 support (taken from configure.ac)
 # TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
 IUSE="+alsa amr bindist coreaudio debug examples gsm ilbc ipv6 jack oss portaudio
-pulseaudio sdl +speex theora v4l2 video x264 X xv"
+pulseaudio sdl +speex theora v4l2 video x264 X"
 REQUIRED_USE="|| ( oss alsa jack portaudio coreaudio )
 	video? ( || ( sdl X ) )
 	theora? ( video )
 	X? ( video )
-	xv? ( X )
 	v4l2? ( video )"
 
 RDEPEND=">=net-libs/ortp-0.16.2[ipv6?]
@@ -40,10 +39,10 @@ RDEPEND=">=net-libs/ortp-0.16.2[ipv6?]
 		theora? ( media-libs/libtheora )
 		sdl? ( media-libs/libsdl[video,X] )
 		X? ( x11-libs/libX11
-			xv? ( x11-libs/libXv ) ) )"
+			x11-libs/libXv ) )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	xv? ( x11-proto/videoproto )"
+	x11-proto/videoproto"
 
 PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
 	ilbc? ( media-plugins/mediastreamer-ilbc )
@@ -112,7 +111,7 @@ src_configure() {
 		$(use_enable v4l2 libv4l) \
 		$(use_enable sdl) \
 		$(use_enable X x11) \
-		$(use_enable xv)
+		$(use_enable X xv)
 }
 
 src_install() {
diff --git a/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild b/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild
deleted file mode 100644
index a63332a5a89d..000000000000
--- a/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3.ebuild,v 1.2 2011/04/09 09:38:42 pva Exp $
-
-EAPI="4"
-
-inherit eutils autotools multilib
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
-# Many cameras will not work or will crash an application if mediastreamer2 is
-# not built with v4l2 support (taken from configure.ac)
-# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa coreaudio debug examples gsm ilbc ipv6 jack oss portaudio pulseaudio
-sdl +speex theora v4l2 video x264 X xv"
-REQUIRED_USE="|| ( oss alsa jack portaudio coreaudio ) theora? ( video ) X? (
-video ) xv? ( X ) v4l2? ( video )"
-
-RDEPEND=">=net-libs/ortp-0.16.2[ipv6?]
-	alsa? ( media-libs/alsa-lib )
-	gsm? ( media-sound/gsm )
-	jack? ( >=media-libs/libsamplerate-0.0.13
-		media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	video? (
-		virtual/ffmpeg
-		v4l2? ( media-libs/libv4l
-			sys-kernel/linux-headers )
-		theora? ( media-libs/libtheora )
-		sdl? ( media-libs/libsdl[video,X] )
-		X? ( x11-libs/libX11
-			xv? ( x11-libs/libXv ) ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	xv? ( x11-proto/videoproto )"
-
-PDEPEND="ilbc? ( media-plugins/mediastreamer-ilbc )
-	video? ( x264? ( media-plugins/mediastreamer-x264 ) )"
-
-src_prepare() {
-	# respect user's CFLAGS
-	sed -i -e "s:-O2::;s: -g::" configure.ac || die "patching configure.ac failed"
-
-	# change default paths
-	sed -i -e "s:\(\${prefix}/\)lib:\1$(get_libdir):" \
-		-e "s:\(prefix/share\):\1/${PN}:" configure.ac \
-		|| die "patching configure.ac failed"
-
-	# fix html doc installation dir
-	sed -i -e "s:\$(pkgdocdir):\$(docdir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
-	sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
-
-	epatch "${FILESDIR}/${PN}-2.7.3-v4l-automagic.patch"
-	# linux/videodev.h dropped in 2.6.38
-	sed -i -e 's:msv4l.c::' src/Makefile.am || die
-	eautoreconf
-
-	# don't build examples in tests/
-	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
-		|| die "patching Makefile.in failed"
-}
-
-src_configure() {
-	# Mac OS X Audio Queue is an audio recording facility, available on
-	# 10.5 (Leopard, Darwin9) and onward
-	local macaqsnd="--disable-macaqsnd"
-	if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]];
-	then
-		macaqsnd="--enable-macaqsnd"
-	fi
-
-	# strict: don't want -Werror
-	# external-ortp: don't use bundled libs
-	# arts: arts is deprecated
-	econf \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--datadir="${EPREFIX}"/usr/share/${PN} \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-strict \
-		--enable-external-ortp \
-		--disable-artsc \
-		$(use_enable alsa) \
-		$(use_enable pulseaudio) \
-		$(use_enable coreaudio macsnd) ${macaqsnd} \
-		$(use_enable debug) \
-		$(use_enable gsm) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable speex) \
-		$(use_enable theora) \
-		$(use_enable video) \
-		$(use_enable v4l2 v4l) \
-		$(use_enable v4l2 libv4l) \
-		$(use_enable sdl) \
-		$(use_enable X x11) \
-		$(use_enable xv)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tests/*.c
-	fi
-}