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

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

5 files changed, 13 insertions, 262 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/Manifest b/media-libs/mediastreamer/Manifest
index 16d90297fd72..8439ae804208 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX mediastreamer-2.2.3_p1-autodeps.patch 4398 RMD160 cc3a98a9d7446e15a3fb5f851a18d6f5342e0908 SHA1 7d00b34a333b273680c612b6f0d0ffa092fb66ba SHA256 0cc00eefe8ed05ff63f3a8928c2d5a3d0fe87719c97bfd52c5057a1bba4bcb9c
 AUX mediastreamer-2.7.3-sdl-build.patch 8006 RMD160 30b4398a6b6488466ce47c27acf4d04028676b5f SHA1 cb620aab50915a20d012a4eaa4db71568364e186 SHA256 f143cf44b767e07ba7bff5572fe5f11950142ff0a36025a64db585aa048ab263
 AUX mediastreamer-2.7.3-v4l-automagic.patch 1083 RMD160 7525df8acec6073afc9d249e124a5a0abca38fa0 SHA1 96b8169fde8375b05aaa7d275089a99117398317 SHA256 697cc9697504e57bb5810b7844eac34bfbae9c909f299ca5bb056b352c26bcfe
@@ -14,15 +11,6 @@ EBUILD mediastreamer-2.2.3_p1-r1.ebuild 3818 RMD160 bd2c86eb7f73d3baaadca3c30890
 EBUILD mediastreamer-2.3.0-r1.ebuild 3847 RMD160 6476120db21958071d930f1dbc43bc1db3b1ea2d SHA1 084a373e4139c782c5c784625b6cd1b7bb082f6c SHA256 33c8f48eba5ee865de37eab53cf185d3e8f0587ea666e21c33c20a95a72559d6
 EBUILD mediastreamer-2.5.0.ebuild 4166 RMD160 1be347cc0366f575ee77befb44a3995dad7642cb SHA1 486f1b49dfbc65cb719b364373e9491d669308b4 SHA256 fe26d84b36f3eaf1bc17949e376ac9d9228e811df295ba62106fbbd1966c15bb
 EBUILD mediastreamer-2.6.0.ebuild 4095 RMD160 e9c25b2c8a6b561a57cd02749d6d36a9469c1db1 SHA1 2d984bda4aff26e62a11ee2e2ec64a798876858e SHA256 dfb22069c4e698d7c609756babc8a4b76c5607f9a967b23ec9dfdbb31c02f467
-EBUILD mediastreamer-2.7.3-r2.ebuild 3772 RMD160 0f0a469eff4c193babcfc143ff1c1d48cc763ef7 SHA1 de984fe0204d7dbb4f4b1449d4325f024a7feb02 SHA256 5255552dec9a9856f0fd06f672ef54f116299b5bf13f96eda56a8ec347cab8b3
-EBUILD mediastreamer-2.7.3-r3.ebuild 3856 RMD160 c4f2e94f9df61708abd2074ed7161bcb4d06f053 SHA1 10af9745bb5f6ad33a5092bfd27b2fd03dff20bc SHA256 9fb3e15dd67a2a08454b1cbbafad8d04f5ebd95398700525af6f0cf05b93e26f
-EBUILD mediastreamer-2.7.3.ebuild 3691 RMD160 7a6850e8bf7cd053e5210981cd48a83b75ffcc3c SHA1 2047bf86866a44d909cf9a7d73b7748e28ef7517 SHA256 4b4904e0922aec0c5a78192c82339c15d868375b597acbba4ab3b75ced41fd2c
-MISC ChangeLog 6626 RMD160 d2e4cb3c7087af123c0a63f92e8111e72e2635ea SHA1 37a73ef8d21feeb10f605ffc850251e0f22af4da SHA256 5707f8552dcdc560e164c2f71ab9916a32e32b115141a841bb7eeb4d418a21a6
+EBUILD mediastreamer-2.7.3-r3.ebuild 3826 RMD160 d8282ed235a1565734d739fa4646829d6c2c1738 SHA1 54f5e786083d02110eabd3ec2bef09ebfa0ff3a6 SHA256 cfeb6679232cb52613a15f96dc8fe5947a654d20f51137964e26fd7ac6b6fe91
+MISC ChangeLog 6853 RMD160 a9ab7160329851c84a25050251480ff6222c3930 SHA1 c9aed17c9bda38fb0207f9bf03a53f6a80f8bbac SHA256 e2f4776b6fcc1c58cfb322dd0c0461b2359e3c842fee22f6516f4ca2ed692025
 MISC metadata.xml 531 RMD160 8c69e8bafc5b2b770b20d3f30352fc81e842e14c SHA1 369aa519353274364586f218538191596828a6f2 SHA256 25bc15caead165fa7563daefe69bfe714efb8e4970f9043751f7f78ea3669dcc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk3OS/0ACgkQodBTJSDyo66KUQD/bpcXJE282BQ+U/2haM7MqcW0
-wtbxHGxF+Nlp8shtLoUA/3PCrrSZAS4KY4QFCgkHqLxXEosQCXVX9iJKDti6oOEL
-=zH/H
------END PGP SIGNATURE-----
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
-}