Version bump, cflags patch updated

Package-Manager: portage-2.2.3/cvs/Linux x86_64

6 files changed, 158 insertions, 33 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index f58fb7b9364e..4e38a212e2af 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/x264
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.98 2013/08/12 15:54:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.99 2013/09/13 13:05:04 lu_zero Exp $
+
+*x264-0.0.20130912 (13 Sep 2013)
+
+  13 Sep 2013; Luca Barbato <lu_zero@gentoo.org> x264-0.0.20130731.ebuild,
+  files/x264-cflags.patch, +files/x264-0.0.20130731-cflags.patch,
+  +x264-0.0.20130912.ebuild:
+  Version bump, cflags patch updated
 
   12 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-0.0.20130731.ebuild,
   x264-9999.ebuild, metadata.xml:
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index a42f2b59e73d..ad59aace45d1 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX x264-0.0.20120707-gcc48.patch 5240 SHA256 24631c7c429099958366c172df6467264a894c13ff64e3979414715fec4d28bc SHA512 561b0f37ffd2b2116d35d33cdccaf098983904b501b71f928d93cdbe3028f462662cbb468000ff5a9eac3acf344919244aa9994641f9136325515b0d8cbf5859 WHIRLPOOL 2f3f17cdb125678e02d1134065eae2b17e6b6f0fef88ba51112b17f945eb37e6e77a959ab0d8ea009824126def2c934f3800a05e63afe642f6364334b4cdf75f
-AUX x264-cflags.patch 2315 SHA256 e8fc30f0e07da1831a9673d9564fd1b71a366b3835644511e60a5c05c2e97def SHA512 d14b5c15bb891fc660cebdb0c2e184b2c339276736bd401ab7b842088bb1991191dee52ebadd1acd942e5bf1b9603436f7eb289235f5ead6b056019245038435 WHIRLPOOL ca871b7145ab946f02831a2303c901ecd77545852f2e88458ce990a396bd965353dd1f18c2c3c3f07dc91261373a761a210e9367547205a97116ac16be51ff6c
+AUX x264-0.0.20130731-cflags.patch 2315 SHA256 e8fc30f0e07da1831a9673d9564fd1b71a366b3835644511e60a5c05c2e97def SHA512 d14b5c15bb891fc660cebdb0c2e184b2c339276736bd401ab7b842088bb1991191dee52ebadd1acd942e5bf1b9603436f7eb289235f5ead6b056019245038435 WHIRLPOOL ca871b7145ab946f02831a2303c901ecd77545852f2e88458ce990a396bd965353dd1f18c2c3c3f07dc91261373a761a210e9367547205a97116ac16be51ff6c
+AUX x264-cflags.patch 2057 SHA256 b48656ac6233cccd30bfe36a4fbf879af0e4fa6df74dc49f75842acf0a86a311 SHA512 1753a3109075deb934801b14b0b8714ca0bb1edac14d907c14f0a5c5f00d2face1854e1a8ad32b00ecaf171e9d748d8108d6f26a0443db4c1aae8486964b55a4 WHIRLPOOL 5b1d441c6761c9fa3942862ce11ed34305c8e55cd275ec5a32bde752b7a4e08ee73f2a7d372500bc8d1df78dad18533833372d784ee7cf17cb02029edbc426b5
 AUX x264-nostrip.patch 433 SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa SHA512 4103c43f54aebc814f4c5aecac0f115ff9f25fef352ce5945b37eb9d7a191fc21c1f608f81b6fb3d534a0a72b8bc4e49c6ed7e1e0d86fe39d18ad4d55241d6dd WHIRLPOOL ae648a2a61d2fcd3c35f5fe16b110249b7acbe2b2bac497b980c557bb3e95f8975296361f7482b5419ca88a1cf25258da60be53805feb6fa426b865dcd0ff4e3
 AUX x264-onlylib-20110425.patch 1120 SHA256 a0bdcfe1a86fdde9f56d7842f203d90eefcc4080664653ea42a8a4cc6231dbbe SHA512 a94d93b4a9f1243b41db4c82b8483767a5da4b69dcbd0ad9414ae4dbb7caa4dee6bb10b2b9f8325d9cda2341e78d9aa89d79f24844ea405cfddbe8d857f43457 WHIRLPOOL 4aa9ba6e18e1b9de1ad6a8e8c90635a399bfa0ae64be89c0b0383a844022fb474686774a5887903b0a639406c5e7165ec862dc03fa7710f1714d03bdeb8aa8df
 AUX x264-x32.patch 1224 SHA256 1daaa89caef24923d703528f438918496360bfbf3e2b56334a4edb5e7659a000 SHA512 ad1ff51b086b7f11adff73ea997feee1d9dfec47bbb457cfd47e0681c11d6bde1b62b5b896d032707a7cb70c9f739cffe500c4c9c5be2e19fe4ccc3463b314db WHIRLPOOL 17d1a51fad912ab5b728335c629f73b00572f033fa52ba7154604664e92fbf91ae192c9e3ab61048e48e5517f829e1582aba2c95b905aca35c21f920490d13e6
@@ -11,18 +9,13 @@ DIST x264-snapshot-20120327-2245.tar.bz2 551101 SHA256 065ffdbd7c9f9dcc7194bd6a4
 DIST x264-snapshot-20120707-2245.tar.bz2 554243 SHA256 52fdc8b558fa7dcb6419fef73fb07e771cdc2544f7652cde42968d640139eedb SHA512 5e263dfe4b4defd66a8a855467692473723ada9c34ab8da7042f2d10327f944914d0c8103f22edd4dc7a1c4664db5bfbf42052652c9f57b392db32f4ab77081b WHIRLPOOL 1a9061e5940e22071390b579abf859fec49f8da51f31e241b65513566eda66178c46b4b4c20318bb981230a16511e84b89e6174bc7f9ccbd48915a909cef3b5b
 DIST x264-snapshot-20130506-2245.tar.bz2 608013 SHA256 da7055a457d19b97ff35a2830e7caae665ea06d22ddc28393168983d1cd21f61 SHA512 6ba35f6b39fefbda6990dc0fd674efbe403b0616f2f02d71ae3e7bbc6ce2bab8878a963dd5f306f8a2b3b9a74c5c0b4dbf9dfb9dc0e602b807f726cf072905b5 WHIRLPOOL bfb4b7dd0e865cd9305ac177f5c544555004039209dda695fcc932aab647b87c96f0bae4fa040276bd3dbee64dcf982f3c2447efdbc01c1d42f040c9d5d0af85
 DIST x264-snapshot-20130731-2245.tar.bz2 625052 SHA256 caa39660f2ddc9dc53033af709452a21479c7b7c715c5f9d744d0d452c2d9e67 SHA512 2abcab4013dee9ac58779afd89fc558a8286cf33affda037e95a7e10cf00387cee1ad461ac59c5020fd9b72d303170f16d4e4b5593ec21528a33b0f530878d9d WHIRLPOOL 6f7fcc1c05c47a0d31578fbd0268b84ba458a968b087fb7d1050f67739bec140a1c3ded288cd0000180b5be921b469357ec9cdc363fc1eec82d82bd795557b56
+DIST x264-snapshot-20130912-2245.tar.bz2 628862 SHA256 87142cf15b7d7052f2e046a4b80adc3176fd6421889ab3bae83afc10d57ec648 SHA512 3e2223ca465b1ac214a421c512477524309694f321baabcd62b84bc341de34ecf196c8c91a931bbda0d7538dc138b924dc22ed7f242e135e4b53b387638b40c0 WHIRLPOOL b795a91511994761e9cf6e3a279708e4536ebc281b9ca1d18f0bceb93c89c062608d2e5c779a0f924d2dc005f90921223b42b22e409eaaca8a0041aae354213f
 EBUILD x264-0.0.20111220.ebuild 2289 SHA256 edf89ceda65eab31f55d66385245eee6481ffb6d9cb0bf39eaf275e1540359c7 SHA512 2783dcb8babb4972de713f68f544974c463e2e1250485afc5ad9513087b3067d630adddfcd07f79ccb19bc5b6b1ae7f0ddeaa27babfb156aac45873e6768bad5 WHIRLPOOL cf521d2495ca285bb0090b457273717ce8cbeae6718f4b9bc08c229837f4fc04dfe284278fa11eef6131053aa3fbb5ecaada8b65063fd380735796928c99472d
 EBUILD x264-0.0.20120327.ebuild 2369 SHA256 652c96142181d3339fb820c0add88ebc21646daf74b24c3bb9b1eaa88737dfc1 SHA512 f90c9af66c75d4f445f1a7443180b8bc4885b0b6be5c64d2c13633ee2094a76dbc74dc33241fd03bba5dcba293df130d45aeb918d8d0b131e8912918583b06de WHIRLPOOL 029fd0b95c4b29e36b6e3cd01671dee797a999631b4a0c086606718295a41ee1c92f667a75d29b1556e2d62a69fd542c323461350f32ff3537ad5706f43fa71a
 EBUILD x264-0.0.20120707.ebuild 2880 SHA256 c1058ae73c205292a5ef7e6e8afc48293b74258f353f796a11518e9e78c8f60f SHA512 2091ef73ef17a7fd84ddf41e03593f0b224c1eaa8be8a6e2410ec3352a8146b19e9e89bda5c9d5fcd3a6d9306b126bf96a32f196288b2aab7c76deb82ae8d82d WHIRLPOOL 0ec1b5c56d0e5af2fb285f2f6d662e73e0449ee0a1dcf31fe2d54c82cd26d9bde03f5ffd95ad8350fee1b5de9552663d553a9ae8b87115bfecf2652a4bd1cb9d
 EBUILD x264-0.0.20130506.ebuild 2303 SHA256 0087e7edbb66caa01bddaaee8f5ef50ce4d17cf0265c840f13967acfdd358bd4 SHA512 c98aae7c6f938a6df1d238295b710bf035868c55c4797f0c87ed90dc47ab5a5a3deba640fd2e63c3931ed53a6816d1164c7a5a77aab1a1fcf98d18c5e4ca735f WHIRLPOOL 5792a11a81c61c814c6b0e644dd381c0e3f832dfb1c4c844a2e606cadaaa8d8cdced3704fc6251350234a5b7a59c806c689f942d30259a22e386147d315171f9
-EBUILD x264-0.0.20130731.ebuild 2109 SHA256 041e48b5eae405243ce1eac867655b6f7bccd30d32bcb73ef5931df6ebf941c1 SHA512 19352cc333fb8aeca45cc055c4fc5fc9e026e83d4d4473f8ba4606e07ca4d3dd565b5538c85d7e85390d9753484e7784dde08502388438439f4dde9075ed746e WHIRLPOOL a5a1f0a0048555ab4d5f9af9ebc391fd285becaa466342ad746498f903b591f5aa225fe02e10b48de2342f1e91069e8bba15dc25e922cd60e50f931b6d1ae7cc
+EBUILD x264-0.0.20130731.ebuild 2108 SHA256 d5a3a2d177cd1aeeca3e16c9a55ea26c404aa373904a5a3872c0528fe3b8707c SHA512 12e9a07a8ce25f14e5e0c7ff17ef6c572cd1bd5da2e1cf49956002695618e63d7e5e28422f019cd5075e6ba7494640d2a5b4bc241db7dede3f299c572dcc0224 WHIRLPOOL 9f28386bc74a0f227f096aa8f59bc29264fa0865a65afa71cbfc47e98f1133debdc7c8ae55413d1bdd8c6dc253d6021e89aaf39eaefe4ad125ed7d4d477a08aa
+EBUILD x264-0.0.20130912.ebuild 2108 SHA256 964fc2aacce1910e7ea9b7ace373b73178a685a600266dbcef81abc48112e5a4 SHA512 5047b29d4e2358a3d13163970340cf1eaf75eaa59bda94666795557bfefe1a7a64c761d7a164284d407d3973ab05e570619c37bc7a81c14ae6791cd19b67a3d7 WHIRLPOOL cc2d9967a435cb7100ac14b16d40118ab1067e78dae7473288ac7f61bce556fb210d7f7fe4bff534768388d85bc8b4510797ed777c0181373a17f189a5467a4f
 EBUILD x264-9999.ebuild 2184 SHA256 fcb1f5d43459df8a0d459836c82a2e5174deb325cc7214187d178712d6bda769 SHA512 fa7f17583b82f534055e3b052406fe2f35da90de46e28fa1c68d4974fbbc5ccdaf9922d01ce1168eb1bbec57b3cb12717da2a43eba942d5c7a678e54be93c5c2 WHIRLPOOL a7dcc5806e127221abd469197f44f86b324f971f31fd0f7166df81ebb3ec3dcfb4860a5a278f6a167c5b4877ecf03ab4634ad19e997bc7955c4466cd9bb2a0ed
-MISC ChangeLog 14717 SHA256 13fe32781f75495277b8844682c837db7668679cfa3b35effa8a9c9e0da22c03 SHA512 69ca788cd3ff47c339824eb38e52604a0112cfa40d364a7840e34d1eaf2eed0b6c072c5eafdb831740a268658bf5431b8f2580d428036cffdf2c904edc2115b4 WHIRLPOOL 99b7148e025a16d6d808398446412d44348b57bc4f2b595bdf9d9a009a6f3299d11d0354fd911ac0e60b615cfd071e6087c47da5ada2c85714664db97c944bf1
+MISC ChangeLog 14958 SHA256 66d0d4f8af4da7d906899ff1b6476b7184f1c9835cad034aed2bde5d18d1a926 SHA512 b3e55c4af0c4b15c1e6a4a5fc31415a0c0d303c15b3bd595f81c3f9121b055b4a67244985b9d61727f9d5d0722c1ffed9560de2407e52d222453c7c1282faa80 WHIRLPOOL 0220f237efb74261744d3095249efbeb9f781f4cd20b8d4af1b5fbaae62111b7e5fde58d648353c5352e5a9cbb56f36086ff18afbdf444e56903ba4634b1cab8
 MISC metadata.xml 606 SHA256 175feae20fc3d84511ce15a469df3ccbd75c02fa75eef9d5ad7c3d5c6c3fead3 SHA512 3ee5bd067211cb998771e58ac79e18a9cf7e87d2aaed48b4f766d226ccac3b74199934e1f911bba3389b16ca28661a9e04bbf7fa65069a10682c0327dc4b4b4b WHIRLPOOL 6637b3208323e2eee0dc64572659b6841e29a45232dc3b2209aa4c0b723a39fb75953209da958435510abbbc377b5f36d8890918600dbd837fa553a413823e1e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iEYEAREIAAYFAlIJBToACgkQvFcC4BYPU0ptjQCfUyhTPl32zA0+20p6GfaPWOCE
-a0sAoLoDRGlvga0HEDtUAEBi5FuW04lN
-=le3U
------END PGP SIGNATURE-----
diff --git a/media-libs/x264/files/x264-0.0.20130731-cflags.patch b/media-libs/x264/files/x264-0.0.20130731-cflags.patch
new file mode 100644
index 000000000000..3014b47eca8e
--- /dev/null
+++ b/media-libs/x264/files/x264-0.0.20130731-cflags.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/420241 for x32 stuff
+initial x32 support -- no asm code, just pure C
+
+avoid messing too much with CFLAGS.
+https://bugs.gentoo.org/show_bug.cgi?id=351219
+https://bugs.gentoo.org/show_bug.cgi?id=413661
+
+
+Index: x264-9999/configure
+===================================================================
+--- x264-9999.orig/configure
++++ x264-9999/configure
+@@ -553,11 +553,6 @@ case $host_cpu in
+             if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
+                 CFLAGS="$CFLAGS -march=i686"
+             fi
+-            if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
+-                CFLAGS="$CFLAGS -mfpmath=sse -msse"
+-            fi
+-            CFLAGS="-m32 $CFLAGS"
+-            LDFLAGS="-m32 $LDFLAGS"
+         else
+             # icc on linux has various degrees of mod16 stack support
+             if [ $SYS = LINUX ]; then
+@@ -588,13 +583,8 @@ case $host_cpu in
+     x86_64)
+         ARCH="X86_64"
+         AS="yasm"
+-        [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
+         if [ "$SYS" = MACOSX ]; then
+             ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
+-            if cc_check '' "-arch x86_64"; then
+-                CFLAGS="$CFLAGS -arch x86_64"
+-                LDFLAGS="$LDFLAGS -arch x86_64"
+-            fi
+         elif [ "$SYS" = WINDOWS ]; then
+             ASFLAGS="$ASFLAGS -f win32 -m amd64"
+             # only the GNU toolchain is inconsistent in prefixing function names with _
+@@ -602,7 +592,11 @@ case $host_cpu in
+             [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase"
+             [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS"
+         else
+-            ASFLAGS="$ASFLAGS -f elf -m amd64"
++            if cpp_check "" "" "__ILP32__" ; then
++                ASFLAGS="$ASFLAGS -f elf -m x32"
++            else
++                ASFLAGS="$ASFLAGS -f elf -m amd64"
++            fi
+         fi
+         ;;
+     powerpc|powerpc64)
+@@ -964,10 +958,6 @@ if [ "$pic" = "yes" ] ; then
+     [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
+ fi
+ 
+-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
+-    CFLAGS="$CFLAGS -fomit-frame-pointer"
+-fi
+-
+ if [ "$strip" = "yes" ]; then
+     CFLAGS="$CFLAGS -s"
+     LDFLAGS="$LDFLAGS -s"
diff --git a/media-libs/x264/files/x264-cflags.patch b/media-libs/x264/files/x264-cflags.patch
index 3014b47eca8e..c08a0d7e3de1 100644
--- a/media-libs/x264/files/x264-cflags.patch
+++ b/media-libs/x264/files/x264-cflags.patch
@@ -1,16 +1,8 @@
-https://bugs.gentoo.org/420241 for x32 stuff
-initial x32 support -- no asm code, just pure C
-
-avoid messing too much with CFLAGS.
-https://bugs.gentoo.org/show_bug.cgi?id=351219
-https://bugs.gentoo.org/show_bug.cgi?id=413661
-
-
-Index: x264-9999/configure
-===================================================================
---- x264-9999.orig/configure
-+++ x264-9999/configure
-@@ -553,11 +553,6 @@ case $host_cpu in
+diff --git a/configure b/configure
+index 07796b1..afdda94 100755
+--- a/configure
++++ b/configure
+@@ -556,11 +556,6 @@ case $host_cpu in
              if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
                  CFLAGS="$CFLAGS -march=i686"
              fi
@@ -22,7 +14,7 @@ Index: x264-9999/configure
          else
              # icc on linux has various degrees of mod16 stack support
              if [ $SYS = LINUX ]; then
-@@ -588,13 +583,8 @@ case $host_cpu in
+@@ -591,13 +586,8 @@ case $host_cpu in
      x86_64)
          ARCH="X86_64"
          AS="yasm"
@@ -33,10 +25,10 @@ Index: x264-9999/configure
 -                CFLAGS="$CFLAGS -arch x86_64"
 -                LDFLAGS="$LDFLAGS -arch x86_64"
 -            fi
-         elif [ "$SYS" = WINDOWS ]; then
+         elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
              ASFLAGS="$ASFLAGS -f win32 -m amd64"
              # only the GNU toolchain is inconsistent in prefixing function names with _
-@@ -602,7 +592,11 @@ case $host_cpu in
+@@ -605,7 +595,11 @@ case $host_cpu in
              [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase"
              [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS"
          else
@@ -49,7 +41,7 @@ Index: x264-9999/configure
          fi
          ;;
      powerpc|powerpc64)
-@@ -964,10 +958,6 @@ if [ "$pic" = "yes" ] ; then
+@@ -971,10 +965,6 @@ if [ "$pic" = "yes" ] ; then
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
diff --git a/media-libs/x264/x264-0.0.20130731.ebuild b/media-libs/x264/x264-0.0.20130731.ebuild
index ec29e9bfb3be..ceff5dbdde4f 100644
--- a/media-libs/x264/x264-0.0.20130731.ebuild
+++ b/media-libs/x264/x264-0.0.20130731.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130731.ebuild,v 1.3 2013/08/12 15:54:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130731.ebuild,v 1.4 2013/09/13 13:05:04 lu_zero Exp $
 
 EAPI=5
 
@@ -36,7 +36,7 @@ DOCS="AUTHORS doc/*.txt"
 src_prepare() {
 	# Initial support for x32 ABI, bug #420241
 	# Avoid messing too much with CFLAGS.
-	epatch "${FILESDIR}"/x264-cflags.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
 }
 
 multilib_src_configure() {
diff --git a/media-libs/x264/x264-0.0.20130912.ebuild b/media-libs/x264/x264-0.0.20130912.ebuild
new file mode 100644
index 000000000000..e7a7bb3b9ed2
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20130912.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130912.ebuild,v 1.1 2013/09/13 13:05:04 lu_zero Exp $
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+else
+	inherit versionator
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SONAME="135"
+SLOT="0/${SONAME}"
+
+LICENSE="GPL-2"
+IUSE="10bit +interlaced pic static-libs sse +threads"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )"
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+DOCS="AUTHORS doc/*.txt"
+
+src_prepare() {
+	# Initial support for x32 ABI, bug #420241
+	# Avoid messing too much with CFLAGS.
+	epatch "${FILESDIR}"/x264-cflags.patch
+}
+
+multilib_src_configure() {
+	tc-export CC
+	local asm_conf=""
+
+	if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
+		asm_conf=" --disable-asm"
+	fi
+
+	# Upstream uses this, see the cflags patch
+	use sse && append-flags "-msse" "-mfpmath=sse"
+
+	"${S}/configure" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-cli \
+		--disable-avs \
+		--disable-lavf \
+		--disable-swscale \
+		--disable-ffms \
+		--disable-gpac \
+		--enable-pic \
+		--enable-shared \
+		--host="${CHOST}" \
+		$(usex 10bit "--bit-depth=10" "") \
+		$(usex interlaced "" "--disable-interlaced") \
+		--disable-opencl \
+		$(usex static-libs "--enable-static" "") \
+		$(usex threads "" "--disable-thread") \
+		${asm_conf} || die
+}