remove nonsensical system-libx264 useflag, we shall always use the system version; people claiming static is faster can put -static in their cflags

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

4 files changed, 14 insertions, 10 deletions

diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 91993d771067..91708a72c568 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.57 2011/09/07 02:27:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.58 2011/09/07 15:09:35 aballier Exp $
+
+  07 Sep 2011; Alexis Ballier <aballier@gentoo.org>
+  x264-encoder-0.0.20110825.ebuild, x264-encoder-9999.ebuild, metadata.xml:
+  remove nonsensical system-libx264 useflag, we shall always use the system
+  version; people claiming static is faster can put -static in their cflags
 
 *x264-encoder-0.0.20110825 (07 Sep 2011)
 
diff --git a/media-video/x264-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml
index 1fa136c01515..d8a22487e4b5 100644
--- a/media-video/x264-encoder/metadata.xml
+++ b/media-video/x264-encoder/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <use>
     <flag name="ffmpegsource">Enable ffmpegsource aka ffms support, disables lavf</flag>
-    <flag name="system-libx264">Use the system x264 library</flag>
   </use>
 </pkgmetadata>
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild
index c567fe35a4b3..04440554e9dd 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20110825.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/x264-encoder/x264-encoder-0.0.20110825.ebuild,v 1.1 2011/09/07 02:27:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild,v 1.2 2011/09/07 15:09:35 aballier Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs versionator
@@ -14,11 +14,11 @@ SRC_URI="http://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug ffmpeg mp4 +system-libx264 +threads"
+IUSE="debug ffmpeg mp4 +threads"
 
 RDEPEND="ffmpeg? ( media-video/ffmpeg )
 	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	system-libx264? ( ~media-libs/x264-${PV} )"
+	~media-libs/x264-${PV}"
 DEPEND="${RDEPEND}
 	amd64? ( >=dev-lang/yasm-0.6.2 )
 	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm )
@@ -35,7 +35,6 @@ src_configure() {
 	use debug && myconf+=" --enable-debug"
 	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
 	use mp4 || myconf+=" --disable-gpac"
-	use system-libx264 && myconf+=" --system-libx264"
 	use threads || myconf+=" --disable-thread"
 
 	./configure \
@@ -47,6 +46,7 @@ src_configure() {
 		--extra-cflags="${CFLAGS}" \
 		--extra-ldflags="${LDFLAGS}" \
 		--host="${CHOST}" \
+		--system-libx264 \
 		${myconf} \
 		|| die
 }
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 00ccc8d1b642..c20d79aa2b0e 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-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/x264-encoder/x264-encoder-9999.ebuild,v 1.2 2011/09/03 18:30:29 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v 1.3 2011/09/07 15:09:35 aballier Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="debug ffmpeg ffmpegsource mp4 +system-libx264 +threads"
+IUSE="debug ffmpeg ffmpegsource mp4 +threads"
 
 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
@@ -39,7 +39,7 @@ RDEPEND="
 	ffmpeg? ( virtual/ffmpeg )
 	ffmpegsource? ( media-libs/ffmpegsource )
 	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
-	system-libx264? ( ~media-libs/x264-${PV} )
+	~media-libs/x264-${PV}
 "
 ASM_DEP=">=dev-lang/yasm-0.6.2"
 DEPEND="${RDEPEND}
@@ -61,7 +61,6 @@ src_configure() {
 	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
 	use ffmpegsource || myconf+=" --disable-ffms"
 	use mp4 || myconf+=" --disable-gpac"
-	use system-libx264 && myconf+=" --system-libx264"
 	use threads || myconf+=" --disable-thread"
 
 	./configure \
@@ -72,5 +71,6 @@ src_configure() {
 		--extra-cflags="${CFLAGS}" \
 		--extra-ldflags="${LDFLAGS}" \
 		--host="${CHOST}" \
+		--system-libx264 \
 		${myconf} || die
 }