Drop old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

12 files changed, 63 insertions, 560 deletions

diff --git a/app-emulation/emul-linux-x86-gstplugins/ChangeLog b/app-emulation/emul-linux-x86-gstplugins/ChangeLog
index 48b0f039a1db..866ebc1bcfce 100644
--- a/app-emulation/emul-linux-x86-gstplugins/ChangeLog
+++ b/app-emulation/emul-linux-x86-gstplugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-gstplugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gstplugins/ChangeLog,v 1.19 2014/06/10 19:31:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gstplugins/ChangeLog,v 1.20 2014/06/15 14:02:58 mgorny Exp $
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  -emul-linux-x86-gstplugins-20140508.ebuild:
+  Drop old.
 
 *emul-linux-x86-gstplugins-20140508-r1 (10 Jun 2014)
 
diff --git a/app-emulation/emul-linux-x86-gstplugins/Manifest b/app-emulation/emul-linux-x86-gstplugins/Manifest
index a58746d20702..bf2c119b9f85 100644
--- a/app-emulation/emul-linux-x86-gstplugins/Manifest
+++ b/app-emulation/emul-linux-x86-gstplugins/Manifest
@@ -7,25 +7,24 @@ DIST emul-linux-x86-gstplugins-20140508.tar.xz 3739808 SHA256 d0e6255361869ba031
 EBUILD emul-linux-x86-gstplugins-20131008.ebuild 591 SHA256 f01942b24d127825bbc05fba90223244ac5567f5d01570b46d289a8ff5d18163 SHA512 96abbb036f4693b0a6e44bb76b4693ff9277c80531a784e6655a516a22b1a314adbd4c82a86f47edeac068e4c5026675859c34adbe4e2657ed9af601edd32a87 WHIRLPOOL baf1c9d2154c4c8a6fd8be6d6026d02f190cce1e3d56909751584a1a6772c23690a3893e31000f4cd70b4661b0ad1657562cb046deeda2fbbf47865a850bb13c
 EBUILD emul-linux-x86-gstplugins-20140406.ebuild 591 SHA256 720028ae057f8daf0f53e417fa92de5b91d7c4a55eca2c3cf9a9fc70e13b603b SHA512 263e7b6bde2b57b809d3a77148dbc7187cbfae583eb46d6b2a2cb1a3e3d51b081d446ab62c5ba6ce41e60686380639232e93a010c2eda482b1113f4821a90058 WHIRLPOOL 154374993117a7e26de77ef4e4f22d5a7f17e136e6425712d31bd1fa9407872bbe54d5d249c03300861751562e1c8c003c5809629e4e1e6049602ff02934ca0a
 EBUILD emul-linux-x86-gstplugins-20140508-r1.ebuild 897 SHA256 aede140601a9dbf8f1e151c026f7c7bf42aa9e49e474e4fa8fd17f6ee48de8db SHA512 845f5b563848270cb7fd875160490396e2c99e6201193e861f4d5af847d092fbba09e466166f12ac654290671dd693521a9947dbc80b845f3e0231373d9fa3ea WHIRLPOOL 94fda257226b40c5f9b57e1675cbd97b99910570384c68607427601c9c06f610ff049529addc0ac1ed58f93d1013ea7b2f31d41fb9c278ea503cd04c44a4dc51
-EBUILD emul-linux-x86-gstplugins-20140508.ebuild 592 SHA256 9a696ed9546c55982c39af278fd4c50c5477f23760fd9a8c5910f62f2c3d3c4c SHA512 19ed41edec44cd3dfd6be6cede64cba7cb527c5b41931b0ce81d45600a0ae8d8acd4634c17ff6ee50f517092c760a48db60238ef5a19d2ba9d7ac686b963e75c WHIRLPOOL 390af17a15577c963c743797ed1093dc55eab23660c12385cbdc122a5e937cbad6ea1c2a51194011dd54d4fc81f1b5a5c66ff6f5fd223709c4587f8b1be0aedd
-MISC ChangeLog 3367 SHA256 9e4ea814e7cb958c900426276eb1c45777ec443198a7fb1e132d9a505e75b411 SHA512 6b776e144001ee48a0cdb5e19d6de4e68c74cfd437b3ef47ecfbd0053843a321a2cb18016b687dc872b155f7790ed55d553e317bcacf93691864d6daf6903b23 WHIRLPOOL d6abdcb16aa07365223e39fdb3ef030c8f297608b92008a52e7a799d2babd75d918608d24bb699dabc66e7b2a98336d4375c244f3f283e6d4feb4685c19d9396
+MISC ChangeLog 3476 SHA256 28e1d1ffb26746cdf2efb14e8a85e24b2d5fdbeab7bc87335e317ce2a5d26aec SHA512 acef33d6ebf7bcf8f9f27c7e1c1ddc578d3a19b199107230d067a6269665b1c3afc9492f8ad7436dd4666389a1ab411dadce4beb7ce80ea0ac7c080465799e82 WHIRLPOOL 920da74630fda07482cd339f76a694fc2cb145c0e2f2a58c605fe625d0da29d29b1c8e31c8e8f0613ab65c3927c202ed19d1b5ebb859d84d549476533ffa3792
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTl1z1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTnaeTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOn0IQALOHKqV4mwTPXHHvgBoAmRcW
-/pjwndIM5rADM5Yef71AQ65G4vu+evopP3Vt94wpWYJqcN+N9zeijXZSB4iSqkyS
-F/l7SfZyUluc4Ic/S/ARgG84quHep7xo+vHbMpCwPEV8DAmnU/MKhJTbwvIrWhy5
-SyOhN47NjeNGLm81rYp3IYZjpDAX4u0AonQ55tQj9S2H8crIvQ2BzcgRPaJxweGg
-CCzXS9SNxP+Q09RL4veLo69AZ++pJiAU+4hDETbnMnFt5gbs3YfiNgjZ+QqixCQz
-WFg+5IfyuponV49xxYtUW0cHqGxlKkNwrsRh7+KdsZ0wkkZG1PcQL9/Zr5sIgibL
-zYekrcMF+AyjGGUxQu18sbJGQXat5BiHjidc6kT4wINjgzScILeUKjDwGef9X+ET
-UMRf/XF1tIbYdHG8WdqMutUX/EAKRPcAD3RB3619APupROZyP73/hm10Y5VP9nEw
-Gj1M9KvVeRssVjIRpemceQucRFJF04HPT8AKSCUIH6qyo4zGsMrXCmnQi7RvzxEV
-dQwwbVDdIK8TZtPXQyI4NQWo85y/rfOBgq9q9K63UA9JMeIfQ1Q8PBIoxbb1T8n6
-UzU8D20uJaqVf+tVRDcdKPyeLBMtD2xaqmjJH3bt4J2kF+FaS5t+kKzl31WqXtQf
-YR5X4mNuVM/2K4h/u5Y6
-=o/mb
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONSsP+gKFX+bGL36V/Y+FzZtUKxDb
+JbSbG3Su6y9JW33d2lkbqwjInRgUoyrWXPPF0utQra4a7xsK6u+gTRpZgYwL4LB4
+tp6LhIcuPZuJy7LOPNeav9BjjeXQJ807eD9MeDAiyl6Z1RnhAipjvstG/GIoazJe
+zk9fWnpXvC/nb/uZkz1WIvezIaOrd9HuTupk24OR64Dcv8PX5H4MxTOT5ON1D7wd
+Jwwjh5fJkl60AzqT8MlOn/cCZVlAHcf0xKb0BqO2cXHbRy02ETyjzNh7eEwfyKD7
+9x3g8etvh7ot0CuVipqmGRTgScqGI1ioBN5Ai9fLPBDWRhh+lzkKV/oLB1nZ1Kc+
+HNmGzLhFTl39RE7D0bNF444BQRPQ4nv9g0GNBxrGN9Kn+6b79dmEvgL3xW9hxarU
+QJOEJ7bxq5ev3Ty/b5IV3O4Cmht1kkAK5e0FJf5m2sytw5BFTVOqipJyut8a/MfA
+8DHrH4LrduPZHR2dELP5ztt1TpoVay+qF4RxNnXZbJ0veAhMPmb9zNPI04NDSCcU
+vpz9OObupqd3e7KuGuu3IiWubK9Iy2/R/CaXmZ2IfY647v+Fj6yfGY0QyyIwNDj2
+k8bwy5D6LQcf3afudWhxgNyySwuZP4x2ksFtK1RY0zTu6ti1vaxPlaWAFAgfnJl7
+NVbWa+4RbEkyLYc6PxRM
+=bJHf
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140508.ebuild b/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140508.ebuild
deleted file mode 100644
index 17e096f176d4..000000000000
--- a/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140508.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20140508.ebuild,v 1.1 2014/05/08 21:43:23 pacho Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2 LGPL-2.1"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-db-${PV}
-	~app-emulation/emul-linux-x86-gtklibs-${PV}
-	~app-emulation/emul-linux-x86-medialibs-${PV}
-	~app-emulation/emul-linux-x86-soundlibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 115d3543f89a..e34260f203ba 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.130 2014/06/11 16:33:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.131 2014/06/15 14:03:50 mgorny Exp $
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  -emul-linux-x86-gtklibs-20140508-r1.ebuild:
+  Drop old.
 
 *emul-linux-x86-gtklibs-20140508-r2 (11 Jun 2014)
 
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 8f582b6342d5..70e09984886c 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -9,26 +9,25 @@ DIST emul-linux-x86-gtklibs-20140406.tar.xz 7395632 SHA256 a6d30621c984d968fd5f1
 DIST emul-linux-x86-gtklibs-20140508.tar.xz 7618292 SHA256 15e70b6e80d2d900e1e117c5c9141f1f7eee28dee7bff717bbb5e89f9a8b9a81 SHA512 68fc9ed94b1d0355bdab23ac44da4bb80630900375161f295474d24d63969a6789696e6f7c53e352401808bf3c95fdbf97ce81aecf2a261010248ee8dc82a1fb WHIRLPOOL 8977acb417694237e9ce05de61dd2ae8b72dd81aed91d4023a6964e7a8c2b5e86f0c19482f020170b793dbc8f7c434dc4a713730ae776c49aa9261c049dbb256
 EBUILD emul-linux-x86-gtklibs-20131008.ebuild 3107 SHA256 1888f4c4eed43eba477dac52f7e60ece28d188946214dfdf7a57a45306418d33 SHA512 5deef9176a32ffeac2f8e370040a063dba5ed0d7307671318de8179586f2fdd5017a2f73581e8827481f61cf83fb66081f6d111052f6c9d0d67e782ce1aaea0c WHIRLPOOL 63cb7264f0bc8927cd1edf2dfa050f0bf51ff345f16ab06f5f6f330661a7e7450a14291d0000f5be0bebb7a9bd62a8bd15cd3229c47bfc84ed03dfed9f9bf3ee
 EBUILD emul-linux-x86-gtklibs-20140406-r1.ebuild 3769 SHA256 2729bc88c4656493cda37ce9f5b7023e6c425ed233f9914cfb69fc50926a6c6c SHA512 fcc3cec923d929b82c5e6581984be005499763b89c85addbf377e6b26fa37e6b5cafe5cc6e44a6cc9a18367e7ba65371da32c21d789a353d13a3752655628fa9 WHIRLPOOL 2415d2c4b6cd371ef91092d501f7868daa36778735062ef0b838ec5eaaf5ccf3d8d6a77c2b33c3682e49be7a363af650b4197742f3286b2db151f99bc4b07d5c
-EBUILD emul-linux-x86-gtklibs-20140508-r1.ebuild 3915 SHA256 3b9b83184c9f14ae0735dbbe75c5ec7482a0491ff9799f9c29f03079d3976e3a SHA512 3c97bc262fcc2f65efb84b2c8ab692c4f565f8f9141cf122b74e51266a01db917be6bab9efb784802a09a55d10b2166284c0a908754935ac38e6bfc631ccb64b WHIRLPOOL d5696d353d439012631ee30a3666637c735b251097ad6c1fa68e958365e4e059372c61cd355ba39821a377bc35e1516d7a58093c311e500e738f7c4677f46cbd
 EBUILD emul-linux-x86-gtklibs-20140508-r2.ebuild 4010 SHA256 764800c38fc0a59bce9d64362db984818000897dd215f20afa8c40680b5d8742 SHA512 7417e376ec69ea410128a4700c2734d438ce2d5f3cb98b0d2a61e2cef56765903622c4e315e48d7e810901563bda248384be6bbf2e02662322dba5a48ac44494 WHIRLPOOL 2b40c36b649c851687649591d1c413ea2e4ebb548c4f01cb678f19ae2a0337b2079bf77f56b8093c447a5d29380be07cdab985c338689970fa07640cdccb3d76
-MISC ChangeLog 23524 SHA256 e8dcc176c5b2df948b525ca8566deabd24086a3b37cd50b8e1a32d53ebc456f3 SHA512 5e21ac2f465115271b8f5d28b8ec9402016b1949a97c532e2a133bfc07c50f3acbcaf7d7a404cf01e9f5ab795d120592580c58b7a6c16b5e655306ab2903524c WHIRLPOOL 47dd062b0a1477796ce9ff558e717b4d3e42e791b329718df7038f33d9ceac6ab938b6ef87ebdfe52fc7cc9df581ea0e5c59b3e0faf6c9e6a808dd0420c586bf
+MISC ChangeLog 23633 SHA256 4f3ce387ba03b00cc6de0bb613f98c8e6d8d390c3cd983e8e88c1d1f1facabf2 SHA512 28df79156c772cb2f8171c2f1eb0d8807ec1d99dc8b6a969c1716aeae289c477d42225768c67a69306769114a4dc8f6cf10f8e1f772ae562d8f44e9d1e2819b2 WHIRLPOOL 25a98d3d60fc7acae65ccf6ae264f51fc574da6dc1a1a9fb3295a390065a4887c4e53baccf1ea0da2af91823c395927b277dfd45f694d80d149b84eb930f24fb
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTmIT0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTnafHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOepUP/3+8JeW2zJNAY5Z2etaW/8cO
-UsJMC9bJHKSRMNCcNDeJnLnrWvqNNZ6v4whDR56b+jocFH8UqC97SsMjy0GiqqQ+
-PLDXJk+rlAHXU5hQBikl9TZHiuxXb/LwLgNnKlnkKxxQeXYn7h41hr75psqn2Gdd
-Iky8lKeNpzg58i92teYS9jxkcZbYtokbktlafzNreQkF8VoNU6jGfLu0xI5LjabK
-h2AwlyJVLHleW+fJRzjKIgsltqCoTmoQunkmi2qe0nwT4CGOO83iitv42yVZTD2L
-pQ+cih+lytz8OFn0bb97u0fdsMqQBEQRdDzKnHjLkccPRQGD1V2EllM4PdHNV5BO
-ywQv58u8p29IegKt4GUDy/Hu7vA01MvuwgAu/UVL8I7XrGpz+I7QBMO9hiYfjdwh
-SUKxL4DP8PzYxfFd0rECO5acMc5NysQKu+FqTyKc3nhkIXe2P1CyXTsHVDi6ztEO
-S94N8REzFUXOm4OsjA4ECijw/e1bmJvyVa/SY1R8Igw3xhA/QB5OERHUe0IREukT
-O44jQyxSqr0I9GEVe4fzugcXFXT50jkUlYKQhj59UhkEwO5NZGVdo1HxLJSnuPK6
-UTUukELXfGaWnS2zKuHmQb+v4z6FfBBFyLLttm4P0YyfwaKcA4USqOnJ7hdCTLpO
-IQeJB0ZKDAyhj5Xp6OUH
-=YB4l
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/PYP/i8sgPdhyBaMuMxxEO7pxHPm
+C0Fvt3OFby9zm7C8CDroDYoELlPIAFvZcGN2oc/08Yklt0y1a5/JLtlPn+ZxCPSP
+wp3nKu/nq9g8Wi3et/gGa/xy83hqMUlI8lNo/+mOT6QL073FHDBaeTH//UIpC8IL
+u3S9mKtv1tmVKD+GWYtKkqljXmIZQAC+ulHCz7c0exl+TtxTdc23FcX0m4Aa0Snr
+l7YNDxuZL1acU5bhqsxGVsjti6PKLAA0UXxjizq5IxZkx+tbGFnLABi979BsvKbq
+JUxpohopLhcGus/VPKQVS3u+JaEpf32+xnacUnDdmBs5oW5HU87ta+EKpX84EtVv
+3BOBhW28RK5lVQeMa8Gt8bTRL1azx9J6Luv1hlhQjUYJjg7gQduBoN4JDp6u59TW
+9cIi62l7NLbpN537etuEPruz1ufaP7CwzsGmhM+jTn+VBm1+3q7Ra8JK/jDIhXxm
+Lsmq/4mxz/llQAHjZGGvhcVkeX9lsTv9DV34fu856PKe6g1IMV9OBQ7oheX0c+5u
+cGRZVDB5PI6lh3mHDb6zLnMBNRMmNheIrKQ1wdeiCnmWIKEyx5H0t1FkG2OpOoau
+HKOfy7reSkHosJ6vJjcdhdVsmK4ochn6gBMtqB4HxplTDoksR+DDt1Z28fVOl2bY
+eXO8N5Pm9mzyTbqfBygW
+=4OVf
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r1.ebuild
deleted file mode 100644
index 81622c97ae85..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140508-r1.ebuild,v 1.1 2014/05/14 13:37:33 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-xlibs-${PV}
-	~app-emulation/emul-linux-x86-opengl-${PV}
-	!abi_x86_32? (
-		!>=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)]
-		!>=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)]
-	)
-	abi_x86_32? (
-		>=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
-		>=x11-libs/cairo-1.12.16-r1[abi_x86_32(-)]
-		>=x11-libs/gdk-pixbuf-2.30.5-r1[abi_x86_32(-)]
-		>=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)]
-		>=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)]
-		>=x11-libs/pango-1.36.2-r1[abi_x86_32(-)]
-		>=x11-libs/pangox-compat-0.0.2-r1[abi_x86_32(-)]
-		>=media-libs/imlib-1.9.15-r4[abi_x86_32(-)]
-		>=dev-libs/atk-2.10.0-r1[abi_x86_32(-)]
-		>=x11-libs/gtk+-2.24.23-r1:2[abi_x86_32(-)]
-	)"
-# RDEPEND on opengl stuff needed due cairo, bug #410213
-
-my_gdk_pixbuf_query_loaders() {
-	# causes segfault if set
-	unset __GL_NO_DSO_FINALIZER
-
-	local tmp_file=$(mktemp --suffix=tmp.XXXXXXXXXXgdk_pixbuf_queryloaders)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "Cannot create temporary file"
-		return 1
-	fi
-
-	if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
-		cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-	else
-		ewarn "Warning, gdk-pixbuf-query-loaders32 failed."
-	fi
-	rm "${tmp_file}"
-}
-
-my_pango_querymodules() {
-	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
-	einfo "Generating pango modules listing..."
-
-	mkdir -p "${PANGO_CONFDIR}"
-	local pango_conf="${PANGO_CONFDIR}/pango.modules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "Cannot create temporary file"
-		return 1
-	fi
-
-	if pango-querymodules32 > "${tmp_file}"; then
-		cat "${tmp_file}" > "${pango_conf}"
-	else
-		ewarn "Cannot update pango.modules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
-
-my_gtk_query_immodules() {
-	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
-	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
-
-	mkdir -p "${GTK2_CONFDIR}"
-	local gtk_conf="${ROOT}${GTK2_CONFDIR}/gtk.immodules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "Cannot create temporary file"
-		return 1
-	fi
-
-	if gtk-query-immodules-2.0-32 > "${tmp_file}"; then
-		cat "${tmp_file}" > "${gtk_conf}"
-	else
-		ewarn "Cannot update gtk.immodules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
-
-src_prepare() {
-	query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/i686-pc-linux-gnu-gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
-	ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
-	emul-linux-x86_src_prepare
-
-	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
-	mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
-
-pkg_preinst() {
-	#bug 169058
-	for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
-		[[ -L ${l} ]] && rm -f ${l}
-	done
-}
-
-pkg_postinst() {
-	if ! use abi_x86_32; then
-		my_pango_querymodules
-		my_gdk_pixbuf_query_loaders
-		my_gtk_query_immodules
-	fi
-
-	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
-	if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then
-		ewarn
-		ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
-		ewarn "multilib systems, please remove it by hand."
-		ewarn
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index edf79aaf7fc3..85b2b53c715a 100644
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-medialibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.105 2014/06/13 20:31:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.106 2014/06/15 14:05:34 mgorny Exp $
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  -emul-linux-x86-medialibs-20140508-r2.ebuild,
+  -emul-linux-x86-medialibs-20140508-r3.ebuild,
+  -emul-linux-x86-medialibs-20140508-r4.ebuild,
+  -emul-linux-x86-medialibs-20140508-r5.ebuild:
+  Drop old.
 
   13 Jun 2014; Michał Górny <mgorny@gentoo.org>
   emul-linux-x86-medialibs-20140508-r5.ebuild:
diff --git a/app-emulation/emul-linux-x86-medialibs/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest
index 561e33b0ee5f..4a4f04d323a4 100644
--- a/app-emulation/emul-linux-x86-medialibs/Manifest
+++ b/app-emulation/emul-linux-x86-medialibs/Manifest
@@ -12,29 +12,25 @@ DIST emul-linux-x86-medialibs-20140406.tar.xz 11406932 SHA256 b2f4634137492cc678
 DIST emul-linux-x86-medialibs-20140508.tar.xz 11322988 SHA256 bb7057b107997ba72d49f93f4284a238121394d3fbb807cc8e48a7191cda8039 SHA512 81e538284a6d821d72d7fef552e24162398109d91306b9a25f4ece0d55064acd6bd3c1b3e83cd22c34a7c55ab2fac149dde60223102627c725d8995f040534f8 WHIRLPOOL 1231d3ae390835f847064a86676cb2c6ae38a6d4961050b1cf2324e8be2ac487f1f33e98111caf3610067d612c7b9076d8965e1dd298dede5955baa505582a39
 EBUILD emul-linux-x86-medialibs-20131008-r1.ebuild 2498 SHA256 2efb848dd180527bfd14896d6b6ae83f03770cfd2def10fe0cf768a3bcda4ffc SHA512 cb88f5eb655874c5d718bc3c381020ec8e68750d672ebbb109d882e5e828b52667198e1a4bd3a5b2342bbdec9fe4a7d6ff49dc4a0f7ca6a5bf6fa385dd7d3aab WHIRLPOOL 0ffde1f95f538930bfa8a0cb5054be995646365e9d4b42fc026a4b254160efa700ef084e4704ddaab75a778590f72cd7f882d26af4a39d27bd0ca26d6125623c
 EBUILD emul-linux-x86-medialibs-20140406.ebuild 2492 SHA256 27cbf38e7c2ba2ac7c138d48c0479d137f14764663e70a412f51d0ff0b3e072d SHA512 3ae52af2f3e4aa5d95d484439248d2b6634ddf5ffd9d182c371efa1a1f18993119346aea0b4c164e35b43f854bad1ec9f2d92ba056c442b028ee5a519c735ba0 WHIRLPOOL 3a5dc305ec547a8ce560de7c57a8104a53679eed1fd48ed431d55a5fa1ea57bab2e7096110c2c1dc5dd43ec185089e0e42b181dd1769b00189b18ebb429cbfd3
-EBUILD emul-linux-x86-medialibs-20140508-r2.ebuild 3485 SHA256 e3c192c0d14831e60146afaf9e7808708990b063e784e11d2660dd53c04eb230 SHA512 90ac940bbb015929e772e0a73b97a1040f964911732c1fa04029f11d19f628f190b75f579036d1e2dc5b530325813816ead51a2871ea5d1a56fdc60ecbc8e26b WHIRLPOOL db2b51d01a28d935c02da6f4f10ca5bd5dc6d5b20150d5452b1fa543e17ee372c477198c86528d48e4dad1b7ee63e181c3c0b20cc36fabd853b15852f60a3a88
-EBUILD emul-linux-x86-medialibs-20140508-r3.ebuild 3577 SHA256 bb0908ddb6e867d237b725ecfe68807c825bed9e330704366e081c446a53b785 SHA512 04a3c4d28b131e114912b4a2c10d022610dbcf1abd237e5bcc8713abb75dad3abb35713f113e8c457b9d7fa19a7c92682c2e6e47cb58be22a5a8a59a93ad0fbb WHIRLPOOL 284273f958bf0b7bebc8688b248c6cfcba06ae234348a7bae2bcb27787b23aa41f519c920ffb9e9fde65e0a512a8e227834cf6e297290b44ec15d5b61cc76b48
-EBUILD emul-linux-x86-medialibs-20140508-r4.ebuild 3156 SHA256 0f28a889373d512fe41b9c4125bf9e76a83876f348fc5004d5e18f7ee02a1fdf SHA512 feaa49a2b16eef6e6c21c4d38b47e390308d2f61a1f9f844f8233a2c5eaecd896cd952dcaed23f000e562a7e9a2804625794316462d33684627cbcff9c97ae26 WHIRLPOOL 09fee3579f6ec5536a072fbf8bf02f641eaa96ee51f78aaf824b511e3ebece7f26a1553b68fea7bf20a46cf6806bd65a37247b2de7db14882d134921697d7344
-EBUILD emul-linux-x86-medialibs-20140508-r5.ebuild 3236 SHA256 2612efdf1c5c396c260e0e4c6c5cf84fa960f50ccc5fbee5031917b7ea72666b SHA512 4e34f35836118b280822f34fceeb490287aaeea6fc9a5d981998b6460a8f0890250d7c77d942ca7fcb991fbf90b536af8de995a89824171349d86d621d44c58d WHIRLPOOL 799f75fc8caf612186f82a90f07a37ac2a0e71cd5c85677c13dda85562877111449f15ff61b76a1811a86a018522716a67b79cda5ce82fe4f71221046c61b9fc
 EBUILD emul-linux-x86-medialibs-20140508-r6.ebuild 3290 SHA256 febfe0e77a61f1072f58d717e875fc2d2d54bc6bb876ef88e6b6725e1d34189a SHA512 1f7b87a7c8731c0f1b9747b965abf7871b7d5f2a8bbd308d8823d39aee127be98d685d307e21ba858bf16e06fcfff2d7f4d87d70d10ff8a8070af2fc47dd467d WHIRLPOOL 37dce25bbb291f487513b825201a4b0475328d4925e747df49f8fe930cd3987a13fcfe334933fb718ea86f572d02628a8503db045c22b3e9b3679d16c755f669
-MISC ChangeLog 20980 SHA256 41075af97fb407001757d8ea4b977f6028ca3f0cb82700823c3b557593c0102e SHA512 db0102918323f90b4758ab675803320154f38e148466798742a603c8d1896774ce7b50b3d7e9aae1b9c13fecd0d931b3ddd4efc30bd87b9a7c41da5e7a959144 WHIRLPOOL 9d16a73c7e4546795325d9540975908f3b00da96b2973740ee47318e3b61471f5a5aa0e1c68082fbf49067c48d553d203167bfe24b190742c6f81072241327b5
+MISC ChangeLog 21235 SHA256 e9d83be1c058eab6c479b5dd0b3db35a56e0e5af19c17cce5c8ee87eb5a3eeb3 SHA512 d8c89c0f724584271938f5824269ff7baaa8c840ec8e6bb3bab62acc70a9587774a84ba5e65345d82bbc2521101803cb35078c740e22e71903b4223ad8608cb9 WHIRLPOOL ded81659cd543039b2d17da1d96bbd513171c054ccc27a8a8b61689b1b675656465adf63405d2879619902d22504bb32ab02ad7df27323a68035d77e592db4a7
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTm1+pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTnagvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQ2gP/jnGrl0PFXcLZ18mocmYW4dU
-9vv6qwzD1XCDHasp0OkYlx0T3fjb96oUVRKTq7ETKccfYRooz6TOVS9qu3y8D9E+
-DGBx9K74ot6HKBYQdF7VkBmRABrx9idf6AbuSBf8VdGjI41Dgk0qSeeXdE8YKAbN
-M6d+OuKo1fbZfwvMWbmUmkw3RTqGPPJyC4OVd52Ba4msh3RQ9ABEu2AdU6KQsBIP
-kZqv8jRkTp7OmTyrQ/Y89zB27xg6rbwcguEIzPwERIPhFBZ//IdLaqlNjWCF6HqD
-28QO1tyCv0ymrJHCmqlLDYBe/wYSBKEwzAgnhrMON5+Ig7AubQ+eGI2sK8a8x24i
-Ykrb+PpLyRKWNEs5zOxS5VJ3i11zrBM40E3DDGDdD3P0bvGiTZY6KQphFd+cXr2e
-14R1BTCwAORFH0QeEu8t8QuCPPyGtcT/TniLGw9Wwx+q4SeNxqgWV092IMfW/4LK
-/f8m9n+lf+K6EqBtWPzBSwKGpGnNn2IkzFR0owEJM+S+D4/BHcHvjdSr53QBtimv
-esMBqPbL0tTtPwU/uGwy/5NmCbqpuLdWR4Y7/U/3Iw2SnEevMgQDziWGjEp3Jeoy
-J9RqrijvNFbp79om5hXKqY8EEhIa7j74+v4pI27Hy+3TjvuDdPbwJxN+f0l/qWcl
-yMRHFAmvVQuZ1Ylju4CX
-=0H+b
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+3wQAJw6GGAJvA5MpdOlJ098kBy+
+UDMpXR4vEOnNWgPUxL/oyvOPS1ASc2zHD6WHEnKaXVOCBS2qWYQWCrWeem0HJ/ky
+VlUHD+TPDE8rFolZ7wOiHHt2jMPrwngmLqSA70GkW1NfHFlno6ov8nlhFwZ1Qmhv
+kpkaCCC9ripPJ6ahLJpHbxCC/nB2DUn3JHGRTsm1Hx0nkGFSI5a92jm4v1CjicMg
+QTwHQhd2nwx32MFxISGg2Qlyo9XEh0CdzWjEYmEKzAQE4I7d1OYouu15bu/bFMl4
+eDL6kuRVEDV+DHp5cwQyEKN4gE+IqLATFfhU9oAygYeJFV/kx5TNq9DocRk/HyW4
+8Swcw886RnFeW0paq7LdxRAlf7RH/u5c2ZWocvR+sdnKs87PvpIWQgzPgGOYEqDy
+T/IY6nPkQsBD2Sd/Zd+KjJHsNo3mqyC+DFEIzB+aQoSi+BNBHRVvLujJN3xRZoBL
+sUfuiXXAhG57cSGUyOj5TDg9a/WO/8nuimtyZ8FaJ2RBtq09JvPUri9cgTxcp6TQ
+sMW+YOb7SFpoOXGzJulAYF+RDk4dg7YzBAKs9DV/6+CxgDxNU4T/Gy/cRyB6DYKu
+br4MP41cpIi+EBjnP+kz7ey8BlccN5Q2wsuKDhO08zwBBA5DNbwHnT6q39qVM/X5
+6fAEqgYRuWlMKIrruqXN
+=5RGK
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild
deleted file mode 100644
index 1e52bd75d0f8..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild,v 1.2 2014/05/29 21:15:13 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32 +pulseaudio"
-
-DEPEND=""
-# required libs
-RDEPEND="
-	!abi_x86_32? (
-		~app-emulation/emul-linux-x86-baselibs-${PV}
-		~app-emulation/emul-linux-x86-xlibs-${PV}
-		~app-emulation/emul-linux-x86-db-${PV}
-	)
-	abi_x86_32? (
-		app-arch/bzip2[abi_x86_32(-)]
-		dev-libs/glib[abi_x86_32(-)]
-		dev-libs/libxml2[abi_x86_32(-)]
-		media-libs/alsa-lib[abi_x86_32(-)]
-		media-libs/freetype[abi_x86_32(-)]
-		media-libs/libpng[abi_x86_32(-)]
-		media-libs/libvorbis[abi_x86_32(-)]
-		media-sound/jack-audio-connection-kit[abi_x86_32(-)]
-		sci-libs/fftw[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-		x11-libs/libXfixes[abi_x86_32(-)]
-		pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
-	)
-	!<=app-emulation/emul-linux-x86-sdl-20081109
-	!<=app-emulation/emul-linux-x86-soundlibs-20110101"
-
-# supplied libs
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		>=media-libs/libvpx-1.2.0_pre[abi_x86_32(-)]
-		>=media-libs/xvid-1.3.2-r1[abi_x86_32(-)]
-		>=media-sound/lame-3.99.5-r1[abi_x86_32(-)]
-		>=media-libs/faac-1.28-r4[abi_x86_32(-)]
-		>=media-libs/faad2-2.7-r3[abi_x86_32(-)]
-		>=media-libs/libtheora-1.1.1-r1[abi_x86_32(-)]
-		>=media-libs/libcuefile-477-r1[abi_x86_32(-)]
-		>=media-libs/libreplaygain-477-r1[abi_x86_32(-)]
-		>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
-		>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)]
-		>=media-libs/speex-1.2_rc1-r2[abi_x86_32(-)]
-		>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)]
-		>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)]
-		>=media-libs/libv4l-0.9.5-r1[abi_x86_32(-)]
-		>=media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)]
-		>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)]
-		>=media-libs/libsidplay-2.1.1-r3:2[abi_x86_32(-)]
-		>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)]
-		>=media-libs/x264-0.0.20130731[abi_x86_32(-)]
-		>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)]
-		>=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)]
-		>=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)]
-		>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)]
-		>=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)]
-		>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)]
-		>=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)]
-		>=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)]
-		>=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
-		>=dev-libs/libcdio-0.92[abi_x86_32(-)]
-		>=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
-		>=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)]
-		>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
-		>=media-libs/libgphoto2-2.5.4-r1[abi_x86_32(-)]
-		>=media-gfx/sane-backends-1.0.24-r4[abi_x86_32(-)]
-	)
-	"
-PDEPEND="!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} )"
-
-pkg_pretend() {
-	if use abi_x86_32 && ! use pulseaudio; then
-		ewarn "You have disabled USE=pulseaudio. This is known to break pre-built"
-		ewarn "libavfilter. If you need it, please turn USE=pulseaudio back on."
-	fi
-}
-
-src_prepare() {
-	# Include all libv4l libs, bug #348277
-	ALLOWED="${S}/usr/lib32/libv4l/"
-	emul-linux-x86_src_prepare
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r3.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r3.ebuild
deleted file mode 100644
index b15254d187e8..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r3.ebuild,v 1.1 2014/06/07 15:28:31 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32 +pulseaudio"
-
-DEPEND=""
-# required libs
-RDEPEND="
-	!abi_x86_32? (
-		~app-emulation/emul-linux-x86-baselibs-${PV}
-		~app-emulation/emul-linux-x86-xlibs-${PV}
-		~app-emulation/emul-linux-x86-db-${PV}
-	)
-	abi_x86_32? (
-		app-arch/bzip2[abi_x86_32(-)]
-		dev-libs/glib[abi_x86_32(-)]
-		dev-libs/libxml2[abi_x86_32(-)]
-		media-libs/alsa-lib[abi_x86_32(-)]
-		media-libs/freetype[abi_x86_32(-)]
-		media-libs/libpng[abi_x86_32(-)]
-		media-libs/libvorbis[abi_x86_32(-)]
-		media-sound/jack-audio-connection-kit[abi_x86_32(-)]
-		sci-libs/fftw[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-		x11-libs/libXfixes[abi_x86_32(-)]
-		pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
-	)
-	!<=app-emulation/emul-linux-x86-sdl-20081109
-	!<=app-emulation/emul-linux-x86-soundlibs-20110101"
-
-# supplied libs
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		>=media-libs/libvpx-1.2.0_pre[abi_x86_32(-)]
-		>=media-libs/xvid-1.3.2-r1[abi_x86_32(-)]
-		>=media-sound/lame-3.99.5-r1[abi_x86_32(-)]
-		>=media-libs/faac-1.28-r4[abi_x86_32(-)]
-		>=media-libs/faad2-2.7-r3[abi_x86_32(-)]
-		>=media-libs/libtheora-1.1.1-r1[abi_x86_32(-)]
-		>=media-libs/libcuefile-477-r1[abi_x86_32(-)]
-		>=media-libs/libreplaygain-477-r1[abi_x86_32(-)]
-		>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
-		>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)]
-		>=media-libs/speex-1.2_rc1-r2[abi_x86_32(-)]
-		>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)]
-		>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)]
-		>=media-libs/libv4l-0.9.5-r1[abi_x86_32(-)]
-		>=media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)]
-		>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)]
-		>=media-libs/libsidplay-2.1.1-r3:2[abi_x86_32(-)]
-		>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)]
-		>=media-libs/x264-0.0.20130731[abi_x86_32(-)]
-		>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)]
-		>=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)]
-		>=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)]
-		>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)]
-		>=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)]
-		>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)]
-		>=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)]
-		>=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)]
-		>=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
-		>=dev-libs/libcdio-0.92[abi_x86_32(-)]
-		>=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
-		>=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)]
-		>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
-		>=media-libs/libgphoto2-2.5.4-r1[abi_x86_32(-)]
-		>=media-gfx/sane-backends-1.0.24-r4[abi_x86_32(-)]
-		>=media-libs/taglib-1.9.1-r1[abi_x86_32(-)]
-		>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)]
-	)
-	"
-PDEPEND="!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} )"
-
-pkg_pretend() {
-	if use abi_x86_32 && ! use pulseaudio; then
-		ewarn "You have disabled USE=pulseaudio. This is known to break pre-built"
-		ewarn "libavfilter. If you need it, please turn USE=pulseaudio back on."
-	fi
-}
-
-src_prepare() {
-	# Include all libv4l libs, bug #348277
-	ALLOWED="${S}/usr/lib32/libv4l/"
-	emul-linux-x86_src_prepare
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r4.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r4.ebuild
deleted file mode 100644
index 028d428454c1..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r4.ebuild,v 1.1 2014/06/07 21:32:20 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-# required libs
-RDEPEND="
-	!abi_x86_32? (
-		~app-emulation/emul-linux-x86-baselibs-${PV}
-		~app-emulation/emul-linux-x86-xlibs-${PV}
-		~app-emulation/emul-linux-x86-db-${PV}
-	)
-	abi_x86_32? (
-		dev-libs/glib[abi_x86_32(-)]
-		dev-libs/libxml2[abi_x86_32(-)]
-		media-libs/freetype[abi_x86_32(-)]
-		media-libs/libpng[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-	)
-	!<=app-emulation/emul-linux-x86-sdl-20081109
-	!<=app-emulation/emul-linux-x86-soundlibs-20110101"
-
-# supplied libs
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		>=media-libs/libvpx-1.2.0_pre[abi_x86_32(-)]
-		>=media-libs/xvid-1.3.2-r1[abi_x86_32(-)]
-		>=media-sound/lame-3.99.5-r1[abi_x86_32(-)]
-		>=media-libs/faac-1.28-r4[abi_x86_32(-)]
-		>=media-libs/faad2-2.7-r3[abi_x86_32(-)]
-		>=media-libs/libtheora-1.1.1-r1[abi_x86_32(-)]
-		>=media-libs/libcuefile-477-r1[abi_x86_32(-)]
-		>=media-libs/libreplaygain-477-r1[abi_x86_32(-)]
-		>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
-		>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)]
-		>=media-libs/speex-1.2_rc1-r2[abi_x86_32(-)]
-		>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)]
-		>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)]
-		>=media-libs/libv4l-0.9.5-r1[abi_x86_32(-)]
-		>=media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)]
-		>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)]
-		>=media-libs/libsidplay-2.1.1-r3:2[abi_x86_32(-)]
-		>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)]
-		>=media-libs/x264-0.0.20130731[abi_x86_32(-)]
-		>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)]
-		>=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)]
-		>=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)]
-		>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)]
-		>=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)]
-		>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)]
-		>=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)]
-		>=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)]
-		>=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
-		>=dev-libs/libcdio-0.92[abi_x86_32(-)]
-		>=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
-		>=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)]
-		>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
-		>=media-libs/libgphoto2-2.5.4-r1[abi_x86_32(-)]
-		>=media-gfx/sane-backends-1.0.24-r4[abi_x86_32(-)]
-		>=media-libs/taglib-1.9.1-r1[abi_x86_32(-)]
-		>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)]
-		>=virtual/ffmpeg-9-r1[abi_x86_32(-)]
-		>=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)]
-	)
-	"
-PDEPEND="!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} )"
-
-src_prepare() {
-	# Include all libv4l libs, bug #348277
-	ALLOWED="${S}/usr/lib32/libv4l/"
-	emul-linux-x86_src_prepare
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild
deleted file mode 100644
index eabcdb5c2940..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild,v 1.2 2014/06/13 20:31:32 mgorny Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-# required libs
-RDEPEND="
-	!abi_x86_32? (
-		~app-emulation/emul-linux-x86-baselibs-${PV}
-		~app-emulation/emul-linux-x86-xlibs-${PV}
-		~app-emulation/emul-linux-x86-db-${PV}
-	)
-	abi_x86_32? (
-		dev-libs/glib[abi_x86_32(-)]
-		dev-libs/libxml2[abi_x86_32(-)]
-		media-libs/freetype[abi_x86_32(-)]
-		media-libs/libpng[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-	)
-	!<=app-emulation/emul-linux-x86-sdl-20081109
-	!<=app-emulation/emul-linux-x86-soundlibs-20110101"
-
-# supplied libs
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		>=media-libs/libvpx-1.2.0_pre[abi_x86_32(-)]
-		>=media-libs/xvid-1.3.2-r1[abi_x86_32(-)]
-		>=media-sound/lame-3.99.5-r1[abi_x86_32(-)]
-		>=media-libs/faac-1.28-r4[abi_x86_32(-)]
-		>=media-libs/faad2-2.7-r3[abi_x86_32(-)]
-		>=media-libs/libtheora-1.1.1-r1[abi_x86_32(-)]
-		>=media-libs/libcuefile-477-r1[abi_x86_32(-)]
-		>=media-libs/libreplaygain-477-r1[abi_x86_32(-)]
-		>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
-		>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)]
-		>=media-libs/speex-1.2_rc1-r2[abi_x86_32(-)]
-		>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)]
-		>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)]
-		>=media-libs/libv4l-0.9.5-r1[abi_x86_32(-)]
-		>=media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)]
-		>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)]
-		>=media-libs/libsidplay-2.1.1-r3:2[abi_x86_32(-)]
-		>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)]
-		>=media-libs/x264-0.0.20130731[abi_x86_32(-)]
-		>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)]
-		>=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)]
-		>=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)]
-		>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)]
-		>=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)]
-		>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)]
-		>=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)]
-		>=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)]
-		>=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
-		>=dev-libs/libcdio-0.92[abi_x86_32(-)]
-		>=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
-		>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
-		>=media-libs/libgphoto2-2.5.4-r1[abi_x86_32(-)]
-		>=media-gfx/sane-backends-1.0.24-r4[abi_x86_32(-)]
-		>=media-libs/taglib-1.9.1-r1[abi_x86_32(-)]
-		>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)]
-		|| (
-			(
-				>=media-video/libav-9.13-r1[abi_x86_32(-)]
-				>=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)]
-			)
-			>=media-video/ffmpeg-2.2.3-r1[abi_x86_32(-)]
-		)
-		>=media-video/mjpegtools-2.1.0-r2[abi_x86_32(-)]
-	)
-	"
-PDEPEND="!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} )"
-
-src_prepare() {
-	# Include all libv4l libs, bug #348277
-	ALLOWED="${S}/usr/lib32/libv4l/"
-	emul-linux-x86_src_prepare
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}