New release version and live ebuild tracking the current release branch

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

4 files changed, 76 insertions, 95 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 7b9ce1084143..eda8e75c6471 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.182 2014/03/28 03:17:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.183 2014/03/30 19:00:19 lu_zero Exp $
+
+*libav-10.9999 (30 Mar 2014)
+*libav-10 (30 Mar 2014)
+
+  30 Mar 2014; Luca Barbato <lu_zero@gentoo.org> -libav-10_alpha1-r1.ebuild,
+  -libav-10_beta1.ebuild, +libav-10.ebuild, +libav-10.9999.ebuild:
+  New release version and live ebuild tracking the current release
+  branch.
 
   28 Mar 2014; Jeroen Roovers <jer@gentoo.org> libav-0.8.11.ebuild:
   Stable for HPPA (bug #504584).
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index fe2cfe73a075..6032fa56aac4 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX libav-0.8.5-support-libcdio-paranoia.patch 1477 SHA256 2e3490bba021c512828f12dfc5e6be39a5f3c53e16b2ceb99e6f6c4e71139803 SHA512 2a9847a435a32fac0b9bd904b932d20f26a6c7b0d086cda42c45f9099d87dbd4e637c7a52e5c29ad0df69a95ffed91bad2673d773c3045f03baf736796ab8332 WHIRLPOOL 77152717b72d245e4bfd5ac0cc1ed4ac3a512086be248515bc7d0c73d4840cfae7ba3bb7a668ee354803b6fba6ad90b992f80f2c335b5173741498a968b3eca2
 DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27c515626a536b87deb610d850 SHA512 eca7783af7afc567ed226942b1318b1874b2487c7dc65406fe2097cf2318d722bb4c45ed14363bc3653f948f7cdac5967162e1f4fbd5cbec1adc244886800bb1 WHIRLPOOL abe5faa67444c3edaf5ae9a57a701ba0fccd3e313941d0f7662b8dc2b3a8886578d7bcbd6ed4abfc62abe3b7a36ea216529710e28d1c9cff8f3bb2b9804707bf
 DIST fate-10.tar.xz 558524508 SHA256 65779319ff75a5d93f20132a7c348db2ff6f0f0275fb64a23f81fbda6e44c1cb SHA512 5e569b899961d82c579d974eb13b8a5263ae7a83dc788119d6abf923c9c133029fd861960a85c316e0b0a0bd61722cc3bcb393a65d9d2c551084c0b1103cc582 WHIRLPOOL d9e0bb01ae809ca57a566ae804b9e30ff0239e43047a7f93d07ab0d31e95c7f06cadd651dd3badc2b906f34ffa12669cff87910ffe115f34c3279615f8afaddb
@@ -8,26 +5,18 @@ DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5dd
 DIST libav-0.8.11.tar.xz 3768252 SHA256 5934e4f0dbf6e0fc4987de86cdd079f1d11a1410ae275e9f46472af17f05155a SHA512 b469cacc57949dae60f12fa5bf21fcb5ca8c724deed7327c2e7a516f97a127eb05e4557ef659da28ae184b6b8e2ee1d93ee70151adf64b0fe345b054bf231b37 WHIRLPOOL 735c36eb60656e4fcc00accc4c8aa3fa9489a066f3f6a9940101e92e3d380c7ee9dde06b76ba464ff7e9671cef74ef790c3bf5618accdb58d051610cec4d33b7
 DIST libav-0.8.7.tar.xz 3763180 SHA256 8be6cbee4066ea031110d0f1cf8f9fecda8bc36d868aafdc7e0d34b59e6d5f3d SHA512 34b23bc61b4755b7d9aa078b77571641a167da0fb356c549ee48fa61fcedd4e9dcd7965ac65487606ef18edb3512f08a565de901f1927f11a18c1864da4ec83a WHIRLPOOL 3896adac36dc789a74e3839061e466f6277d225ecc13e9f6f96953b353fe6e15cd76b0464704240eb97c4c0fec230b21d7e4aa684869e367bb489ddee938bada
 DIST libav-0.8.9.tar.xz 3765764 SHA256 4f5181164e4007d5b0013bb3cc5e3b7393ab71ac286319c714b7697e2784f77f SHA512 92dccdad6d2c2c5d2e9493ce4fc866ac1f12aa010ab29339cc057bad15b8ac553969b028c75c531037bb52d90fe5acbfd21c79a7c56d2932e576ef80a199fd03 WHIRLPOOL 319d2f6655014b8a24e65b46ad92ee84de5f1461ba0dd39ccd10e4940d817817bbcaff28024eb0b1be761cb4310dfd7bfe095bfbb4ce479fc4c86ce4baecc106
-DIST libav-10_alpha1.tar.xz 4559072 SHA256 9253dcff6ccccb43477ab0181ea670b1c29e41842edb7c2bdedfc510533115b6 SHA512 a13d5260ffcf21607b23e682401aafb893a79a3bd39fd5aba73d3f7a790640e80932e189a983a0102481a1dbcd3c1e1011bd335bcd0fbd6df883d93449a5156b WHIRLPOOL 7fbf518c6a2738faf5500f18a776d8ba866f263b92b188e7e76aac9639a6014382f6303d47b4252be6a5b900a3634895bef8ee2d8e01bdf3ab3a5db6932bb220
-DIST libav-10_beta1.tar.xz 4635736 SHA256 8180f499ea4f3f350dcdd9ab4bbb16d2a3b8744a582736aff9abfbf4636e3806 SHA512 c2a33b1134d701ed9e3f72ab19865373f6bb7371a93d7ae26410d0dc740c8cf872190ec54f67435c95211cc1edf42d42d0396405f6620e0b4646ac872ee4dc56 WHIRLPOOL 3f2900fd511e333bd70d146054fc0f4c9f4d51a0d6bf17eb38259c39329a0834b7cd76dcb3d0455b4cd54cee0dd913f11250a72ea28a6757f60139315d46b97b
+DIST libav-10.tar.xz 4646864 SHA256 69ce0756ad5916fb1cf47d198d7b6232d2aed42c39e3e350b6adafb3e45679a0 SHA512 00505d0491fff4a502af9d6472670c31ffaccebf26aea85ced751eb2070108f56ebf930204a4ea4640eaf6d46ebf3e9629bc95a75786fb4c2b2866f794dd3f35 WHIRLPOOL ace1a0ca9b736c9f5039c586069f3de854bfe2ee030c5537685cfee5e36c7e247fc64f99c5a135bc794926a7cca77408280573897b262595c180ff50b68be2fa
 DIST libav-9.10.tar.xz 4074176 SHA256 83dbe640779da1c1e8d8836c99575f57f749d18407494ebca451578afee9300d SHA512 ba43d999237bd656169e320df87827d08444297010b3448dfa20eaa47d51b8736f8cd7c650a3327f4c68c34b06813700afabb3f68e2f799004ddfa5556fc3561 WHIRLPOOL 6fbd67a024e723d93208c42f3b4f1f85bb7b2e9532c15952a076b82cb1be0c17870da87cb6a83b9d83d3874280158b8e60eccd7dcc4927c389a8241ccde0582d
 DIST libav-9.12.tar.xz 4074572 SHA256 60fef8947d375579211635b13fc8bc79c6bb760d074a523c1ae1062682b3a0f2 SHA512 71f2d38885860bc48f961a42cc74ae11807dc0c869c7ba8c22388d47de7d62f69e6e49cd18b4591c0a62d1da84bdba8d4cd08bc7cf498117ac48c7263190a1cd WHIRLPOOL 1a8652e3e4603b845111897da48c01709426a1c227c47dd2429b766e99a7ae86d008d6434db9a1b1538984271682dd2783a5a805a042e23efcf282b0901114bb
 EBUILD libav-0.8.11.ebuild 9172 SHA256 84d747ccd9c337404b94a25a2f562c600ddd65e99dad2dbee8033d40a0ab493c SHA512 30e868ad9a77321e68a5decf0aa691efe39ac7514ecf3af5c8e55d56e43b6d57358a2882a3e969978c2988daec5ea69d2c6c36fa5cbfb6a93acd1d22a9a957b5 WHIRLPOOL c61fc7e37382360165f3a09f6c5737cd5e9086e7349ddb7a7acb2624acb27cdc4dec27723195d20cfc765ea65ad923461d5d148fad63f75bb58adf72262681b8
 EBUILD libav-0.8.7.ebuild 9169 SHA256 1c9e6a9784b18f3b04c36b62240d79da5a12452c21d727e1880252540d118a76 SHA512 cf5fb3101b4f34dae9cfb44b0151cd4e37ea686583a959504896b9bd222e61226a90c9d5e2b5d504b9362c12dc588c5bc53e615513abcfb5de1218f3d43c117f WHIRLPOOL b4a18d997ee016c05cf99db84b0c6712c4a3f9baae531129b30747664593cb624e1703a23bc0e80ebfa203bd35ae6ec4c6316d3fe4706769ce78cea93916742b
 EBUILD libav-0.8.9-r1.ebuild 10312 SHA256 64b75a0bdf27d77611fe295de241484e538cb7378f6eeddb6dd940d4fe4c306b SHA512 8895b1e1d92f668a3464841a0391370ae1e00252e9fcfb0469c8544fd484ca9dc3a84f65822ed21d0824a8e1eaa07a3d9ae84fa4d1b7a96985c3b0be80c35bfd WHIRLPOOL f95f33304756c378da523b0d2d27390e31efcc51bd8d9157d6b4dea7d396fa5780193256bf095bebf8450ced1c92f00a76618dcb6164df26294560bdf27aa2cd
 EBUILD libav-0.8.9999.ebuild 9178 SHA256 527bce140ec102b77d723e3dd87acdc76fae74858cc2ca17fcc2dbe2da4ffee2 SHA512 db75d7cd03b3281b3903c5c788b601aa964e214f735e89e6bf05f2b857d16d3388f876aa2e531b55de1ed7aee0b4c1de5332600e3396d3632f144aad762f4689 WHIRLPOOL d4c450d037dc9c28a49ac229c09e733744f446c42b15d9c97e87b0157e34da4de161e9e28184fc3ad81e65692186c9c67569ea682e751b1865dacccae6814792
-EBUILD libav-10_alpha1-r1.ebuild 9610 SHA256 4b009ee4a5f251446f9c1171df26ba6df4af9585f7a5ed4fd2d5e5faa3a655c2 SHA512 a2f24129d11ecc39bd4ee4c9d4e2d1a19170c3ebdc0addceb83470daa5fe72b9b523e2a0a3fe7ecabac9bbcbeadd8d1837429ce576964d768c88ed30b87fd0ce WHIRLPOOL 702415047f315adc5b0f742025c4a2ffdb59cb5c42d36c2ccf0063e743da22131df5be6bcd0e6c0b71542ec604a225bc0407135d5889ed2d303902857082b6f8
-EBUILD libav-10_beta1.ebuild 8380 SHA256 5bb7d25a3f5d7b94c1bfee1ec7d55d310348a71fb9e9451568f7e319dc524eaa SHA512 0ebc04fbd2eced2baac2d3c0c156d0fe0d92f6ae624b95d0a783a49f5d46d87c03e0fbfa8f1fd0f7f3c97c10e65796752358070b14d0130f3a01af9f920f28bf WHIRLPOOL c61756dee4926705e0c28948db01318f300788d4a36493e3a073a67c5d70058c0097c23f200dd36e53ead81fa52d2b87ff259bf994eabbe37b7bbe13e611ed84
+EBUILD libav-10.9999.ebuild 8379 SHA256 a5f6570d38ae0be5241e920190e346ee6b36f6fe2f5459e0335c318a472a9af8 SHA512 fce18e7a2e38ac1a49594639b186467883fd2f376ee32c8b8cb8ac52d037cf565802285841777ecbf7fc18a7533b50de311279e8e1bab57bfc7bbfd7adb9540a WHIRLPOOL 98733af420ac4a3a8eb9b9bd6e9df9aa6ac404514b4c58d3250ec1cbf140322038662516eb5114efefb4d09b09d6ddaaa21a68eb7f532b50b7e11ffa6f045715
+EBUILD libav-10.ebuild 8374 SHA256 8421617c8033cc57b90c17e8c779b68e7f27eddc8f2e87e1fab610a694aedc10 SHA512 dd0dc775243b3d448069f29fa3e9fa72b4c5f09a6a64924d81bc2b9dd1a1a94c5fb82ce395d046fb328de877f0f0b85576c3498f23c81597a06150b40cdad709 WHIRLPOOL 4441c006d62f55df33c6c4764adac9f67f4d32396288c5b9346b9997832cb058cf0dd9377a9debb34bd3522ace3c32c37e0177bb44e2a79b57cd14fa5af95fed
 EBUILD libav-9.10-r1.ebuild 9655 SHA256 0cbb1a5172f26fd8cad46a958d17af5c59b82cad24cfa8e4d16b1e4758b583c5 SHA512 908c65c33d67a0efa55a9bfff82ef27cea576036f794478b0ac4d8ccaf5896fd14dd1cb55fff789bc297beada9bfbe2b765cd1ae683ee36fbc45f4ae6b0a1471 WHIRLPOOL 8d6a0a8e6e2ca19d7d8087bb7c58c98c6971e95526bb5447576ee725ea3a2ef6401094f4430b37b1515fffc07805c794e4f7f34d628c3a4ee96ffd0bf1a2e991
 EBUILD libav-9.12.ebuild 8505 SHA256 207d15535eaa537c9f6fd3a6f0a02416685716be11deab31475e6ccfa4b01477 SHA512 29ec750c1aab1d2bef43a32de0dc82962c66630faffb7115fa1012cf28b3d0e31aa8dfd81cfd963114ed0316b8217ff5010e7b02bc2e959c0389d83b70f11ebc WHIRLPOOL 76202467cda721095cd3d5bf13b411ffbccb05402e60215d1cb490765b9a251e3a83c1957e5eac0a74e5f2c0886924b41c6ffbb6967678d874011061287d9195
 EBUILD libav-9.9999.ebuild 8508 SHA256 277c23dfa059f11ed2ffd7fa869ee98c5fdf9c26664e0b1b49c466452766198b SHA512 672b4fc0723f02b92fb5e39112a741028faa73c16399138685ce91671e394c78b87dfda86bab7442128b5733b4df9ba092970a59dc0659a71fcf21c681dddf3f WHIRLPOOL 960ed166cb20634ab38cf0d7d9be0a407316d4b6eaeeee9ef7750bb510e59574b044e5637c61557c844f002f5f924ba1b6f4f403073294c633a64f4bc87d013b
 EBUILD libav-9999.ebuild 8385 SHA256 2bda09a154ce30423ce39483bcc6d03fb7416a9321bbd1f3ab4213a0272bbb65 SHA512 7c2e5530562551cb3efc408b68e3fc764c213b1cb5efbf527a9da42f25d967265e65185eaef8019860161692425e8a8877e94f73d8fc90b2bc1047df39a40712 WHIRLPOOL 88b0d7328e3aba271867cee6aaf2e950ffabaa5b31d513fe02b00fa348458390fb0adfb648054d8d0f03f0de008cb2aa3e8ef3296f73a826bb08836f20583edb
-MISC ChangeLog 27529 SHA256 3d2cdfe1cdfafc401d3e58f715356310969d1c62f01e73dfb2e4d3550462cfa4 SHA512 2d05fe6df2942227326fc0e4a155eed176d3153ec8c69cd5863ce8ca3158ed8047a70f2cf92647c1f6871a749177920e0e412876a9bc42613af3173e33732a58 WHIRLPOOL e53e7e3f6ca47cc22bbab1ac52238b26fb807cc06cd149095f2f46dae72d0480c1c6d8ab8ef4d79bf65507be28c3895ed6c04fdf7f6cc18fa10128f28c2b1a60
+MISC ChangeLog 27809 SHA256 b4834864aa17e1307a1d660729ff1476329058248f2e2fa06ea7ca6ffe18708c SHA512 b1dc4a07b73fa25e4541355c52185db33098428b3548a9ea7578c78dc443d48e076534ad9b70fa3f4bc10d67ad5ff766db0cd85b4d75e4837b78f6d04f4e8eba WHIRLPOOL 4cbcdd24df31c02b4fb98bb93297301fa75d2aaeda39ed54061bc0a77ceb6c9e1a8a8bb807b85a000912dea8f600d1db7597018ebcbb053b40949b9abf3c0b57
 MISC metadata.xml 3106 SHA256 968ffe2f92f6e2ae9963fe0005e78fc205ebca769d48eedd578472cef8c8cfcc SHA512 f10f99a54e1806b17d0923429c2df151e470edceefd854e63c0411b2be6fbbaf829e441dd318ff0e87d5f2d6985c52673646c20c971fba9c0d44d67edc3bb5c8 WHIRLPOOL 9004c95991227752427cf62491949845931683a9a45a7a555b98b1bf92cf7d2efad0e2c912b4a069e58e31f41062d0025b8e3a082e0cc37c5d13484969058a47
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlM06dgACgkQVWmRsqeSphP2AgCfdYGmttJaY533p0x6fjESckSr
-oycAnj+naG2xbkDIWAnqQcziDdRxUCM2
-=drs2
------END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-10_beta1.ebuild b/media-video/libav/libav-10.9999.ebuild
index 317fcf7a2173..52e4d8d94e26 100644
--- a/media-video/libav/libav-10_beta1.ebuild
+++ b/media-video/libav/libav-10.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10_beta1.ebuild,v 1.3 2014/03/18 15:27:10 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.9999.ebuild,v 1.1 2014/03/30 19:00:19 lu_zero Exp $
 
 EAPI=5
 
diff --git a/media-video/libav/libav-10_alpha1-r1.ebuild b/media-video/libav/libav-10.ebuild
index bbe88183f2a3..90438f25aa52 100644
--- a/media-video/libav/libav-10_alpha1-r1.ebuild
+++ b/media-video/libav/libav-10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10_alpha1-r1.ebuild,v 1.3 2014/03/18 15:27:10 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.ebuild,v 1.1 2014/03/30 19:00:19 lu_zero Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 fi
 
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} multilib-minimal
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
 
 DESCRIPTION="Complete solution to record, convert and stream audio and video."
 HOMEPAGE="http://libav.org/"
@@ -26,11 +26,9 @@ SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-10.tar.xz )"
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/10"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
+~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
 	+encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
 	+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
@@ -48,64 +46,58 @@ TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
 
 RDEPEND="
 	!media-video/ffmpeg:0
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	bzip2? ( app-arch/bzip2 )
 	cdio? (
 		|| (
-			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]
-			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
 		)
 	)
 	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		aac? ( media-libs/vo-aacenc )
+		amr? ( media-libs/vo-amrwbenc )
+		faac? ( media-libs/faac )
+		fdk? ( media-libs/fdk-aac )
+		mp3? ( >=media-sound/lame-3.98.3 )
 		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			media-libs/libogg[${MULTILIB_USEDEP}]
-		)
-		vorbis? (
-			media-libs/libvorbis[${MULTILIB_USEDEP}]
-			media-libs/libogg[${MULTILIB_USEDEP}]
+			>=media-libs/libtheora-1.1.1[encode]
+			media-libs/libogg
 		)
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+		vorbis? ( media-libs/libvorbis media-libs/libogg )
+		x264? ( >=media-libs/x264-0.0.20111017:= )
+		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
-	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
 	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		media-libs/libdc1394
+		sys-libs/libraw1394
 	)
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	rtmp? ( >=media-video/rtmpdump-2.2f )
 	ssl? (
-		openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-		!openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] )
+		openssl? ( dev-libs/openssl )
+		!openssl? ( net-libs/gnutls )
 	)
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
+	schroedinger? ( media-libs/schroedinger )
+	speex? ( >=media-libs/speex-1.2_beta3 )
+	truetype? ( media-libs/freetype:2 )
+	vaapi? ( x11-libs/libva )
+	vdpau? ( x11-libs/libvdpau )
+	vpx? ( >=media-libs/libvpx-0.9.6 )
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
 	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20130224-r11
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)"
+	zlib? ( sys-libs/zlib )
+"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
@@ -138,7 +130,7 @@ src_prepare() {
 	fi
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
@@ -227,15 +219,9 @@ multilib_src_configure() {
 
 	# disable mmx accelerated code if PIC is required
 	# as the provided asm decidedly is not PIC for x86.
-	# also disable asm for x32.
-	case ${ABI} in
-	x86*)
-		use pic && myconf+=" --disable-mmx --disable-mmxext"
-	;;
-	x32)
-		myconf+=" --disable-asm"
-	;;
-	esac
+	if use pic && use x86 ; then
+		myconf+=" --disable-mmx --disable-mmxext"
+	fi
 
 	# Option to force building pic
 	use pic && myconf+=" --enable-pic"
@@ -274,7 +260,8 @@ multilib_src_configure() {
 		fi
 	fi
 
-	"${S}"/configure \
+	cd "${S}"
+	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
@@ -290,12 +277,12 @@ multilib_src_configure() {
 	MAKEOPTS+=" V=1"
 }
 
-multilib_src_compile() {
+src_compile() {
 	local i
 
 	emake
 
-	if use tools && multilib_build_binaries; then
+	if use tools; then
 		tc-export CC
 
 		for i in ${TOOLS}; do
@@ -304,22 +291,19 @@ multilib_src_compile() {
 	fi
 }
 
-multilib_src_install() {
+src_install() {
 	local i
 
-	emake DESTDIR="${D}" install-libs install-headers
-	if multilib_build_binaries; then
-		emake DESTDIR="${D}" install install-man
-		cd "${S}"
-		dodoc Changelog README INSTALL
-		dodoc doc/*.txt
-		use doc && dodoc doc/*.html
-
-		if use tools; then
-			for i in ${TOOLS}; do
-				dobin tools/${i}
-			done
-		fi
+	emake DESTDIR="${D}" install install-man
+
+	dodoc Changelog README INSTALL
+	dodoc doc/*.txt
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		for i in ${TOOLS}; do
+			dobin tools/${i}
+		done
 	fi
 }