Try to split up gpl code so user can compile just LGPL version.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 31 insertions, 23 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 22f7a7b452b3..c2c229fe14b5 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.11 2011/04/12 13:40:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.12 2011/04/12 14:24:49 scarabeus Exp $
+
+  12 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild,
+  metadata.xml:
+  Try to split up gpl code so user can compile just LGPL version.
 
   12 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild:
   Update deps to match latest reality.
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index b9c2ea891524..d9ddededf015 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -8,13 +8,13 @@ DIST libav-0.7_pre20110327.tar.xz 3496216 RMD160 3c7d6e3c05eb18575520d287615229f
 EBUILD libav-0.6.2.ebuild 7533 RMD160 1bddb36b6993fffbb60f99720746eb0bef479099 SHA1 f89c1bec58f536e13d040a2ebb352216765e41e3 SHA256 9f4beecf6b25c7d99c34cdc17081002d737bff08f6a62c118db30730d051d594
 EBUILD libav-0.6.9999.ebuild 7480 RMD160 bef818254c619c434a5c92eee489ff98153ecbd9 SHA1 a37fa450a9a288e1d90996e8a2ce41abb98e0eff SHA256 38bf1b9cb10b49b50bd805ed404447fd8aef3bad6baaeafaa7dea8a8252ae162
 EBUILD libav-0.7_pre20110327.ebuild 7599 RMD160 9a944d8b477ca204c6273c415e0e05d664cb3347 SHA1 7efdc9795b64432c98036856ce0b50c37ba25115 SHA256 142caaad04431a584457b425d232dadecc79e358900e7ca03518c99101c75d67
-EBUILD libav-9999.ebuild 7821 RMD160 1ac54f80f6bce1481c5cd92db7afea2c7486d6a3 SHA1 88b38f0311e22bcae58d0a5b7fc52c5265ee7e7e SHA256 e8e3c9b627fd48bafbe7133bed787a042030707ac7f37ea35780f90253e58fe2
-MISC ChangeLog 2266 RMD160 c587b41827ea6089ba7c03fe52daa45fd95e6d3e SHA1 fba5556d727ba30d9c582ac7bb9478f76372c3f1 SHA256 b695b16bfe4c8b20d6c4587e27ac2ac704bd329f67fe6c5c2dd4da89f3688fcb
-MISC metadata.xml 2224 RMD160 b31aadc76506beb9d1f3973e463713b6f8905138 SHA1 9aab9663adb18b42339de393e0579c3409bcb2ac SHA256 d09c61e2ab128ee5889f990f9a61b497179dd1f150c99aa3286201b3a7b2ab4a
+EBUILD libav-9999.ebuild 7867 RMD160 ede030980d7fa5da840cee19cbfb4f1d3f06b05a SHA1 c4427fd0e9892e1dcff95efe964c102d818c8662 SHA256 ed2baf49661d7a1c76f225ca4392eb9bdf36417d8e5cff011a9d10ad0738c133
+MISC ChangeLog 2423 RMD160 8aaaf3c748864a2cb849d4e65286ce00094082bd SHA1 853ff499b14853142d05b828fa0576f573755ec0 SHA256 a99d6a43eff7706ee355379741b1f933aac15a2a31308e9bb1aab2a41dc103db
+MISC metadata.xml 2343 RMD160 beadccfc0b455869a2810504ee185f622de04961 SHA1 421b87ca6c05fbde61a429dee1c90dcb88e7751a SHA256 daf4da36c94dbd7dd4e44dc643dda9420bafcec1824014ecdcb5c9067d5096b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2kVkIACgkQHB6c3gNBRYdGmQCfWiswiCTw+yBFKUnP9Zy9+5bH
-2SYAn1lUhTdNH0I5KwVqZE+mWDVuACIz
-=rfD6
+iEYEARECAAYFAk2kYLcACgkQHB6c3gNBRYdo4ACeN4V5PrtsYcuxtJ+4TwqnX20y
+qJAAniyu2Wz8m50dZPjr7lQaoAiGA1H6
+=ddeK
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index f28c4044cab9..c476f19d458b 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.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-video/libav/libav-9999.ebuild,v 1.8 2011/04/12 13:40:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.9 2011/04/12 14:24:49 scarabeus Exp $
 
 EAPI=4
 
@@ -22,12 +22,12 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.bz2"
 fi
 
-LICENSE="GPL-3"
+LICENSE="LGPL-2 gpl? ( GPL-3 )"
 SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
@@ -41,9 +41,9 @@ RDEPEND="
 	bzip2? ( app-arch/bzip2 )
 	dirac? ( media-video/dirac )
 	encode? (
+		aac? ( media-libs/vo-aacenc )
 		amr? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
-		!faac? ( aac? ( media-libs/vo-aacenc ) )
 		mp3? ( >=media-sound/lame-3.98.3 )
 		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
@@ -79,7 +79,11 @@ DEPEND="${RDEPEND}
 "
 
 # faac can't be binary distributed
-REQUIRED_USE="bindist? ( !faac )"
+# faac and aac are concurent implementations
+# amr and aac require gpl
+REQUIRED_USE="bindist? ( !faac )
+	faac? ( !aac ) aac? ( !faac )
+	amr? ( gpl ) aac? ( gpl )"
 
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
@@ -92,6 +96,13 @@ src_configure() {
 	local myconf="${EXTRA_FFMPEG_CONF}"
 	local uses i
 
+	myconf="
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-postproc
+		--enable-avfilter
+	"
+
 	# enabled by default
 	uses="debug doc network vaapi zlib"
 	for i in ${uses}; do
@@ -112,10 +123,9 @@ src_configure() {
 	# Encoders
 	if use encode; then
 		use mp3 && myconf+=" --enable-libmp3lame"
-		use amr && myconf+=" --enable-libvo-amrwbenc --enable-version3"
+		use amr && myconf+=" --enable-libvo-amrwbenc"
 		use faac && myconf+=" --enable-libfaac --enable-nonfree"
-		# faac has priority
-		use faac || use aac && myconf+=" --enable-libvo-aacenc --enable-version3"
+		use aac && myconf+=" --enable-libvo-aacenc"
 		uses="theora vorbis x264 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=" --enable-lib${i}"
@@ -178,14 +188,6 @@ src_configure() {
 		break
 	done
 
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		--enable-version3
-		--enable-postproc
-		--enable-avfilter
-		${myconf}"
-
 	# cross compile support
 	if tc-is-cross-compiler ; then
 		myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index 312f40f1bb67..a51b55f7bebc 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -18,6 +18,8 @@
 		(notice: the resulting binaries are unredistributable)</flag>
 	<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
+	<flag name="gpl">Build all GPL licensed code. Without this flag set the
+		package is build under LGPL license.</flag>
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
 	<flag name="mmxext">Enables mmx2 support</flag>
 	<flag name="network">Enables network streaming support</flag>