diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild
index 8fa847e290ba..92b7cbb6b729 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild,v 1.6 2012/10/14 20:20:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.4.2.ebuild,v 1.7 2012/11/12 12:31:01 blueness Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ppc64 ~x86 ~amd64-fbsd"
IUSE="doc +introspection"
RDEPEND=">=dev-libs/glib-2.28:2
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 690fe3a4d521..22f102ff5727 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,3 @@
DIST calibre-0.9.1.tar.xz 27084512 SHA256 c4d32577133769dd8db7a75d1293c2762a8dd876f1203557d33be7a61fed89b3 SHA512 7d770a1e1793a7110c59995c12497092e214662bf47a2196feab296c147f538a0dc19617919cdb8606fb43fb10668f7c8d7009ff1a96f9221a36ab0b363877f5 WHIRLPOOL c51914f30995a0b740e2a67bf77893ac676310c37844175f1aaff717bbc4b24dedd70183bf84d0742a470a302ce8f6965cffd4d39b1ee71ce263a46552a90add
-DIST calibre-0.9.4.tar.xz 27222020 SHA256 a0acd1bc84ceb22a76b89abffa8b03de2e133a7cd9c981fec0ff4a0acf8e8838 SHA512 168cfd3c8feab3ca06627f4a47f02f98d3e00caf636c6d5f37388232e760e4d9f9170afa345010d8e1c5a81b55a7e0d45cb754a7336219df681e5e0ee3de24ed WHIRLPOOL 98e1271cc424015ac105605623ccaaea16f6885a16576b48a44cb6dd524ddd7e976faf18653302df4755ade705c656a18b7fa2c0263547b25af8c5a1762a68e2
DIST calibre-0.9.5.tar.xz 27361044 SHA256 91d5b534b7e662f9650b56e6f028dc850b06b85620633d0ff4ad9c541248a46e SHA512 e7524da565c1aa1777844a4ce419a630a89ce02657c36038a28812763337b5d23c8ac52c23f33be14fd006f10218e48ce652b99ba9815126aefc99ce60ea1fad WHIRLPOOL aecd4472d9e970a68e0a4940630a91ad6fb03514cb8e0d39a10a87e37fef4610a45e381d1e36b874e0e519f3ecb7fe54be245d8f2ddad4f22c6279e5c4d75722
+DIST calibre-0.9.6.tar.xz 27346664 SHA256 d2cb83a8fc32b3258f3a491f33f4271bfd4020ac4fdbbf01131deb81bba9624f SHA512 6bbacc8ed9af318bdfc09807937ec5e3e2d99a9b1d408cbf4dd4976926b415736928a16ee8d712ae1b93e98ab612841123bb370440c78db9c350ebd6503f8e58 WHIRLPOOL 306662c0b7dae93ec0d5c63903e02fc6a9cdf6427290bd366464dca7c618f602380fec9767a23baafaf1257135f333553c345356bf06560785c0664f9d74cf36
diff --git a/app-text/calibre/calibre-0.9.4.ebuild b/app-text/calibre/calibre-0.9.6.ebuild
similarity index 99%
rename from app-text/calibre/calibre-0.9.4.ebuild
rename to app-text/calibre/calibre-0.9.6.ebuild
index ef3504ff3b5f..41ef2e71dc30 100644
--- a/app-text/calibre/calibre-0.9.4.ebuild
+++ b/app-text/calibre/calibre-0.9.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.4.ebuild,v 1.1 2012/10/26 08:41:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.6.ebuild,v 1.1 2012/11/12 08:14:27 zmedico Exp $
EAPI=4
PYTHON_DEPEND=2:2.7
diff --git a/app-vim/python-mode/Manifest b/app-vim/python-mode/Manifest
index 1350752fcb95..7314bbc26204 100644
--- a/app-vim/python-mode/Manifest
+++ b/app-vim/python-mode/Manifest
@@ -1 +1 @@
-DIST python-mode-0.6.8.tar.gz 471053 SHA256 5df9e99f4d3b6e8dd884359f32b028e5777e55383e518f7ece5895433bdc7573 SHA512 40c1ae9c6f6df22b29b6f5c2bc47a60d085b2e7dc8be6d51ee125d1067ec1e10567e794200a093ec392faded5231654be7376ba45816b77fb045e4b7770666f8 WHIRLPOOL 7b91c3a569dffb87a655765dc7a6f4365a84b90228538f00aaff09a77330ee232a38e85932cfb6e482cda78dc6e121d4fe0a506fcd0e63247ca2fdb1a556b7d0
+DIST python-mode-0.6.10.tar.gz 474266 SHA256 ed97b9c260cafa38e01d1bc988e611df8a4681922e3ba4022e5ccac692b8f583 SHA512 562d91a377e783b2cf2583910f4c6b0e8530be9533b513198f5ac97e7581672f95f69e752d391d2a6ad9ac0621c967bc46c02f79fdc38d25172f14267fe27f7e WHIRLPOOL 404458e298ab3c093c031ac00cf43e66652a8054fecfb4d2c481d73a2efbb6949409545f5269bcb43f519b19a27dd8b68fb75a166dce1e78d49e1899bfe17901
diff --git a/app-vim/python-mode/python-mode-0.6.8.ebuild b/app-vim/python-mode/python-mode-0.6.10.ebuild
similarity index 96%
rename from app-vim/python-mode/python-mode-0.6.8.ebuild
rename to app-vim/python-mode/python-mode-0.6.10.ebuild
index 2fa6a5a7081a..e5b3e162315b 100644
--- a/app-vim/python-mode/python-mode-0.6.8.ebuild
+++ b/app-vim/python-mode/python-mode-0.6.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/python-mode/python-mode-0.6.8.ebuild,v 1.1 2012/09/07 09:39:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/python-mode/python-mode-0.6.10.ebuild,v 1.1 2012/11/12 10:07:46 xarthisius Exp $
EAPI=4
diff --git a/dev-lang/cll1h/cll1h-0.6-r1.ebuild b/dev-lang/cll1h/cll1h-0.6-r1.ebuild
index 5bdb538e2192..1efc651cd9f7 100644
--- a/dev-lang/cll1h/cll1h-0.6-r1.ebuild
+++ b/dev-lang/cll1h/cll1h-0.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cll1h/cll1h-0.6-r1.ebuild,v 1.1 2012/11/02 12:21:17 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cll1h/cll1h-0.6-r1.ebuild,v 1.2 2012/11/12 12:07:00 blueness Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://gpl.arachne.cz/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~amd64-linux ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos"
IUSE=""
DEPEND=""
diff --git a/dev-lang/pcc/Manifest b/dev-lang/pcc/Manifest
index a85426f91462..0c037b130506 100644
--- a/dev-lang/pcc/Manifest
+++ b/dev-lang/pcc/Manifest
@@ -3,3 +3,4 @@ DIST pcc-100604.tgz 635050 SHA256 22a94395dfa73b30b11c263eb480ae7174b23ec7d19005
DIST pcc-100830.tgz 637154 SHA256 a9edc4ee3283c29c556b20a194a7d2555142f61c1fc6cbd98e98768819bf02af SHA512 847b53d5adf6e30195db68094f35ef5ef4c31af07b55dec6979691b74a7297bda67df92e64abce2aad42dba5f635f5458089ef61ba4301b6cf7707313d2366ce WHIRLPOOL ca38c2fc4ca1c2c541ac0c0fef8aef7a6f1cb5e7fe68e989d6f3a689b75a8ec12a0699d2b895840c2f7113e612977c90e48d69758c6875bcae9fa4278234791f
DIST pcc-101124.tgz 642325 SHA256 8425f7886a46f54412cdb246d004adc01004afd03dd3ee546f4c107c5a36a4af SHA512 ad68fee60db8aec2e55d54dca9bdc4cac0bebc8db177b60e70dfd6f13706d65f84c76a57c2ef15a98f94a3c53b855d810f47932742f653be8d2ca413a0396487 WHIRLPOOL 5e50e840abcd5e258cf01757dac74f3216156918a3374cdf3430ab8a868f10a5365f9a2515e78bfe0cba68c606d12e692af1bcd6d40e7e9824a5965ef5126a2a
DIST pcc-20110116.tgz 646743 SHA256 2c79929666d92ac2b20c8d94c4c1028df6d3c3848cad1eb02d9d328b32dbd7df SHA512 86c5bf2a0f630458c2b6353b58119641116cadfe103d332493fdb87ba361c8452d978bc96b387abeeeea9c544b1de3a3a60386227365bf4cb878a4e2020c4721 WHIRLPOOL 80a843b1767b27a7963b7737bd671616aabc67203008a7a6470daa2489d8916a2cdee7697525b59a31cc8aa72d861676d707f1ce14c2531903a4bee7037299f0
+DIST pcc-20121112.tgz 780561 SHA256 bf640dc33bdd47d4c4f85d4360ec9555358cfa4de2b40c76f5b861430b80202e SHA512 7a8f3c45927a1291522f9b4b8c8d746e96c4a9761b9efc96e3dd0068fdf65b15b8bd2ccdc9021921cf68a9dd174f91f4614cf3eced0705ba077ecd6de5f1e573 WHIRLPOOL 25cf6f53550bb11e5313651214df2a5b4d919e9eaad0cded47fe3effc3bf60b14b2b966a05c7f4a0c223b23b5a4c4bbee2a6c6fb516341ab712729c886810106
diff --git a/dev-lang/pcc/pcc-1.0.1_pre20121112.ebuild b/dev-lang/pcc/pcc-1.0.1_pre20121112.ebuild
new file mode 100644
index 000000000000..b131712ec1d0
--- /dev/null
+++ b/dev-lang/pcc/pcc-1.0.1_pre20121112.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pcc/pcc-1.0.1_pre20121112.ebuild,v 1.1 2012/11/12 05:35:19 patrick Exp $
+
+EAPI=2
+
+inherit eutils versionator autotools
+
+DESCRIPTION="pcc portable c compiler"
+HOMEPAGE="http://pcc.ludd.ltu.se"
+
+SRC_URI="ftp://pcc.ludd.ltu.se/pub/${PN}/${PN}-${PVR/*_pre/}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~amd64-fbsd"
+IUSE=""
+DEPEND=">=dev-libs/pcc-libs-${PV}"
+RDEPEND="${DEPEND}"
+S=${WORKDIR}/${PN}-${PVR/*_pre/}/
+
+
+src_prepare() {
+ sed -i -e 's/AC_CHECK_PROG(strip,strip,yes,no)//' configure.ac || die "Failed to fix configure.ac"
+ sed -i -e 's/AC_SUBST(strip)//' configure.ac || die "Failed to fix configure.ac more"
+ eautoreconf
+}
+
+src_compile() {
+ # not parallel-safe yet
+ emake -j1 || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/dev-libs/pcc-libs/Manifest b/dev-libs/pcc-libs/Manifest
index 324755bd9dd9..8d429e0b2eb8 100644
--- a/dev-libs/pcc-libs/Manifest
+++ b/dev-libs/pcc-libs/Manifest
@@ -3,3 +3,4 @@ DIST pcc-libs-100604.tbz2 148394 SHA256 72ca919aa272791628b38ac7c69dd14b8d3042bd
DIST pcc-libs-100830.tgz 188569 SHA256 c08a05bdd698bb5593c313a8a8a8a353722d2a7767474c9b743d6a98f4d1412b SHA512 957ed95010cf588fb5b37668c28edb29bc4db5f2fe6728693bff7717fe492cdc4511d6af7d9c96062dd46fdc2d20753a1e6fc6e73cdcaa864c7dabf6cfa0b1d5 WHIRLPOOL 42c34eeaea15f7d29c4a07276b1e3fa19d22bb2504d8ffee37df4b05c7738b783afa99b52e4ab6b0d3b80a05874f12b9d5645c2a6e77cc8e2bfd642f340e88aa
DIST pcc-libs-101124.tgz 188690 SHA256 5ac71f403abc316c5163229bfce5b77d6023e7b2c139b67a21b40a89d805c467 SHA512 c3fd2f6b2ac2c862528adddc90384af5cc8aaf028e75272d453dada8f861a1d17b86609900b9bbfd7c6e7fbd41491d62ccbe0ff43d618dba71901af245a4a132 WHIRLPOOL 2630785f248eb86a269c2b9eed5c5c08c7a1d0a01844597d552995c6a8b4cd2e80f256efbd5a8233196ff6524c91cea0eeee5f5d8e7a2b14a63436f087163a61
DIST pcc-libs-20110116.tgz 188713 SHA256 5d787c4ba1a39f0c3c3dd0756e9262a313e7d958be0b3321e3564df91c22da96 SHA512 afa27a99562e3ef14b6f2a9a6b8ee46cd7d4b16cea8fbbcae3768ace76e8f8238f14b4d26f70b00671ade0645ffc2995254940976c45d9e43811488523f3118c WHIRLPOOL fdc4bfeff5912b3a397d80702fc429f1d621d6899aa39a955f9b8e25df52088a9db7d65eb0769159a64cd6d75ca8133a1c1e92c3951c48ac41ac65d07e794fae
+DIST pcc-libs-20121112.tgz 190520 SHA256 f467beaaa9aa611aa6d7b8a4db5c1792f25933219899fb391dd41b97a6aa06ec SHA512 15524bd09be9cafc95f1c28102f357db0ac27148062dc2b003f9e20aa8055871da7efa833c27a77920ee2ec4b8a68d2d7553f13095c5575efc3acd176fd2a21f WHIRLPOOL bbbe715f547e5e2198e6b2c11c2a84773ce3273c25213cc03e10185c34c95f97c596d94b66dc481f943c0c20c97a4471f593acaa1790b61c89bdf52b6876f498
diff --git a/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20121112.ebuild b/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20121112.ebuild
new file mode 100644
index 000000000000..fe05af15f751
--- /dev/null
+++ b/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20121112.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pcc-libs/pcc-libs-1.0.1_pre20121112.ebuild,v 1.1 2012/11/12 05:34:05 patrick Exp $
+
+EAPI=2
+
+inherit eutils versionator
+
+DESCRIPTION="pcc compiler support libs"
+HOMEPAGE="http://pcc.ludd.ltu.se"
+
+SRC_URI="ftp://pcc.ludd.ltu.se/pub/${PN}/${PN}-${PVR/*_pre/}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~amd64-fbsd"
+
+IUSE=""
+DEPEND=""
+RDEPEND="${DEPEND}"
+S=${WORKDIR}/${PN}-${PVR/*_pre/}/
+
+src_compile() {
+ # not parallel-safe yet
+ emake -j1 || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index 168791c8ecaf..79f36d17af56 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,2 +1,2 @@
-DIST pyxdg-0.19.tar.gz 38170 SHA256 99cf27e00f1484eeeea31aa47de52644284dca34adf73b715e87fb0a3b8d4ad5 SHA512 1e202a0f4f6c00f66abe4717b2a5796b11bb466accc0d08f6172a4fa5d24de2121a39457d7e6f0b417945970e38590a94785300f23b82c0aed6d5969efb239b6 WHIRLPOOL 2039b24b60e099d084e8b957e0770c440ce7abcd575f58d0e4c01ca255ab0ab2f5b1c815374ff3bc3cc1c61800696edd35753bb8b7c93ee74401f630e42e9176
DIST pyxdg-0.23.tar.gz 45029 SHA256 5cc0573dd0b8096404796ae2655e7631d2905a033f959a1072929dc1a10a678a SHA512 8384c50c72ec0b6ae9e183385d10f709e5e439d29cc44551e9672b9c423f705d2f41cb531251b08787b1604f7c6d273be90d6216689906f06ded692d1fb41556 WHIRLPOOL 14730d8c2c8d169e82fd600fa18a8526885ba6bf739e47fab179a2ca91f922fb3ac63a49264c72d2d32873ebab2bac90a7f87b45e6890e8f2c47113d21633a83
+DIST pyxdg-0.24.tar.gz 47039 SHA256 220487bcea2d67c8da2a21bb261d647e03519a0b1a631365e45c77632c9491b6 SHA512 c5c76ac9ded8747bb984ff5249b49511a59101f5686ad3115340bcbd1db42f829b4965ee8ae9b12944fb92fa60d2c5d80822af03ce178e06d131cdf2e120fbf7 WHIRLPOOL 8d5a20610019bb53e7511d7bcb2a96de3a21effd52b5f084c3e570b909e6d3957390a5bea4718ba01d734e83d0022879e76334194a7c3e0d4ab17be6ebffe3c4
diff --git a/dev-python/pyxdg/pyxdg-0.19.ebuild b/dev-python/pyxdg/pyxdg-0.19.ebuild
deleted file mode 100644
index 9d6f16262f47..000000000000
--- a/dev-python/pyxdg/pyxdg-0.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.19.ebuild,v 1.9 2012/06/27 04:21:04 floppym Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-DESCRIPTION="A Python module to deal with freedesktop.org specifications"
-SRC_URI="http://people.freedesktop.org/~lanius/${P}.tar.gz"
-HOMEPAGE="http://pyxdg.freedesktop.org/ http://people.freedesktop.org/~lanius/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_MODNAME="xdg"
-DOCS="AUTHORS"
-
-src_prepare() {
- distutils_src_prepare
- epatch "${FILESDIR}/${PN}-subprocess.patch"
-}
-
-src_install () {
- distutils_src_install
-
- insinto /usr/share/doc/${PF}/tests
- insopts -m 755
- doins test/*
-}
diff --git a/dev-python/pyxdg/pyxdg-0.24.ebuild b/dev-python/pyxdg/pyxdg-0.24.ebuild
new file mode 100644
index 000000000000..c32fe1cca199
--- /dev/null
+++ b/dev-python/pyxdg/pyxdg-0.24.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.24.ebuild,v 1.1 2012/11/12 04:29:51 radhermit Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="2.5"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils
+
+DESCRIPTION="A Python module to deal with freedesktop.org specifications"
+HOMEPAGE="http://freedesktop.org/wiki/Software/pyxdg http://cgit.freedesktop.org/xdg/pyxdg/"
+SRC_URI="http://people.freedesktop.org/~takluyver/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+PYTHON_MODNAME=xdg
+
+DOCS="AUTHORS ChangeLog README TODO"
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index f0a76c7f5c89..75891851f8cd 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.138 2012/11/01 08:35:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.139 2012/11/12 09:28:53 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -10,8 +10,8 @@
# This eclass contains various functions that are used when building Qt4.
case ${EAPI} in
- 2|3|4|5) : ;;
- *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+ 3|4|5) : ;;
+ *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
esac
inherit eutils flag-o-matic multilib toolchain-funcs versionator
@@ -101,8 +101,6 @@ S=${WORKDIR}/${MY_P}
# @DESCRIPTION:
# Sets up PATH and LD_LIBRARY_PATH.
qt4-build_pkg_setup() {
- [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
-
# Protect users by not allowing downgrades between releases.
# Downgrading revisions within the same release should be allowed.
if has_version ">${CATEGORY}/${P}-r9999:4"; then
@@ -190,7 +188,7 @@ qt4-build_src_unpack() {
# PATCHES array variable containing all various patches to be applied.
# This variable is expected to be defined in global scope of ebuild.
# Make sure to specify the full path. This variable is utilised in
-# src_unpack/src_prepare phase, based on EAPI.
+# src_prepare() phase.
#
# @CODE
# PATCHES=( "${FILESDIR}/mypatch.patch"
@@ -208,11 +206,9 @@ qt4-build_src_prepare() {
QTDIR="." ./bin/syncqt || die "syncqt failed"
fi
- if version_is_at_least 4.7; then
- # avoid X11 dependency in non-gui packages
- local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
- has ${PN} ${nolibx11_pkgs} && qt_nolibx11
- fi
+ # avoid X11 dependency in non-gui packages
+ local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
+ has ${PN} ${nolibx11_pkgs} && qt_nolibx11
if use aqua; then
# provide a proper macx-g++-64
@@ -376,7 +372,7 @@ qt4-build_src_configure() {
-docdir ${QTDOCDIR}
-headerdir ${QTHEADERDIR}
-plugindir ${QTPLUGINDIR}
- $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
+ -importdir ${QTIMPORTDIR}
-datadir ${QTDATADIR}
-translationdir ${QTTRANSDIR}
-sysconfdir ${QTSYSCONFDIR}
@@ -550,7 +546,6 @@ fix_includes() {
# @DESCRIPTION:
# Perform the actual installation including some library fixes.
qt4-build_src_install() {
- [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
setqtenv
install_directories ${QT4_TARGET_DIRECTORIES}
@@ -558,8 +553,8 @@ qt4-build_src_install() {
fix_library_files
fix_includes
- # remove .la files since we are building only shared Qt libraries
- find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
+ # remove .la files since we are building only shared libraries
+ prune_libtool_files
}
# @FUNCTION: setqtenv
@@ -567,20 +562,19 @@ qt4-build_src_install() {
setqtenv() {
# Set up installation directories
QTPREFIXDIR=${EPREFIX}/usr
- QTBINDIR=${EPREFIX}/usr/bin
- QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
- QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
- QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
- QTHEADERDIR=${EPREFIX}/usr/include/qt4
+ QTBINDIR=${QTPREFIXDIR}/bin
+ QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt4
+ QTPCDIR=${QTPREFIXDIR}/$(get_libdir)/pkgconfig
+ QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
+ QTHEADERDIR=${QTPREFIXDIR}/include/qt4
QTPLUGINDIR=${QTLIBDIR}/plugins
QTIMPORTDIR=${QTLIBDIR}/imports
- QTDATADIR=${EPREFIX}/usr/share/qt4
+ QTDATADIR=${QTPREFIXDIR}/share/qt4
QTTRANSDIR=${QTDATADIR}/translations
QTSYSCONFDIR=${EPREFIX}/etc/qt4
QTEXAMPLESDIR=${QTDATADIR}/examples
QTDEMOSDIR=${QTDATADIR}/demos
QMAKE_LIBDIR_QT=${QTLIBDIR}
- QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
PLATFORM=$(qt_mkspecs_dir)
unset QMAKESPEC
@@ -594,23 +588,26 @@ setqtenv() {
# @DESCRIPTION:
# Generates Makefiles for the given list of directories.
prepare_directories() {
+ # avoid running over the maximum argument number, bug #299810
+ {
+ echo "${S}"/mkspecs/common/*.conf
+ find "${S}" -name '*.pr[io]'
+ } | xargs sed -i \
+ -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
+ -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
+ || die
+
for x in "$@"; do
pushd "${S}"/${x} >/dev/null || die
einfo "Running qmake in: ${x}"
- # avoid running over the maximum argument number, bug #299810
- {
- echo "${S}"/mkspecs/common/*.conf
- find "${S}" -name '*.pr[io]'
- } | xargs sed -i \
- -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
- -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
- || die
- "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
+ "${S}"/bin/qmake \
+ "LIBS+=-L${QTLIBDIR}" \
+ "CONFIG+=nostrip" \
+ || die "qmake failed"
popd >/dev/null || die
done
}
-
# @FUNCTION: build_directories
# @USAGE: < directories >
# @INTERNAL
@@ -619,9 +616,14 @@ prepare_directories() {
build_directories() {
for x in "$@"; do
pushd "${S}"/${x} >/dev/null || die
- emake CC="$(tc-getCC)" \
+ emake \
+ AR="$(tc-getAR) cqs" \
+ CC="$(tc-getCC)" \
CXX="$(tc-getCXX)" \
- LINK="$(tc-getCXX)" || die "emake failed"
+ LINK="$(tc-getCXX)" \
+ RANLIB=":" \
+ STRIP=":" \
+ || die "emake failed"
popd >/dev/null || die
done
}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 8bff408e09c0..a74f0a83d144 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,4 +1,5 @@
DIST lilypond-2.14.2.tar.gz 15224418 SHA256 243a6b3845722a37083d73ed681e69ffde0b3b9c6158af20db3c0926dd982696 SHA512 e2d551eb8cfc08387519c7282c3813072da644c7e503461669fa79621af2805ac63b9924c7bb2894b2413f05e202b426d9ee0f6889e99287cc1941442342232a WHIRLPOOL 3b85ad14214726f13fe6ffda7a2ba42b10c079139c0c44ec380a8ec5c485966f88ba52184ad126957515948a6de77f884fe4e6be7696a39eec8b1aafd682ec05
DIST lilypond-2.16.0.tar.gz 15994773 SHA256 ecd5b7a2da668c94de7757e366f34bdd5d49b89e9b40ce859174dd2a7edb163d SHA512 254ea1a1efbff2f5eb39f9007a27d57b8a43fc86278e28594541c3c2b47c7f0349c7f390c7789528f9531fc95a64010db7beb25390a0f884653287919e600dcc WHIRLPOOL 7ee02629edf0ade4105f52fa3fdbcdd4e8cd763027e6be2a9871fe59138db848af00fb5f143ad4855d6522b484a15c0bc51a7a5a849fd955ddec7979e7e9904d
+DIST lilypond-2.16.1.tar.gz 16061427 SHA256 f56e21fe92f29c88365eb6cf80b5be86a169e23cfb054ccbec457059f3df796e SHA512 2b09e5c64fe707cef64d82dc4bb109afd95a33775148a1f81235f4dc04724f63e669fb7f07db008fd4707f25c5136a91686984974a9dc2d6c4a7ef85be543319 WHIRLPOOL a981f5a4ae1ee9c618708bf9a5cc78fee9e6ae179b7e1a7d33a767a971594009684d37a1b4bacf9a618f42f29ecaec0468e7a37aa8cd7e5ac9695ed645cab228
DIST lilypond-2.17.5.tar.gz 16051524 SHA256 d121075918089f93c2527e4a9a47800668ea996570336aa062449296d6c9a17a SHA512 294c42e6e45fb838f04a7c0ffb6bfec5667d79be0fe779e11f1ebeffe5999630365ba5f29cefaba72fe8b5ee64e14eb04e80a26f4ffef3d580928a551be7a7fe WHIRLPOOL f3b929ecf32417a374eb4b6cb52d11b8990df319cd6072e9c2a208953def803d9b720587ad2965a0c88bd5dc5d7e5c8dacc42712e6c1e641df9ef99922968a86
DIST lilypond-2.17.6.tar.gz 16112409 SHA256 dac4a1676aad4e0cb903d2736b500d63e74e1ecc68140dd0b3222d39f8379e26 SHA512 de1597bdf4fb336674cf87b9110997c69edf6cbd9b193a473f3e4d287390a04f368197ba40e2d202c79d2b98a18fed85bff541a2e081ecd0657846a8a64191fd WHIRLPOOL 4e483ca6613a99a00e185177475b09dfc46f31618544d3aef354c226d3d7453b2df2afa2fabbb2795db18f943f6afcd5d63f3bac0ac15fef2d38f0e6f45d068e
diff --git a/media-sound/lilypond/lilypond-2.16.1.ebuild b/media-sound/lilypond/lilypond-2.16.1.ebuild
new file mode 100644
index 000000000000..412f5bed4a78
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.16.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.16.1.ebuild,v 1.1 2012/11/12 04:57:14 radhermit Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+
+inherit elisp-common python autotools eutils
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+SLOT="0"
+LICENSE="GPL-3 FDL-1.3"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug emacs profile vim-syntax"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+ >=dev-scheme/guile-1.8.2[deprecated,regex]
+ media-fonts/urw-fonts
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=x11-libs/pango-1.12.3
+ emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+ app-text/t1utils
+ dev-lang/perl
+ dev-texlive/texlive-metapost
+ virtual/pkgconfig
+ media-gfx/fontforge
+ >=sys-apps/texinfo-4.11
+ >=sys-devel/bison-2.0
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.16.0-tex-docs.patch
+ if ! use vim-syntax ; then
+ sed -i -e "s/vim//" GNUmakefile.in || die
+ fi
+
+ sed -i -e "s/OPTIMIZE -g/OPTIMIZE/" aclocal.m4 || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # documentation generation currently not supported since it requires a newer
+ # version of texi2html than is currently in the tree
+
+ econf \
+ --with-ncsb-dir=/usr/share/fonts/urw-fonts \
+ --disable-documentation \
+ --disable-optimising \
+ --disable-pipe \
+ $(use_enable debug debugging) \
+ $(use_enable profile profiling)
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+ || die "elisp-compile failed"
+ fi
+}
+
+src_install () {
+ emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+ # remove elisp files since they are in the wrong directory
+ rm -r "${D}"/usr/share/emacs || die
+
+ if use emacs ; then
+ elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+ || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+ fi
+
+ python_convert_shebangs -r 2 "${D}"
+
+ dodoc AUTHORS.txt HACKING NEWS.txt README.txt THANKS
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 0ea95be98db0..f0864f819a05 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,4 +1,3 @@
DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27c515626a536b87deb610d850 SHA512 eca7783af7afc567ed226942b1318b1874b2487c7dc65406fe2097cf2318d722bb4c45ed14363bc3653f948f7cdac5967162e1f4fbd5cbec1adc244886800bb1 WHIRLPOOL abe5faa67444c3edaf5ae9a57a701ba0fccd3e313941d0f7662b8dc2b3a8886578d7bcbd6ed4abfc62abe3b7a36ea216529710e28d1c9cff8f3bb2b9804707bf
-DIST libav-0.8.2.tar.xz 3807340 SHA256 96df20327396937add9df2693bba8ec109ef3eda7251065ddcaa86a8d9f3a7df SHA512 e081e87ad820ae3eb3f14bc9374a1415c9543d91895fea3ee562c844b73a0a6c2e9486ec5e2b3e1903eba30f19a068bc6effa4dde7287fcaee4231fa5f6d9682 WHIRLPOOL 7d44ebe6e5b4c16e6dae08e42109f37497ba6888bfaab3e54aae16d9ef1d96e843095c8d43a7c803fc01cabb4b05f1034c88a93790e91a25c92ce7f9e673aaf2
DIST libav-0.8.3.tar.xz 3798260 SHA256 37a9fc8bb5e56dcb0487afbb013f745a14addff61cea08a6009e2fd01251f080 SHA512 92c6106af54be32d73576f8a22a1d48dea0ff0ba0f5ccc9895cbe29de372c89d9d41ea43d52b3a0453af6214def02f96ef30bb483cd8a94b9ea400e7dd863e9a WHIRLPOOL 384935d937e85163224b69c5b4f98155650a3a79993783c098b88ca20d56bf1927280031bdcd4a7babc272f26c6f38056de80b303316b206541dfdeb34e9a34e
DIST libav-0.8.4.tar.xz 3797112 SHA256 a4a53410ed864848063628277eb94f1921a7edfef7cf2e8bc9ab69f4f659c754 SHA512 67f0a78c2cfa88c98a5d9b3a528a6190eb3b2e0c1885010fced6d46bcf1337bddc7473e2b078ebe656c32897603fd908cbb938e663cb1f2a4fa8d7b1db129bb8 WHIRLPOOL e4252c391454f8e70fed7aa5ba10a4ff8d92297d2966c9921f6360760e9749ded4f5f7fe71a9acbec47b557d1290314ca4aba7b62a75ac33a816132ba8043724
diff --git a/media-video/libav/libav-0.8.2-r2.ebuild b/media-video/libav/libav-0.8.2-r2.ebuild
deleted file mode 100644
index 3116c7b076bc..000000000000
--- a/media-video/libav/libav-0.8.2-r2.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.2-r2.ebuild,v 1.4 2012/05/22 16:52:18 flameeyes Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]] ; then
- SCM="git-2"
- EGIT_REPO_URI="git://git.libav.org/libav.git"
- [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video."
-HOMEPAGE="http://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
- SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
-fi
-
-SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
-
-LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
-SLOT="0"
-[[ ${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="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
- custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
- +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
- oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
- static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
- +zlib"
-
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2
-neon ssse3 vis"
-
-for i in ${CPU_FEATURES}; do
- IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
- !media-video/ffmpeg
- alsa? ( media-libs/alsa-lib )
- amr? ( media-libs/opencore-amr )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio )
- dirac? ( media-video/dirac )
- encode? (
- aac? ( media-libs/vo-aacenc )
- amr? ( media-libs/vo-amrwbenc )
- faac? ( media-libs/faac )
- mp3? ( >=media-sound/lame-3.98.3 )
- theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
- vorbis? ( media-libs/libvorbis media-libs/libogg )
- x264? ( >=media-libs/x264-0.0.20111017 )
- xvid? ( >=media-libs/xvid-1.1.0 )
- )
- truetype? ( media-libs/freetype:2 )
- frei0r? ( media-plugins/frei0r-plugins )
- gsm? ( >=media-sound/gsm-1.0.12-r1 )
- ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
- pulseaudio? ( media-sound/pulseaudio )
- rtmp? ( >=media-video/rtmpdump-2.2f )
- ssl? ( openssl? ( dev-libs/openssl )
- !openssl? ( net-libs/gnutls ) )
- sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
- schroedinger? ( media-libs/schroedinger )
- speex? ( >=media-libs/speex-1.2_beta3 )
- vaapi? ( x11-libs/libva )
- vdpau? ( x11-libs/libvdpau )
- vpx? ( >=media-libs/libvpx-0.9.6 )
- X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
- zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/make-3.81
- dirac? ( virtual/pkgconfig )
- doc? ( app-text/texi2html )
- mmx? ( dev-lang/yasm )
- rtmp? ( virtual/pkgconfig )
- schroedinger? ( virtual/pkgconfig )
- truetype? ( virtual/pkgconfig )
- test? ( net-misc/wget )
- v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl )
- rtmp? ( network )
- amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
- test? ( encode )"
-
-src_prepare() {
- # if we have snapshot then we need to hardcode the version
- if [[ ${PV%_p*} != ${PV} ]]; then
- sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
- fi
-}
-
-src_configure() {
- local myconf="${EXTRA_LIBAV_CONF}"
- local uses i
-
- myconf+="
- $(use_enable gpl)
- $(use_enable gpl version3)
- --enable-avfilter
- "
-
- # enabled by default
- uses="debug doc network zlib"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use bzip2 || myconf+=" --disable-bzlib"
- use sdl || myconf+=" --disable-avplay"
-
- if use ssl; then
- use openssl && myconf+=" --enable-openssl --enable-nonfree" \
- || myconf+=" --enable-gnutls"
- fi
-
- use custom-cflags && myconf+=" --disable-optimizations"
- use cpudetection && myconf+=" --enable-runtime-cpudetect"
-
- #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
- # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
- # use vdpau || myconf="${myconf} --disable-decoder=${i}"
- #done
- use vdpau || myconf+=" --disable-vdpau"
-
- use vaapi && myconf+=" --enable-vaapi"
-
- # Encoders
- if use encode; then
- use mp3 && myconf+=" --enable-libmp3lame"
- use amr && myconf+=" --enable-libvo-amrwbenc"
- use faac && myconf+=" --enable-libfaac --enable-nonfree"
- use aac && myconf+=" --enable-libvo-aacenc"
- uses="theora vorbis x264 xvid"
- for i in ${uses}; do
- use ${i} && myconf+=" --enable-lib${i}"
- done
- else
- myconf+=" --disable-encoders"
- fi
-
- # libavdevice options
- use cdio && myconf+=" --enable-libcdio"
- use ieee1394 && myconf+=" --enable-libdc1394"
- use pulseaudio && myconf+=" --enable-libpulse"
- # Indevs
- # v4l1 is gone since linux-headers-2.6.38
- myconf+=" --disable-indev=v4l"
- use v4l || myconf+=" --disable-indev=v4l2"
- for i in alsa oss jack; do
- use ${i} || myconf+=" --disable-indev=${i}"
- done
- use X && myconf+=" --enable-x11grab"
- # Outdevs
- for i in alsa oss ; do
- use ${i} || myconf+=" --disable-outdev=${i}"
- done
- # libavfilter options
- use frei0r && myconf+=" --enable-frei0r"
- use truetype && myconf+=" --enable-libfreetype"
-
- # Threads; we only support pthread for now but ffmpeg supports more
- use threads && myconf+=" --enable-pthreads"
-
- # Decoders
- use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
- uses="gsm dirac rtmp schroedinger speex vpx"
- for i in ${uses}; do
- use ${i} && myconf+=" --enable-lib${i}"
- done
- use jpeg2k && myconf+=" --enable-libopenjpeg"
-
- # CPU features
- for i in ${CPU_FEATURES}; do
- use ${i%:*} || myconf+=" --disable-${i#*:}"
- done
-
- # pass the right -mfpu as extra
- use neon && myconf+=" --extra-cflags=-mfpu=neon"
-
- # disable mmx accelerated code if PIC is required
- # as the provided asm decidedly is not PIC for x86.
- if use pic && use x86 ; then
- myconf+=" --disable-mmx --disable-mmx2"
- fi
-
- # Option to force building pic
- use pic && myconf+=" --enable-pic"
-
- # Try to get cpu type based on CFLAGS.
- # Bug #172723
- # We need to do this so that features of that CPU will be better used
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure
- # will just ignore it.
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [ "${i}" = "native" ] && i="host" # bug #273421
- [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
- myconf+=" --cpu=${i}"
- break
- done
-
- # cross compile support
- if tc-is-cross-compiler ; then
- myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
- case ${CHOST} in
- *freebsd*)
- myconf+=" --target-os=freebsd"
- ;;
- mingw32*)
- myconf+=" --target-os=mingw32"
- ;;
- *linux*)
- myconf+=" --target-os=linux"
- ;;
- esac
- fi
-
- # Misc stuff
- use hardcoded-tables && myconf+=" --enable-hardcoded-tables"
-
- # Specific workarounds for too-few-registers arch...
- if [[ $(tc-arch) == "x86" ]]; then
- filter-flags -fforce-addr -momit-leaf-frame-pointer
- append-flags -fomit-frame-pointer
- is-flag -O? || append-flags -O2
- if use debug; then
- # no need to warn about debug if not using debug flag
- ewarn ""
- ewarn "Debug information will be almost useless as the frame pointer is omitted."
- ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
- ewarn "difficult to fix. Please have that in mind."
- ewarn ""
- fi
- fi
-
- cd "${S}"
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --shlibdir="${EPREFIX}"/usr/$(get_libdir) \
- --mandir="${EPREFIX}"/usr/share/man \
- --enable-shared \
- --cc="$(tc-getCC)" \
- --ar="$(tc-getAR)" \
- $(use_enable static-libs static) \
- ${myconf} || die
-}
-
-src_compile() {
- emake
-
- if use qt-faststart; then
- tc-export CC
- emake tools/qt-faststart
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install install-man
-
- dodoc Changelog README INSTALL
- dodoc doc/*.txt
- use doc && dodoc doc/*.html
-
- if use qt-faststart; then
- dobin tools/qt-faststart
- fi
-
- for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
- dosym ${i} /usr/bin/${i/av/ff}
- done
-}
-
-pkg_postinst() {
- elog "Please note that the programs formerly known as ffplay, ffserver"
- elog "and ffprobe are now called avplay, avserver and avprobe."
- elog
- elog "ffmpeg had been replaced by the feature incompatible avconv thus"
- elog "the legacy ffmpeg is provided for compatibility with older scripts"
-}
-
-src_test() {
- LD_LIBRARY_PATH="${S}/libavcore:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
- emake fate SAMPLES="${WORKDIR}/fate"
-}
diff --git a/media-video/libav/libav-0.8.2.ebuild b/media-video/libav/libav-0.8.2.ebuild
deleted file mode 100644
index a7140c288a84..000000000000
--- a/media-video/libav/libav-0.8.2.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.2.ebuild,v 1.10 2012/06/20 11:10:40 scarabeus Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999 ]] ; then
- SCM="git-2"
- EGIT_REPO_URI="git://git.libav.org/libav.git"
- [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video."
-HOMEPAGE="http://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
- SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
-SLOT="0"
-[[ ${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="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
- custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
- +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
- oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
- static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
- +zlib"
-
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon iwmmxt"
-
-for i in ${CPU_FEATURES}; do
- IUSE="${IUSE} ${i%:*}"
-done
-
-RDEPEND="
- !media-libs/libpostproc
- !media-video/ffmpeg
- alsa? ( media-libs/alsa-lib )
- amr? ( media-libs/opencore-amr )
- bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio )
- dirac? ( media-video/dirac )
- encode? (
- aac? ( media-libs/vo-aacenc )
- amr? ( media-libs/vo-amrwbenc )
- faac? ( media-libs/faac )
- mp3? ( >=media-sound/lame-3.98.3 )
- theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
- vorbis? ( media-libs/libvorbis media-libs/libogg )
- x264? ( >=media-libs/x264-0.0.20111017 )
- xvid? ( >=media-libs/xvid-1.1.0 )
- )
- truetype? ( media-libs/freetype )
- frei0r? ( media-plugins/frei0r-plugins )
- gsm? ( >=media-sound/gsm-1.0.12-r1 )
- ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
- rtmp? ( >=media-video/rtmpdump-2.2f )
- ssl? ( openssl? ( dev-libs/openssl )
- !openssl? ( net-libs/gnutls ) )
- sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
- schroedinger? ( media-libs/schroedinger )
- speex? ( >=media-libs/speex-1.2_beta3 )
- vaapi? ( x11-libs/libva )
- vdpau? ( x11-libs/libvdpau )
- vpx? ( >=media-libs/libvpx-0.9.6 )
- X? ( x11-libs/libX11 x11-libs/libXext )
- zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/make-3.81
- dirac? ( virtual/pkgconfig )
- doc? ( app-text/texi2html )
- mmx? ( dev-lang/yasm )
- rtmp? ( virtual/pkgconfig )
- schroedinger? ( virtual/pkgconfig )
- test? ( net-misc/wget )
- v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl )
- rtmp? ( network )
- amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
-
-RESTRICT="test"
-
-src_prepare() {
- # if we have snapshot then we need to hardcode the version
- if [[ ${PV%_p*} != ${PV} ]]; then
- sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
- fi
-}
-
-src_configure() {
- local myconf="${EXTRA_LIBAV_CONF}"
- local uses i
-
- myconf+="
- $(use_enable gpl)
- $(use_enable gpl version3)
- --enable-postproc
- --enable-avfilter
- "
-
- # enabled by default
- uses="debug doc network zlib"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use bzip2 || myconf+=" --disable-bzlib"
- use sdl || myconf+=" --disable-avplay"
-
- if use ssl; then
- use openssl && myconf+=" --enable-openssl --enable-nonfree" \
- || myconf+=" --enable-gnutls"
- fi
-
- use custom-cflags && myconf+=" --disable-optimizations"
- use cpudetection && myconf+=" --enable-runtime-cpudetect"
-
- #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
- # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
- # use vdpau || myconf="${myconf} --disable-decoder=${i}"
- #done
- use vdpau || myconf+=" --disable-vdpau"
-
- use vaapi && myconf+=" --enable-vaapi"
-
- # Encoders
- if use encode; then
- use mp3 && myconf+=" --enable-libmp3lame"
- use amr && myconf+=" --enable-libvo-amrwbenc"
- use faac && myconf+=" --enable-libfaac --enable-nonfree"
- use aac && myconf+=" --enable-libvo-aacenc"
- uses="theora vorbis x264 xvid"
- for i in ${uses}; do
- use ${i} && myconf+=" --enable-lib${i}"
- done
- else
- myconf+=" --disable-encoders"
- fi
-
- # libavdevice options
- use cdio && myconf+=" --enable-libcdio"
- use ieee1394 && myconf+=" --enable-libdc1394"
- use pulseaudio && myconf+=" --enable-libpulse"
- # Indevs
- # v4l1 is gone since linux-headers-2.6.38
- myconf+=" --disable-indev=v4l"
- use v4l || myconf+=" --disable-indev=v4l2"
- for i in alsa oss jack; do
- use ${i} || myconf+=" --disable-indev=${i}"
- done
- use X && myconf+=" --enable-x11grab"
- # Outdevs
- for i in alsa oss ; do
- use ${i} || myconf+=" --disable-outdev=${i}"
- done
- # libavfilter options
- use frei0r && myconf+=" --enable-frei0r"
- use truetype && myconf+=" --enable-libfreetype"
-
- # Threads; we only support pthread for now but ffmpeg supports more
- use threads && myconf+=" --enable-pthreads"
-
- # Decoders
- use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
- uses="gsm dirac rtmp schroedinger speex vpx"
- for i in ${uses}; do
- use ${i} && myconf+=" --enable-lib${i}"
- done
- use jpeg2k && myconf+=" --enable-libopenjpeg"
-
- # CPU features
- for i in ${CPU_FEATURES}; do
- use ${i%:*} || myconf+=" --disable-${i#*:}"
- done
-
- # pass the right -mfpu as extra
- use neon && myconf+=" --extra-cflags=-mfpu=neon"
-
- # disable mmx accelerated code if PIC is required
- # as the provided asm decidedly is not PIC for x86.
- if use pic && use x86 ; then
- myconf+=" --disable-mmx --disable-mmx2"
- fi
-
- # Option to force building pic
- use pic && myconf+=" --enable-pic"
-
- # Try to get cpu type based on CFLAGS.
- # Bug #172723
- # We need to do this so that features of that CPU will be better used
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure
- # will just ignore it.
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [ "${i}" = "native" ] && i="host" # bug #273421
- [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
- myconf+=" --cpu=${i}"
- break
- done
-
- # cross compile support
- if tc-is-cross-compiler ; then
- myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
- case ${CHOST} in
- *freebsd*)
- myconf+=" --target-os=freebsd"
- ;;
- mingw32*)
- myconf+=" --target-os=mingw32"
- ;;
- *linux*)
- myconf+=" --target-os=linux"
- ;;
- esac
- fi
-
- # Misc stuff
- use hardcoded-tables && myconf+=" --enable-hardcoded-tables"
-
- # Specific workarounds for too-few-registers arch...
- if [[ $(tc-arch) == "x86" ]]; then
- filter-flags -fforce-addr -momit-leaf-frame-pointer
- append-flags -fomit-frame-pointer
- is-flag -O? || append-flags -O2
- if use debug; then
- # no need to warn about debug if not using debug flag
- ewarn ""
- ewarn "Debug information will be almost useless as the frame pointer is omitted."
- ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
- ewarn "difficult to fix. Please have that in mind."
- ewarn ""
- fi
- fi
-
- cd "${S}"
- ./configure \
- --prefix="$EPREFIX"/usr \
- --libdir="$EPREFIX"/usr/$(get_libdir) \
- --shlibdir="$EPREFIX"/usr/$(get_libdir) \
- --mandir="$EPREFIX"/usr/share/man \
- --enable-shared \
- --cc="$(tc-getCC)" \
- $(use_enable static-libs static) \
- ${myconf} || die
-}
-
-src_compile() {
- emake
-
- if use qt-faststart; then
- tc-export CC
- emake tools/qt-faststart
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install install-man
-
- dodoc Changelog README INSTALL
- dodoc doc/*.txt
- use doc && dodoc doc/*.html
-
- if use qt-faststart; then
- dobin tools/qt-faststart
- fi
-
- for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
- dosym ${i} /usr/bin/${i/av/ff}
- done
-}
-
-pkg_postinst() {
- elog "Please note that the programs formerly known as ffplay, ffserver"
- elog "and ffprobe are now called avplay, avserver and avprobe."
- elog
- elog "ffmpeg had been replaced by the feature incompatible avconv thus"
- elog "the legacy ffmpeg is provided for compatibility with older scripts"
-}
-
-src_test() {
- local i tests
- if use encode; then
- tests="codectest lavftest seektest"
- for i in ${tests}; do
- LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
- emake ${i}
- done
- else
- ewarn "Tests fail without USE=encode, skipping"
- fi
-}
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index 41c8aae90f12..8c480e27c6f3 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -3,3 +3,4 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
DIST mplayer2-2.0_p20120309.tar.xz 3328620 SHA256 8a46e0be27dd479c91bde64a35725c6ff668e5a74ab3a56ac3fe29d16f6a0a31 SHA512 c9b1eda3cfc6279a96864aad9a6096b36742460233f03d715b94437e8ffbb1086d006f379f8fb4d7e2b7598ce810e62b5f88151832b19d8459344079fa55fe67 WHIRLPOOL 15522e5bf9c2fdabc86c23122159b7f9ee855211eb4ae088f1ebff07bb8dcb4b763d61c49ba31ea18d3e3c237a60e685a23e4fac71bf94b1af80f84c638d9fd3
DIST mplayer2-2.0_p20120828.tar.xz 1739048 SHA256 7a53079c52c73ce00df5c29e1e2c19f944365213c70107b4bf992cf32ca85093 SHA512 d8eebf9deb1f07f7178037c9e980bbd942f0c68937fb6f37aad9b4e25f6a4d2cc5b6f055537c7dca12adf198e6f2531197f2869fbd0ba301d5fc7f5294f82b97 WHIRLPOOL ca9055a631fc7d19329db3c45b297f497c44c5e82f621af5cc76e32b4fac8585690f8252156dd2fcd44bd150ad18778aaf2c2b5796ca53f32e4de81d85385135
+DIST mplayer2-2.0_p20121108.tar.xz 1549508 SHA256 7d0f18998b6b059e1e06d66d030e5c4979aff158f050d7354c3056e6aaf29c0d SHA512 b8e507aa7e928267f648f228c1fafc236c0af39836733c0029583250784462a87cd713ba86312329c8c4c6cb175dcae24e2064498ddc6d51b162da51c43a8646 WHIRLPOOL bc0fd93ee2a56095bdad81aef9997e48cb177569a47c5abd5bace58af2a8eb114c352abadea2306437b5650d85f549109ad2173491b833d211e5dc816c7f7dd0
diff --git a/media-video/mplayer2/metadata.xml b/media-video/mplayer2/metadata.xml
index 3415521dfad4..637f48f490c7 100644
--- a/media-video/mplayer2/metadata.xml
+++ b/media-video/mplayer2/metadata.xml
@@ -55,5 +55,6 @@
Enables Targa video output
Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card
Enables support for xanim based codecs
+ Enables yuv4mpeg video output
diff --git a/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild b/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild
new file mode 100644
index 000000000000..ebb9c13b3fae
--- /dev/null
+++ b/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild
@@ -0,0 +1,480 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20121108.ebuild,v 1.1 2012/11/12 08:20:18 radhermit Exp $
+
+EAPI=4
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
+
+inherit python toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
+
+NAMESUF="${PN/mplayer/}"
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayer2.org/"
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
+else
+ SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} == *9999* ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+IUSE="+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug
+directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
+ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
+md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc
+pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga
++theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama
++xscreensaver +xv xvid yuv4mpeg
+"
+IUSE+=" symlink"
+
+CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
+for x in ${CPU_FEATURES}; do
+ IUSE+=" ${x}"
+done
+
+# bindist does not cope with win32codecs, which are nonfree
+REQUIRED_USE="
+ bindist? ( !win32codecs )
+ cddb? ( cdio network )
+ dvdnav? ( dvd )
+ lcms? ( opengl )
+ libass? ( iconv )
+ opengl? ( || ( aqua X ) )
+ radio? ( || ( dvb v4l ) )
+ vdpau? ( X )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+"
+
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+RDEPEND+="
+ sys-libs/ncurses
+ sys-libs/zlib
+ !bindist? (
+ x86? (
+ win32codecs? ( media-libs/win32codecs )
+ )
+ )
+ X? (
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+ opengl? ( virtual/opengl )
+ lcms? ( media-libs/lcms:2 )
+ vdpau? ( x11-libs/libvdpau )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? (
+ x11-libs/libXv
+ )
+ )
+ a52? ( media-libs/a52dec )
+ alsa? ( media-libs/alsa-lib )
+ bluray? ( media-libs/libbluray )
+ bs2b? ( media-libs/libbs2b )
+ cdio? ( dev-libs/libcdio )
+ directfb? ( dev-libs/DirectFB )
+ dts? ( media-libs/libdca )
+ dv? ( media-libs/libdv )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? (
+ >=media-libs/libdvdread-4.1.3
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+ )
+ enca? ( app-i18n/enca )
+ faad? ( media-libs/faad2 )
+ gif? ( media-libs/giflib )
+ iconv? ( virtual/libiconv )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg )
+ ladspa? ( media-libs/ladspa-sdk )
+ libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts )
+ libcaca? ( media-libs/libcaca )
+ lirc? ( app-misc/lirc )
+ mad? ( media-libs/libmad )
+ mng? ( media-libs/libmng )
+ mp3? ( media-sound/mpg123 )
+ nut? ( >=media-libs/libnut-661 )
+ png? ( media-libs/libpng )
+ pnm? ( media-libs/netpbm )
+ portaudio? ( >=media-libs/portaudio-19_pre20111121 )
+ postproc? ( || ( media-libs/libpostproc =media-libs/libquvi-0.4.1 )
+ rar? (
+ || (
+ app-arch/unrar
+ app-arch/rar
+ )
+ )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl )
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora )
+ vorbis? ( media-libs/libvorbis )
+ xanim? ( media-video/xanim )
+ xvid? ( media-libs/xvid )
+ >=virtual/ffmpeg-0.10.2
+ symlink? ( !media-video/mplayer )
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-lang/python-2.7
+ dev-python/docutils
+ sys-devel/gettext
+ X? (
+ x11-proto/videoproto
+ x11-proto/xf86vidmodeproto
+ xinerama? ( x11-proto/xineramaproto )
+ xscreensaver? ( x11-proto/scrnsaverproto )
+ )
+ amd64? ( ${ASM_DEP} )
+ doc? (
+ dev-libs/libxslt app-text/docbook-xml-dtd
+ app-text/docbook-xsl-stylesheets
+ )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-py2compat.patch"
+)
+
+pkg_setup() {
+ if [[ ${PV} == *9999* ]]; then
+ elog
+ elog "This is a live ebuild which installs the latest from upstream's"
+ elog "${VCS_ECLASS} repository, and is unsupported by Gentoo."
+ elog "Everything but bugs in the ebuild itself will be ignored."
+ elog
+ fi
+
+ if use cpudetection; then
+ ewarn
+ ewarn "You've enabled the cpudetection flag. This feature is"
+ ewarn "included mainly for people who want to use the same"
+ ewarn "binary on another system with a different CPU architecture."
+ ewarn "MPlayer will already detect your CPU settings by default at"
+ ewarn "buildtime; this flag is used for runtime detection."
+ ewarn "You won't need this turned on if you are only building"
+ ewarn "mplayer for this system. Also, if your compile fails, try"
+ ewarn "disabling this use flag."
+ fi
+
+ if use !libass; then
+ ewarn
+ ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+ fi
+
+ einfo "For various format support you need to enable the support on your ffmpeg package:"
+ einfo " media-video/libav or media-video/ffmpeg"
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
+ python_pkg_setup
+ major=$(python_get_version --major)
+ minor=$(python_get_version --minor)
+ [[ ( ${major} -eq 2 && ${minor} -ge 7 ) || ${major} -ge 3 ]] \
+ || die "Please eselect Python 2.7 or later"
+}
+
+src_prepare() {
+ # fix path to bash executable in configure scripts
+ local bash_scripts="configure version.sh"
+ sed -i -e "1c\#!${EPREFIX}/bin/bash" \
+ ${bash_scripts} || die
+
+ sed -e 's/rst2man /rst2man.py /g' -i Makefile || die
+
+ if [[ -n ${NAMESUF} ]]; then
+ sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
+ -i configure || die
+ sed -e "s/mplayer/${PN}/" \
+ -i TOOLS/midentify.sh || die
+ fi
+
+ base_src_prepare
+}
+
+src_configure() {
+ local myconf=""
+ local uses i
+
+ # set LINGUAS
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+
+ # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+ # compilation in almost every situation. The reason for this is
+ # because if --enable is used, it will force the build of that option,
+ # regardless of whether the dependency is available or not.
+
+ ###################
+ #Optional features#
+ ###################
+ # disable tremor, it needs libvorbisidec and is for FPU-less systems only
+ myconf+="
+ --disable-tremor
+ $(use_enable network networking)
+ $(use_enable joystick)
+ "
+ uses="bluray enca ftp libass rtc vcd"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use ipv6 || myconf+=" --disable-inet6"
+ use nut || myconf+=" --disable-libnut"
+ use quvi || myconf+=" --disable-libquvi"
+ use rar || myconf+=" --disable-unrarexec"
+ use samba || myconf+=" --disable-smb"
+ if ! use lirc; then
+ myconf+="
+ --disable-lirc
+ --disable-lircc
+ --disable-apple-ir
+ "
+ fi
+
+ ########
+ # CDDA #
+ ########
+ use cddb || myconf+=" --disable-cddb"
+ use cdio || myconf+=" --disable-libcdio"
+
+ ################################
+ # DVD read, navigation support #
+ ################################
+ #
+ # dvdread - accessing a DVD
+ # dvdnav - navigation of menus
+ #
+ # use external libdvdcss, dvdread and dvdnav
+ myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
+ use dvd || myconf+=" --disable-dvdread"
+ use dvdnav || myconf+=" --disable-dvdnav"
+
+ #############
+ # Subtitles #
+ #############
+ #
+ # iconv optionally can use unicode
+ use iconv || myconf+=" --disable-iconv --charset=noconv"
+ use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+ #####################################
+ # DVB / Video4Linux / Radio support #
+ #####################################
+ myconf+=" --disable-tv-bsdbt848"
+ # v4l1 is gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
+ use dvb || myconf+=" --disable-dvb"
+ use pvr || myconf+=" --disable-pvr"
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
+ myconf+="
+ --enable-radio
+ --disable-radio-capture
+ "
+ else
+ myconf+="
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ "
+ fi
+ else
+ myconf+="
+ --disable-tv
+ --disable-tv-v4l2
+ --disable-radio
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ --disable-dvb
+ --disable-v4l2
+ --disable-pvr"
+ fi
+
+ ##########
+ # Codecs #
+ ##########
+ myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
+ use dts || myconf+=" --disable-libdca"
+ use mp3 || myconf+=" --disable-mpg123"
+ uses="a52 bs2b dv vorbis"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-lib${i}"
+ done
+ uses="faad gif jpeg mad mng png pnm speex tga theora xanim xvid"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+
+ #################
+ # Binary codecs #
+ #################
+ # bug 213836
+ if ! use x86 || ! use win32codecs; then
+ use quicktime || myconf+=" --disable-qtx"
+ fi
+
+ ######################
+ # RealPlayer support #
+ ######################
+ # Realplayer support shows up in four places:
+ # - libavcodec (internal)
+ # - win32codecs
+ # - realcodecs (win32codecs libs)
+ # - realcodecs (realplayer libs)
+
+ # internal
+ use real || myconf+=" --disable-real"
+
+ # Real binary codec support only available on x86, amd64
+ if use real; then
+ use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
+ use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
+ fi
+ myconf+=" $(use_enable win32codecs win32dll)"
+
+ ################
+ # Video Output #
+ ################
+ uses="directfb md5sum sdl yuv4mpeg"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use libcaca || myconf+=" --disable-caca"
+ use postproc || myconf+=" --disable-libpostproc"
+
+ ################
+ # Audio Output #
+ ################
+ myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
+ uses="alsa jack ladspa portaudio"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ #use openal && myconf+=" --enable-openal" # build fails
+ use pulseaudio || myconf+=" --disable-pulse"
+ if ! use radio; then
+ use oss || myconf+=" --disable-ossaudio"
+ fi
+
+ ####################
+ # Advanced Options #
+ ####################
+ # Platform specific flags, hardcoded on amd64 (see below)
+ use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+ for i in ${CPU_FEATURES//+/}; do
+ myconf+=" $(use_enable ${i})"
+ done
+
+ use debug && myconf+=" --enable-debug=3"
+
+ if use x86 && gcc-specs-pie; then
+ filter-flags -fPIC -fPIE
+ append-ldflags -nopie
+ fi
+
+ ###########################
+ # X enabled configuration #
+ ###########################
+ use X || myconf+=" --disable-x11"
+ uses="vdpau xinerama xv"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use opengl || myconf+=" --disable-gl"
+ use lcms || myconf+=" --disable-lcms2"
+ use xscreensaver || myconf+=" --disable-xss"
+
+ ############################
+ # OSX (aqua) configuration #
+ ############################
+ if use aqua; then
+ myconf+="
+ --enable-macosx-finder
+ --enable-macosx-bundle
+ "
+ fi
+
+ ./configure \
+ --cc="$(tc-getCC)" \
+ --pkg-config="$(tc-getPKG_CONFIG)" \
+ --prefix="${EPREFIX}"/usr \
+ --bindir="${EPREFIX}"/usr/bin \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --confdir="${EPREFIX}"/etc/${PN} \
+ --datadir="${EPREFIX}"/usr/share/${PN} \
+ --mandir="${EPREFIX}"/usr/share/man \
+ --localedir="${EPREFIX}"/usr/share/locale \
+ --enable-translation \
+ ${myconf} || die
+}
+
+src_compile() {
+ base_src_compile
+ use doc && emake -j1 -C DOCS/xml html-chunked
+}
+
+src_install() {
+ local i
+
+ emake \
+ DESTDIR="${D}" \
+ INSTALLSTRIP="" \
+ install
+
+ dodoc AUTHORS Copyright README etc/codecs.conf
+
+ docinto tech/
+ dodoc DOCS/tech/{*.txt,mpsub.sub,playtree}
+ docinto TOOLS/
+ dodoc -r TOOLS
+ if use real; then
+ docinto tech/realcodecs/
+ dodoc DOCS/tech/realcodecs/*
+ fi
+
+ if use doc; then
+ docinto html/
+ dohtml -r "${S}"/DOCS/HTML/*
+ fi
+
+ insinto /etc/${PN}
+ newins "${S}/etc/example.conf" mplayer.conf
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+ doins "${S}/etc/input.conf"
+
+ # set unrar path when required
+ if use rar; then
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+ fi
+ dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
+
+ newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF}
+
+ if [[ -n ${NAMESUF} ]]; then
+ mv "${ED}/usr/share/man/man1/mplayer.1" "${ED}/usr/share/man/man1/mplayer${NAMESUF}.1" || die
+
+ if use symlink; then
+ dosym "${PN}" /usr/bin/mplayer
+ dosym "midentify${NAMESUF}" /usr/bin/midentify
+ fi
+ fi
+}
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index d672bf174784..dfd4030775df 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.46 2012/09/27 23:02:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.47 2012/11/12 08:20:18 radhermit Exp $
EAPI=4
[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
+inherit python toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
NAMESUF="${PN/mplayer/}"
DESCRIPTION="Media Player for Linux"
@@ -15,15 +15,8 @@ HOMEPAGE="http://www.mplayer2.org/"
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
else
- RELEASE_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
+ SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
fi
-SRC_URI="${RELEASE_URI}
- !truetype? (
- mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
- )
-"
LICENSE="GPL-3"
SLOT="0"
@@ -32,13 +25,14 @@ if [[ ${PV} == *9999* ]]; then
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
fi
-IUSE="+a52 aalib +alsa aqua bidi bindist bl bluray bs2b cddb +cdio
- cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad
- fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
- +libass libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png
- pnm portaudio postproc pulseaudio pvr +quicktime quvi radio +rar +real
- +rtc samba sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis
- win32codecs +X xanim xinerama +xscreensaver +xv xvid"
+IUSE="+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug
+directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
+ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
+md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc
+pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga
++theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama
++xscreensaver +xv xvid yuv4mpeg
+"
IUSE+=" symlink"
CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
@@ -46,22 +40,15 @@ for x in ${CPU_FEATURES}; do
IUSE+=" ${x}"
done
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
-
# bindist does not cope with win32codecs, which are nonfree
REQUIRED_USE="
bindist? ( !win32codecs )
cddb? ( cdio network )
dvdnav? ( dvd )
- dxr3? ( X )
- ggi? ( X )
- libass? ( truetype )
- opengl? ( || ( X aqua ) )
+ lcms? ( opengl )
+ libass? ( iconv )
+ opengl? ( || ( aqua X ) )
radio? ( || ( dvb v4l ) )
- truetype? ( iconv )
vdpau? ( X )
xinerama? ( X )
xscreensaver? ( X )
@@ -69,7 +56,6 @@ REQUIRED_USE="
"
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-# nemesi? ( net-libs/libnemesi )
RDEPEND+="
sys-libs/ncurses
sys-libs/zlib
@@ -81,11 +67,8 @@ RDEPEND+="
X? (
x11-libs/libXext
x11-libs/libXxf86vm
- ggi? (
- media-libs/libggi
- media-libs/libggiwmh
- )
opengl? ( virtual/opengl )
+ lcms? ( media-libs/lcms:2 )
vdpau? ( x11-libs/libvdpau )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
@@ -94,9 +77,7 @@ RDEPEND+="
)
)
a52? ( media-libs/a52dec )
- aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
- bidi? ( dev-libs/fribidi )
bluray? ( media-libs/libbluray )
bs2b? ( media-libs/libbs2b )
cdio? ( dev-libs/libcdio )
@@ -115,20 +96,19 @@ RDEPEND+="
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg )
ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] )
+ libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts )
libcaca? ( media-libs/libcaca )
lirc? ( app-misc/lirc )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng )
mp3? ( media-sound/mpg123 )
- nas? ( media-libs/nas )
nut? ( >=media-libs/libnut-661 )
png? ( media-libs/libpng )
pnm? ( media-libs/netpbm )
portaudio? ( >=media-libs/portaudio-19_pre20111121 )
postproc? ( || ( media-libs/libpostproc =media-libs/libquvi-0.4.1 )
rar? (
|| (
app-arch/unrar
@@ -139,11 +119,6 @@ RDEPEND+="
sdl? ( media-libs/libsdl )
speex? ( media-libs/speex )
theora? ( media-libs/libtheora )
- truetype? (
- media-libs/fontconfig
- >=media-libs/freetype-2.2.1:2
- virtual/ttf-fonts
- )
vorbis? ( media-libs/libvorbis )
xanim? ( media-video/xanim )
xvid? ( media-libs/xvid )
@@ -154,11 +129,11 @@ ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=dev-lang/python-2.7
+ dev-python/docutils
sys-devel/gettext
X? (
x11-proto/videoproto
x11-proto/xf86vidmodeproto
- dxr3? ( media-video/em8300-libraries )
xinerama? ( x11-proto/xineramaproto )
xscreensaver? ( x11-proto/scrnsaverproto )
)
@@ -196,8 +171,20 @@ pkg_setup() {
ewarn "disabling this use flag."
fi
+ if use !libass; then
+ ewarn
+ ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+ fi
+
einfo "For various format support you need to enable the support on your ffmpeg package:"
einfo " media-video/libav or media-video/ffmpeg"
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
+ python_pkg_setup
+ major=$(python_get_version --major)
+ minor=$(python_get_version --minor)
+ [[ ( ${major} -eq 2 && ${minor} -ge 7 ) || ${major} -ge 3 ]] \
+ || die "Please eselect Python 2.7 or later"
}
src_prepare() {
@@ -206,13 +193,11 @@ src_prepare() {
sed -i -e "1c\#!${EPREFIX}/bin/bash" \
${bash_scripts} || die
+ sed -e 's/rst2man /rst2man.py /g' -i Makefile || die
+
if [[ -n ${NAMESUF} ]]; then
sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
-i configure || die
- sed -e "\, -m 644 DOCS/man/en/mplayer,i\ mv DOCS/man/en/mplayer.1 DOCS/man/en/${PN}.1" \
- -e "\, -m 644 DOCS/man/\$(lang)/mplayer,i\ mv DOCS/man/\$(lang)/mplayer.1 DOCS/man/\$(lang)/${PN}.1" \
- -e "s/er.1/er${NAMESUF}.1/g" \
- -i Makefile || die
sed -e "s/mplayer/${PN}/" \
-i TOOLS/midentify.sh || die
fi
@@ -235,20 +220,16 @@ src_configure() {
###################
#Optional features#
###################
- # disable svga since we don't want it
# disable tremor, it needs libvorbisidec and is for FPU-less systems only
myconf+="
- --disable-svga
--disable-tremor
$(use_enable network networking)
$(use_enable joystick)
"
- uses="bl bluray enca ftp libass rtc" # nemesi <- not working with in-tree ebuild
- myconf+=" --disable-nemesi" # nemesi automagic disable
+ uses="bluray enca ftp libass rtc vcd"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- use bidi || myconf+=" --disable-fribidi"
use ipv6 || myconf+=" --disable-inet6"
use nut || myconf+=" --disable-libnut"
use quvi || myconf+=" --disable-libquvi"
@@ -283,10 +264,8 @@ src_configure() {
#############
# Subtitles #
#############
- # SRT/ASS/SSA (subtitles) requires freetype support
- # freetype support requires iconv
+ #
# iconv optionally can use unicode
- use truetype || myconf+=" --disable-freetype"
use iconv || myconf+=" --disable-iconv --charset=noconv"
use iconv && use unicode && myconf+=" --charset=UTF-8"
@@ -294,8 +273,6 @@ src_configure() {
# DVB / Video4Linux / Radio support #
#####################################
myconf+=" --disable-tv-bsdbt848"
- # broken upstream, won't work with recent kernels
- myconf+=" --disable-ivtv"
# v4l1 is gone since linux-headers-2.6.38
myconf+=" --disable-tv-v4l1"
if { use dvb || use v4l || use pvr || use radio; }; then
@@ -339,7 +316,6 @@ src_configure() {
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- myconf+=" --disable-live" # >=live-2012 are broken
#################
# Binary codecs #
@@ -371,41 +347,18 @@ src_configure() {
################
# Video Output #
################
- uses="directfb md5sum sdl"
+ uses="directfb md5sum sdl yuv4mpeg"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- use aalib || myconf+=" --disable-aa"
- use fbcon || myconf+=" --disable-fbdev"
- use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
use libcaca || myconf+=" --disable-caca"
use postproc || myconf+=" --disable-libpostproc"
- if ! use kernel_linux || ! use video_cards_mga; then
- myconf+=" --disable-mga --disable-xmga"
- fi
-
- if use video_cards_tdfx; then
- myconf+="
- $(use_enable video_cards_tdfx tdfxvid)
- $(use_enable fbcon tdfxfb)
- "
- else
- myconf+="
- --disable-3dfx
- --disable-tdfxvid
- --disable-tdfxfb
- "
- fi
-
- # sun card, disable by default, see bug #258729
- myconf+=" --disable-xvr100"
-
################
# Audio Output #
################
myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
- uses="alsa jack ladspa nas portaudio"
+ uses="alsa jack ladspa portaudio"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
@@ -435,12 +388,13 @@ src_configure() {
###########################
# X enabled configuration #
###########################
- myconf+=" --disable-dga1 --disable-dga2 --disable-vesa"
- uses="dxr3 ggi vdpau xinerama xv"
+ use X || myconf+=" --disable-x11"
+ uses="vdpau xinerama xv"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
use opengl || myconf+=" --disable-gl"
+ use lcms || myconf+=" --disable-lcms2"
use xscreensaver || myconf+=" --disable-xss"
############################
@@ -496,18 +450,6 @@ src_install() {
dohtml -r "${S}"/DOCS/HTML/*
fi
- if ! use truetype; then
- dodir /usr/share/${PN}/fonts
- # Do this generic, as the mplayer people like to change the structure
- # of their zips ...
- for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
- cp -pPR "${i}" "${ED}/usr/share/${PN}/fonts"
- done
- # Fix the font symlink ...
- rm -rf "${ED}/usr/share/${PN}/font"
- dosym fonts/font-arial-14-iso-8859-1 /usr/share/${PN}/font
- fi
-
insinto /etc/${PN}
newins "${S}/etc/example.conf" mplayer.conf
cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
@@ -527,8 +469,12 @@ _EOF_
newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF}
- if [[ -n ${NAMESUF} ]] && use symlink; then
- dosym "${PN}" /usr/bin/mplayer
- dosym "midentify${NAMESUF}" /usr/bin/midentify
+ if [[ -n ${NAMESUF} ]]; then
+ mv "${ED}/usr/share/man/man1/mplayer.1" "${ED}/usr/share/man/man1/mplayer${NAMESUF}.1" || die
+
+ if use symlink; then
+ dosym "${PN}" /usr/bin/mplayer
+ dosym "midentify${NAMESUF}" /usr/bin/midentify
+ fi
fi
}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4322b5cbbcc7..1d5222503600 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 12 Nov 2012 04:06:52 +0000
+Mon, 12 Nov 2012 12:36:53 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4322b5cbbcc7..1d5222503600 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 12 Nov 2012 04:06:52 +0000
+Mon, 12 Nov 2012 12:36:53 +0000
diff --git a/metadata/md5-cache/app-text/calibre-0.9.4 b/metadata/md5-cache/app-text/calibre-0.9.6
similarity index 94%
rename from metadata/md5-cache/app-text/calibre-0.9.4
rename to metadata/md5-cache/app-text/calibre-0.9.6
index eb93a0376a36..3b4c9f56e4e3 100644
--- a/metadata/md5-cache/app-text/calibre-0.9.4
+++ b/metadata/md5-cache/app-text/calibre-0.9.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2 >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
SLOT=0
-SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.4/calibre-0.9.4.tar.xz
+SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.6/calibre-0.9.6.tar.xz
_eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fae1580cf51f5cde6173aaf72046aa2c
+_md5_=8df5ee68dcc5dc0c45591eb59a6566c5
diff --git a/metadata/md5-cache/app-vim/python-mode-0.6.8 b/metadata/md5-cache/app-vim/python-mode-0.6.10
similarity index 83%
rename from metadata/md5-cache/app-vim/python-mode-0.6.8
rename to metadata/md5-cache/app-vim/python-mode-0.6.10
index a2c9d1f02401..3106571e1863 100644
--- a/metadata/md5-cache/app-vim/python-mode-0.6.8
+++ b/metadata/md5-cache/app-vim/python-mode-0.6.10
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=LGPL-3
RDEPEND=dev-python/astng dev-python/autopep8 dev-python/pyflakes dev-python/pylint dev-python/rope dev-python/ropemode || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
SLOT=0
-SRC_URI=https://github.com/klen/python-mode/tarball/0.6.8 -> python-mode-0.6.8.tar.gz
+SRC_URI=https://github.com/klen/python-mode/tarball/0.6.10 -> python-mode-0.6.10.tar.gz
_eclasses_=vcs-snapshot d7572a392e0bd8e207deae5414f6a887 vim-doc 1c18baeec98cec3287524cbf2fee2bd2 vim-plugin 0a9f94c8f498d61aecc18fdc8ad711dd
-_md5_=8ac60dee03c483093161658c1bf5b35e
+_md5_=cf9dd5ad2848d7643ff26da62a75a276
diff --git a/metadata/md5-cache/dev-lang/cll1h-0.6-r1 b/metadata/md5-cache/dev-lang/cll1h-0.6-r1
index fbce5b3ed09d..4455b6e1d29f 100644
--- a/metadata/md5-cache/dev-lang/cll1h-0.6-r1
+++ b/metadata/md5-cache/dev-lang/cll1h-0.6-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=C<<1 programming language system
EAPI=4
HOMEPAGE=http://gpl.arachne.cz/
-KEYWORDS=~amd64 ~amd64-linux ~ppc ~x86 ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~amd64-linux ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos
LICENSE=LGPL-2.1
RDEPEND=sys-devel/gcc
SLOT=0
SRC_URI=http://gpl.arachne.cz/download/cll1h-0.6.tar.gz
-_md5_=28d336fc2e3b04a17d12dba38918c070
+_md5_=6bc4567ff34357cd8102bc171ca26de2
diff --git a/metadata/md5-cache/dev-lang/pcc-1.0.1_pre20121112 b/metadata/md5-cache/dev-lang/pcc-1.0.1_pre20121112
new file mode 100644
index 000000000000..7b41e0f13750
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/pcc-1.0.1_pre20121112
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-libs/pcc-libs-1.0.1_pre20121112 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=pcc portable c compiler
+EAPI=2
+HOMEPAGE=http://pcc.ludd.ltu.se
+KEYWORDS=~x86 ~amd64 ~amd64-fbsd
+LICENSE=BSD
+RDEPEND=>=dev-libs/pcc-libs-1.0.1_pre20121112
+SLOT=0
+SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc/pcc-20121112.tgz
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=3fe0b3717702e65d5384a9f3c3b065e1
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20121112 b/metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20121112
new file mode 100644
index 000000000000..ef0443095a44
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20121112
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=pcc compiler support libs
+EAPI=2
+HOMEPAGE=http://pcc.ludd.ltu.se
+KEYWORDS=~x86 ~amd64 ~amd64-fbsd
+LICENSE=BSD
+SLOT=0
+SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-libs/pcc-libs-20121112.tgz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=9a21e5d3b34e96b443c1d4e66d81e816
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.19 b/metadata/md5-cache/dev-python/pyxdg-0.19
deleted file mode 100644
index 3f7acf294a79..000000000000
--- a/metadata/md5-cache/dev-python/pyxdg-0.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=A Python module to deal with freedesktop.org specifications
-EAPI=2
-HOMEPAGE=http://pyxdg.freedesktop.org/ http://people.freedesktop.org/~lanius/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://people.freedesktop.org/~lanius/pyxdg-0.19.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=81cb2f1e1216072329daf95ccedc33af
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.24 b/metadata/md5-cache/dev-python/pyxdg-0.24
new file mode 100644
index 000000000000..ad1fc71b813b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyxdg-0.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=|| ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
+DESCRIPTION=A Python module to deal with freedesktop.org specifications
+EAPI=4
+HOMEPAGE=http://freedesktop.org/wiki/Software/pyxdg http://cgit.freedesktop.org/xdg/pyxdg/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=|| ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=http://people.freedesktop.org/~takluyver/pyxdg-0.24.tar.gz
+_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
+_md5_=23103aa2d6682c8dc5d7dab4b1b77f56
diff --git a/metadata/md5-cache/media-sound/lilypond-2.16.1 b/metadata/md5-cache/media-sound/lilypond-2.16.1
new file mode 100644
index 000000000000..acca878e6597
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lilypond-2.16.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=GNU Music Typesetter
+EAPI=5
+HOMEPAGE=http://lilypond.org/
+IUSE=debug emacs profile vim-syntax
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-3 FDL-1.3
+RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) =dev-lang/python-2*
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.1.tar.gz
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f elisp-common cdb887d0e278ea6e82ea2a5d4792c52a eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4c68b2a0e37573a598ef23188a40b868
diff --git a/metadata/md5-cache/media-video/libav-0.8.2 b/metadata/md5-cache/media-video/libav-0.8.2
deleted file mode 100644
index 889df673e331..000000000000
--- a/metadata/md5-cache/media-video/libav-0.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!media-libs/libpostproc !media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) truetype? ( media-libs/freetype ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video.
-EAPI=4
-HOMEPAGE=http://libav.org/
-IUSE=+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon iwmmxt
-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
-LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-libs/libpostproc !media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) truetype? ( media-libs/freetype ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://libav.org/releases/libav-0.8.2.tar.xz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1a0c1d06593cbce0ca82e033a7d8ac99
diff --git a/metadata/md5-cache/media-video/libav-0.8.2-r2 b/metadata/md5-cache/media-video/libav-0.8.2-r2
deleted file mode 100644
index 368fbc53680d..000000000000
--- a/metadata/md5-cache/media-video/libav-0.8.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) truetype? ( media-libs/freetype:2 ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) test? ( net-misc/wget ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video.
-EAPI=4
-HOMEPAGE=http://libav.org/
-IUSE=+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext neon ssse3 vis
-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
-LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) truetype? ( media-libs/freetype:2 ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) test? ( encode )
-SLOT=0
-SRC_URI=http://libav.org/releases/libav-0.8.2.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8115e7ba916e7e3ee85d7774b4cbd017
diff --git a/metadata/md5-cache/media-video/mplayer2-2.0_p20121108 b/metadata/md5-cache/media-video/mplayer2-2.0_p20121108
new file mode 100644
index 000000000000..98e1c0ea0987
--- /dev/null
+++ b/metadata/md5-cache/media-video/mplayer2-2.0_p20121108
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) nut? ( >=media-libs/libnut-661 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc =media-libs/libquvi-0.4.1 ) rar? ( || ( app-arch/unrar app-arch/rar ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer ) virtual/pkgconfig >=dev-lang/python-2.7 dev-python/docutils sys-devel/gettext X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm )
+DESCRIPTION=Media Player for Linux
+EAPI=4
+HOMEPAGE=http://www.mplayer2.org/
+IUSE=+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga +theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid yuv4mpeg symlink 3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) nut? ( >=media-libs/libnut-661 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc =media-libs/libquvi-0.4.1 ) rar? ( || ( app-arch/unrar app-arch/rar ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer )
+REQUIRED_USE=bindist? ( !win32codecs ) cddb? ( cdio network ) dvdnav? ( dvd ) lcms? ( opengl ) libass? ( iconv ) opengl? ( || ( aqua X ) ) radio? ( || ( dvb v4l ) ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
+SLOT=0
+SRC_URI=http://rion-overlay.googlecode.com/files/mplayer2-2.0_p20121108.tar.xz
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=bd59ad878e695a9abbdc754891cedc2f
diff --git a/metadata/md5-cache/media-video/mplayer2-9999 b/metadata/md5-cache/media-video/mplayer2-9999
index b671734d005e..5d79b2b8f856 100644
--- a/metadata/md5-cache/media-video/mplayer2-9999
+++ b/metadata/md5-cache/media-video/mplayer2-9999
@@ -1,13 +1,12 @@
DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ggi? ( media-libs/libggi media-libs/libggiwmh ) opengl? ( virtual/opengl ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc =media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer ) virtual/pkgconfig >=dev-lang/python-2.7 sys-devel/gettext X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto dxr3? ( media-video/em8300-libraries ) xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) dev-vcs/git
+DEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) nut? ( >=media-libs/libnut-661 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc =media-libs/libquvi-0.4.1 ) rar? ( || ( app-arch/unrar app-arch/rar ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer ) virtual/pkgconfig >=dev-lang/python-2.7 dev-python/docutils sys-devel/gettext X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) dev-vcs/git
DESCRIPTION=Media Player for Linux
EAPI=4
HOMEPAGE=http://www.mplayer2.org/
-IUSE=+a52 aalib +alsa aqua bidi bindist bl bluray bs2b cddb +cdio cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm portaudio postproc pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid symlink 3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3 video_cards_s3virge video_cards_mga video_cards_tdfx
+IUSE=+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga +theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid yuv4mpeg symlink 3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3
LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ggi? ( media-libs/libggi media-libs/libggiwmh ) opengl? ( virtual/opengl ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc =media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer )
-REQUIRED_USE=bindist? ( !win32codecs ) cddb? ( cdio network ) dvdnav? ( dvd ) dxr3? ( X ) ggi? ( X ) libass? ( truetype ) opengl? ( || ( X aqua ) ) radio? ( || ( dvb v4l ) ) truetype? ( iconv ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
+RDEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) nut? ( >=media-libs/libnut-661 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc =media-libs/libquvi-0.4.1 ) rar? ( || ( app-arch/unrar app-arch/rar ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer )
+REQUIRED_USE=bindist? ( !win32codecs ) cddb? ( cdio network ) dvdnav? ( dvd ) lcms? ( opengl ) libass? ( iconv ) opengl? ( || ( aqua X ) ) radio? ( || ( dvb v4l ) ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
SLOT=0
-SRC_URI=!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 git-2 15733ab6a6feb34af9837b41623c2bad multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b19e6f650592f97a78cc3fee74d510dd
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 git-2 15733ab6a6feb34af9837b41623c2bad multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=abeab710c35ce0275f721667906ca038
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2 b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2
index a4023bf5371f..2d549edb16ee 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Nagios 1.4.16 plugins - Pack of plugins to make Nagios work properly
EAPI=4
HOMEPAGE=http://www.nagios.org/
IUSE=+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid jabber gnutls sudo smart
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ppc ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.6g ) gnutls? ( net-libs/gnutls ) ) radius? ( >=net-dialup/radiusclient-0.3.2 ) >=dev-lang/perl-5.6.1-r7 samba? ( >=net-fs/samba-2.2.5-r1 ) snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) nagios-ntp? ( >=net-misc/ntp-4.1.1a ) nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) ups? ( >=sys-power/nut-1.4 ) nagios-game? ( >=games-util/qstat-2.6 ) jabber? ( >=dev-perl/Net-Jabber-2.0 ) sudo? ( >=app-admin/sudo-1.8.5 ) smart? ( sys-apps/smartmontools )
REQUIRED_USE=smart? ( sudo )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/nagiosplug/nagios-plugins-1.4.16.tar.gz http://dev.gentoo.org/~flameeyes/nagios-plugins/nagios-plugins-1.4.16-patches-2.tar.xz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e247cb1f770cb93440d92cd4625cf8e6
+_md5_=1c6f2fa7747ce02b0c6938a978ed28fb
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2 b/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
index b7c1fa78031a..acc5c67776c1 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
@@ -3,10 +3,10 @@ DEPEND=net-analyzer/net-snmp || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/a
DESCRIPTION=Additional Nagios plugins for monitoring SNMP capable devices
EAPI=4
HOMEPAGE=http://nagios.manubulon.com
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=net-analyzer/net-snmp
SLOT=0
SRC_URI=http://nagios.manubulon.com/nagios-plugins-snmp-0.6.0.tgz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=adcb878efedf438a4a2ddc82347041c8
+_md5_=2fa9d1a7dd8219b113b08bd3d473092e
diff --git a/metadata/md5-cache/net-dns/dnssec-root-20110630 b/metadata/md5-cache/net-dns/dnssec-root-20110630
index b070f2f3a937..8660b2e28609 100644
--- a/metadata/md5-cache/net-dns/dnssec-root-20110630
+++ b/metadata/md5-cache/net-dns/dnssec-root-20110630
@@ -4,9 +4,9 @@ DESCRIPTION=The DNSSEC root key(s)
EAPI=4
HOMEPAGE=https://www.iana.org/dnssec/
IUSE=test
-KEYWORDS=amd64 ~hppa x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
LICENSE=public-domain
RESTRICT=mirror
SLOT=0
SRC_URI=http://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-20100715.xml http://data.iana.org/root-anchors/Kjqmt7v.csr -> Kjqmt7v-20100715.csr test? ( http://data.iana.org/root-anchors/Kjqmt7v.crt -> Kjqmt7v-20110630.crt http://data.iana.org/root-anchors/root-anchors.p7s -> root-anchors-20110630.p7s http://data.iana.org/root-anchors/root-anchors.asc -> root-anchors-20100715.asc http://data.iana.org/root-anchors/icannbundle.pem -> icannbundle-20100715.pem http://data.iana.org/root-anchors/icann.pgp -> icann-20110715.pgp )
-_md5_=ff0a0a70104b06dfbec319e387a06eba
+_md5_=7d1451f6a06e7e681b00a2c984f0661b
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.6.13 b/metadata/md5-cache/net-dns/ldns-utils-1.6.13
index d5fb07c1bfad..2db4d4e7a144 100644
--- a/metadata/md5-cache/net-dns/ldns-utils-1.6.13
+++ b/metadata/md5-cache/net-dns/ldns-utils-1.6.13
@@ -4,10 +4,10 @@ DESCRIPTION=Set of utilities to simplify various dns(sec) tasks.
EAPI=3
HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
IUSE=ecdsa examples gost ssl
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
LICENSE=BSD
RDEPEND=>=net-libs/ldns-1.6.13[ecdsa?,gost?,ssl?] examples? ( net-libs/libpcap )
SLOT=0
SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.13.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=88882c08c632693fa1f214016e4b24bd
+_md5_=4dbb6e14075b0a23d75b94cb697fcc4a
diff --git a/metadata/md5-cache/net-dns/unbound-1.4.18 b/metadata/md5-cache/net-dns/unbound-1.4.18
index 5f0ad6e86ceb..c60fcc52932c 100644
--- a/metadata/md5-cache/net-dns/unbound-1.4.18
+++ b/metadata/md5-cache/net-dns/unbound-1.4.18
@@ -4,10 +4,10 @@ DESCRIPTION=A validating, recursive and caching DNS resolver
EAPI=4
HOMEPAGE=http://unbound.net/
IUSE=debug gost python selinux static-libs test threads
-KEYWORDS=~amd64 ~hppa ~x86 ~x64-macos
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x64-macos
LICENSE=BSD GPL-2
RDEPEND=dev-libs/expat dev-libs/libevent >=dev-libs/openssl-0.9.8 >=net-libs/ldns-1.6.13[ecdsa,ssl,gost?] selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root python? ( =dev-lang/python-2* )
SLOT=0
SRC_URI=http://unbound.net/downloads/unbound-1.4.18.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c9bd91fdd0cac24db1afc4102a407906
+_md5_=d0a6ca5873a5209e5f88fb6beddb52ec
diff --git a/metadata/md5-cache/net-libs/ldns-1.6.13-r1 b/metadata/md5-cache/net-libs/ldns-1.6.13-r1
index d58ee061eadf..8aa5b46f22dc 100644
--- a/metadata/md5-cache/net-libs/ldns-1.6.13-r1
+++ b/metadata/md5-cache/net-libs/ldns-1.6.13-r1
@@ -4,7 +4,7 @@ DESCRIPTION=ldns is a library with the aim to simplify DNS programing in C
EAPI=4
HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
IUSE=doc gost +ecdsa python +ssl static-libs vim-syntax
-KEYWORDS=~amd64 ~hppa ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos
LICENSE=BSD
RDEPEND=ssl? ( >=dev-libs/openssl-0.9.7 ) ecdsa? ( >=dev-libs/openssl-0.9.8 ) gost? ( >=dev-libs/openssl-1 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
REQUIRED_USE=ecdsa? ( ssl )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.13.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=792b4165cf0b4d803dc68d63536f5d78
+_md5_=21c30270cd913751c846eb9b5f899837
diff --git a/metadata/md5-cache/net-misc/ser2net-2.7 b/metadata/md5-cache/net-misc/ser2net-2.7
deleted file mode 100644
index 0ba7d6ed0105..000000000000
--- a/metadata/md5-cache/net-misc/ser2net-2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Serial To Network Proxy
-EAPI=2
-HOMEPAGE=http://sourceforge.net/projects/ser2net
-IUSE=tcpd
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=mirror://sourceforge/ser2net/ser2net-2.7.tar.gz
-_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6e79ae06f488d6a44672b08be6b36548
diff --git a/metadata/md5-cache/net-nds/phpldapadmin-1.2.3 b/metadata/md5-cache/net-nds/phpldapadmin-1.2.3
new file mode 100644
index 000000000000..f0f3aa3aa65d
--- /dev/null
+++ b/metadata/md5-cache/net-nds/phpldapadmin-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+DESCRIPTION=phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server.
+EAPI=2
+HOMEPAGE=http://phpldapadmin.sourceforge.net
+IUSE=vhosts
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[hash,ldap,session,xml,nls] || ( =dev-lang/php-5.3 ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+SLOT=1.2.3
+SRC_URI=mirror://sourceforge/phpldapadmin/phpldapadmin-1.2.3.tgz
+_eclasses_=depend.php df169a364e191b840b695604097e3c21 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 phpconfutils e108303831029e5b8a9d24b991b1d62a toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 webapp 25b9b1696f5e698711f47d45c3d45e3e
+_md5_=8b326a03b10db7b9d675d1eaf6a0ae2b
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p121112 b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p121112
new file mode 100644
index 000000000000..a95f2ac91b03
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p121112
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=dev-lang/tk[threads] dev-python/numpy dev-tcltk/tix =sci-libs/ccpn-data-2.2.2* sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+DESCRIPTION=The Collaborative Computing Project for NMR
+EAPI=4
+HOMEPAGE=http://www.ccpn.ac.uk/ccpn
+IUSE=extendnmr +opengl
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( CCPN LGPL-2.1 )
+PDEPEND=extendnmr? ( >=sci-chemistry/aria-2.3.2-r1 sci-chemistry/prodecomp )
+RDEPEND=dev-lang/tk[threads] dev-python/numpy dev-tcltk/tix =sci-libs/ccpn-data-2.2.2* sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-121112.patch.xz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 portability 536c5e70c5fb252ed3b769e04aa3f05b python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=6a98a9dd1543d7549073e16af8a2c164
diff --git a/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112 b/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112
new file mode 100644
index 000000000000..6f9607e2ce4e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND==dev-lang/python-2*
+DESCRIPTION=The Collaborative Computing Project for NMR - Data
+EAPI=4
+HOMEPAGE=http://www.ccpn.ac.uk/ccpn
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( CCPN LGPL-2.1 )
+RDEPEND=!=sci-libs/amd-1.3 virtual/blas metis? ( >=sci-libs/cholmod-2[metis] ) virtual/pkgconfig doc? ( virtual/latex-base )
+DEPEND=>=sci-libs/amd-1.3 sci-libs/cholmod[metis] virtual/blas metis? ( >=sci-libs/cholmod-2[metis] ) virtual/pkgconfig doc? ( virtual/latex-base )
DESCRIPTION=Unsymmetric multifrontal sparse LU factorization library
EAPI=4
HOMEPAGE=http://www.cise.ufl.edu/research/sparse/umfpack
IUSE=doc metis static-libs
KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos
LICENSE=GPL-2
-RDEPEND=>=sci-libs/amd-1.3 virtual/blas metis? ( >=sci-libs/cholmod-2[metis] )
+RDEPEND=>=sci-libs/amd-1.3 sci-libs/cholmod[metis] virtual/blas metis? ( >=sci-libs/cholmod-2[metis] )
SLOT=0
SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/umfpack-5.6.1.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f autotools-utils b65ac5ba56a20f3d7a01c67b7b3c9b01 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8a2d7712be5ab276797ca579ac69cd7f
+_md5_=5f5fb3024233ebac111c163d87479ccc
diff --git a/metadata/md5-cache/sys-apps/openrc-0.11.4 b/metadata/md5-cache/sys-apps/openrc-0.11.4
deleted file mode 100644
index ee49f4d5ed87..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.11.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.22 sys-apps/dbus >=sys-auth/polkit-0.104-r1 introspection? ( dev-libs/gobject-introspection ) kernel_linux? ( || ( >=sys-fs/udev-171-r6[gudev] =app-pda/libimobiledevice-1 >=app-pda/libplist-1 ) ) systemd? ( sys-apps/systemd ) kernel_linux? ( >=sys-power/pm-utils-1.4.1 ) systemd? ( app-shells/bash )
SLOT=0
SRC_URI=http://upower.freedesktop.org/releases/upower-0.9.18.tar.xz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 systemd fc2fa698095b76894d4516729da4337b toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 udev f7490675e06a5e4db55adf394f078b7b user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=875afac88c3f6eff031df4e65001323d
+_md5_=2b99a04f30e237338e8bcf033e846fa5
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.9 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.13
similarity index 97%
rename from metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.9
rename to metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.13
index 84c2f151f3c6..5547f2ec6832 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.9
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.13
@@ -9,6 +9,6 @@ LICENSE=MIT
RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( sys-fs/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
REQUIRED_USE=|| ( glamor sna uxa )
SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.20.9.tar.bz2
+SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.20.13.tar.bz2
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f autotools-utils b65ac5ba56a20f3d7a01c67b7b3c9b01 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 libtool 2b273eea1976cfaed3449345d94331ac linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 xorg-2 ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=4f10c3954ecc9567ef035f898666a82a
+_md5_=cc8ba9e606f4090e3ea8a090028bb3fd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.8 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.8
deleted file mode 100644
index be0f284c9f14..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( sys-fs/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) >=x11-proto/dri2proto-2.6 x11-proto/resourceproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for Intel cards
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=glamor +sna +udev uxa xvmc dri
-KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-fbsd -x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXext x11-libs/libXfixes >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.29[video_cards_intel] glamor? ( x11-libs/glamor ) sna? ( >=x11-base/xorg-server-1.10 ) udev? ( sys-fs/udev ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-REQUIRED_USE=|| ( glamor sna uxa )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.20.8.tar.bz2
-_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f autotools-utils b65ac5ba56a20f3d7a01c67b7b3c9b01 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 libtool 2b273eea1976cfaed3449345d94331ac linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 xorg-2 ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=b5308b89c356fc07553bb0575151179c
diff --git a/metadata/md5-cache/x11-libs/libqxt-0.6.2 b/metadata/md5-cache/x11-libs/libqxt-0.6.2
index 1740eb95188b..8f2a475daca6 100644
--- a/metadata/md5-cache/x11-libs/libqxt-0.6.2
+++ b/metadata/md5-cache/x11-libs/libqxt-0.6.2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libXrandr x11-libs/qt-core:4 x11-libs/qt-gui:4 berkdb? ( >=sys-libs/db-4.6 ) sql? ( x11-libs/qt-sql:4 ) ssl? ( >=dev-libs/openssl-0.9.8 x11-libs/qt-core:4[ssl] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( x11-libs/qt-assistant:4 )
+DEPEND=x11-libs/libXrandr x11-libs/qt-core:4[ssl] x11-libs/qt-gui:4 berkdb? ( >=sys-libs/db-4.6 ) sql? ( x11-libs/qt-sql:4 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( x11-libs/qt-assistant:4 )
DESCRIPTION=The Qt eXTension library provides cross-platform utility classes for the Qt toolkit
EAPI=4
HOMEPAGE=http://libqxt.org/
-IUSE=berkdb debug doc sql ssl web xscreensaver zeroconf
+IUSE=berkdb debug doc sql web xscreensaver zeroconf
KEYWORDS=amd64 x86
LICENSE=|| ( CPL-1.0 LGPL-2.1 )
-RDEPEND=x11-libs/libXrandr x11-libs/qt-core:4 x11-libs/qt-gui:4 berkdb? ( >=sys-libs/db-4.6 ) sql? ( x11-libs/qt-sql:4 ) ssl? ( >=dev-libs/openssl-0.9.8 x11-libs/qt-core:4[ssl] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) xscreensaver? ( x11-libs/libXScrnSaver )
+RDEPEND=x11-libs/libXrandr x11-libs/qt-core:4[ssl] x11-libs/qt-gui:4 berkdb? ( >=sys-libs/db-4.6 ) sql? ( x11-libs/qt-sql:4 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) xscreensaver? ( x11-libs/libXScrnSaver )
SLOT=0
SRC_URI=http://dev.libqxt.org/libqxt/get/v0.6.2.tar.bz2 -> libqxt-0.6.2.tar.bz2
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-r2 19af9102ca9b827213997cc636e7e33c toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=33d8ba9fa43493221653bd018c2cc33c
+_md5_=034d9be106714fadf98f66066b6a6ea4
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.7.4 b/metadata/md5-cache/x11-libs/qt-assistant-4.7.4
index 8cedf678669b..31d8c1384c18 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=~x11-libs/qt-gui-4.7.4[aqua=,debug=,glib=,qt3support=,trace?] ~x11-libs/qt-sql-4.7.4[aqua=,debug=,qt3support=,sqlite] ~x11-libs/qt-webkit-4.7.4[aqua=,debug=] ~x11-libs/qt-declarative-4.7.4[debug=,qt3support=] !x11-libs/qt-assistant-4.7.4-r9999:4 !x11-libs/qt-bearer-4.7.4-r9999:4 !x11-libs/qt-core-4.7.4-r9999:4 !x11-libs/qt-dbus-4.7.4-r9999:4 !x11-libs/qt-declarative-4.7.4-r9999:4 !x11-libs/qt-demo-4.7.4-r9999:4 !x11-libs/qt-gui-4.7.4-r9999:4 !x11-libs/qt-multimedia-4.7.4-r9999:4 !x11-libs/qt-opengl-4.7.4-r9999:4 !x11-libs/qt-openvg-4.7.4-r9999:4 !x11-libs/qt-phonon-4.7.4-r9999:4 !x11-libs/qt-qt3support-4.7.4-r9999:4 !x11-libs/qt-script-4.7.4-r9999:4 !x11-libs/qt-sql-4.7.4-r9999:4 !x11-libs/qt-svg-4.7.4-r9999:4 !x11-libs/qt-test-4.7.4-r9999:4 !x11-libs/qt-webkit-4.7.4-r9999:4 !x11-libs/qt-xmlpatterns-4.7.4-r9999:4
SLOT=4
SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=973dd9b306fdaa69bd7f7cb5d46463fb
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1 b/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1
index bd655d668bfd..82a402cc4ed1 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.1[aqua=,debug=,qpa=] ) !x11-libs/qt-assistant-4.8.1-r9999:4 !x11-libs/qt-bearer-4.8.1-r9999:4 !x11-libs/qt-core-4.8.1-r9999:4 !x11-libs/qt-dbus-4.8.1-r9999:4 !x11-libs/qt-declarative-4.8.1-r9999:4 !x11-libs/qt-demo-4.8.1-r9999:4 !x11-libs/qt-gui-4.8.1-r9999:4 !x11-libs/qt-multimedia-4.8.1-r9999:4 !x11-libs/qt-opengl-4.8.1-r9999:4 !x11-libs/qt-openvg-4.8.1-r9999:4 !x11-libs/qt-phonon-4.8.1-r9999:4 !x11-libs/qt-qt3support-4.8.1-r9999:4 !x11-libs/qt-script-4.8.1-r9999:4 !x11-libs/qt-sql-4.8.1-r9999:4 !x11-libs/qt-svg-4.8.1-r9999:4 !x11-libs/qt-test-4.8.1-r9999:4 !x11-libs/qt-webkit-4.8.1-r9999:4 !x11-libs/qt-xmlpatterns-4.8.1-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=63e744abf3a29653d98e6159008b7772
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.8.2-r1 b/metadata/md5-cache/x11-libs/qt-assistant-4.8.2-r1
index 42d8c0faea38..7ff633ff218d 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.8.2-r1
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.2[aqua=,debug=,qpa=] ) !x11-libs/qt-assistant-4.8.2-r9999:4 !x11-libs/qt-bearer-4.8.2-r9999:4 !x11-libs/qt-core-4.8.2-r9999:4 !x11-libs/qt-dbus-4.8.2-r9999:4 !x11-libs/qt-declarative-4.8.2-r9999:4 !x11-libs/qt-demo-4.8.2-r9999:4 !x11-libs/qt-gui-4.8.2-r9999:4 !x11-libs/qt-multimedia-4.8.2-r9999:4 !x11-libs/qt-opengl-4.8.2-r9999:4 !x11-libs/qt-openvg-4.8.2-r9999:4 !x11-libs/qt-phonon-4.8.2-r9999:4 !x11-libs/qt-qt3support-4.8.2-r9999:4 !x11-libs/qt-script-4.8.2-r9999:4 !x11-libs/qt-sql-4.8.2-r9999:4 !x11-libs/qt-svg-4.8.2-r9999:4 !x11-libs/qt-test-4.8.2-r9999:4 !x11-libs/qt-webkit-4.8.2-r9999:4 !x11-libs/qt-xmlpatterns-4.8.2-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=d97eb9a86fa92eb8c16c40446ba19b7b
diff --git a/metadata/md5-cache/x11-libs/qt-assistant-4.8.3 b/metadata/md5-cache/x11-libs/qt-assistant-4.8.3
index d9b2499e0d89..0d9bd9a97d76 100644
--- a/metadata/md5-cache/x11-libs/qt-assistant-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-assistant-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=~x11-libs/qt-gui-4.8.3[aqua=,debug=,glib=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.3[aqua=,debug=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.3[aqua=,debug=] ) !x11-libs/qt-assistant-4.8.3-r9999:4 !x11-libs/qt-bearer-4.8.3-r9999:4 !x11-libs/qt-core-4.8.3-r9999:4 !x11-libs/qt-dbus-4.8.3-r9999:4 !x11-libs/qt-declarative-4.8.3-r9999:4 !x11-libs/qt-demo-4.8.3-r9999:4 !x11-libs/qt-gui-4.8.3-r9999:4 !x11-libs/qt-multimedia-4.8.3-r9999:4 !x11-libs/qt-opengl-4.8.3-r9999:4 !x11-libs/qt-openvg-4.8.3-r9999:4 !x11-libs/qt-phonon-4.8.3-r9999:4 !x11-libs/qt-qt3support-4.8.3-r9999:4 !x11-libs/qt-script-4.8.3-r9999:4 !x11-libs/qt-sql-4.8.3-r9999:4 !x11-libs/qt-svg-4.8.3-r9999:4 !x11-libs/qt-test-4.8.3-r9999:4 !x11-libs/qt-webkit-4.8.3-r9999:4 !x11-libs/qt-xmlpatterns-4.8.3-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=7dc4a6684781eac150533b9c7cc58510
diff --git a/metadata/md5-cache/x11-libs/qt-bearer-4.8.1 b/metadata/md5-cache/x11-libs/qt-bearer-4.8.1
index d77f0f21b558..6c33a94c7289 100644
--- a/metadata/md5-cache/x11-libs/qt-bearer-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-bearer-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] connman? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !x11-libs/qt-assistant-4.8.1-r9999:4 !x11-libs/qt-bearer-4.8.1-r9999:4 !x11-libs/qt-core-4.8.1-r9999:4 !x11-libs/qt-dbus-4.8.1-r9999:4 !x11-libs/qt-declarative-4.8.1-r9999:4 !x11-libs/qt-demo-4.8.1-r9999:4 !x11-libs/qt-gui-4.8.1-r9999:4 !x11-libs/qt-multimedia-4.8.1-r9999:4 !x11-libs/qt-opengl-4.8.1-r9999:4 !x11-libs/qt-openvg-4.8.1-r9999:4 !x11-libs/qt-phonon-4.8.1-r9999:4 !x11-libs/qt-qt3support-4.8.1-r9999:4 !x11-libs/qt-script-4.8.1-r9999:4 !x11-libs/qt-sql-4.8.1-r9999:4 !x11-libs/qt-svg-4.8.1-r9999:4 !x11-libs/qt-test-4.8.1-r9999:4 !x11-libs/qt-webkit-4.8.1-r9999:4 !x11-libs/qt-xmlpatterns-4.8.1-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=13793892ad9ae82474fefdf7b23cfa6c
diff --git a/metadata/md5-cache/x11-libs/qt-bearer-4.8.2 b/metadata/md5-cache/x11-libs/qt-bearer-4.8.2
index 7f8ed28ecda5..c8e76fc0e992 100644
--- a/metadata/md5-cache/x11-libs/qt-bearer-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-bearer-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] connman? ( ~x11-libs/qt-dbus-4.8.2[aqua=,c++0x=,debug=,qpa=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.2[aqua=,c++0x=,debug=,qpa=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !x11-libs/qt-assistant-4.8.2-r9999:4 !x11-libs/qt-bearer-4.8.2-r9999:4 !x11-libs/qt-core-4.8.2-r9999:4 !x11-libs/qt-dbus-4.8.2-r9999:4 !x11-libs/qt-declarative-4.8.2-r9999:4 !x11-libs/qt-demo-4.8.2-r9999:4 !x11-libs/qt-gui-4.8.2-r9999:4 !x11-libs/qt-multimedia-4.8.2-r9999:4 !x11-libs/qt-opengl-4.8.2-r9999:4 !x11-libs/qt-openvg-4.8.2-r9999:4 !x11-libs/qt-phonon-4.8.2-r9999:4 !x11-libs/qt-qt3support-4.8.2-r9999:4 !x11-libs/qt-script-4.8.2-r9999:4 !x11-libs/qt-sql-4.8.2-r9999:4 !x11-libs/qt-svg-4.8.2-r9999:4 !x11-libs/qt-test-4.8.2-r9999:4 !x11-libs/qt-webkit-4.8.2-r9999:4 !x11-libs/qt-xmlpatterns-4.8.2-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=7f8332e633c60603f2082691ea951514
diff --git a/metadata/md5-cache/x11-libs/qt-bearer-4.8.3 b/metadata/md5-cache/x11-libs/qt-bearer-4.8.3
index 3098aa3fd780..47a38436f5ec 100644
--- a/metadata/md5-cache/x11-libs/qt-bearer-4.8.3
+++ b/metadata/md5-cache/x11-libs/qt-bearer-4.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=~x11-libs/qt-core-4.8.3[aqua=,debug=] connman? ( ~x11-libs/qt-dbus-4.8.3[aqua=,debug=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.3[aqua=,debug=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !x11-libs/qt-assistant-4.8.3-r9999:4 !x11-libs/qt-bearer-4.8.3-r9999:4 !x11-libs/qt-core-4.8.3-r9999:4 !x11-libs/qt-dbus-4.8.3-r9999:4 !x11-libs/qt-declarative-4.8.3-r9999:4 !x11-libs/qt-demo-4.8.3-r9999:4 !x11-libs/qt-gui-4.8.3-r9999:4 !x11-libs/qt-multimedia-4.8.3-r9999:4 !x11-libs/qt-opengl-4.8.3-r9999:4 !x11-libs/qt-openvg-4.8.3-r9999:4 !x11-libs/qt-phonon-4.8.3-r9999:4 !x11-libs/qt-qt3support-4.8.3-r9999:4 !x11-libs/qt-script-4.8.3-r9999:4 !x11-libs/qt-sql-4.8.3-r9999:4 !x11-libs/qt-svg-4.8.3-r9999:4 !x11-libs/qt-test-4.8.3-r9999:4 !x11-libs/qt-webkit-4.8.3-r9999:4 !x11-libs/qt-xmlpatterns-4.8.3-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=c2e454b27049a459f2cdc3271c9eb3e1
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1 b/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1
index 2ace6e06034b..43decece7573 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1
+++ b/metadata/md5-cache/x11-libs/qt-core-4.7.4-r1
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.7.4[aqua=,glib=,qt3support] )
RDEPEND=sys-libs/zlib glib? ( dev-libs/glib ) ssl? ( dev-libs/openssl ) !x11-libs/qt-assistant-4.7.4-r9999:4 !x11-libs/qt-bearer-4.7.4-r9999:4 !x11-libs/qt-core-4.7.4-r9999:4 !x11-libs/qt-dbus-4.7.4-r9999:4 !x11-libs/qt-declarative-4.7.4-r9999:4 !x11-libs/qt-demo-4.7.4-r9999:4 !x11-libs/qt-gui-4.7.4-r9999:4 !x11-libs/qt-multimedia-4.7.4-r9999:4 !x11-libs/qt-opengl-4.7.4-r9999:4 !x11-libs/qt-openvg-4.7.4-r9999:4 !x11-libs/qt-phonon-4.7.4-r9999:4 !x11-libs/qt-qt3support-4.7.4-r9999:4 !x11-libs/qt-script-4.7.4-r9999:4 !x11-libs/qt-sql-4.7.4-r9999:4 !x11-libs/qt-svg-4.7.4-r9999:4 !x11-libs/qt-test-4.7.4-r9999:4 !x11-libs/qt-webkit-4.7.4-r9999:4 !x11-libs/qt-xmlpatterns-4.7.4-r9999:4
SLOT=4
SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=e1d915a994c04fa29c0b8615e2e1288e
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3 b/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3
index d99afffbd731..6b37449b16b0 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3
+++ b/metadata/md5-cache/x11-libs/qt-core-4.8.1-r3
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,glib=,qpa=,qt3s
RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49 ) ssl? ( dev-libs/openssl ) !x11-libs/qt-assistant-4.8.1-r9999:4 !x11-libs/qt-bearer-4.8.1-r9999:4 !x11-libs/qt-core-4.8.1-r9999:4 !x11-libs/qt-dbus-4.8.1-r9999:4 !x11-libs/qt-declarative-4.8.1-r9999:4 !x11-libs/qt-demo-4.8.1-r9999:4 !x11-libs/qt-gui-4.8.1-r9999:4 !x11-libs/qt-multimedia-4.8.1-r9999:4 !x11-libs/qt-opengl-4.8.1-r9999:4 !x11-libs/qt-openvg-4.8.1-r9999:4 !x11-libs/qt-phonon-4.8.1-r9999:4 !x11-libs/qt-qt3support-4.8.1-r9999:4 !x11-libs/qt-script-4.8.1-r9999:4 !x11-libs/qt-sql-4.8.1-r9999:4 !x11-libs/qt-svg-4.8.1-r9999:4 !x11-libs/qt-test-4.8.1-r9999:4 !x11-libs/qt-webkit-4.8.1-r9999:4 !x11-libs/qt-xmlpatterns-4.8.1-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=b4b9147b02b58c8b9cb6d89b0d091808
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.8.2 b/metadata/md5-cache/x11-libs/qt-core-4.8.2
index 8262d93865dd..269e50bff7d5 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-core-4.8.2
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,glib=,qpa=,qt3s
RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49 ) ssl? ( dev-libs/openssl ) !x11-libs/qt-assistant-4.8.2-r9999:4 !x11-libs/qt-bearer-4.8.2-r9999:4 !x11-libs/qt-core-4.8.2-r9999:4 !x11-libs/qt-dbus-4.8.2-r9999:4 !x11-libs/qt-declarative-4.8.2-r9999:4 !x11-libs/qt-demo-4.8.2-r9999:4 !x11-libs/qt-gui-4.8.2-r9999:4 !x11-libs/qt-multimedia-4.8.2-r9999:4 !x11-libs/qt-opengl-4.8.2-r9999:4 !x11-libs/qt-openvg-4.8.2-r9999:4 !x11-libs/qt-phonon-4.8.2-r9999:4 !x11-libs/qt-qt3support-4.8.2-r9999:4 !x11-libs/qt-script-4.8.2-r9999:4 !x11-libs/qt-sql-4.8.2-r9999:4 !x11-libs/qt-svg-4.8.2-r9999:4 !x11-libs/qt-test-4.8.2-r9999:4 !x11-libs/qt-webkit-4.8.2-r9999:4 !x11-libs/qt-xmlpatterns-4.8.2-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=166900f1420a7b6faadefefa55d45794
diff --git a/metadata/md5-cache/x11-libs/qt-core-4.8.3-r1 b/metadata/md5-cache/x11-libs/qt-core-4.8.3-r1
index 6cf1f4a789d6..84dc7c86784c 100644
--- a/metadata/md5-cache/x11-libs/qt-core-4.8.3-r1
+++ b/metadata/md5-cache/x11-libs/qt-core-4.8.3-r1
@@ -10,5 +10,5 @@ PDEPEND=qt3support? ( ~x11-libs/qt-gui-4.8.3[aqua=,debug=,glib=,qt3support] )
RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49 ) ssl? ( dev-libs/openssl ) !x11-libs/qt-assistant-4.8.3-r9999:4 !x11-libs/qt-bearer-4.8.3-r9999:4 !x11-libs/qt-core-4.8.3-r9999:4 !x11-libs/qt-dbus-4.8.3-r9999:4 !x11-libs/qt-declarative-4.8.3-r9999:4 !x11-libs/qt-demo-4.8.3-r9999:4 !x11-libs/qt-gui-4.8.3-r9999:4 !x11-libs/qt-multimedia-4.8.3-r9999:4 !x11-libs/qt-opengl-4.8.3-r9999:4 !x11-libs/qt-openvg-4.8.3-r9999:4 !x11-libs/qt-phonon-4.8.3-r9999:4 !x11-libs/qt-qt3support-4.8.3-r9999:4 !x11-libs/qt-script-4.8.3-r9999:4 !x11-libs/qt-sql-4.8.3-r9999:4 !x11-libs/qt-svg-4.8.3-r9999:4 !x11-libs/qt-test-4.8.3-r9999:4 !x11-libs/qt-webkit-4.8.3-r9999:4 !x11-libs/qt-xmlpatterns-4.8.3-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=9180d5a4d067a7485715555695b7154d
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.7.4 b/metadata/md5-cache/x11-libs/qt-dbus-4.7.4
index 6cdd7afd2760..ab8919d3684f 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.7.4
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.7.4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=~x11-libs/qt-core-4.7.4[aqua=,debug=] >=sys-apps/dbus-1.0.2 !x11-libs/qt-assistant-4.7.4-r9999:4 !x11-libs/qt-bearer-4.7.4-r9999:4 !x11-libs/qt-core-4.7.4-r9999:4 !x11-libs/qt-dbus-4.7.4-r9999:4 !x11-libs/qt-declarative-4.7.4-r9999:4 !x11-libs/qt-demo-4.7.4-r9999:4 !x11-libs/qt-gui-4.7.4-r9999:4 !x11-libs/qt-multimedia-4.7.4-r9999:4 !x11-libs/qt-opengl-4.7.4-r9999:4 !x11-libs/qt-openvg-4.7.4-r9999:4 !x11-libs/qt-phonon-4.7.4-r9999:4 !x11-libs/qt-qt3support-4.7.4-r9999:4 !x11-libs/qt-script-4.7.4-r9999:4 !x11-libs/qt-sql-4.7.4-r9999:4 !x11-libs/qt-svg-4.7.4-r9999:4 !x11-libs/qt-test-4.7.4-r9999:4 !x11-libs/qt-webkit-4.7.4-r9999:4 !x11-libs/qt-xmlpatterns-4.7.4-r9999:4
SLOT=4
SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=0c232fb72bcc982245b612922f0baa9a
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.8.1 b/metadata/md5-cache/x11-libs/qt-dbus-4.8.1
index 16bf915f04fa..688c3d70330e 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.8.1
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=>=sys-apps/dbus-1.2 ~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] !x11-libs/qt-assistant-4.8.1-r9999:4 !x11-libs/qt-bearer-4.8.1-r9999:4 !x11-libs/qt-core-4.8.1-r9999:4 !x11-libs/qt-dbus-4.8.1-r9999:4 !x11-libs/qt-declarative-4.8.1-r9999:4 !x11-libs/qt-demo-4.8.1-r9999:4 !x11-libs/qt-gui-4.8.1-r9999:4 !x11-libs/qt-multimedia-4.8.1-r9999:4 !x11-libs/qt-opengl-4.8.1-r9999:4 !x11-libs/qt-openvg-4.8.1-r9999:4 !x11-libs/qt-phonon-4.8.1-r9999:4 !x11-libs/qt-qt3support-4.8.1-r9999:4 !x11-libs/qt-script-4.8.1-r9999:4 !x11-libs/qt-sql-4.8.1-r9999:4 !x11-libs/qt-svg-4.8.1-r9999:4 !x11-libs/qt-test-4.8.1-r9999:4 !x11-libs/qt-webkit-4.8.1-r9999:4 !x11-libs/qt-xmlpatterns-4.8.1-r9999:4
SLOT=4
SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build 1335abd31076b0f6f2de01fa3b9ba610 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 420c4859890a664d00a25bab483dcc07 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-build a99fc3fe09eb9d8b699de07d06765ec3 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=da33e17291bf3d63185f34f9383c1bd6
diff --git a/metadata/md5-cache/x11-libs/qt-dbus-4.8.2 b/metadata/md5-cache/x11-libs/qt-dbus-4.8.2
index b7424900550e..4069564ff0f0 100644
--- a/metadata/md5-cache/x11-libs/qt-dbus-4.8.2
+++ b/metadata/md5-cache/x11-libs/qt-dbus-4.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=>=sys-apps/dbus-1.2 ~x11-libs/qt-core-4.8.2[aqua=,c++0x=,debug=,qpa=] !x11-libs/qt-assistant-4.8.2-r9999:4 !x11-libs/qt-bearer-4.8.2-r9999:4 !x11-libs/qt-core-4.8.2-r9999:4 !x11-libs/qt-dbus-4.8.2-r9999:4 !x11-libs/qt-declarative-4.8.2-r9999:4 !x11-libs/qt-demo-4.8.2-r9999:4 !x11-libs/qt-gui-4.8.2-r9999:4 !