Small update, mark proper license and introduce tools useflag in the live ebuild

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

8 files changed, 37 insertions, 22 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 852fcd2db88c..89e4c50b245d 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.60 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.61 2012/03/20 22:58:59 lu_zero Exp $
+
+  20 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.7.4.ebuild,
+  libav-0.7.9999.ebuild, libav-0.8.ebuild, libav-0.8.1.ebuild,
+  libav-0.8.9999.ebuild, libav-9999.ebuild, metadata.xml:
+  Small update, mark proper license and introduce tools useflag in the
+  live ebuild
 
 *libav-0.8.1 (16 Mar 2012)
 
diff --git a/media-video/libav/libav-0.7.4.ebuild b/media-video/libav/libav-0.7.4.ebuild
index e114e103e741..b1c33b7793e5 100644
--- a/media-video/libav/libav-0.7.4.ebuild
+++ b/media-video/libav/libav-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.4.ebuild,v 1.1 2012/01/27 10:06:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.4.ebuild,v 1.2 2012/03/20 22:58:59 lu_zero Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
 SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-0.7.9999.ebuild b/media-video/libav/libav-0.7.9999.ebuild
index f08ed41c6eb6..ffdc554b7303 100644
--- a/media-video/libav/libav-0.7.9999.ebuild
+++ b/media-video/libav/libav-0.7.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.5 2012/02/08 19:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.6 2012/03/20 22:58:59 lu_zero Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
 SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-0.8.1.ebuild b/media-video/libav/libav-0.8.1.ebuild
index 6a766bb10db5..0f010371dc30 100644
--- a/media-video/libav/libav-0.8.1.ebuild
+++ b/media-video/libav/libav-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.1.ebuild,v 1.1 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.1.ebuild,v 1.2 2012/03/20 22:58:59 lu_zero Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
 SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild
index b52eef75db6c..60d4bd2f9ed9 100644
--- a/media-video/libav/libav-0.8.9999.ebuild
+++ b/media-video/libav/libav-0.8.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.6 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.7 2012/03/20 22:58:59 lu_zero Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
 SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-0.8.ebuild b/media-video/libav/libav-0.8.ebuild
index 397768b297f7..099c878817b9 100644
--- a/media-video/libav/libav-0.8.ebuild
+++ b/media-video/libav/libav-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.8 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.9 2012/03/20 22:58:59 lu_zero Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
 SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index da52c3e17d97..bf135c06a239 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.34 2012/03/16 20:18:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.35 2012/03/20 22:58:59 lu_zero Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="LGPL-2 gpl? ( GPL-3 )"
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
@@ -30,9 +30,8 @@ SLOT="0"
 IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
 	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
 	  +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
-	  oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
-	  static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
-	  +zlib"
+	  oss pic pulseaudio rtmp schroedinger sdl speex ssl +ssse3 static-libs
+	  test theora threads tools v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon"
 
@@ -105,6 +104,8 @@ src_prepare() {
 	fi
 }
 
+TOOLS="aviocat graph2dot ismindex qt-faststart"
+
 src_configure() {
 	local myconf="${EXTRA_FFMPEG_CONF}"
 	local uses i
@@ -115,6 +116,8 @@ src_configure() {
 		--enable-avfilter
 	"
 
+	use zlib && TOOLS+=" cws2fws"
+
 	# enabled by default
 	uses="debug doc network zlib"
 	for i in ${uses}; do
@@ -262,21 +265,27 @@ src_configure() {
 src_compile() {
 	emake
 
-	if use qt-faststart; then
+	if use tools; then
 		tc-export CC
-		emake tools/qt-faststart
+		local i
+		for i in ${TOOLS}; do
+			emake tools/${i}
+		done
 	fi
 }
 
 src_install() {
+	local i
 	emake DESTDIR="${D}" install install-man
 
 	dodoc Changelog README INSTALL
 	dodoc doc/*.txt
 	use doc && dodoc doc/*.html
 
-	if use qt-faststart; then
-		dobin tools/qt-faststart
+	if use tools; then
+		for i in ${TOOLS}; do
+			dobin tools/${i}
+		done
 	fi
 
 	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
@@ -288,8 +297,7 @@ pkg_postinst() {
 	elog "Please note that the programs formerly known as ffplay, ffserver"
 	elog "and ffprobe are now called avplay, avserver and avprobe."
 	elog
-	elog "ffmpeg had been replaced by the feature incompatible avconv thus"
-	elog "the legacy ffmpeg is provided for compatibility with older scripts"
+	elog "ffmpeg had been replaced by the feature incompatible avconv"
 }
 
 src_test() {
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index f555b6968a63..9a9e1188b56b 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -33,6 +33,7 @@
 	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
 	<flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/gnutls</pkg>.</flag>
 	<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips).</flag>
+	<flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag>
 	<flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding.</flag>
 	<flag name="vdpau">Enable VDPAU decoders (requires nVidia video cards to offload CPU processing to video card.</flag>
 	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>