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

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

5 files changed, 22 insertions, 28 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/Manifest b/media-video/x264-encoder/Manifest
index bf2ab5067307..a92c84b38992 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX x264-encoder-nolib-20110425.patch 1547 RMD160 ace0273445d751bf1b538abad364e3b738dad21c SHA1 2cdb96488785f1f355018d0b6727b3bd373d43a6 SHA256 124955cb5322d5f40771669798217991826dbc1f8ca9daac821d672238011c88
 AUX x264-encoder-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
 DIST x264-snapshot-20110426-2245.tar.bz2 495607 RMD160 3104b39f695a08c8199298eb89d5c500ffebfb45 SHA1 b2aa061648354aa80adeeba33819d8b961185dbc SHA256 2610ea30eb8857f7b8933137f8994f83243038fd8e336343e3422a5f25459fcc
 DIST x264-snapshot-20110825-2245.tar.bz2 514353 RMD160 6aeb636d7b395969f9ad2a0e72ffc9ee0eea9e48 SHA1 d551f6f7482c6af022cdaded89668a0579bd88d5 SHA256 55afee361554818ccc4ee553d3d058a7fb584af155ec7eeab45cd778acec43c5
 EBUILD x264-encoder-0.0.20110426.ebuild 1601 RMD160 662ea7c2892182b8f34c9dea40a4b2311716e145 SHA1 7c02087be895a085e1735feb9429fe19b0984346 SHA256 02761fcfe6dc5ba24bd994c5d9a74c95bb5e41633f52096f8b7d05374069ed70
-EBUILD x264-encoder-0.0.20110825.ebuild 1589 RMD160 58b114bb84754fc0961cdf7b9def160615b8e269 SHA1 9973249212ec91768c5927a4f2f4c4d3d7bf0bf9 SHA256 b87ef693272053f3533b810aa849f68662a81a7b110bcc7fb2e2b64845c53eee
-EBUILD x264-encoder-9999.ebuild 2045 RMD160 53c69d395e4c2a4631336b926b873a49bc9047f8 SHA1 12e8ed11e22c8dc8bbed738fc5095df306311e17 SHA256 7e005152b6dd43f8b1463991eb7fc315e808aa751db8a5d5addd0835f608256c
-MISC ChangeLog 9439 RMD160 0c773bc9cab16538a284959ec724f3c341ad7925 SHA1 c27d90a1f23f39f5aeea4e16bad45d0abc9b764a SHA256 5c58d4c32655f7be11abcf2573d12bbb43102c552cd9c5fb869fdd98b7a3d702
-MISC metadata.xml 406 RMD160 9029a6c8e8c3ef9b95ac115348a03046093d0b4e SHA1 7751f58fededb0730443270d9de41c788f5ff0f3 SHA256 76b280c774fb996541b22ceb6ec5d6acf35593c1962c14f157409626e114a510
+EBUILD x264-encoder-0.0.20110825.ebuild 1523 RMD160 7d0704db1e5c27b52e1e0543b138842885a81e96 SHA1 863644f7f52f2ed6d7f25faeea0e63e37c945f23 SHA256 d475d9b028c65d3065c3a4ae43e084ac240b5f86c624a4ae77fe3cde1a459b82
+EBUILD x264-encoder-9999.ebuild 1978 RMD160 9d8918893284f4dbc6b2472c6f214f17c740cf28 SHA1 7e55d81845b0bb522e12088840bf1630053a81a7 SHA256 b81858a1841906def5447eb36e385eec6d1ad00a6c484a9e4eb7955a09ee09db
+MISC ChangeLog 9720 RMD160 704871c8965e00205f867ce7947b064626cfe152 SHA1 072f26f878d8c128f6da7675c1b169cac7c518bc SHA256 d53160015c1732742dfd01eb5fde0a2c71bada50d5b3e368bacc929ce4ca1368
+MISC metadata.xml 339 RMD160 a8aed4568a6644d6a42490ac4990e63b9e6c01e1 SHA1 33c2b6733410c0a58dfbb4138f32527fe41f9dd1 SHA256 bc94b0562cbff3f9c6e4a32e61c87f40184245098858bf1bef30b6ccf4f2a774
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOZtajAAoJEHy/RO9cNQiDckYP/2UhZNnF1Z6v8/sFbxro1E2q
-xHBmCxi8UiHa8nGzb2h2U9nwfyCavp5Bw4LBGPWM+74c7xYbLTxJMk8PNC6G0uJx
-S++2CWIdK9XbdJqDebp/1iHmMGQwwri6QRvqRg/HFgE5OFOajlnbOnojJyaeV/Cl
-TZpKdewUrSJPAVsSbesREEc8X22i4AejNuSA9dJ+Sk1bJMBUayGfBAz/9kgfuZ8L
-Rm31ckmKM4hi3SArUamkuYhA922M61FlQviWTtA4BWrCT/Cc9zHhUFoSk60VFrkQ
-dkRtd2RJpAAd8cHDXPp2f7D+3B7luT0ajen/5nqH8dhOCiVnLPkTBvDi0fftLrxQ
-q+yyKGFyP79jXeKir8rspZaQwHOU4Gy+yQqqbaLaUAqvK4zpgxzMlkC45uePBtcr
-fIUfL9HbdoDR09rZ0s4A3/TJZwxnn4GcxuNVb/uPF8zmGvNtldCz+MsUeUhsVNn2
-QXQkv4arwA3RPRdHVlK9oMLd3SIHjvGE8aQ3AWvVxTSUchBoDdJtWr1i/ub8QhjG
-BmtBnrCWykYA2E/HEXCOaBK9lQG26H2OYXOoDjbJOFfHMde0wgjx09yXt/18HHec
-uoCL9GuzmCYWhvVp7wyoA+GfUXLqIQhcAP9Gls/VHv6eTmmgGGxnBmubKpEtJxCv
-GIBNCT/yjubs1Dvg+9ow
-=WgoO
+iEYEARECAAYFAk5niTUACgkQvFcC4BYPU0rRogCgmcnoSlOlvrxSm6y7gZmROQvH
+6cAAnipAEHIA+eQIKQKL0/2DvMAI/Krt
+=elQO
 -----END PGP SIGNATURE-----
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
 }