Fix static-libs usage (bug #336431 by Nikoli).

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

4 files changed, 16 insertions, 12 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index eaff9970f8cf..9bfa15f9870f 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.392 2011/01/29 20:03:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.393 2011/03/10 03:50:26 radhermit Exp $
+
+  10 Mar 2011; Tim Harder <radhermit@gentoo.org> ffmpeg-0.6_p25423.ebuild,
+  ffmpeg-0.6_p25767.ebuild, ffmpeg-9999.ebuild:
+  Fix static-libs usage (bug #336431 by Nikoli).
 
   29 Jan 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   fix git URI
diff --git a/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild b/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild
index 9b6f0b124100..1775a1701069 100644
--- a/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.7 2010/11/26 16:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25423.ebuild,v 1.8 2011/03/10 03:50:26 radhermit Exp $
 
 EAPI="2"
 
@@ -97,7 +97,6 @@ src_configure() {
 	done
 	use bzip2 || myconf="${myconf} --disable-bzlib"
 	use sdl || myconf="${myconf} --disable-ffplay"
-	use static-libs || myconf="${myconf} --disable-static"
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
 	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
@@ -227,8 +226,9 @@ src_configure() {
 		--libdir=/usr/$(get_libdir) \
 		--shlibdir=/usr/$(get_libdir) \
 		--mandir=/usr/share/man \
-		--enable-static --enable-shared \
+		--enable-shared \
 		--cc="$(tc-getCC)" \
+		$(use_enable static-libs static) \
 		${myconf} || die
 }
 
diff --git a/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild b/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
index aa69aa3fe6fb..6188c53b51e3 100644
--- a/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild,v 1.4 2010/12/09 16:11:56 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild,v 1.5 2011/03/10 03:50:26 radhermit Exp $
 
 EAPI="2"
 
@@ -97,7 +97,6 @@ src_configure() {
 	done
 	use bzip2 || myconf="${myconf} --disable-bzlib"
 	use sdl || myconf="${myconf} --disable-ffplay"
-	use static-libs || myconf="${myconf} --disable-static"
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
 	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
@@ -227,8 +226,9 @@ src_configure() {
 		--libdir=/usr/$(get_libdir) \
 		--shlibdir=/usr/$(get_libdir) \
 		--mandir=/usr/share/man \
-		--enable-static --enable-shared \
+		--enable-shared \
 		--cc="$(tc-getCC)" \
+		$(use_enable static-libs static) \
 		${myconf} || die
 }
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 9dfba8667ec0..d3f04cd7852d 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-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/ffmpeg/ffmpeg-9999.ebuild,v 1.30 2011/01/29 20:03:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.31 2011/03/10 03:50:26 radhermit Exp $
 
 EAPI="2"
 
@@ -93,7 +93,6 @@ src_configure() {
 	done
 	use bzip2 || myconf="${myconf} --disable-bzlib"
 	use sdl || myconf="${myconf} --disable-ffplay"
-	use static-libs || myconf="${myconf} --disable-static"
 
 	use custom-cflags && myconf="${myconf} --disable-optimizations"
 	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
@@ -223,8 +222,9 @@ src_configure() {
 		--libdir=/usr/$(get_libdir) \
 		--shlibdir=/usr/$(get_libdir) \
 		--mandir=/usr/share/man \
-		--enable-static --enable-shared \
+		--enable-shared \
 		--cc="$(tc-getCC)" \
+		$(use_enable static-libs static) \
 		${myconf} || die
 }