diff --git a/app-accessibility/SphinxTrain/metadata.xml b/app-accessibility/SphinxTrain/metadata.xml
index 18c05c3db3c1..acc417de6d38 100644
--- a/app-accessibility/SphinxTrain/metadata.xml
+++ b/app-accessibility/SphinxTrain/metadata.xml
@@ -1,12 +1,15 @@
-accessibility
-sound
-
+ accessibility
+ sound
+
SphinxTrain is CMU Sphinx's training package.
-
+
SphinxTrainはCMU Sphinxの調教パッケージです。
+
+ cmusphinx
+
diff --git a/app-accessibility/eflite/metadata.xml b/app-accessibility/eflite/metadata.xml
index d24f65ecb21b..c4c56fa229f6 100644
--- a/app-accessibility/eflite/metadata.xml
+++ b/app-accessibility/eflite/metadata.xml
@@ -1,24 +1,27 @@
-accessibility
-sound
-
-williamh@gentoo.org
-
-
-
+ accessibility
+ sound
+
+ williamh@gentoo.org
+
+
+
EFlite is a speech server for Emacspeak and other screen readers
that allows them to interface with Festival Lite, a free
text-to-speech engine developed at the CMU Speech Center as an
off-shoot of Festival.
-
- EFliteã¯Emacspeakã¨ä»ã®ã¹ã¯ãªã¼ã³èªåãè£
ç½®ã®ã¹ãã¼ããµã¼ãããã®
- ãµã¼ãã¼ã§åã®ããã°ã©ã ã¯Festival Lite(CMU Speech Centerã§éçºãã
- Festivalã®ããã«ã¹ãã¼ãã«ããã¹ããå¤ããã¨ã³ã¸ã³ã)ã¨
- ã¤ã³ã¿ãã§ã¹ãããã¨ãåºæ¥ãã
+
+ EFliteはEmacspeakと他のスクリーン読取り装置のスピーチサーバ。この
+ サーバーで前のプログラムはFestival Lite(CMU Speech Centerで開発した
+ Festivalのようにスピーチにテキストを変わるエンジン。)と
+ インタフェスすることが出来る。
+
+ eflite
+
diff --git a/app-accessibility/epos/metadata.xml b/app-accessibility/epos/metadata.xml
index cdac64016dfe..e85edf9eb1de 100644
--- a/app-accessibility/epos/metadata.xml
+++ b/app-accessibility/epos/metadata.xml
@@ -1,6 +1,8 @@
-
-accessibility
+ accessibility
+
+ epos
+
diff --git a/app-accessibility/espeak/metadata.xml b/app-accessibility/espeak/metadata.xml
index 6a31c202cb6d..c07bb6b946aa 100644
--- a/app-accessibility/espeak/metadata.xml
+++ b/app-accessibility/espeak/metadata.xml
@@ -1,8 +1,11 @@
-accessibility
-
- williamh@gentoo.org
-
+ accessibility
+
+ williamh@gentoo.org
+
+
+ espeak
+
diff --git a/app-accessibility/festival-it/metadata.xml b/app-accessibility/festival-it/metadata.xml
index aaded464e92b..9776e2a6b646 100644
--- a/app-accessibility/festival-it/metadata.xml
+++ b/app-accessibility/festival-it/metadata.xml
@@ -7,6 +7,9 @@
neurogeek@gentoo.org
+
+ it-festival
+
diff --git a/app-accessibility/freetts/metadata.xml b/app-accessibility/freetts/metadata.xml
index 699b7bb48f06..654f205d7a0c 100644
--- a/app-accessibility/freetts/metadata.xml
+++ b/app-accessibility/freetts/metadata.xml
@@ -4,7 +4,10 @@
accessibility
java
+
+ freetts
+
diff --git a/app-accessibility/julius/metadata.xml b/app-accessibility/julius/metadata.xml
index a826ee74d34b..cbed4e8e981f 100644
--- a/app-accessibility/julius/metadata.xml
+++ b/app-accessibility/julius/metadata.xml
@@ -2,5 +2,7 @@
accessibility
+
+ julius
+
-
diff --git a/app-accessibility/perlbox-voice/metadata.xml b/app-accessibility/perlbox-voice/metadata.xml
index 91f4e72fb544..32f1581eed5b 100644
--- a/app-accessibility/perlbox-voice/metadata.xml
+++ b/app-accessibility/perlbox-voice/metadata.xml
@@ -4,4 +4,7 @@
maintainer-needed@gentoo.org
+
+ perlbox
+
diff --git a/app-accessibility/pidgin-festival/metadata.xml b/app-accessibility/pidgin-festival/metadata.xml
index b2a7ca429c25..84a3de50495e 100644
--- a/app-accessibility/pidgin-festival/metadata.xml
+++ b/app-accessibility/pidgin-festival/metadata.xml
@@ -1,6 +1,9 @@
-net-im
-accessibility
+ net-im
+ accessibility
+
+ pidgin-festival
+
diff --git a/app-accessibility/pocketsphinx/metadata.xml b/app-accessibility/pocketsphinx/metadata.xml
index a826ee74d34b..831e814f0766 100644
--- a/app-accessibility/pocketsphinx/metadata.xml
+++ b/app-accessibility/pocketsphinx/metadata.xml
@@ -2,5 +2,7 @@
accessibility
+
+ cmusphinx
+
-
diff --git a/app-accessibility/sphinx2/metadata.xml b/app-accessibility/sphinx2/metadata.xml
index 523097ffe305..a5e5fcc49020 100644
--- a/app-accessibility/sphinx2/metadata.xml
+++ b/app-accessibility/sphinx2/metadata.xml
@@ -1,6 +1,9 @@
-accessibility
-sound
+ accessibility
+ sound
+
+ cmusphinx
+
diff --git a/app-accessibility/sphinx3/metadata.xml b/app-accessibility/sphinx3/metadata.xml
index b723de1dbba2..831e814f0766 100644
--- a/app-accessibility/sphinx3/metadata.xml
+++ b/app-accessibility/sphinx3/metadata.xml
@@ -1,5 +1,8 @@
-accessibility
+ accessibility
+
+ cmusphinx
+
diff --git a/app-accessibility/sphinxbase/metadata.xml b/app-accessibility/sphinxbase/metadata.xml
index 3a41b49fd724..d72ef0fd2aae 100644
--- a/app-accessibility/sphinxbase/metadata.xml
+++ b/app-accessibility/sphinxbase/metadata.xml
@@ -2,4 +2,7 @@
accessibility
+
+ cmusphinx
+
diff --git a/app-accessibility/yasr/metadata.xml b/app-accessibility/yasr/metadata.xml
index cdac64016dfe..6e084ef16675 100644
--- a/app-accessibility/yasr/metadata.xml
+++ b/app-accessibility/yasr/metadata.xml
@@ -1,6 +1,8 @@
-
-accessibility
+ accessibility
+
+ yasr
+
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
index ca935354faab..c60ce0ba2450 100644
--- a/app-admin/bastille/metadata.xml
+++ b/app-admin/bastille/metadata.xml
@@ -3,4 +3,7 @@
hardened
The Bastille Hardening System attempts to "harden" or "tighten" Unix operating systems.
+
+ bastille-linux
+
diff --git a/app-admin/chroot_safe/metadata.xml b/app-admin/chroot_safe/metadata.xml
index 91f4e72fb544..4145ddd1b330 100644
--- a/app-admin/chroot_safe/metadata.xml
+++ b/app-admin/chroot_safe/metadata.xml
@@ -4,4 +4,7 @@
maintainer-needed@gentoo.org
+
+ chrootsafe
+
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 8c165b007b5f..81d6ebe98f1b 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -11,25 +11,26 @@
Brenden Matthews
Upstream author
+ conky
Conky is a system monitor that sits in the corner of your desktop. It is a fork of Torsmo that is actually maintained.
diff --git a/app-admin/conkyforecast/metadata.xml b/app-admin/conkyforecast/metadata.xml
index 5b80fb94c393..7ad6f3ff7899 100644
--- a/app-admin/conkyforecast/metadata.xml
+++ b/app-admin/conkyforecast/metadata.xml
@@ -1,8 +1,11 @@
-
-xmw@gentoo.org
-Michael Weber
-
+
+ xmw@gentoo.org
+ Michael Weber
+
+
+ ~conky-companions
+
diff --git a/app-admin/consul/consul-0.5.2.ebuild b/app-admin/consul/consul-0.5.2.ebuild
index 8ac43d0ee78c..16de8127df03 100644
--- a/app-admin/consul/consul-0.5.2.ebuild
+++ b/app-admin/consul/consul-0.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-0.5.2.ebuild,v 1.3 2015/05/25 19:12:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-0.5.2.ebuild,v 1.4 2015/06/09 07:00:48 zmedico Exp $
EAPI=5
@@ -151,6 +151,7 @@ src_install() {
-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
rm -rf "${WORKDIR}"/src/${x}
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+ insopts -m0644 -p # preserve timestamps for bug 551486
insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
insinto /usr/lib/go/src/${GO_PN%/*}
diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild
index 78ca5d8c124b..4dc9ac4aaf18 100644
--- a/app-admin/consul/consul-9999.ebuild
+++ b/app-admin/consul/consul-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-9999.ebuild,v 1.3 2015/05/25 19:12:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-9999.ebuild,v 1.4 2015/06/09 07:00:48 zmedico Exp $
EAPI=5
@@ -107,6 +107,7 @@ src_install() {
-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
rm -rf "${WORKDIR}"/src/${x}
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+ insopts -m0644 -p # preserve timestamps for bug 551486
insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
insinto /usr/lib/go/src/${GO_PN%/*}
diff --git a/app-admin/cpulimit/metadata.xml b/app-admin/cpulimit/metadata.xml
index 8ad2b4de9bf4..39e355636da9 100644
--- a/app-admin/cpulimit/metadata.xml
+++ b/app-admin/cpulimit/metadata.xml
@@ -5,4 +5,7 @@
nullishzero@gentoo.org
Pavel Kazakov
+
+ limitcpu
+
diff --git a/app-admin/fetchlog/metadata.xml b/app-admin/fetchlog/metadata.xml
index ff62877c67ae..a12c82df6025 100644
--- a/app-admin/fetchlog/metadata.xml
+++ b/app-admin/fetchlog/metadata.xml
@@ -1,7 +1,10 @@
-
- maintainer-needed@gentoo.org
-
+
+ maintainer-needed@gentoo.org
+
+
+ fetchlog
+
diff --git a/app-admin/filewatcher/metadata.xml b/app-admin/filewatcher/metadata.xml
index 45b62f4eb9c2..bd3257d7693a 100644
--- a/app-admin/filewatcher/metadata.xml
+++ b/app-admin/filewatcher/metadata.xml
@@ -1,9 +1,11 @@
-
maintainer-needed@gentoo.org
Default assignee for orphaned packages
+
+ filewatcher
+
diff --git a/app-admin/genromfs/metadata.xml b/app-admin/genromfs/metadata.xml
index 92ee9e3d02fa..eedb2fb06e9f 100644
--- a/app-admin/genromfs/metadata.xml
+++ b/app-admin/genromfs/metadata.xml
@@ -1,9 +1,12 @@
-
- maintainer-needed@gentoo.org
-
-A readonly filesystem designed to be small and very space
+
+ maintainer-needed@gentoo.org
+
+ A readonly filesystem designed to be small and very space
efficent
+
+ genromfs
+
diff --git a/app-admin/glance/metadata.xml b/app-admin/glance/metadata.xml
index d9757a109a9d..0dc3e103ba37 100644
--- a/app-admin/glance/metadata.xml
+++ b/app-admin/glance/metadata.xml
@@ -12,7 +12,9 @@
metadata as well as retrieval of the actual image.
+
+ glance
+
-
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index a232f0c267ca..4c8d1bcd9619 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -1,16 +1,19 @@
-proxy-maintainers
-
- samuel.bauer@yahoo.fr
- Samuel Bauer
-
-
- xmw@gentoo.org
- Michael Weber
-
-
+ proxy-maintainers
+
+ samuel.bauer@yahoo.fr
+ Samuel Bauer
+
+
+ xmw@gentoo.org
+ Michael Weber
+
+
gtkdiskfree is a gtk extension to the cli tool df, does the same and more
+
+ gtkdiskfree
+
diff --git a/app-admin/integrit/metadata.xml b/app-admin/integrit/metadata.xml
index 73acb1019b53..f22d1250efc5 100644
--- a/app-admin/integrit/metadata.xml
+++ b/app-admin/integrit/metadata.xml
@@ -2,4 +2,7 @@
forensics
+
+ integrit
+
diff --git a/app-admin/kedpm/metadata.xml b/app-admin/kedpm/metadata.xml
index c47f929037b8..a4448f8b98a8 100644
--- a/app-admin/kedpm/metadata.xml
+++ b/app-admin/kedpm/metadata.xml
@@ -1,8 +1,11 @@
-
- maintainer-needed@gentoo.org
-
-key storing program
+
+ maintainer-needed@gentoo.org
+
+ key storing program
+
+ kedpm
+
diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
index afab73a27d2a..caa10597adc1 100644
--- a/app-admin/longrun/metadata.xml
+++ b/app-admin/longrun/metadata.xml
@@ -1,10 +1,15 @@
-maintainer-needed@gentoo.org
-
+
+ maintainer-needed@gentoo.org
+
+
Longrun is a user space utility program for controlling the Longrun
thermal and power save functionalities found in the processors made
by Transmeta.
+
+ longrun
+
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index 80004f356047..c0a75cd058dd 100644
--- a/app-admin/metalog/metadata.xml
+++ b/app-admin/metalog/metadata.xml
@@ -1,8 +1,11 @@
-base-system
-
- vapier@gentoo.org
-
+ base-system
+
+ vapier@gentoo.org
+
+
+ metalog
+
diff --git a/app-admin/mktwpol/metadata.xml b/app-admin/mktwpol/metadata.xml
index 0602d9179e29..3bb560150e4f 100644
--- a/app-admin/mktwpol/metadata.xml
+++ b/app-admin/mktwpol/metadata.xml
@@ -14,6 +14,7 @@
https://sourceforge.net/p/mktwpol/code/ci/master/tree/CHANGES
https://sourceforge.net/p/mktwpol/code/ci/master/tree/README
https://sourceforge.net/p/mktwpol/discussion/bugs/
+ mktwpol
mktwpol is a tool that aids system administrators in the
diff --git a/app-admin/petrovich/metadata.xml b/app-admin/petrovich/metadata.xml
index f9d50da18d39..a62bf0525ea1 100644
--- a/app-admin/petrovich/metadata.xml
+++ b/app-admin/petrovich/metadata.xml
@@ -5,4 +5,7 @@
maintainer-needed@gentoo.org
This package lacks a primary herd or maintainer.
+
+ petrovich
+
diff --git a/app-admin/procinfo-ng/metadata.xml b/app-admin/procinfo-ng/metadata.xml
index 4a00a64b40ae..7f43c0128eef 100644
--- a/app-admin/procinfo-ng/metadata.xml
+++ b/app-admin/procinfo-ng/metadata.xml
@@ -4,4 +4,7 @@
jlec@gentoo.org
+
+ procinfo-ng
+
diff --git a/app-admin/pwgen/metadata.xml b/app-admin/pwgen/metadata.xml
index 6fbd2dadb114..11dddfb5251a 100644
--- a/app-admin/pwgen/metadata.xml
+++ b/app-admin/pwgen/metadata.xml
@@ -8,4 +8,7 @@
+
+ pwgen
+
diff --git a/app-admin/quickswitch/metadata.xml b/app-admin/quickswitch/metadata.xml
index 13f68ade10f9..3c6ff9fb93de 100644
--- a/app-admin/quickswitch/metadata.xml
+++ b/app-admin/quickswitch/metadata.xml
@@ -1,9 +1,12 @@
-
- maintainer-needed@gentoo.org
-
-A utility for linux laptop users to use multiple network
+
+ maintainer-needed@gentoo.org
+
+ A utility for linux laptop users to use multiple network
profiles, and switch effortlessly.
+
+ quickswitch
+
diff --git a/app-admin/radmind/metadata.xml b/app-admin/radmind/metadata.xml
index 3fd219c80cc9..c5692ac1bf6c 100644
--- a/app-admin/radmind/metadata.xml
+++ b/app-admin/radmind/metadata.xml
@@ -1,7 +1,10 @@
-netmon
-A suite of Unix command-line tools and a server designed to remotely administer
+ netmon
+ A suite of Unix command-line tools and a server designed to remotely administer
the file systems of multiple Unix machines.
+
+ radmind
+
diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml
index bf77bb5f4c2f..6ba8e796f6b5 100644
--- a/app-admin/sshguard/metadata.xml
+++ b/app-admin/sshguard/metadata.xml
@@ -5,4 +5,7 @@
+
+ sshguard
+
diff --git a/app-admin/swatch/metadata.xml b/app-admin/swatch/metadata.xml
index 7ef321f9a0a1..9180d4d30061 100644
--- a/app-admin/swatch/metadata.xml
+++ b/app-admin/swatch/metadata.xml
@@ -18,4 +18,7 @@
evolucionado hacia una utilidad que puede monitorizar cualquier
tipo de registro.
+
+ swatch
+
diff --git a/app-admin/sxid/metadata.xml b/app-admin/sxid/metadata.xml
index f9d50da18d39..66bdcb020fbe 100644
--- a/app-admin/sxid/metadata.xml
+++ b/app-admin/sxid/metadata.xml
@@ -5,4 +5,7 @@
maintainer-needed@gentoo.org
This package lacks a primary herd or maintainer.
+
+ sxid
+
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
index 26e09e104fa7..c44b4576eaf4 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild,v 1.3 2015/06/08 12:49:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild,v 1.4 2015/06/09 07:17:03 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/syslog-summary/syslog-summary-1.14.ebuild b/app-admin/syslog-summary/syslog-summary-1.14.ebuild
deleted file mode 100644
index b1bd9d5505b4..000000000000
--- a/app-admin/syslog-summary/syslog-summary-1.14.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-summary/syslog-summary-1.14.ebuild,v 1.6 2014/08/10 01:37:44 patrick Exp $
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="Summarizes the contents of a syslog log file"
-HOMEPAGE="http://github.com/dpaleino/syslog-summary"
-SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- python_convert_shebangs 2 syslog-summary
-
- # Sadly, the makefile is useless for us.
- rm Makefile || die
-}
-
-src_install() {
- dobin syslog-summary || die
- dodoc AUTHORS ChangeLog NEWS README || die
- doman syslog-summary.1 || die
-
- insinto /etc/syslog-summary
- doins ignore.rules || die
-}
diff --git a/app-admin/systemrescuecd-x86/metadata.xml b/app-admin/systemrescuecd-x86/metadata.xml
index 46720f594169..4b2dec1d9979 100644
--- a/app-admin/systemrescuecd-x86/metadata.xml
+++ b/app-admin/systemrescuecd-x86/metadata.xml
@@ -5,4 +5,7 @@
mgorny@gentoo.org
Michał Górny
+
+ systemrescuecd
+
diff --git a/app-admin/tripwire/metadata.xml b/app-admin/tripwire/metadata.xml
index 9f0e27256fa6..6e194bd6a1a8 100644
--- a/app-admin/tripwire/metadata.xml
+++ b/app-admin/tripwire/metadata.xml
@@ -28,4 +28,7 @@
Adds support for Secure Socket Layer connections
Builds the package statically
+
+ tripwire
+
diff --git a/app-admin/usermin/metadata.xml b/app-admin/usermin/metadata.xml
index 39b1cd6057fc..3317d0c52e61 100644
--- a/app-admin/usermin/metadata.xml
+++ b/app-admin/usermin/metadata.xml
@@ -7,4 +7,7 @@
A web-based user administration interface.
+
+ webadmin
+
diff --git a/app-admin/vault/vault-0.1.2.ebuild b/app-admin/vault/vault-0.1.2.ebuild
index c29d18d66e27..815eda069d63 100644
--- a/app-admin/vault/vault-0.1.2.ebuild
+++ b/app-admin/vault/vault-0.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/vault/vault-0.1.2.ebuild,v 1.1 2015/05/26 03:17:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/vault/vault-0.1.2.ebuild,v 1.2 2015/06/09 07:09:29 zmedico Exp $
EAPI=5
@@ -93,6 +93,7 @@ src_install() {
-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
rm -rf "${WORKDIR}"/src/${x}
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+ insopts -m0644 -p # preserve timestamps for bug 551486
insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
insinto /usr/lib/go/src/${GO_PN%/*}
diff --git a/app-admin/vault/vault-9999.ebuild b/app-admin/vault/vault-9999.ebuild
index b26b4ea8568c..1310273bc84c 100644
--- a/app-admin/vault/vault-9999.ebuild
+++ b/app-admin/vault/vault-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/vault/vault-9999.ebuild,v 1.2 2015/05/26 05:28:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/vault/vault-9999.ebuild,v 1.3 2015/06/09 07:09:29 zmedico Exp $
EAPI=5
@@ -89,6 +89,7 @@ src_install() {
-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
rm -rf "${WORKDIR}"/src/${x}
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+ insopts -m0644 -p # preserve timestamps for bug 551486
insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
insinto /usr/lib/go/src/${GO_PN%/*}
diff --git a/app-admin/watchfolder/metadata.xml b/app-admin/watchfolder/metadata.xml
index 91f4e72fb544..67a0ac76914d 100644
--- a/app-admin/watchfolder/metadata.xml
+++ b/app-admin/watchfolder/metadata.xml
@@ -4,4 +4,7 @@
maintainer-needed@gentoo.org
+
+ watchd
+
diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
index 624da9617964..f1dbb51ddeb3 100644
--- a/app-admin/webmin/metadata.xml
+++ b/app-admin/webmin/metadata.xml
@@ -7,4 +7,7 @@
PhobosK
Proxy maintainer. Assign bugs to him
+
+ webadmin
+
diff --git a/app-admin/xstow/metadata.xml b/app-admin/xstow/metadata.xml
index 625d2484d6f1..fd48bdee4f61 100644
--- a/app-admin/xstow/metadata.xml
+++ b/app-admin/xstow/metadata.xml
@@ -11,4 +11,7 @@
Maxim Koltsov
A program that manages the installation of software packages.
+
+ xstow
+
diff --git a/app-antivirus/clamav-unofficial-sigs/metadata.xml b/app-antivirus/clamav-unofficial-sigs/metadata.xml
index f3b97aaa8e99..3c2da3db86b6 100644
--- a/app-antivirus/clamav-unofficial-sigs/metadata.xml
+++ b/app-antivirus/clamav-unofficial-sigs/metadata.xml
@@ -4,4 +4,7 @@
mjo@gentoo.org
+
+ unofficial-sigs
+
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index cc89685917a6..7d2b0e47b1e8 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -7,4 +7,7 @@
A Top like tool which shows what clamd is currently scanning amongst other things
Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.
+
+ clamav
+
diff --git a/app-arch/advancecomp/metadata.xml b/app-arch/advancecomp/metadata.xml
index 454495193633..50789f6b11fe 100644
--- a/app-arch/advancecomp/metadata.xml
+++ b/app-arch/advancecomp/metadata.xml
@@ -9,4 +9,7 @@
AdvanceCOMP is a set of recompression utilities for .PNG, .MNG, .ZIP
and .GZ files
+
+ advancemame
+
diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml
index 3571887356be..9dc430496357 100644
--- a/app-arch/afio/metadata.xml
+++ b/app-arch/afio/metadata.xml
@@ -1,14 +1,17 @@
-
- maintainer-needed@gentoo.org
-
-
+
+ maintainer-needed@gentoo.org
+
+
Afio makes cpio-format archives. It deals somewhat gracefully
with input data corruption, supports multi-volume archives during interactive
operation, and can make compressed archives that are much safer than compressed
tar or cpio archives. Afio is best used as an 'archive engine' in a backup
script.
+
+ afio
+
diff --git a/app-arch/arc/metadata.xml b/app-arch/arc/metadata.xml
index f22cec1f2758..0e81bff44113 100644
--- a/app-arch/arc/metadata.xml
+++ b/app-arch/arc/metadata.xml
@@ -1,8 +1,11 @@
-
- maintainer-needed@gentoo.org
-
-A program that is able to create and extract files form the DOS .ARC file
+
+ maintainer-needed@gentoo.org
+
+ A program that is able to create and extract files form the DOS .ARC file
+
+ arc
+
diff --git a/app-arch/bsdsfv/metadata.xml b/app-arch/bsdsfv/metadata.xml
index 3d8776134ef4..81551492a11e 100644
--- a/app-arch/bsdsfv/metadata.xml
+++ b/app-arch/bsdsfv/metadata.xml
@@ -1,9 +1,12 @@
-
- angelos@gentoo.org
- Christoph Mende
-
-A all in one SFV utility.
+
+ angelos@gentoo.org
+ Christoph Mende
+
+ A all in one SFV utility.
+
+ bsdsfv
+
diff --git a/app-arch/cfv/metadata.xml b/app-arch/cfv/metadata.xml
index 5a567ef17139..9a061aa30829 100644
--- a/app-arch/cfv/metadata.xml
+++ b/app-arch/cfv/metadata.xml
@@ -2,7 +2,7 @@
- maintainer-needed@gentoo.org
+ maintainer-needed@gentoo.org
cfv is a utility to both test and create .sfv, .csv, .crc,
@@ -11,6 +11,9 @@
data.
+
+ cfv
+
diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
index e826d4d48d70..24ef88ea5b33 100644
--- a/app-arch/deltarpm/metadata.xml
+++ b/app-arch/deltarpm/metadata.xml
@@ -1,8 +1,11 @@
-
-maintainer-needed@gentoo.org
-
-A tool to create and apply deltarpms.
+
+ maintainer-needed@gentoo.org
+
+ A tool to create and apply deltarpms.
+
+ deltarpm/deltarpm
+
diff --git a/app-arch/duff/metadata.xml b/app-arch/duff/metadata.xml
index c6d862855eb5..da9a0b9845f9 100644
--- a/app-arch/duff/metadata.xml
+++ b/app-arch/duff/metadata.xml
@@ -1,7 +1,10 @@
-
- robbat2@gentoo.org
-
+
+ robbat2@gentoo.org
+
+
+ duff
+
diff --git a/app-arch/dump/metadata.xml b/app-arch/dump/metadata.xml
index c1fe9249ea8d..1d2ab7dac1e1 100644
--- a/app-arch/dump/metadata.xml
+++ b/app-arch/dump/metadata.xml
@@ -6,6 +6,9 @@
A utility to help backup and restore files on a harddrive.
+
+ dump
+
diff --git a/app-arch/funzix/metadata.xml b/app-arch/funzix/metadata.xml
index 7123fa8f9ece..a3c636b4cc4d 100644
--- a/app-arch/funzix/metadata.xml
+++ b/app-arch/funzix/metadata.xml
@@ -1,7 +1,10 @@
-
- vapier@gentoo.org
-
+
+ vapier@gentoo.org
+
+
+ funzix
+
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
new file mode 100644
index 000000000000..62aa64f8fb01
--- /dev/null
+++ b/app-arch/gcab/Manifest
@@ -0,0 +1 @@
+DIST gcab-0.6.tar.xz 316668 SHA256 a0443b904bfa7227b5155bfcdf9ea9256b6e26930b8febe1c41f972f6f1334bb SHA512 80c18f213b94402cbb4c19ed506f4a40e9c4f8deb9ddf6ee990214213f011f7638d83122b36cadff86330b524eef82969d1245b64d5d04eb5998f76cd2ca6df8 WHIRLPOOL 8e6140d6a9d11cf0ce249d15ce2fda21fbbca9c366cc938ff99398bcd32f375d07909c421ade7530611902c27e7c002d8f43ff71c04830c5062849ebe5c347e5
diff --git a/app-arch/gcab/gcab-0.6.ebuild b/app-arch/gcab/gcab-0.6.ebuild
new file mode 100644
index 000000000000..06995db02527
--- /dev/null
+++ b/app-arch/gcab/gcab-0.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gcab/gcab-0.6.ebuild,v 1.1 2015/06/09 02:40:49 tetromino Exp $
+
+EAPI=5
+
+GCONF_DEBUG=no
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 vala
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ >=dev-libs/glib-2.22:2
+ sys-libs/zlib
+ introspection? ( >=dev-libs/gobject-introspection-0.9.4 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ gnome2_src_prepare
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local myconf
+ use vala || myconf="VAPIGEN=no"
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ ${myconf}
+}
diff --git a/app-arch/gcab/metadata.xml b/app-arch/gcab/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/app-arch/gcab/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+gnome
+
diff --git a/app-arch/gtk-splitter/metadata.xml b/app-arch/gtk-splitter/metadata.xml
index c4840f8fc776..664da02d2022 100644
--- a/app-arch/gtk-splitter/metadata.xml
+++ b/app-arch/gtk-splitter/metadata.xml
@@ -1,9 +1,12 @@
-
- maintainer-needed@gentoo.org
- This package lacks a primary herd or maintainer
-
+
+ maintainer-needed@gentoo.org
+ This package lacks a primary herd or maintainer
+
A program to split files into smaller pieces and the put them back together.
+
+ gtk-splitter
+
diff --git a/app-arch/innoextract/metadata.xml b/app-arch/innoextract/metadata.xml
index 362260dde8a8..3d1917dd249b 100644
--- a/app-arch/innoextract/metadata.xml
+++ b/app-arch/innoextract/metadata.xml
@@ -13,7 +13,9 @@
Proxy maintainer. CC him on bugs
+
+ innoextract
+
-
diff --git a/app-arch/lha/metadata.xml b/app-arch/lha/metadata.xml
index 170fdabfec14..8eb52056a1e2 100644
--- a/app-arch/lha/metadata.xml
+++ b/app-arch/lha/metadata.xml
@@ -9,4 +9,7 @@
A utility for creating and opening lzh archives.
+
+ lha
+
diff --git a/app-arch/libpar2/metadata.xml b/app-arch/libpar2/metadata.xml
index 5443fcb1c131..e20bf81c246e 100644
--- a/app-arch/libpar2/metadata.xml
+++ b/app-arch/libpar2/metadata.xml
@@ -5,4 +5,7 @@
radhermit@gentoo.org
Tim Harder
+
+ libpar2
+
diff --git a/app-arch/lziprecover/Manifest b/app-arch/lziprecover/Manifest
index 831fdf05d623..667fecd50000 100644
--- a/app-arch/lziprecover/Manifest
+++ b/app-arch/lziprecover/Manifest
@@ -1,3 +1,2 @@
-DIST lziprecover-1.15.tar.gz 82763 SHA256 2adf0dfc77a0b2f93257d9f3f1171fc11121b43da55fa53715459b7fa93f1661 SHA512 407d836ca76de3ef393979cefb23fa86dc9a6af50f0733eb2f31e0b4404582b03e0e5429c537d8aed69e2ae12855e282afc0926cd9064b0cb5ce4fac702c7552 WHIRLPOOL b552cc9320b46630a14fb5010593acaf852449ca4c99685959340618877da59d9f662d441a36e5cd04358b598a1d21b1c8c81f2eff029a96bd469b04a62ed4ac
DIST lziprecover-1.16.tar.gz 71746 SHA256 fe01f89f439aa13cf8e169a92ac591262d24b9df61942cbecaa89180c3004882 SHA512 0c647214ae57883baa4fed2cad32d003d6601178cbb8cbf0a8de604eb91fda5f5b9dda840532381ca46b236a2a168ed65f621d65c1382b60df9e3e4b68880e2f WHIRLPOOL 0c0bec65f45d5fed23c592ab9de1e221c46ab16701c85cb401e852c344ab36bb21d4d906827b78df4741aec9c87db51d06d49f675bfef90174b7672915bca021
-DIST lziprecover-1.17-pre1.tar.gz 73320 SHA256 6f37bcd0d8f7cddde8ab051572dabdd28b9abe2625e7396ecc2e2f6b6b432dea SHA512 6dd080099f1b268cd3db2962d811d4607cc4fe788852ff98259296327c56e608a2bd47282dd575ed97c5e2326f01dd122a065938330722b9152d1e56a74aecf2 WHIRLPOOL 97aaf0f09ead3c0a4df6aa6e1bd17a4752be47482966415947a40350a137ed5f6e15f8246c7842f79795262825d086f134c9a3ca9a7582a5ec6db52e6365f0d9
+DIST lziprecover-1.17.tar.gz 75941 SHA256 a539b86d282a4bb154e01b04c3e09eaf7540b2c2be72d6b2110900c076bf3dbd SHA512 409a3634ef15238f8c87e6e69ecf0cf83c48274cff6c54a901a4f80bdc3d475b6bf03215cfee762ac64ca41b3e8a805ab620ceaaa1bec7fc22ffafad049b5f0f WHIRLPOOL 1b97ac140cdc190fdb3ceec5337576c775166bf4a30fbd8f956208095898411bd9ee7cbd99bd4e44aae11d67e9a6ad52ba60967d87c9eb057830950ede23aefa
diff --git a/app-arch/lziprecover/lziprecover-1.15.ebuild b/app-arch/lziprecover/lziprecover-1.15.ebuild
deleted file mode 100644
index d2d0e7019c34..000000000000
--- a/app-arch/lziprecover/lziprecover-1.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lziprecover/lziprecover-1.15.ebuild,v 1.4 2014/08/10 01:43:12 patrick Exp $
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lziprecover is a data recovery tool and decompressor for files in the lzip compressed data format"
-HOMEPAGE="http://www.nongnu.org/lzip/lziprecover.html"
-SRC_URI="http://download.savannah.gnu.org/releases-noredirect/lzip/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_configure() {
- # not autotools-based
- ./configure \
- --prefix="${EPREFIX}"/usr \
- CXX="$(tc-getCXX)" \
- CPPFLAGS="${CPPFLAGS}" \
- CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" || die
-}
diff --git a/app-arch/lziprecover/lziprecover-1.17_pre1.ebuild b/app-arch/lziprecover/lziprecover-1.17.ebuild
similarity index 86%
rename from app-arch/lziprecover/lziprecover-1.17_pre1.ebuild
rename to app-arch/lziprecover/lziprecover-1.17.ebuild
index 9e51e458cd09..15f10a2ec6bd 100644
--- a/app-arch/lziprecover/lziprecover-1.17_pre1.ebuild
+++ b/app-arch/lziprecover/lziprecover-1.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lziprecover/lziprecover-1.17_pre1.ebuild,v 1.1 2014/11/19 06:45:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lziprecover/lziprecover-1.17.ebuild,v 1.1 2015/06/09 06:57:00 polynomial-c Exp $
EAPI=5
diff --git a/app-arch/lzma/metadata.xml b/app-arch/lzma/metadata.xml
index ff62877c67ae..8fbc72cbc106 100644
--- a/app-arch/lzma/metadata.xml
+++ b/app-arch/lzma/metadata.xml
@@ -1,7 +1,10 @@
-
- maintainer-needed@gentoo.org
-
+
+ maintainer-needed@gentoo.org
+
+
+ sevenzip
+
diff --git a/app-arch/ncompress/metadata.xml b/app-arch/ncompress/metadata.xml
index 96a2d586367d..c43c5b6e7f64 100644
--- a/app-arch/ncompress/metadata.xml
+++ b/app-arch/ncompress/metadata.xml
@@ -1,5 +1,8 @@
-base-system
+ base-system
+
+ ncompress
+
diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
index 1f58fb9397ce..9ed2c1559b3e 100644
--- a/app-arch/p7zip/metadata.xml
+++ b/app-arch/p7zip/metadata.xml
@@ -8,4 +8,7 @@
+
+ p7zip
+
diff --git a/app-arch/par/metadata.xml b/app-arch/par/metadata.xml
index aba833ed90e0..fcb2ecb3ba47 100644
--- a/app-arch/par/metadata.xml
+++ b/app-arch/par/metadata.xml
@@ -2,6 +2,9 @@
- maintainer-needed@gentoo.org
+ maintainer-needed@gentoo.org
+
+ parchive
+
diff --git a/app-arch/pbzip2/metadata.xml b/app-arch/pbzip2/metadata.xml
index e7f124652b9b..db352e4aad4f 100644
--- a/app-arch/pbzip2/metadata.xml
+++ b/app-arch/pbzip2/metadata.xml
@@ -8,4 +8,7 @@
+
+ pbzip2
+
diff --git a/app-arch/pdv/metadata.xml b/app-arch/pdv/metadata.xml
index 09a9ad783a01..ed5703f6dbb5 100644
--- a/app-arch/pdv/metadata.xml
+++ b/app-arch/pdv/metadata.xml
@@ -1,9 +1,12 @@
-
-maintainer-needed@gentoo.org
-
-A payload Delivery vehicle that contains a complete package and
+
+ maintainer-needed@gentoo.org
+
+ A payload Delivery vehicle that contains a complete package and
the commands to install it.
+
+ pdv
+
diff --git a/app-arch/pet2tgz/metadata.xml b/app-arch/pet2tgz/metadata.xml
index c2d865517c00..74382342e237 100644
--- a/app-arch/pet2tgz/metadata.xml
+++ b/app-arch/pet2tgz/metadata.xml
@@ -5,4 +5,7 @@
ssuominen@gentoo.org
Samuli Suominen
+
+ pet2tgz
+
diff --git a/app-arch/pure-sfv/metadata.xml b/app-arch/pure-sfv/metadata.xml
index f9d50da18d39..174e6155e7df 100644
--- a/app-arch/pure-sfv/metadata.xml
+++ b/app-arch/pure-sfv/metadata.xml
@@ -5,4 +5,7 @@
maintainer-needed@gentoo.org
This package lacks a primary herd or maintainer.
+
+ pure-sfv
+
diff --git a/app-arch/star/metadata.xml b/app-arch/star/metadata.xml
index f23b9cae1593..486d2934ff92 100644
--- a/app-arch/star/metadata.xml
+++ b/app-arch/star/metadata.xml
@@ -2,4 +2,7 @@
shell-tools
+
+ s-tar
+
diff --git a/app-arch/tardy/metadata.xml b/app-arch/tardy/metadata.xml
index 65568112c646..4bc0f72ff7ab 100644
--- a/app-arch/tardy/metadata.xml
+++ b/app-arch/tardy/metadata.xml
@@ -5,4 +5,7 @@
maintainer-needed@gentoo.org
Tardy is a tar post-processor for manipulating the file headers.
+
+ tardy
+
diff --git a/app-arch/torrentzip/metadata.xml b/app-arch/torrentzip/metadata.xml
index f4bb579433f6..207b29f7ce14 100644
--- a/app-arch/torrentzip/metadata.xml
+++ b/app-arch/torrentzip/metadata.xml
@@ -8,4 +8,7 @@
multiple systems. It has the ability to create a torrentzip format
from a zip file.
+
+ trrntzip
+
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
index af80d5db4b69..a186eb633331 100644
--- a/app-arch/unzip/metadata.xml
+++ b/app-arch/unzip/metadata.xml
@@ -1,8 +1,11 @@
-base-system
-
+ base-system
+
+
+ infozip
+
diff --git a/app-arch/upx-ucl/metadata.xml b/app-arch/upx-ucl/metadata.xml
index 65099be5cafd..0fc231e1b2bf 100644
--- a/app-arch/upx-ucl/metadata.xml
+++ b/app-arch/upx-ucl/metadata.xml
@@ -1,8 +1,11 @@
-
-maintainer-needed@gentoo.org
-
+
+ maintainer-needed@gentoo.org
+
UPX is a versatile executable packer with a excellent compression ratio
+
+ sevenzip
+
diff --git a/app-arch/xarchiver/metadata.xml b/app-arch/xarchiver/metadata.xml
index d56729e92f8e..c37f26d0afd9 100644
--- a/app-arch/xarchiver/metadata.xml
+++ b/app-arch/xarchiver/metadata.xml
@@ -2,4 +2,7 @@
xfce
+
+ xarchiver
+
diff --git a/app-arch/zip/metadata.xml b/app-arch/zip/metadata.xml
index 841173ebe79a..87a70240b179 100644
--- a/app-arch/zip/metadata.xml
+++ b/app-arch/zip/metadata.xml
@@ -1,9 +1,12 @@
-base-system
-Application that supports the Info Zip series of encryption.
-
+ base-system
+ Application that supports the Info Zip series of encryption.
+
+
+ infozip
+
diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index 8865d48f8139..694128c76da0 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -19,7 +19,10 @@
Dustin J. Mitchell
+
+ amanda
+
diff --git a/app-backup/backuppc/metadata.xml b/app-backup/backuppc/metadata.xml
index e7f283ad6978..1d438e3031fe 100644
--- a/app-backup/backuppc/metadata.xml
+++ b/app-backup/backuppc/metadata.xml
@@ -2,4 +2,7 @@
app-backup
+
+ backuppc
+
diff --git a/app-cdr/k3b/k3b-2.0.3-r2.ebuild b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
index ac850af8c03b..1d30217040ae 100644
--- a/app-cdr/k3b/k3b-2.0.3-r2.ebuild
+++ b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r2.ebuild,v 1.3 2015/06/05 14:52:05 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r2.ebuild,v 1.4 2015/06/09 07:23:13 ago Exp $
EAPI=5
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.k3b.org/"
LICENSE="GPL-2 FDL-1.2"
SLOT="4"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
CDEPEND="
diff --git a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
index 49ae61e80064..256453a6acac 100644
--- a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
+++ b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild,v 1.2 2015/06/08 16:08:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild,v 1.3 2015/06/09 07:12:01 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="X"
DEPEND=""
diff --git a/app-editors/adie/adie-1.7.49.ebuild b/app-editors/adie/adie-1.7.49.ebuild
index b492428bb322..257db5d3b6b0 100644
--- a/app-editors/adie/adie-1.7.49.ebuild
+++ b/app-editors/adie/adie-1.7.49.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/adie/adie-1.7.49.ebuild,v 1.2 2015/05/28 10:29:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/adie/adie-1.7.49.ebuild,v 1.3 2015/06/09 07:13:52 ago Exp $
EAPI=5
@@ -10,7 +10,7 @@ DESCRIPTION="Text editor based on the FOX Toolkit"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
IUSE=""
DEPEND="~x11-libs/fox-${PV}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild
index 86f0036a1977..02bdf564fee9 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild,v 1.3 2015/06/08 12:49:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild,v 1.4 2015/06/09 07:22:47 ago Exp $
EAPI=5
@@ -27,7 +27,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 -x86"
+KEYWORDS="amd64 x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-emulation/xen-tools/xen-tools-4.5.0-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.5.0-r5.ebuild
index 84af8a9db784..d289f6a6c330 100644
--- a/app-emulation/xen-tools/xen-tools-4.5.0-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.5.0-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.5.0-r5.ebuild,v 1.2 2015/06/08 12:49:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.5.0-r5.ebuild,v 1.3 2015/06/09 07:22:39 ago Exp $
EAPI=5
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else
- KEYWORDS="amd64 ~arm ~arm64 -x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
UPSTREAM_VER=5
SECURITY_VER=2
# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen/xen-4.5.0-r6.ebuild b/app-emulation/xen/xen-4.5.0-r6.ebuild
index bc8bb4a15e84..cecf3119df50 100644
--- a/app-emulation/xen/xen-4.5.0-r6.ebuild
+++ b/app-emulation/xen/xen-4.5.0-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild,v 1.2 2015/06/08 12:49:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild,v 1.3 2015/06/09 07:22:43 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
live_eclass="git-2"
else
- KEYWORDS="amd64 ~arm ~arm64"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
UPSTREAM_VER=4
SECURITY_VER=1
GENTOO_VER=
diff --git a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
index 40a18c107a6d..285a0294bb07 100644
--- a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
+++ b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild,v 1.5 2015/05/28 15:21:58 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild,v 1.6 2015/06/09 07:08:07 ago Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/scim-imengine/37309/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
IUSE="+gtk3 nls kasumi"
DEPEND=">=app-i18n/scim-1.2[gtk3=]
diff --git a/app-i18n/scim/scim-1.4.14.ebuild b/app-i18n/scim/scim-1.4.14.ebuild
index 24f41bfa258e..87465f41620a 100644
--- a/app-i18n/scim/scim-1.4.14.ebuild
+++ b/app-i18n/scim/scim-1.4.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.14.ebuild,v 1.7 2015/05/28 15:21:46 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.14.ebuild,v 1.8 2015/06/09 07:08:11 ago Exp $
EAPI="4"
inherit eutils flag-o-matic multilib gnome2-utils autotools-utils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="doc gtk3"
RDEPEND="x11-libs/libX11
diff --git a/app-misc/fsniper/fsniper-1.3.1-r1.ebuild b/app-misc/fsniper/fsniper-1.3.1-r1.ebuild
index a5f75b10ac7c..9df5e3753769 100644
--- a/app-misc/fsniper/fsniper-1.3.1-r1.ebuild
+++ b/app-misc/fsniper/fsniper-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fsniper/fsniper-1.3.1-r1.ebuild,v 1.2 2015/06/08 12:49:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fsniper/fsniper-1.3.1-r1.ebuild,v 1.3 2015/06/09 07:21:51 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/app-misc/fsniper/fsniper-1.3.1.ebuild b/app-misc/fsniper/fsniper-1.3.1.ebuild
deleted file mode 100644
index 33e4256c34be..000000000000
--- a/app-misc/fsniper/fsniper-1.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fsniper/fsniper-1.3.1.ebuild,v 1.5 2011/10/07 14:57:06 jlec Exp $
-
-DESCRIPTION="Tool that monitors a given set of directories for new files"
-HOMEPAGE="https://github.com/l3ib/fsniper/"
-SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- dev-libs/libpcre
- sys-apps/file"
-RDEPEND="${DEPEND}"
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog example.conf README || die
-}
diff --git a/app-misc/klavaro/klavaro-3.0.1.ebuild b/app-misc/klavaro/klavaro-3.0.1.ebuild
index 7544b4bb27ab..06f2d3e145a1 100644
--- a/app-misc/klavaro/klavaro-3.0.1.ebuild
+++ b/app-misc/klavaro/klavaro-3.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-3.0.1.ebuild,v 1.2 2015/06/08 12:49:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-3.0.1.ebuild,v 1.3 2015/06/09 07:14:31 ago Exp $
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+static-libs"
RDEPEND="
diff --git a/app-shells/sash/sash-3.8.ebuild b/app-shells/sash/sash-3.8.ebuild
index 0b810a83fd30..b176c3139bd3 100644
--- a/app-shells/sash/sash-3.8.ebuild
+++ b/app-shells/sash/sash-3.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.8.ebuild,v 1.3 2015/06/07 10:24:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.8.ebuild,v 1.4 2015/06/09 04:52:07 jer Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
LICENSE="freedist"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="static"
DEPEND="
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
index 1d9ad7f3fe86..f701fb3371b0 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild,v 1.8 2015/06/05 15:03:21 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild,v 1.9 2015/06/09 05:24:24 jer Exp $
EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="cups dbus djvu gtk idn linguas_de static-libs X"
RESTRICT="djvu? ( bindist )"
diff --git a/app-text/stardict/stardict-3.0.6.ebuild b/app-text/stardict/stardict-3.0.6.ebuild
index c522656fd025..24076b86efd0 100644
--- a/app-text/stardict/stardict-3.0.6.ebuild
+++ b/app-text/stardict/stardict-3.0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.6.ebuild,v 1.3 2015/06/08 12:49:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.6.ebuild,v 1.4 2015/06/09 07:14:13 ago Exp $
EAPI=5
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
LICENSE="CPL-1.0 GPL-3 LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
IUSE="espeak gucharmap qqwry pronounce spell tools"
RESTRICT="test"
diff --git a/app-text/writerperfect/writerperfect-0.9.2.ebuild b/app-text/writerperfect/writerperfect-0.9.2.ebuild
index 9d005f498f98..bfd17434014c 100644
--- a/app-text/writerperfect/writerperfect-0.9.2.ebuild
+++ b/app-text/writerperfect/writerperfect-0.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/writerperfect/writerperfect-0.9.2.ebuild,v 1.2 2015/06/08 16:09:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/writerperfect/writerperfect-0.9.2.ebuild,v 1.3 2015/06/09 07:16:27 ago Exp $
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~x86-linux ~x86-solaris"
IUSE="abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps"
# FIXME: libepubgen
diff --git a/dev-go/go-crypto/Manifest b/dev-go/go-crypto/Manifest
index 804872a7ae79..3a5e8babe6f9 100644
--- a/dev-go/go-crypto/Manifest
+++ b/dev-go/go-crypto/Manifest
@@ -1 +1,2 @@
DIST go-crypto-1.4.2_p20150514.tar.gz 868394 SHA256 2d1a2f17d2b2c261a33f2c1b4a963a25fdccfd633539b7616a628d1fee024457 SHA512 25c389988ac13cb6c8981c221f0bd54b096402833c1de5ee49dbaf253435ca39094080bdce78a57876b5af00eb41ff6c7655e12262379407867dacc309e703ac WHIRLPOOL 649d979753b15cf7cd4dcc1b45b701020e0bc6da9169c8731e5fff15832a63431ce9d8297f51a1542368e04ca9a50e2cc715d9bdbff4c3c33ab9351effabc8d5
+DIST go-crypto-1.4.2_p20150608.tar.gz 874125 SHA256 2980e16b13dbe52fd2f5128e06c664fe5712a52efa185fa3578d8abc6a124406 SHA512 6ad4e8ecf8c19c5428bd560b90a97bd7db084038e5afaa197a3d76349639e41ac3992e8bafe701b9f32e30ed63a6d0d511fd98cbcc2039f338f4bc174ad03e0e WHIRLPOOL d18fed06e4f2d4bdbde42aeaf02ece2a5c8264f1b222aadfe1c49f16ba814ab15f4d1d9f6050fbdd83825d7dec273e4f14ac95dae2db08ed7472a57fbb55e7bc
diff --git a/dev-go/go-crypto/go-crypto-1.4.2_p20150608.ebuild b/dev-go/go-crypto/go-crypto-1.4.2_p20150608.ebuild
new file mode 100644
index 000000000000..45756a9db796
--- /dev/null
+++ b/dev-go/go-crypto/go-crypto-1.4.2_p20150608.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-crypto/go-crypto-1.4.2_p20150608.ebuild,v 1.1 2015/06/09 03:22:30 zmedico Exp $
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="Go supplementary cryptography libraries"
+MY_PN=${PN##*-}
+GO_PN=golang.org/x/${MY_PN}
+HOMEPAGE="https://godoc.org/${GO_PN}"
+EGIT_COMMIT="1e856cbfdf9bc25eefca75f83f25d55e35ae72e0"
+SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-lang/go-1.4"
+RDEPEND=""
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_unpack() {
+ default
+ mkdir -p src/${GO_PN%/*} || die
+ mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
+}
+
+src_prepare() {
+ # disable broken tests
+ sed -e 's:TestAgentForward(:_\0:' -i ssh/test/agent_unix_test.go || die
+ sed -e 's:TestRunCommandSuccess(:_\0:' \
+ -e 's:TestRunCommandStdin(:_\0:' \
+ -e 's:TestRunCommandStdinError(:_\0:' \
+ -e 's:TestRunCommandWeClosed(:_\0:' \
+ -e 's:TestFuncLargeRead(:_\0:' \
+ -e 's:TestKeyChange(:_\0:' \
+ -e 's:TestValidTerminalMode(:_\0:' \
+ -i ssh/test/session_test.go || die
+}
+
+src_compile() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}/src/${GO_PN%/*}" \
+ "${GOROOT}/pkg/linux_${ARCH}/${GO_PN%/*}" || die
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
+}
+
+src_test() {
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
+ go test -x -v ${GO_PN}/... || die $?
+}
+
+src_install() {
+ insinto /usr/lib/go
+ find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
+ doins -r "${WORKDIR}"/{pkg,src}
+}
diff --git a/dev-go/go-crypto/go-crypto-9999.ebuild b/dev-go/go-crypto/go-crypto-9999.ebuild
index 26b184e1f8f5..b7c065fecb1d 100644
--- a/dev-go/go-crypto/go-crypto-9999.ebuild
+++ b/dev-go/go-crypto/go-crypto-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-crypto/go-crypto-9999.ebuild,v 1.4 2015/05/24 08:37:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-crypto/go-crypto-9999.ebuild,v 1.5 2015/06/09 03:22:30 zmedico Exp $
EAPI=5
inherit git-r3
@@ -49,5 +49,6 @@ src_test() {
src_install() {
insinto /usr/lib/go
find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
doins -r "${WORKDIR}"/{pkg,src}
}
diff --git a/dev-go/go-net/Manifest b/dev-go/go-net/Manifest
index a08f00f8371c..4c151f3d66d9 100644
--- a/dev-go/go-net/Manifest
+++ b/dev-go/go-net/Manifest
@@ -1 +1,2 @@
DIST go-net-1.4.2_p20150520.tar.gz 450301 SHA256 e0f3069df10e710e5e13dcfafeba8bca604d83bda7b253fccf38934cc4a76fa3 SHA512 dbf6c50d6da21e7e44a48a71ea02c9d03dd2535a1fecc46060f2b42bd6d922b53f3455138120cf7c499834cb0aa6a8b8282a0b14dee085c350b2cc00de8787be WHIRLPOOL 65439c96cbb35f634ded4746cbd6b22d99574547de17120e1748897b370738138d6cdfc808421dcf2a5289fe3336dca406ee53e4e423b524c05d99249fbe27d0
+DIST go-net-1.4.2_p20150604.tar.gz 470847 SHA256 407c9a5796baabb40a04cc09fcbc21efc0df72c38e95550054f8191741ad6207 SHA512 5bf62beed4a5d847dd4034fb713412f26f48d392c133ad4ac7409b75af82cb4b72ce46c3dbda7aab58d42879db4bb120432722362f7b8d2cb8131e9f3709c4e5 WHIRLPOOL ab69bca5c7c72a88d64a694b01911645850cea7741798934d3350a49d57704c0be99a9ebaca7582aed5e03be64dd3daf25778e3193b65f9cad522d6b62397c82
diff --git a/dev-go/go-net/go-net-1.4.2_p20150604.ebuild b/dev-go/go-net/go-net-1.4.2_p20150604.ebuild
new file mode 100644
index 000000000000..fcfdfb03bb9d
--- /dev/null
+++ b/dev-go/go-net/go-net-1.4.2_p20150604.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-net/go-net-1.4.2_p20150604.ebuild,v 1.2 2015/06/09 06:52:46 zmedico Exp $
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="Go supplementary network libraries"
+MY_PN=${PN##*-}
+GO_PN=golang.org/x/${MY_PN}
+HOMEPAGE="https://godoc.org/${GO_PN}"
+EGIT_COMMIT="dfe268fd2bb5c793f4c083803609fce9806c6f80"
+SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-lang/go-1.4
+ dev-go/go-text"
+RDEPEND=""
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_unpack() {
+ default
+ mkdir -p src/${GO_PN%/*} || die
+ mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
+}
+
+src_prepare() {
+ # disable broken tests
+ sed -e 's:TestReadProppatch(:_\0:' -i webdav/xml_test.go || die
+ sed -e 's:TestPingGoogle(:_\0:' \
+ -e 's:TestNonPrivilegedPing(:_\0:' \
+ -i icmp/ping_test.go || die
+}
+
+src_compile() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}/src/${GO_PN}" \
+ "${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
+}
+
+src_test() {
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
+ go test -x -v ${GO_PN}/... || die $?
+}
+
+src_install() {
+ insinto /usr/lib/go
+ find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
+ doins -r "${WORKDIR}"/{pkg,src}
+}
diff --git a/dev-go/go-net/go-net-9999.ebuild b/dev-go/go-net/go-net-9999.ebuild
index cbc2fce7dacc..495fe4a3e61b 100644
--- a/dev-go/go-net/go-net-9999.ebuild
+++ b/dev-go/go-net/go-net-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-net/go-net-9999.ebuild,v 1.3 2015/05/24 08:52:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-net/go-net-9999.ebuild,v 1.4 2015/06/08 19:34:50 zmedico Exp $
EAPI=5
inherit git-r3
@@ -45,5 +45,6 @@ src_test() {
src_install() {
insinto /usr/lib/go
find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
doins -r "${WORKDIR}"/{pkg,src}
}
diff --git a/dev-go/go-oauth2/Manifest b/dev-go/go-oauth2/Manifest
index 03d804464c6f..2ebf2f6c6540 100644
--- a/dev-go/go-oauth2/Manifest
+++ b/dev-go/go-oauth2/Manifest
@@ -1,2 +1,3 @@
DIST gcloud-golang-629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz 144387 SHA256 bee11c31bc0f8914b4b72463033eb7432f28cec490673f4a12618b64868ee1f5 SHA512 33bdb3a9b3379bdd2502ade3ee9a41601effbd3f4bae88a7a7b4931866b73b336846b50994b254cac85571693566e12f4a23a0b8a0428d6aef1b301d468ef417 WHIRLPOOL 50426185042fe8b754b2db30b11fce588a189cb61e3e9781409edde6a5deb15a109ed1bf78e5831414762f497d3a6dcd98f2291f9c93b283059aa5b453ac9121
DIST go-oauth2-1.4.2_p20150511.tar.gz 31804 SHA256 db262d679331282b056bb19a7552405c34a7c8504597e822058ceb9d61aefdd8 SHA512 a8357f3b7d7f8b8c54044f28fe4b11f7558b82914a6ac91b7d2044f6da3cadddb2c4ea0b7466e71e5b51dd010dd342eb1077cf050351f6fd2527c39c1cd89134 WHIRLPOOL 86de0719ffb854d3fc16ed48f1802016447d64cd6294a72130c133bdf9d722a280b7c00972d49e27f18a2655056acfa0a36b4a80015c64f19d8088084dc3da50
+DIST go-oauth2-1.4.2_p20150527.tar.gz 32027 SHA256 eb1d48e29653b0bc68e41ef35df0d421e586e666ce52d7d504a6f2fb89807ce1 SHA512 9070bfed2e280286dbaeb360e77a9b2decf3e272e945ce4099875f7fd2e378b54082f8a9b4a2b7289d6984be4c66110d34b814cbc8e2850fd44122d484258fd4 WHIRLPOOL 09f19f1111f0a1d40ccff541c5cf4ad968264c91e9f6a3c18d23d441520002896b99f8f9979922dd4245edd9b46f89c46c94144b516c8424de43ccae8d462598
diff --git a/dev-go/go-oauth2/go-oauth2-1.4.2_p20150527.ebuild b/dev-go/go-oauth2/go-oauth2-1.4.2_p20150527.ebuild
new file mode 100644
index 000000000000..4754596f57a6
--- /dev/null
+++ b/dev-go/go-oauth2/go-oauth2-1.4.2_p20150527.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-oauth2/go-oauth2-1.4.2_p20150527.ebuild,v 1.1 2015/06/09 03:43:11 zmedico Exp $
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="Go client implementation for OAuth 2.0 spec"
+MY_PN=${PN##*-}
+GO_PN=golang.org/x/${MY_PN}
+HOMEPAGE="https://godoc.org/${GO_PN}"
+EGIT_COMMIT="b5adcc2dcdf009d0391547edc6ecbaff889f5bb9"
+SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+https://github.com/GoogleCloudPlatform/gcloud-golang/archive/629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz -> gcloud-golang-629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-lang/go-1.4
+ dev-go/go-net"
+RDEPEND=""
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_unpack() {
+ default
+ mkdir -p src/${GO_PN%/*} || die
+ mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
+
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ export GOROOT="${WORKDIR}/goroot" GOPATH=${WORKDIR}
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}/src/${GO_PN}" || die
+
+ mkdir -p "${GOROOT}/src/google.golang.org" || die
+ rm -rf "${GOROOT}/src/google.golang.org"/* || die
+ rm -rf "${GOROOT}/pkg/${KERNEL}_${ARCH}/google.golang.org" || die
+ mv gcloud-golang-629ed086d82ad5d0ac3668e309b8785aaf54735b "${GOROOT}/src/google.golang.org/cloud" || die
+}
+
+src_compile() {
+ go install -v -x -work google.golang.org/cloud/compute/metadata || die
+ go install -v -x -work ${GO_PN}/... || die
+}
+
+src_test() {
+ # google/example_test.go imports appengine, introducing a circular dep
+ mv google/example_test.go{,_}
+ go test -x -v ${GO_PN}/... || die $?
+ mv google/example_test.go{_,}
+}
+
+src_install() {
+ insinto /usr/lib/go
+ find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
+ doins -r "${WORKDIR}"/{pkg,src}
+}
diff --git a/dev-go/go-sys/go-sys-1.4.2_p20150518.ebuild b/dev-go/go-sys/go-sys-1.4.2_p20150518-r1.ebuild
similarity index 92%
rename from dev-go/go-sys/go-sys-1.4.2_p20150518.ebuild
rename to dev-go/go-sys/go-sys-1.4.2_p20150518-r1.ebuild
index f4c56110d45a..33ab84be51c5 100644
--- a/dev-go/go-sys/go-sys-1.4.2_p20150518.ebuild
+++ b/dev-go/go-sys/go-sys-1.4.2_p20150518-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-sys/go-sys-1.4.2_p20150518.ebuild,v 1.1 2015/05/21 07:39:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-sys/go-sys-1.4.2_p20150518-r1.ebuild,v 1.1 2015/06/09 03:28:08 zmedico Exp $
EAPI=5
@@ -47,5 +47,6 @@ src_install() {
insinto /usr/lib/go/src/${GO_PN}
find "${WORKDIR}"/src/${GO_PN} -name '.git*' -exec \
rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
doins -r "${WORKDIR}"/src/${GO_PN}/unix
}
diff --git a/dev-go/go-sys/go-sys-9999.ebuild b/dev-go/go-sys/go-sys-9999.ebuild
index df888d78a3ee..95655ef99595 100644
--- a/dev-go/go-sys/go-sys-9999.ebuild
+++ b/dev-go/go-sys/go-sys-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-sys/go-sys-9999.ebuild,v 1.1 2015/05/19 07:24:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-sys/go-sys-9999.ebuild,v 1.2 2015/06/09 03:28:08 zmedico Exp $
EAPI=5
inherit git-r3
@@ -40,5 +40,6 @@ src_install() {
insinto /usr/lib/go/src/${GO_PN}
find "${WORKDIR}"/src/${GO_PN} -name '.git*' -exec \
rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
doins -r "${WORKDIR}"/src/${GO_PN}/unix
}
diff --git a/dev-go/go-text/Manifest b/dev-go/go-text/Manifest
index 7d0c3b5c67f5..c84b4ed8ba5c 100644
--- a/dev-go/go-text/Manifest
+++ b/dev-go/go-text/Manifest
@@ -1 +1,2 @@
DIST go-text-1.4.2_p20150506.tar.gz 3711464 SHA256 807391d9a71534abdcae0a04c585be2e1e08ce2f04a5eaf5c1284f003f97ec89 SHA512 da91210954c2ff925ff0e3bc1c0c1b3e0267c949ae81f40124eb46dd77349fbe7b27397470949efb84657cece22427a95bad6c22bb82d0ff6a69236106900280 WHIRLPOOL d924086b1400d9557e67cc11b710946660fa2b54bdf18618ea6c79b0b0e16bcd3c50afcb8fe93d00510a766bfae2f6b298d88967e79e42037011ec8cf034c7e1
+DIST go-text-1.4.2_p20150604.tar.gz 3719061 SHA256 71017417b42ea4e68ac77303782c83b627bfbceed041a1467ddc6319c78923ad SHA512 1bbc5bff271243ee31e346a79abf9dd128907cea82fa1eaba11be62780bd1f6b6b76a2ae9476fbe350224f450e75d12efcffd67521b49d6bec44ce2bb085f0d3 WHIRLPOOL e953d99d661537c8838757ae507f2adda3319ef22ce687a39533351201c5bb7206701db4b54f7c0e4d6df803b378a4f587a2015646825b4c3dfad97696baed2e
diff --git a/dev-go/go-text/go-text-1.4.2_p20150604.ebuild b/dev-go/go-text/go-text-1.4.2_p20150604.ebuild
new file mode 100644
index 000000000000..84ac76d1cb57
--- /dev/null
+++ b/dev-go/go-text/go-text-1.4.2_p20150604.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-1.4.2_p20150604.ebuild,v 1.1 2015/06/09 03:07:26 zmedico Exp $
+
+EAPI=5
+
+KEYWORDS="~amd64"
+DESCRIPTION="Go text processing support"
+MY_PN=${PN##*-}
+GO_PN=golang.org/x/${MY_PN}
+HOMEPAGE="https://godoc.org/${GO_PN}"
+EGIT_COMMIT="df923bbb63f8ea3a26bb743e2a497abd0ab585f7"
+SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-lang/go-1.4"
+RDEPEND=""
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_unpack() {
+ default
+ mkdir -p src/${GO_PN%/*} || die
+ mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
+}
+
+src_compile() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}/src/${GO_PN}" \
+ "${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
+}
+
+src_test() {
+ # Create go symlink for TestLinking in display/dict_test.go
+ mkdir -p "${GOROOT}/bin"
+ ln -s /usr/bin/go "${GOROOT}/bin/go" || die
+
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
+ go test -x -v ${GO_PN}/... || die $?
+}
+
+src_install() {
+ exeinto /usr/lib/go/bin
+ doexe "${WORKDIR}"/bin/*
+ insinto /usr/lib/go
+ find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
+ doins -r "${WORKDIR}"/{pkg,src}
+}
diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild
index 312b2ab1b981..37b218ff7c47 100644
--- a/dev-go/go-text/go-text-9999.ebuild
+++ b/dev-go/go-text/go-text-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-9999.ebuild,v 1.4 2015/05/24 08:19:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-9999.ebuild,v 1.5 2015/06/09 03:07:26 zmedico Exp $
EAPI=5
inherit git-r3
@@ -42,5 +42,6 @@ src_install() {
doexe "${WORKDIR}"/bin/*
insinto /usr/lib/go
find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
doins -r "${WORKDIR}"/{pkg,src}
}
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 4cf9557d74a0..d2d741cb6f17 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,3 +1,4 @@
DIST go-favicon.ico 1150 SHA256 d76ca702a6d81e20ddd31c8c5a4368130e7c68d990600316f6f1c9509bd38ba7 SHA512 194c4b3c360321a10f714b6755d9155de6129682b4070d19b52d0d5706fcbd1d244ea38c33fd77fe1dec85b3e39720dd0a62f5b126803036fbc8337a9d72fea6 WHIRLPOOL f55a84a28812bffd1fa38e098e6ba7d757bdefc0e20c3d8ef767fb1bc7d6e2cfbb8d1ae0593e81cce17c27f60e6aacf094e6c67b1f592c0546090feab9d3830f
DIST go-tools-1.4.2_p20150520.tar.gz 1625986 SHA256 ea5cdf7c19b250c2e98b136ff993d1ecbfb66b052c7ac748a03f99eedf676f99 SHA512 1a3fd27fb79d449f876823f032f1a4a00bbb83cf8e9c370634910e76cdcb3c0e4b5fbad6b6012e928e82c7c986a1dadc60c49f2b6021730952725dc32e3cea3d WHIRLPOOL 641d95c9dccf7194a38ee767cb2cf54c91f676a271ef7113df2b05ffaeed7c2afeddd2a1ab005a80f035762cf502b57e336948cc55e1a7ab0d7b625779555183
DIST go-tools-1.4.2_p20150602.tar.gz 1625375 SHA256 45adbc0f45e5a7cda896f2ad832d6fedd99f079d860e0ff4b828703b39835d05 SHA512 b89d90decd5fc55164f558ce55b35e6fe6cf0cbc7caa0a4ea9003a1d9031cfa7e5b88160bded2fe9062e90e1f5126a0265fb49acee4236ec793c5a140ffc1343 WHIRLPOOL 905777ad852530ce046d6dbe0e46a6a34c82f7446c547ba2574ab4a947d090e150bb82f6ad24c49dca76f8cf660c369ea0d580a8b19ce3082734cff0e1babd0a
+DIST go-tools-1.4.2_p20150606.tar.gz 1625903 SHA256 d121fc152648283413bc0596a55edc229796a7640d2ba6e1fd31c4fc316bb32c SHA512 68904e9799f80c77b1ccda2483eea4dcb19825aaf94355f967d1b0c3547ebf85772c0e92d9b5ba2e492a8af1b4cd07037d121add3c42760d15ca41c05d1161ab WHIRLPOOL 2e5e51112b4ddf2f391c8131e0b84e4c73ddcfcedc46ee934700b45c9cac5c2ee6a4984c02fa80c2207bd39d6b903a68c72cddec0fabcdd14ec2c6a4c7c7f727
diff --git a/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild b/dev-go/go-tools/go-tools-1.4.2_p20150606.ebuild
similarity index 77%
rename from dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild
rename to dev-go/go-tools/go-tools-1.4.2_p20150606.ebuild
index bb10df8e1e23..dc91c97291e7 100644
--- a/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild
+++ b/dev-go/go-tools/go-tools-1.4.2_p20150606.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild,v 1.5 2015/05/28 07:11:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-1.4.2_p20150606.ebuild,v 1.1 2015/06/09 03:17:38 zmedico Exp $
EAPI=5
@@ -9,8 +9,9 @@ DESCRIPTION="Go Tools"
MY_PN=${PN##*-}
GO_PN=golang.org/x/${MY_PN}
HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_COMMIT="3d1847243ea4f07666a91110f48e79e43396603d"
-SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+EGIT_COMMIT="ac303766f5f240c1796eeea3dc9bf34f1261aa35"
+SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ http://golang.org/favicon.ico -> go-favicon.ico"
LICENSE="BSD"
SLOT="0"
IUSE=""
@@ -25,6 +26,7 @@ src_unpack() {
default
mkdir -p src/${GO_PN%/*} || die
mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
+ cp "${DISTDIR}"/go-favicon.ico "${S}"/godoc/static/favicon.ico || die
}
src_prepare() {
@@ -47,6 +49,11 @@ src_prepare() {
-e 's:TestStdKen(:_\0:' -i go/types/stdlib_test.go || die
sed -e 's:TestRepoRootForImportPath(:_\0:' -i go/vcs/vcs_test.go || die
sed -e 's:TestStdlib(:_\0:' -i refactor/lexical/lexical_test.go || die
+
+ # Add favicon to the godoc web interface (bug 551030)
+ sed -e 's:"example.html",:\0\n\t"favicon.ico",:' -i godoc/static/makestatic.go || die
+ sed -e 's:\n\0:' -i \
+ godoc/static/godoc.html || die
}
src_compile() {
@@ -55,6 +62,12 @@ src_compile() {
cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
rm -rf "${GOROOT}/src/${GO_PN}" \
"${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
+
+ # Generate static.go with favicon included
+ pushd godoc/static >/dev/null
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} go run makestatic.go || die
+ popd >/dev/null
+
GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
}
@@ -81,5 +94,6 @@ src_install() {
insinto /usr/lib/go
find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
doins -r "${WORKDIR}"/{pkg,src}
}
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 3496e6c4875c..43549f2032da 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.6 2015/06/03 07:05:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.7 2015/06/09 03:17:38 zmedico Exp $
EAPI=5
inherit git-r3
@@ -92,5 +92,6 @@ src_install() {
insinto /usr/lib/go
find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ insopts -m0644 -p # preserve timestamps for bug 551486
doins -r "${WORKDIR}"/{pkg,src}
}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
index 9c5bd5512405..f17ebb634047 100644
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild,v 1.3 2015/06/08 16:07:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild,v 1.4 2015/06/09 07:09:50 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="lib-only"
RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
index 8c83c4a56cf6..17693422aff1 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild,v 1.2 2015/06/08 16:08:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild,v 1.3 2015/06/09 07:11:06 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
diff --git a/dev-haskell/hspec/hspec-1.8.1.1.ebuild b/dev-haskell/hspec/hspec-1.8.1.1.ebuild
index 568977d496c9..3a1464b47071 100644
--- a/dev-haskell/hspec/hspec-1.8.1.1.ebuild
+++ b/dev-haskell/hspec/hspec-1.8.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hspec/hspec-1.8.1.1.ebuild,v 1.2 2015/06/08 16:07:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hspec/hspec-1.8.1.1.ebuild,v 1.3 2015/06/09 07:10:28 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
diff --git a/dev-haskell/list/list-0.5.2.ebuild b/dev-haskell/list/list-0.5.2.ebuild
index 60d9b972400b..14312e5f8691 100644
--- a/dev-haskell/list/list-0.5.2.ebuild
+++ b/dev-haskell/list/list-0.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/list/list-0.5.2.ebuild,v 1.2 2015/06/08 16:08:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/list/list-0.5.2.ebuild,v 1.3 2015/06/09 07:11:24 ago Exp $
EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
diff --git a/dev-haskell/logict/logict-0.6.0.2.ebuild b/dev-haskell/logict/logict-0.6.0.2.ebuild
index f735da72d7d9..44027cdbbb13 100644
--- a/dev-haskell/logict/logict-0.6.0.2.ebuild
+++ b/dev-haskell/logict/logict-0.6.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/logict/logict-0.6.0.2.ebuild,v 1.3 2015/06/08 16:07:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/logict/logict-0.6.0.2.ebuild,v 1.4 2015/06/09 07:10:46 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=dev-haskell/mtl-2:=[profile?] =virtual/jre-1.5
+ dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.6
${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
test? ( dev-java/junit:4 )
${COMMON_DEP}"
diff --git a/dev-java/cglib/cglib-3.1.ebuild b/dev-java/cglib/cglib-3.1.ebuild
index 3f500a5496e7..68c8008a3523 100644
--- a/dev-java/cglib/cglib-3.1.ebuild
+++ b/dev-java/cglib/cglib-3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-3.1.ebuild,v 1.1 2015/04/11 18:37:34 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-3.1.ebuild,v 1.2 2015/06/08 23:28:00 monsieurp Exp $
EAPI="5"
@@ -14,12 +14,12 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
IUSE=""
COMMON_DEP="dev-java/asm:4
- >=dev-java/ant-core-1.7.0"
+ dev-java/ant-core:0"
RDEPEND=">=virtual/jre-1.6
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/commons-digester/commons-digester-3.2-r1.ebuild b/dev-java/commons-digester/commons-digester-3.2-r1.ebuild
index 7f0fc305cb16..110b6c027560 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-3.2-r1.ebuild,v 1.1 2015/04/11 21:05:13 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-3.2-r1.ebuild,v 1.2 2015/06/08 23:28:16 monsieurp Exp $
EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
CDEPEND="dev-java/cglib:3
dev-java/commons-beanutils:1.7
diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild b/dev-java/easymock/easymock-3.2-r1.ebuild
index c8eecedfbb9a..6fc9328749f2 100644
--- a/dev-java/easymock/easymock-3.2-r1.ebuild
+++ b/dev-java/easymock/easymock-3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock/easymock-3.2-r1.ebuild,v 1.3 2015/04/11 22:23:20 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock/easymock-3.2-r1.ebuild,v 1.4 2015/06/08 23:31:46 monsieurp Exp $
EAPI="5"
@@ -14,25 +14,23 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
-COMMON_DEPEND="
- dev-java/junit:4
+CDEPEND="dev-java/junit:4
dev-java/objenesis:0
- dev-java/cglib:2.2
-"
+ dev-java/cglib:3"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
app-arch/unzip
- ${COMMON_DEPEND}"
+ ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
S="${WORKDIR}/${P}"
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-2.2"
+JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-3"
JAVA_SRC_DIR="src"
src_unpack() {
diff --git a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
index 768c46a2d439..f6b98cb2e0b1 100644
--- a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
+++ b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild,v 1.3 2015/04/02 18:07:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild,v 1.4 2015/06/08 21:30:26 monsieurp Exp $
EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
CDEPEND="java-virtuals/xmlrpc-api:0
java-virtuals/transaction-api:0"
diff --git a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
index 4182bdf73d86..04bbc2ea042f 100644
--- a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
+++ b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild,v 1.3 2015/04/02 18:08:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild,v 1.4 2015/06/08 21:27:03 monsieurp Exp $
EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~x86 ~amd64"
CDEPEND="java-virtuals/servlet-api:3.0"
diff --git a/dev-java/jsr101/jsr101-1.4-r2.ebuild b/dev-java/jsr101/jsr101-1.4-r2.ebuild
new file mode 100644
index 000000000000..56d2349090e9
--- /dev/null
+++ b/dev-java/jsr101/jsr101-1.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr101/jsr101-1.4-r2.ebuild,v 1.1 2015/06/09 08:59:41 monsieurp Exp $
+
+EAPI=5
+JAVA_PKG_IUSE=""
+
+inherit versionator java-pkg-2
+
+DESCRIPTION="Java(TM) API for XML-Based RPC Specification Interface Classes"
+HOMEPAGE="http://jcp.org/aboutJava/communityprocess/first/jsr101/"
+MY_PN=axis
+MY_PV=$(replace_all_version_separators _)
+SRC_URI="mirror://apache/ws/${MY_PN}/${MY_PV}/${MY_PN}-src-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+CDEPEND="java-virtuals/servlet-api:2.5
+ java-virtuals/saaj-api:0"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_compile() {
+ mkdir build
+ ejavac \
+ -classpath $(java-pkg_getjars servlet-api-2.5,saaj-api) \
+ $(find src/javax/xml/rpc -name "*.java") -d build
+ cd build
+ jar cf jaxrpc-api.jar $(find . -type f) || die "jar failed"
+}
+
+src_install() {
+ java-pkg_dojar build/*.jar
+}
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
index fa1d1de04bd9..9332e5af68bf 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -1,2 +1,3 @@
+DIST javax.faces-2.2.9-sources.jar 3098257 SHA256 f3ba4bcafcdac5e92bd784574e3f0b35ff4b7c56d07dda628a8e0246d1a40b27 SHA512 a398c7edd483af59e59c52896dfd6fbf67948cb9778940bb5045c6c4ee2e0549e24ee321dcf7a8bdadbbec82c7e533840bc42669e79664fa864627744b6cc0e3 WHIRLPOOL 040768e9aba1575137e4a1ef7bbf587fea71ff46119066a0fe5b72a9c0a1da647fbef1a712952efa0d59d51ca346366eefc0f79b7912cc7d071d695a39edf48c
DIST mojarra-1.2_15-b01-FCS-patch.bz2 4369 SHA256 c8495b51225201bf23033a01bb853abf1cc0a40214aa6a68c7dd1c30812e6cd1 SHA512 125e511b052d4c70314a069c47ce72b51e4dd9d1c6826def6c1a8c0bf72f6c711a9fb9f05065a5f1f46dce8462b701198f67d257b1f0aa683b494b31d90205ac WHIRLPOOL 62efb9f165d40be7ba94be04046867b342d2ba39f340443bceb3f8b421c9be2c8c312ea9e04d7c743e6440fe124bd8566fa383013a9654b7758f180f659234c4
DIST mojarra-1.2_15-b01-FCS-source.zip 5091287 SHA256 8678db1e93a2f605b696ae3a04e145bc14dd46409301ae230dc6ee4477ccb343 SHA512 6e8d8278aac36d3971bef523f8ec90a4959c0d6ec69642d5edd10379c2cdbe13242ad197475abda887b886f166b8c7ea762be5560a746f2426cec9c6a25c0144 WHIRLPOOL c5b2ab6a568468c2570d61d5cf8bc5f7147b403c9f7718c2ea32eda783605f48aa41c9f8a96cf48e13c10e5859061a527f40c003d7ff48a66571be6a69472559
diff --git a/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch b/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
new file mode 100644
index 000000000000..d73ee9ce0596
--- /dev/null
+++ b/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
@@ -0,0 +1,26 @@
+--- src/com/sun/faces/util/Util.java.orig 2015-06-08 21:08:39.770000000 +0000
++++ src/com/sun/faces/util/Util.java 2015-06-08 21:10:12.719000000 +0000
+@@ -315,13 +315,16 @@
+ // as the same adapter in a standalone program works as one might expect.
+ // So, for now, if the classname starts with '[', then use Class.forName()
+ // to avoid CR 643419 and for all other cases, use ClassLoader.loadClass().
+- if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {
+- if (name.charAt(0) == '[') {
+- return Class.forName(name, true, loader);
+- } else {
+- return loader.loadClass(name);
+- }
+- }
++ //
++ // Disable Groovy stuff for the time being
++ // since groovy 2.4 hasn't hit the tree... yet.
++ // if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {
++ // if (name.charAt(0) == '[') {
++ // return Class.forName(name, true, loader);
++ // } else {
++ // return loader.loadClass(name);
++ // }
++ // }
+ return Class.forName(name, true, loader);
+ }
+
diff --git a/dev-java/mojarra/mojarra-2.2.9.ebuild b/dev-java/mojarra/mojarra-2.2.9.ebuild
new file mode 100644
index 000000000000..62adeaa7f9e4
--- /dev/null
+++ b/dev-java/mojarra/mojarra-2.2.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/mojarra-2.2.9.ebuild,v 1.1 2015/06/08 21:36:31 monsieurp Exp $
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
+HOMEPAGE="https://javaserverfaces.dev.java.net/"
+SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="2.2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="dev-java/glassfish-persistence:0
+ dev-java/glassfish-ejb-api:0
+ java-virtuals/servlet-api:3.0
+ dev-java/tomcat-jstl-spec:1.2.5
+ dev-java/tomcat-jstl-impl:1.2.5
+ dev-java/validation-api:1.0
+ dev-java/javax-inject:0
+ dev-java/cdi-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="glassfish-persistence,glassfish-ejb-api,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5,validation-api-1.0,cdi-api-1.2,servlet-api-3.0,javax-inject"
+
+java_prepare() {
+ mkdir src || die
+ mv * src
+
+ # We *MUST* bump Groovy to 2.4 at some point
+ # to make this stuff work correctly.
+ rm -v src/com/sun/faces/scripting/groovy/GroovyHelperImpl.java || die
+ epatch "${FILESDIR}"/${P}-Util.java.patch
+}
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild
index a23a3a293781..48c51d071aa5 100644
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild,v 1.1 2015/06/03 07:53:38 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild,v 1.2 2015/06/08 21:00:35 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
@@ -20,9 +20,9 @@ SLOT="1.2.5"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-CDEPEND="dev-java/tomcat-jstl-impl:1.2.5
+CDEPEND="java-virtuals/servlet-api:3.0
dev-java/tomcat-jstl-spec:1.2.5
- dev-java/tomcat-servlet-api:3.1"
+ dev-java/tomcat-jstl-impl:1.2.5"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
@@ -35,7 +35,7 @@ DEPEND=">=virtual/jdk-1.6
S="${WORKDIR}/${MY_P}"
JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
EANT_BUILD_TARGET="package"
EANT_BUILD_XML="compat/build.xml"
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
index faca5ea909e2..95f20e833f08 100644
--- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild,v 1.1 2015/06/03 07:56:37 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild,v 1.2 2015/06/08 21:03:56 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
@@ -20,9 +20,9 @@ SLOT="1.2.5"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-CDEPEND="dev-java/tomcat-jstl-impl:1.2.5
- dev-java/tomcat-jstl-spec:1.2.5
- dev-java/tomcat-servlet-api:3.1"
+CDEPEND="java-virtuals/servlet-api:3.0
+ dev-java/tomcat-jstl-impl:1.2.5
+ dev-java/tomcat-jstl-spec:1.2.5"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
@@ -35,7 +35,7 @@ DEPEND=">=virtual/jdk-1.6
S="${WORKDIR}/${MY_P}"
JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
EANT_BUILD_TARGET="package"
EANT_BUILD_XML="jstlel/build.xml"
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
index 7462944a4709..b2bd7507e379 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild,v 1.1 2015/06/03 08:00:12 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild,v 1.2 2015/06/08 21:08:52 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
@@ -20,7 +20,7 @@ SLOT="1.2.5"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-CDEPEND="dev-java/tomcat-servlet-api:3.0"
+CDEPEND="java-virtuals/servlet-api:3.0"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
@@ -33,7 +33,7 @@ DEPEND=">=virtual/jdk-1.6
S="${WORKDIR}/${MY_P}"
JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.0"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0"
EANT_BUILD_TARGET="package"
EANT_BUILD_XML="spec/build.xml"
diff --git a/dev-libs/apr-util/apr-util-1.5.4.ebuild b/dev-libs/apr-util/apr-util-1.5.4.ebuild
index 12d1ff8169b7..faa04d30b8d4 100644
--- a/dev-libs/apr-util/apr-util-1.5.4.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.4.ebuild,v 1.6 2015/06/08 14:08:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.4.ebuild,v 1.7 2015/06/09 07:23:42 ago Exp $
EAPI="4"
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
#RESTRICT="test"
diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild
index 739b158aff1e..712d758335a3 100644
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ b/dev-libs/apr/apr-1.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.2.ebuild,v 1.5 2015/06/08 14:08:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.2.ebuild,v 1.6 2015/06/09 07:23:38 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index f41468eab175..c3086eadd33e 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,2 +1,3 @@
DIST atk-2.12.0.tar.xz 688716 SHA256 48a8431974639c5a59c24fcd3ece1a19709872d5dfe78907524d9f5e9993f18f SHA512 422f0f4ef5f29707e77065557516a218ff23e78f61fa8e8c78b4a528c06cfeaff934e67eaaec00dc82cd13b2869e30618883a53010bd828dbebe51baea848272 WHIRLPOOL 2fda41b10a3890e7f097756da5aa3d502a0017ab82abbd67f72835b55240c9d23d53521e5632e0e287cc8c1e17598635c3385ca5362c4e1c42bcbc52c97db984
DIST atk-2.14.0.tar.xz 696064 SHA256 2875cc0b32bfb173c066c22a337f79793e0c99d2cc5e81c4dac0d5a523b8fbad SHA512 3aa5155086d607a2779be1e96ae77798192f93161c855b194f15c49d968bb88535e16ee6114911857f31aeedfc0930f3f828d225f71a7b2f48e85919ab7d057b WHIRLPOOL 0b9f956e35f0baa65a63d7029d4f7317f13c22975696f80ff1f4515af5850368c43e69561c50d8b7b944f98e0482ac7c63d7a496f11566024d497b93e776fe12
+DIST atk-2.16.0.tar.xz 699816 SHA256 095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562 SHA512 dc8827779d14fe7212733464f8775f67d60ab3027fcd935245d57c5899e8fc8acc6ceb88ee58f7bfbf259b89447868b3c93726ac56f46bf30a722b47b7bbd7da WHIRLPOOL 94ab7594c9e2508e6e2c9b62bfd80ebedf802a38e5bcd9c28b1224deb56d38d551687d0280e5af57b9713dd1fdbac84c58a03638856aab72bd060009188df641
diff --git a/dev-libs/atk/atk-2.16.0.ebuild b/dev-libs/atk/atk-2.16.0.ebuild
new file mode 100644
index 000000000000..546409d5b6b4
--- /dev/null
+++ b/dev-libs/atk/atk-2.16.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.16.0.ebuild,v 1.1 2015/06/08 22:22:15 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
+HOMEPAGE="http://projects.gnome.org/accessibility/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="+introspection nls test"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5
+ dev-util/gtk-doc-am
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ gnome2_src_prepare
+
+ if ! use test; then
+ # don't waste time building tests (bug #226353)
+ sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+ || die "sed failed"
+ fi
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(multilib_native_use_enable introspection)
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/html docs/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 9ebcbe527efd..ee6dea7899a1 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,4 +2,5 @@ DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89
DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
DIST glib-2.42.2.tar.xz 7002480 SHA256 a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db SHA512 6b46e4ac67d79ca2cc5c32ceb7cc8112140645032cb3c8c9ba2f59a0d3c2aee06707b7573bbd72f6c21ea7798a7351bd205aa57857a58b0be008c75f897ef782 WHIRLPOOL 5c25c5f6d20217cce4f8c34d9d05cd39197b4b36c5a85447943fcab47cd343253879516b722eb0c4895eebae5f3d4e76c820730b9e7f6c890aca9c87dc963564
+DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
diff --git a/dev-libs/glib/glib-2.44.1.ebuild b/dev-libs/glib/glib-2.44.1.ebuild
new file mode 100644
index 000000000000..0e675a0efd28
--- /dev/null
+++ b/dev-libs/glib/glib-2.44.1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.44.1.ebuild,v 1.1 2015/06/08 22:45:27 eva Exp $
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+# Building with --disable-debug highly unrecommended. It will build glib in
+# an unusable form as it disables some commonly used API. Please do not
+# convert this to the use_enable form, as it results in a broken build.
+GCONF_DEBUG="yes"
+# Completely useless with or without USE static-libs, people need to use
+# pkg-config
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic multilib \
+ pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+ http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+REQUIRED_USE="
+ utils? ( ${PYTHON_REQUIRED_USE} )
+ test? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="
+ !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ || (
+ >=dev-libs/elfutils-0.142
+ >=dev-libs/libelf-0.8.12
+ >=sys-freebsd/freebsd-lib-9.2_rc1
+ )
+ selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+ xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+ fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+ utils? (
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-libs/libxslt-1.0
+ >=sys-devel/gettext-0.11
+ >=dev-util/gtk-doc-am-1.20
+ systemtap? ( >=dev-util/systemtap-1.3 )
+ test? (
+ sys-devel/gdb
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+ >=sys-apps/dbus-1.2.14 )
+ !& /dev/null; then
+ if has_version sys-apps/dbus; then
+ export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+ export DBUS1_LIBS="-ldbus-1"
+ fi
+ export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+ export LIBFFI_LIBS="-lffi"
+ fi
+
+ local myconf
+
+ case "${CHOST}" in
+ *-mingw*) myconf="${myconf} --with-threads=win32" ;;
+ *) myconf="${myconf} --with-threads=posix" ;;
+ esac
+
+ # Only used by the gresource bin
+ multilib_is_native_abi || myconf="${myconf} --disable-libelf"
+
+ # FIXME: Always use internal libpcre, bug #254659
+ # (maybe consider going back to system lib
+ ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+ $(use_enable xattr) \
+ $(use_enable fam) \
+ $(use_enable selinux) \
+ $(use_enable static-libs static) \
+ $(use_enable systemtap dtrace) \
+ $(use_enable systemtap systemtap) \
+ --disable-compile-warnings \
+ --enable-man \
+ --with-pcre=internal \
+ --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+ if multilib_is_native_abi; then
+ local d
+ for d in glib gio gobject; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ export XDG_CONFIG_DIRS=/etc/xdg
+ export XDG_DATA_DIRS=/usr/local/share:/usr/share
+ export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+ unset GSETTINGS_BACKEND # bug 352451
+ export LC_TIME=C # bug #411967
+ python_export_best
+
+ # Related test is a bit nitpicking
+ mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+ chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+ # Hardened: gdb needs this, bug #338891
+ if host-is-pax ; then
+ pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+ || die "Hardened adjustment failed"
+ fi
+
+ # Need X for dbus-launch session X11 initialization
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog* NEWS* README"
+ einstalldocs
+
+ if use utils ; then
+ python_replicate_script "${ED}"/usr/bin/gtester-report
+ else
+ rm "${ED}usr/bin/gtester-report"
+ rm "${ED}usr/share/man/man1/gtester-report.1"
+ fi
+
+ # Do not install charset.alias even if generated, leave it to libiconv
+ rm -f "${ED}/usr/lib/charset.alias"
+
+ # Don't install gdb python macros, bug 291328
+ rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ if has_version '=dev-libs/gobject-introspection-common-${PV}
+ >=dev-libs/glib-2.$(get_version_component_range 2):2
+ doctool? ( dev-python/mako )
+ virtual/libffi:=
+ virtual/pkgconfig
+ !=dev-util/gtk-doc-am-1.19
+ sys-devel/bison
+ sys-devel/flex
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ if ! has_version "x11-libs/cairo[glib]"; then
+ # Bug #391213: enable cairo-gobject support even if it's not installed
+ # We only PDEPEND on cairo to avoid circular dependencies
+ export CAIRO_LIBS="-lcairo -lcairo-gobject"
+ export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+ fi
+
+ # To prevent crosscompiling problems, bug #414105
+ gnome2_src_configure \
+ --disable-static \
+ CC="$(tc-getCC)" \
+ YACC="$(type -p yacc)" \
+ $(use_with cairo) \
+ $(use_enable doctool)
+}
+
+src_install() {
+ DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+ gnome2_src_install
+
+ # Prevent collision with gobject-introspection-common
+ rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+ "${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+ rmdir "${ED}"usr/share/aclocal || die
+}
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index ae5a2a62fb34..d19548f0643d 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1 +1,2 @@
DIST libunistring-0.9.3.tar.gz 2555215 SHA256 610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3 SHA512 351c0c94c4a31efbed932978ff8afae4defd7c28771d2d877b5ead5383a4f1b53200ece72b6908a9bafb7836775b2af3465e051226e43520ada2b8c583314d12 WHIRLPOOL f6a4f6571556193c0bacb3e4a29202da7f2ba96e7d0fb25a638fe2149bb38de029de43e66e1cbe80bbb633df3fe3469525e296ea57ef66ac7ca96cd082abdb2d
+DIST libunistring-0.9.5.tar.gz 3487957 SHA256 1a8c0772467850bef7197318a95f44abbb678ea83cbf119a3500cc7848276a17 SHA512 89404b8f0fde264c3faa4285e4717487f2b6c348fa9374ccff2251eb3db6dda208fe013056a22f496c1fb099abe7e79b72a203d15499c641e3ac48e7957ba1b4 WHIRLPOOL 445a836b687187faa8b562dff694add9448b7a2770b51748974bead2304f00c2242a3488c20819c250f800f6711d3f594803094aae2b8cb189a1519f2450db20
diff --git a/dev-libs/libunistring/libunistring-0.9.5.ebuild b/dev-libs/libunistring/libunistring-0.9.5.ebuild
new file mode 100644
index 000000000000..d3d31f90e096
--- /dev/null
+++ b/dev-libs/libunistring/libunistring-0.9.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunistring/libunistring-0.9.5.ebuild,v 1.1 2015/06/08 21:22:41 eva Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Library for manipulating Unicode strings and C strings according to the Unicode standard"
+HOMEPAGE="http://www.gnu.org/software/libunistring/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+IUSE="doc static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-nodocs.patch
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ dodoc AUTHORS README ChangeLog || die "dodoc failed"
+ if use doc; then
+ dohtml doc/*.html || die "dohtml failed"
+ doinfo doc/*.info || die "doinfo failed"
+ fi
+
+ emake DESTDIR="${D}" install || die "Install failed"
+
+ prune_libtool_files
+}
diff --git a/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild
index 6b8e75ec9fc3..b3bd57347898 100644
--- a/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild
+++ b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild,v 1.4 2015/06/08 16:08:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild,v 1.5 2015/06/09 07:07:02 ago Exp $
EAPI="5"
PHP_EXT_NAME="memcache"
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php5-5 php5-4"
inherit php-ext-pecl-r2
-KEYWORDS="amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc64 x86"
DESCRIPTION="PHP extension for using memcached"
LICENSE="PHP-3"
diff --git a/dev-python/Coffin/Coffin-2.0.1.ebuild b/dev-python/Coffin/Coffin-2.0.1.ebuild
new file mode 100644
index 000000000000..924e59313122
--- /dev/null
+++ b/dev-python/Coffin/Coffin-2.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Coffin/Coffin-2.0.1.ebuild,v 1.1 2015/06/09 07:33:18 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Jinja2 adapter for Django"
+HOMEPAGE="http://github.com/coffin/coffin"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_prepare_all() {
+ # Req'd to avoid file collisions
+ sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+# Tests attempt to import an abandonned module
diff --git a/dev-python/Coffin/Manifest b/dev-python/Coffin/Manifest
index 6a9b0b0fb775..0d48379a8665 100644
--- a/dev-python/Coffin/Manifest
+++ b/dev-python/Coffin/Manifest
@@ -1 +1,2 @@
DIST Coffin-0.3.8.tar.gz 35269 SHA256 be3e804ea1c740d8f09c0f811253eee4c6aeeb993455521cac6e95e1e4d6151b SHA512 e3e0b9855e14b7fc57cd164aa3ba50f84847eb8a324d4ceaf52513224d235889407c061d542a894b82d6cdc96fc378fd44856d46f471333017d7a6ac6427c7d3 WHIRLPOOL c8105e5900e0f07a461689ca0c7295bb483991ec86466f4e72b8e837631fe6135a5db9192598d1f763bbfff773a06d5b611e391620a9ac76f3313f475802d978
+DIST Coffin-2.0.1.tar.gz 9858 SHA256 b1cfb44b1ef7daabc7c607a937f85e4b89b63bd9536ee3b817461747a476a65c SHA512 e618c74a91f84e7f41411c8e34b2c97fad1a59bc5124f0f5b3439abf1b0c2972d5f59d4b71f49393e843cd588ec143c08d659e90d2cfd006d55b5244b5727ccc WHIRLPOOL a1c745eca498ac5e7877c0ce20433d22c647d9e419b5269eb1a167d9ab478c068acfd6d2d59f485e8cb2f2fe7b440aa84c34ccefdc7595fb43a9d320e08d12cd
diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest
index 89f77b11a136..d2f48579dc21 100644
--- a/dev-python/datashape/Manifest
+++ b/dev-python/datashape/Manifest
@@ -1,3 +1,2 @@
-DIST datashape-0.4.2.tar.gz 79106 SHA256 56ca27c5eb090d3670d3f59d2cd4a9855c488495fd1888e6f723a21f42acfa32 SHA512 d12eecdce6ffeb77d9367fcf978c2cfddea3bd2daa53a2aea983464c41ff2a408f9d199462ed25eebf247f4bb0f9e827ac97a5acab19979a5d30789898441c49 WHIRLPOOL 5497a90258115e8db30414ab1bedbad88d38462e6606561c9be7645137557608ac12a384e93da08f3e2cb49c1ffbb5a3b5d33483376ee8f170cfe6af10a9dc32
DIST datashape-0.4.4.tar.gz 80923 SHA256 c4142eadbdb986a350941e5427d35a2aa106934f9197e91ccb53809c4c79e394 SHA512 047127e070b1cbecd241a888a8b2d773ee149d05e08556644ae0add79f774be9795caab8b8c6de146dc9281ebfd93aadbcb54c2c08fc8fa7f1612834cecf9753 WHIRLPOOL 8294278a940f2a89e525e1133d5870c320b37d1cf1f48f24b267fa792c1599695e8b72cdda6a455500cd8d6d008d394791ba5ea71c7ff42d71da9059bcf47268
DIST datashape-0.4.5.tar.gz 93549 SHA256 34d4922fa924ef474de2ef8b69833fe2d5da51703d74426f8c4354c9bb209d0f SHA512 f8fcaf923640e42d0ceb6cd607e89b74145443f33ec1d4c0018dc0093518d572ae890bf582487b0c2de6c9d793e96ebb7dc901a330150f2ef2f203b329db5968 WHIRLPOOL cb78a9fd8337d9047c473914f216a06ff3797cc3fc494982696ba8c379d3e50e7cc194f84557eada06fe8459d3711589ad6e1404eb2ae9e389e81e104d447ce0
diff --git a/dev-python/datashape/datashape-0.4.2.ebuild b/dev-python/datashape/datashape-0.4.2.ebuild
deleted file mode 100644
index 0256ef0ec48e..000000000000
--- a/dev-python/datashape/datashape-0.4.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/datashape/datashape-0.4.2.ebuild,v 1.3 2015/03/08 23:43:12 pacho Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Language defining a data description protocol"
-HOMEPAGE="https://github.com/ContinuumIO/datashape"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/multipledispatch[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- # Prevent un-needed d'loading
- sed -e "s/'sphinx.ext.intersphinx', //" -i docs/source/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/datashape/datashape-0.4.4.ebuild b/dev-python/datashape/datashape-0.4.4.ebuild
index 006eaa6de09e..f78dffea3f73 100644
--- a/dev-python/datashape/datashape-0.4.4.ebuild
+++ b/dev-python/datashape/datashape-0.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/datashape/datashape-0.4.4.ebuild,v 1.2 2015/06/08 14:09:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/datashape/datashape-0.4.4.ebuild,v 1.3 2015/06/09 07:17:42 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild b/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild
index 14e0929bdf91..fe2b461e10d4 100644
--- a/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild,v 1.9 2015/06/08 16:07:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild,v 1.10 2015/06/09 07:17:23 ago Exp $
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
RDEPEND=">=dev-libs/openssl-0.9.8:0="
diff --git a/dev-python/python-cluster/Manifest b/dev-python/python-cluster/Manifest
index 04bae0f28f69..85498a6d8488 100644
--- a/dev-python/python-cluster/Manifest
+++ b/dev-python/python-cluster/Manifest
@@ -1,2 +1 @@
-DIST cluster-1.1.1b3.tar.gz 38391 SHA256 f04d5ed367f9abcc169aac814480aca286548b694b9b5dd1414a055ba775ff22 SHA512 bc13f17d78e998edc5a47c162c4ff90c07f44ebada40ed8a59f6dfacde5b2eb7704c2d989c505e71a283be1602a658124ae43f10428bc302351fc970ebc98d06 WHIRLPOOL 5db9479e6e4a6962b906955661823c7f41a93d29e681e5eeeb04a00b6d9d15a3f34c76375ece123196de4e5768d554dc2eddc2777ea77a360f5876ec83d92061
DIST cluster-1.2.2.tar.gz 44074 SHA256 7d62faf24fa08ef13f71013e9f624c528b12f0d1e6ab58c4bd26b5874d3163d8 SHA512 02600fa1fccdb07251bea83ab81908c22968fcfd4d6ccf382a75ab43117ee8ecc4385f7666f272d1e6cfc0634f7e15778635b50fde572773e564604c981e75cf WHIRLPOOL c5ee445f0b51b5af4e927049ef8cdd5decac3cef73f23d909b4b38b9b896100fffb531af7bf4ac059aae19ca07583d1b60e0e79cb874b718033474bd148d9731
diff --git a/dev-python/python-cluster/python-cluster-1.1.1_beta3.ebuild b/dev-python/python-cluster/python-cluster-1.1.1_beta3.ebuild
deleted file mode 100644
index 4cea00585df5..000000000000
--- a/dev-python/python-cluster/python-cluster-1.1.1_beta3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cluster/python-cluster-1.1.1_beta3.ebuild,v 1.3 2011/04/19 09:37:11 tomka Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS=1
-PYTHON_MODNAME="cluster.py"
-
-inherit distutils eutils
-
-MY_P=cluster-${PV/_beta/b}
-DESCRIPTION="Allows grouping a list of arbitrary objects into related groups (clusters)"
-HOMEPAGE="http://python-cluster.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/python-cluster-python3.patch
- distutils_src_prepare
-}
diff --git a/dev-python/python-cluster/python-cluster-1.2.2.ebuild b/dev-python/python-cluster/python-cluster-1.2.2.ebuild
index 424f243ab863..ed36755c6c6f 100644
--- a/dev-python/python-cluster/python-cluster-1.2.2.ebuild
+++ b/dev-python/python-cluster/python-cluster-1.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cluster/python-cluster-1.2.2.ebuild,v 1.2 2015/06/08 14:08:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cluster/python-cluster-1.2.2.ebuild,v 1.3 2015/06/09 07:18:01 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/c/cluster/cluster-${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
S="${WORKDIR}/cluster-${PV}"
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 1fe64f09aef7..59a820c68612 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1 +1,2 @@
DIST simpleeval-0.8.2.tar.gz 8282 SHA256 828e79056ae2083ff6091dd8d33855974300241c3dd7d4a173faf901a17c7b09 SHA512 288d597c646ee0c70e3a6e04fd8db112b7b7a00ad53101114cc1724110c2f71d7b5f382f9052ebdb8dbc6b48c1391c870966b72df368701548d513d3053c1759 WHIRLPOOL 88edf67da8cda1bc1ab0c66a908fc12b2e5a4b14db9f6f0e8dc771c53a4c731c38d2dbad3a8d2c2f2d8efc3b3f86ed7be1eceffa5c3d5b8cd5a096ee99c87d5c
+DIST simpleeval-0.8.5.tar.gz 13858 SHA256 76fb692abfc45c57a25540b976ddb4b3029162015e4f13735ac783bc4437a99b SHA512 da913e7dba3af05488e3bfa105c42ecc8d7ee74d3e520e32c362051b8c123b9357876cd23e400e34171042538297f32b1903f40f2b854759c856abd89548093f WHIRLPOOL c28f5e12e2032f4b0c65acefbaf2100d25124c8425c0018d0a1f9160ac082fd6c1f171f2a11b530c7c8aaaa512f21d61f222ce292d792384fd0930b4c9af769b
diff --git a/dev-python/simpleeval/simpleeval-0.8.5.ebuild b/dev-python/simpleeval/simpleeval-0.8.5.ebuild
new file mode 100644
index 000000000000..47c184c8b67d
--- /dev/null
+++ b/dev-python/simpleeval/simpleeval-0.8.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleeval/simpleeval-0.8.5.ebuild,v 1.1 2015/06/09 08:21:46 cedk Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, safe single expression evaluator library"
+HOMEPAGE="https://github.com/danthedeckie/simpleeval"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ ${DEPEND}
+ dev-python/setuptools"
+
+DOCS="README.rst"
+
+python_test() {
+ esetup.py test || die
+}
diff --git a/dev-ruby/builder/builder-3.0.4-r1.ebuild b/dev-ruby/builder/builder-3.0.4-r1.ebuild
index 49753a65a5c1..478f1d827d8e 100644
--- a/dev-ruby/builder/builder-3.0.4-r1.ebuild
+++ b/dev-ruby/builder/builder-3.0.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-3.0.4-r1.ebuild,v 1.5 2015/06/08 12:34:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-3.0.4-r1.ebuild,v 1.6 2015/06/09 07:19:38 ago Exp $
EAPI=5
USE_RUBY="ruby19 ruby20"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rubyforge.org/projects/builder/"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bundler/bundler-1.7.13.ebuild b/dev-ruby/bundler/bundler-1.7.13.ebuild
index 589a917ca1a0..934eeba3ca69 100644
--- a/dev-ruby/bundler/bundler-1.7.13.ebuild
+++ b/dev-ruby/bundler/bundler-1.7.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.7.13.ebuild,v 1.6 2015/05/27 11:03:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.7.13.ebuild,v 1.7 2015/06/09 04:34:39 jer Exp $
EAPI=5
@@ -21,7 +21,7 @@ HOMEPAGE="http://github.com/carlhuda/bundler"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
index a470f8de40fe..c13358482922 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild,v 1.3 2015/06/08 12:34:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild,v 1.4 2015/06/09 07:19:00 ago Exp $
EAPI=5
USE_RUBY="ruby19 ruby20"
@@ -15,7 +15,7 @@ HOMEPAGE="http://capistranorb.com/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/daemons/daemons-1.1.9-r1.ebuild b/dev-ruby/daemons/daemons-1.1.9-r1.ebuild
index 2028ee65ceb0..bb64acf62d98 100644
--- a/dev-ruby/daemons/daemons-1.1.9-r1.ebuild
+++ b/dev-ruby/daemons/daemons-1.1.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemons/daemons-1.1.9-r1.ebuild,v 1.7 2015/06/08 12:34:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemons/daemons-1.1.9-r1.ebuild,v 1.8 2015/06/09 07:19:57 ago Exp $
EAPI=5
USE_RUBY="ruby19 ruby20"
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/thuehlinger/daemons"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples"
all_ruby_prepare() {
diff --git a/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild b/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild
index d0cbad1410e7..b784e90aa489 100644
--- a/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild,v 1.7 2015/06/08 12:34:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-1.0.3-r1.ebuild,v 1.8 2015/06/09 07:20:16 ago Exp $
EAPI=5
# jruby → has shims for Java handling but tests fail badly, remaining
@@ -18,7 +18,7 @@ HOMEPAGE="http://rubyeventmachine.com"
LICENSE="|| ( GPL-2 Ruby )"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="${DEPEND}
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.99997.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.99997.ebuild
index 8afc6376a759..704056787dd4 100644
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.99997.ebuild
+++ b/dev-ruby/ruby-odbc/ruby-odbc-0.99997.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-odbc/ruby-odbc-0.99997.ebuild,v 1.3 2015/06/08 12:34:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-odbc/ruby-odbc-0.99997.ebuild,v 1.4 2015/06/09 07:19:19 ago Exp $
EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
LICENSE="|| ( GPL-2 Ruby )"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
diff --git a/dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild b/dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild
index b694e9ed32d2..8bfe688258ba 100644
--- a/dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild
+++ b/dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild,v 1.3 2015/05/28 10:29:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild,v 1.4 2015/06/09 07:18:41 ago Exp $
EAPI=5
USE_RUBY="ruby19 ruby20"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/openid/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-macos"
IUSE="test"
all_ruby_prepare() {
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index 0141ac4b943e..f14b345c5c08 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,3 +1,4 @@
+DIST temple-0.6.10.gem 36864 SHA256 0161614497136071cf02cd88f18e9fd0d1d9598552181c6a11e7a4a7e322ffd3 SHA512 668d4b12ff2f5b28fa70755036c4b2d4612ee6fd0f66382cc534d5e1555e0105e6efff58ddfdadc62dd0a0f0066fe37ac9228299258a045ba7af7ad73600ba83 WHIRLPOOL d00aab4925212ff2573ba7b1bb9efe6646b18068ae721347fa53dc75d1d92054fe575f3a0f84c80021530d9ba16f68665a1c61ae051442faf240f974a509a12c
DIST temple-0.6.8.gem 36352 SHA256 160a3f38e275c9238ff1266b2ea5a7402844a46f1f70bb126a6ad1017bd9db76 SHA512 003583a2be5b65c488c0e5a41f25a15e87d9390ab8ede6f0f44ec073fe802622a3e169f8dfdd0751dc3bb128371c23a6eee4696376620845f70cdcb986bec6c5 WHIRLPOOL bd45fb1932dd4ee470d454f25b5751312a2d0d6565e33addc9f1fbb2e5e99a1f4ec6ac3dce1ff51f3e8df70e88e27db1cd151ac72a941a1cad009657b16fbce7
-DIST temple-0.7.4.gem 36352 SHA256 3cf146921d9fe86355bc4af40040fe0f8555766139c91562a70e858fb213d5b6 SHA512 7e26adec512d645b56769150734a74cfffce96e21a637355e9eb32713f2301720e0dc9b48ce33a89d2e14d2d67ebf369ccba7e3300dd7727e2955a8d54d2aaee WHIRLPOOL 29ed146819dbe8be18bb14d6a6f71b025760c9ef34c6da5d742d846b04cdafd59ee009f0045259a5d5c14022aa912f53cc1333dd51f1cb565b8584b55092fe80
DIST temple-0.7.5.gem 36352 SHA256 e59e5e9221d0a135c89ffc5eb657a29e1c930483fd386d33b9ab340c0d3a95af SHA512 74c4dbff899ddf9c0edf2ba5732b843fe676166ad1fef59bd41c60ca49710e0f18df4f745aa85ec9f8e16062c0445feac8223786a2492dd7d091674cba648538 WHIRLPOOL 6c4bdfdffa402f22c8ed70818b03b0a17ddde6d6d3899867cd8f997afaf763bf7584adf7d14f5a0e0cf04418057ba9a3803a4b1699f7ef25388ab47b3b190a09
+DIST temple-0.7.6.gem 36864 SHA256 60c10cdab98d9023905ce4bf1ae497419ea5649cd9b75d3e016bd2b32555597b SHA512 9b75e59dd07352f712fa8021bb25d327a470735f27a0283054de34b1aa20b6443098da3b8cf350b1a23ad25e61ef1e024d0ef93b28714d06e32f76af9718f6a5 WHIRLPOOL bcf6ccb9b8c7bfd30779142f12c9166765045689515517ee9bcccdecc720fb2778f92ff8c4be266ec0a4a480fd9de72de78ec3c3990b672e5e7fff4c1ab2a9f7
diff --git a/dev-ruby/temple/temple-0.6.10.ebuild b/dev-ruby/temple/temple-0.6.10.ebuild
new file mode 100644
index 000000000000..5570997e5683
--- /dev/null
+++ b/dev-ruby/temple/temple-0.6.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/temple-0.6.10.ebuild,v 1.1 2015/06/09 05:48:01 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
+HOMEPAGE="https://github.com/judofyr/temple"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/tilt )"
+
+all_ruby_prepare() {
+ # Avoid test failing based on specific load ordering
+ sed -i -e '/should have use_html_safe option/,/^ end/ s:^:#:' \
+ test/filters/test_escapable.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} -Ilib:test -S bacon --automatic --quiet || die
+}
diff --git a/dev-ruby/temple/temple-0.7.5.ebuild b/dev-ruby/temple/temple-0.7.5.ebuild
index f45f73dc729f..7805e67c8a7c 100644
--- a/dev-ruby/temple/temple-0.7.5.ebuild
+++ b/dev-ruby/temple/temple-0.7.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/temple-0.7.5.ebuild,v 1.2 2015/01/16 05:00:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/temple-0.7.5.ebuild,v 1.3 2015/06/09 05:25:19 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21"
@@ -16,7 +16,7 @@ DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby
HOMEPAGE="http://github.com/judofyr/temple"
LICENSE="MIT"
-SLOT="0"
+SLOT="0.7"
KEYWORDS="~amd64 ~x86"
IUSE=""
diff --git a/dev-ruby/temple/temple-0.7.4.ebuild b/dev-ruby/temple/temple-0.7.6.ebuild
similarity index 69%
rename from dev-ruby/temple/temple-0.7.4.ebuild
rename to dev-ruby/temple/temple-0.7.6.ebuild
index 2ee4f98a2e55..ca7a29e807ad 100644
--- a/dev-ruby/temple/temple-0.7.4.ebuild
+++ b/dev-ruby/temple/temple-0.7.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/temple-0.7.4.ebuild,v 1.1 2014/12/23 23:08:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/temple/temple-0.7.6.ebuild,v 1.1 2015/06/09 05:24:35 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21"
@@ -13,14 +13,15 @@ RUBY_FAKEGEM_TASK_TEST=""
inherit ruby-fakegem
DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
-HOMEPAGE="http://github.com/judofyr/temple"
+HOMEPAGE="https://github.com/judofyr/temple"
LICENSE="MIT"
-SLOT="0"
+SLOT="0.7"
KEYWORDS="~amd64 ~x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/bacon
+ dev-ruby/erubis
>=dev-ruby/tilt-2.0.1 )"
each_ruby_test() {
diff --git a/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild b/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild
index 24372119dc63..df9c01a61b14 100644
--- a/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild
+++ b/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild,v 1.2 2015/06/08 14:08:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild,v 1.3 2015/06/09 07:16:46 ago Exp $
EAPI=5
inherit eutils versionator
@@ -22,7 +22,7 @@ SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-$
LICENSE="Apache-2.0"
SLOT="0"
IUSE="selinux"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="app-arch/zip"
RDEPEND=">=virtual/jdk-1.7
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index df3069f11492..6db0f815edfc 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,3 +1,4 @@
DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
DIST glib-2.42.1.tar.xz 6985120 SHA256 8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a SHA512 0d273e3e24f164f16f6663f88866ae412714eab7d15c1901fdef61f13649a08f9962e49f9d52e8a1683100f9c2dcc468b9a5bf8a9b3d6ca7b0d9488bc58f3f1e WHIRLPOOL 5cf0dbce9890a61210f0c1c0b43a6147bfff107ee8d37de959fc533b56fa9e253d74996ed3ad05b2d756aecf65c1bd8cb1faaaa50096304df2b2f09d05b28804
DIST glib-2.42.2.tar.xz 7002480 SHA256 a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db SHA512 6b46e4ac67d79ca2cc5c32ceb7cc8112140645032cb3c8c9ba2f59a0d3c2aee06707b7573bbd72f6c21ea7798a7351bd205aa57857a58b0be008c75f897ef782 WHIRLPOOL 5c25c5f6d20217cce4f8c34d9d05cd39197b4b36c5a85447943fcab47cd343253879516b722eb0c4895eebae5f3d4e76c820730b9e7f6c890aca9c87dc963564
+DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
new file mode 100644
index 000000000000..a88e8493e4c3
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild,v 1.1 2015/06/08 21:50:16 eva Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+ PATCHES=(
+ "${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+ )
+ distutils-r1_python_prepare_all
+
+ sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
+ cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+ sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+ einfo "Skipping tests. This package is tested by dev-libs/glib"
+ einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all # no-op, but prevents QA warning
+ doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 557295946664..96fc4aed8cb6 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,2 +1,3 @@
DIST gtk-update-icon-cache-2.24.27.tar.xz 285228 SHA256 ae01d2c6aaededa1ddd7aac3ff1e6a7619a8854961ecf2297b72ab0bb36736e4 SHA512 71deed19785244a1af08c71bbbff54436762b95eddecd530ded06190127dff7e1e72dcf764377737bfcbc125528b434be76939cae33e79755fe23da8e503297c WHIRLPOOL 4aa6d8a98972bfe5a99cacf82dccb5e1224a74a198b89a3c33c232b6d08bab547c9dc5748a3c308dd0f38ff2cfa7f908b2e906c212a1e82deea32c91cc92a309
DIST gtk-update-icon-cache-3.14.13.tar.xz 306376 SHA256 1e054574afc7c954c3d0d231007698a2ec6fd1655dc388572343376157f01f35 SHA512 eb6994a6a7a738e9b50a2c812fa0fb88b3c7516662059190ddeb6d61abdec5f00efcc44fc278bd42b8fca2c171c0746e8412b4b7294b65b75d41fa4289dff175 WHIRLPOOL cf10ae3e8abb6db3eb040d04c2d39a9909fa45935084d6d2591a96e1f4dd58c000d4d1b6af766e9d8402f6409d626f4817bda76d36aaf1a620c49f1738b78355
+DIST gtk-update-icon-cache-3.16.3.tar.xz 316384 SHA256 067a918331acf9fcdb6ef3bfc03274aa9d045cc8d4aa9ba6f21aafb7a088fe7f SHA512 b8e6d127403cb3a9a384822dd93aee6191532746632d4364953df7321b5f0900dffea3617ed8e9ea9cfb3ecd27978f88ddc43e5ec3882c602c37a3b0e6fa1b04 WHIRLPOOL 6b0ed55cb28cca15259b1f349cf04eb3736e0a31a5fff538d143a1d76e0380650cecf4aa0b88c270da3c69dfe0523c698874a8d8e4f0b30d5023a6eb5f72d619
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild
new file mode 100644
index 000000000000..83c47eff97cf
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild,v 1.1 2015/06/08 22:02:54 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.43.4:2
+ >=x11-libs/gdk-pixbuf-2.30:2
+ !=dev-util/intltool-0.50.1
+ virtual/pkgconfig
+"
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
index 65d7399f835e..2751b5c52d41 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/patchutils/patchutils-0.3.3.ebuild,v 1.3 2015/06/07 09:27:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/patchutils/patchutils-0.3.3.ebuild,v 1.5 2015/06/09 04:47:02 jer Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RDEPEND=""
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index e1e4b34c3cad..94a488e6506e 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -6,8 +6,8 @@ DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d
DIST git-2.3.6.tar.xz 3621716 SHA256 3ce01c54e92b47366756f57742280e052412efde65344e31f51ad8a48a7c60fc SHA512 53ad21db0fa6bb48ee24302c35ee929b1bd1fae3b646845523e7105b8539700cef23e2425170dec0311c7e746c41b743cfd78f192613b586291e44b49c3c284d WHIRLPOOL 12cf33fc19efea4f885a9b5c6d7099893b92742ffaad8e407016abfc5232ddd4763db95fc657a185830e2f904cdb2b04e8ad1c4305f09d77ff8f7db07c139799
DIST git-2.3.7.tar.xz 3621804 SHA256 eb4696943f82ab55be71048d6e640942b78cd179ec501989aff8706b57f6515b SHA512 87502626d228c8c231794cc8fde29175578c1a5d4bc69aa2fd722f5a2ca3860cdb8c54aaa679fc56bdd498810e75af60e568bf4ff3375f5ff54fdc98a46e2fce WHIRLPOOL 982797f9fe540fe980a3c566d1b77b9342a420e21df97203a4e7990988b8eef7f7a37aba4f7158ca72db01a16c8f1f90a9b94b5c492a184ead8c1be98896928f
DIST git-2.3.8.tar.xz 3622512 SHA256 cb4d9228f63b7a9500d55383878bb4bbb60b80deb7ae1a5858c7103ba14de5a6 SHA512 bf693fbe7fc16a240470501af2a7736ebfdbf027c0cc8adbd601d2b1c98ec7d968959e06dd8a3d0e206dc351e83a161475191d59d76f9e2da3e13b4de8716fb4 WHIRLPOOL 93aa2d832e57181de25035952a566c9d3330105e277930f088eb10e2073120c296b6dd87375437c9e9b7880c9b56e2c0de0fda5f77f0da9d2f96840c2fe8eda8
-DIST git-2.4.1.tar.xz 3682912 SHA256 72851809632c9d1651290caa4bbd3b3094e92fbc6e0e0eb01c454a945c30ada4 SHA512 3130f5fc2f408098f1012d7f5572d9a0bd57cf745cd233525ef226d329867e7fcc93d70823a9dcd9c7bc95db55ada4dbb32b0501e9fe5c2c5e11780c02e422cd WHIRLPOOL 746cbe0e8f266e4d6d73636ed26b3a28150c40491c0b45a44ba42cc7b92a2ed357c44d7cdb046fca50b98ceaa2e987eaa0ff53c1ce875c1b69d722f399020092
DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c
+DIST git-2.4.3.tar.xz 3687444 SHA256 f05007a9d1ef28c3d84091ddf7ce5d29c2df2272f34b4dd8b24e09274280d814 SHA512 ae9647e121d8aae9a57a2ae1d1b0474c94b8663b61c41d4dbf50e83e85fb78cfc794452fd1eeb9e31ddc784d1b78babe789c8be7bc80e7dc9884fa1ba9cb0633 WHIRLPOOL a7e62ce2217eeb6bbfad7d13c78d65898a144fb72ed944a19632e5c14a51de950c7afa7d08d4d3a1130980e1463b3d62851d6217ae6ed5946773d8ad61ae0c27
DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36 WHIRLPOOL 7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c
DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b WHIRLPOOL edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2
DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3 WHIRLPOOL 35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9
@@ -16,8 +16,8 @@ DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002
DIST git-htmldocs-2.3.6.tar.xz 987292 SHA256 b37439087ae465534588a65380e3acb66d3e6949904ede720febeed1dc5d8b49 SHA512 ccb836c3df4bfb96174500295c630aa1ac3bea475460434e4d097c3e178bec5a0b5037ff17281fe6a6bc7bb3ae6bcac03ee4009611bb222eccaebc3ae6aac81f WHIRLPOOL 8c58f108d1ea95bf552604b956e727dcf7a8f0eed8979239b0b6ab931aceffc76434137b5f76054563a09985bcaad0a03359da8791469adae71a3a8821084d58
DIST git-htmldocs-2.3.7.tar.xz 987448 SHA256 8e797f1d50ef4f5681fab9bd2e45ac6c1d75b4a87f67d7a55ac37e1befaefc7f SHA512 7ec6ca9c43fdae5469eb2d81cd2c4325e3baf28028c0170077b0fef4f5c2620ee5c4ae15f021eb84e5b11d19dd13b39d38e27e14b162b690f4368a44c5b8a175 WHIRLPOOL 72eb57e299ff6dfff31a041e7ba0b85b5e65f1c163b2bf89de2e34308f2e6849333caa7d433d3352e55dc112ab60f48b777056618ee3c99ba67ceb643a8f99ef
DIST git-htmldocs-2.3.8.tar.xz 987840 SHA256 54b8d98e34bceeac906ffa8b7c93e8a2cd2cf3c7f4d0c0334e9d5e0c704ca23f SHA512 7aa72d55a6a2687a3ecb26f9db76f69e4003c87864b8239068b029a9d63f99a023bf76ec3ea60952ecf11608d2d684f4ad1b2ac76942cd44ec67bdf8f497330f WHIRLPOOL 60145b5a48a6780b0edb3a7ef50b3649193818e3aa8199de94dd9bf1cca110d7411902c8e7e3df881eec77aa59208780b60b946aeb5f13960de954af6fd88fbe
-DIST git-htmldocs-2.4.1.tar.xz 991280 SHA256 b899dbf605121c8a7e60517121e1ff362fb4b6f51a204bb64b044b568023161a SHA512 cc9ba76560fb50761698cf3204f3a9ede2efa543f4465ce39f2015664b52037f79156d7c4519599edd3206411b0b8d2b74d3970fde07d8a5e5ae8e791d64882e WHIRLPOOL 2e005fee8987009e12f6a3911142d083e9baa208d958d4f73997ace171c0d472f5fcf9f9844c3d5ed7e6a01cfe69c6a52503be2cd99bfe964e0e8fbf934edc17
DIST git-htmldocs-2.4.2.tar.xz 992192 SHA256 792cfc6c8236fdb58dfd66e39766c7b8097080361eed28443207bc6c36e07911 SHA512 e9790b698c50a09724ec9c71001a70f2a6a7094b72326f290f3b5c7b274181f331fdbb71cb4e2db9edf1229ae534a715b2974424b89d515b901b074bdeb30b66 WHIRLPOOL ef3de3704e7c0e34174b1e16f0837c52d9ce9d64c0f61c417a52811ca623ae17304a2b9d484457569d635a269b4dedb3e940bf0fa7d3db1bc4f744bf1d392ff1
+DIST git-htmldocs-2.4.3.tar.xz 993204 SHA256 5a6f6ef9c992eef29b62d8e963ba508583b917f14a374e0fbba3fe50a44c111a SHA512 55fbcffc89336083975ebdfc0123bdd7ee7d72cb02d54250684360dc5fc324209e5ae57a8f6bded65d850714b84c9322bbbea30c769389d5af67cd7599486478 WHIRLPOOL bb38b49cb28ada1e174fb8be8a6b41d19dcb941f0dd79955ce58deb31603288540fc2a4fe11b615a8984b143f69b6e6800243c53988d31a81adbe7342d483433
DIST git-manpages-1.8.5.6.tar.gz 569061 SHA256 58ef7cb3121639b8d78e2e4c4f7f886bab57af9e9e137b10f372dfad573872c1 SHA512 a524a1c7e8bdc73ffe04bebb5c7050a18c8649b98714bf255c8e3c32a2443d8d5abf33e3ca2eb108d601f01e0bda50fed1e134ffdae87bcf6f551cbbd250c4ba WHIRLPOOL 2db62b96e972dbcbec1ac59d7244bf2c2ff7140c941d1d3c6b9062bd79b80541d7fa3982c5a3bc55a18fc9112ab3fa648966be5c3e1135ab7b5c89080bee82b6
DIST git-manpages-1.9.5.tar.gz 571625 SHA256 37cc735c4ced6574e8e93349d52d30372fc6f9fe3de3d6b9934a14857d6aade8 SHA512 e3df3e933fed6ff2845989a0146b28789452e9583bc19dd4a9ad335f64b15feffbdc4dd7cdb9d6b5216f7f85837318cf9b10df033f8022777f91c2b0894fb231 WHIRLPOOL e25d77fd8d9cacb92d45fd50640bc65189d02d7e23b276ccaf3b35ba1fe64ab0c49045d1fb8983b7b2b5bd996e767508446ac76506b074ded10feef1f9256918
DIST git-manpages-2.0.5.tar.xz 359000 SHA256 3cf1581da2a19c0651df445ee5f801e108619befe8965e01d61faa46ca57b642 SHA512 b3981565a34a203283801b86717386971ef53c2f5c47bdde290aa0df4d62045ecbcab1ff1b4d1d8ddf7d489e74d65b0208d87ace7ca8c8be9525be548e445425 WHIRLPOOL e8c78eb38cb3192455ccb991a4ce5cd3988d06f1f06cdf0722e4ce6fb1d4e57f618058cf07d312bcab4f5821a1b1dfc016c03626d4f3429d3e5ef089607a2801
@@ -26,5 +26,5 @@ DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c6899
DIST git-manpages-2.3.6.tar.xz 371620 SHA256 b1356f5cb3e7bf53445b08f24ea6950ef1f80031aedd6cd90e3ec60ff1f06b02 SHA512 c7ff2e6aea8c0c12009f29724c899e606b6620e7d408ee3c536fb5239ebcaa0b790a6ee1287dccd88df8776fbc2e72e799124426dbacd82e12f05e3f9f3c909a WHIRLPOOL 7117ba84d888ea448807f3bf51f958b86de011afed1bbad78abf4390c1a77f799f77781f4d9bf1e9287ab903b912b7ca270433c1f4a1f112a4cb4840dde3d400
DIST git-manpages-2.3.7.tar.xz 371556 SHA256 77e783b0ff15f6c0048bb6c4b79b141dd045516a45fe72c2a4b6fe1434e476ae SHA512 fb8a79c5b058faee528f70df93f9743b2bc2399e0b0737cccf26691f9d5a2697430587a95706dc70d2130cf56139ecf5c0b172a5ea475f0c2d333d481bbcbb9c WHIRLPOOL b475367033b3444c098cf225abe1d127d30b3adc9313b07f15145f67ef5ee49bd89e8ddabc253e7d3378c360fc30ec69a110365b3c3f5333f7d1bd66e225a248
DIST git-manpages-2.3.8.tar.xz 371528 SHA256 4d38de9decf80864480fcd5cc58783e3bff4e22383b281193acd82ffa3751fe2 SHA512 8c6aaf60e4b6505ae6789fa658ff15534cf5dfa51c03fdf47a624723b75a8448d71faa9f4ee61c5c243b775c4047dd2ffffc664b37e7f38b60c90fc56252ed93 WHIRLPOOL c6068de21f53e20ec17cd724059d91781e81abf617c2169c1099997afdeac371a59927d9db0b98c1f64c66b3de016b351b08a2f37a43038a924137f6f139a72e
-DIST git-manpages-2.4.1.tar.xz 372600 SHA256 ebebd18797b84dd0251ac9ebcd35d55da95e651f18a13e6d8ac7d3c5ccc9d8f0 SHA512 b87b11c86f3e680f6a1d7cc0f7cdafda3adc49be725eb178b20ab33ae2e322d34f0aeca04ceca49f696226c9217962c1fd80d8e5169cda14783c50cbd81e0edf WHIRLPOOL 3d22538699e1eb882b10acc329369211491ed38d0b82cce63a487a83ec9d096954a81dcd860e66004f37e92b088c8244fa953c7591fc750ebccdf96ce73d3f56
DIST git-manpages-2.4.2.tar.xz 372804 SHA256 1b1830e804725e90ff319d801ab25f84ad956564379ef976bdc91bd58b743c32 SHA512 52f28cd537fc9fd34acad8834aa05d7d758e2f639df18b978effb676d5dbb660c99764075eb216c6377adb14b0b2d58584c8b3f635442bd4ded36a31b8757dc4 WHIRLPOOL f30b9293aa594111ce4baa46fee474b114199cc691ae43dea565a346f8ad7eb2cd72574bd6ddf9d5b32af020ad6032778cef3610ccac74d0f94be965b335962f
+DIST git-manpages-2.4.3.tar.xz 373072 SHA256 91e1a9cb4a35c141bd875063fedc0409ecb676e828204afabc75c3b4c7b844cc SHA512 98ffa7d7407300b63f07d0b7d27604efa99e602fc316359624b43312de983422611ca68d2a13634cc5421e1ac14914d45e9b933f55957854075a3a6476dfb1f1 WHIRLPOOL 915ba5bdb165c7a5f46c888b6517bfce7baad1f628554ca85aa6274ba5f52229af97bc7219e566baeced7b5393389b661781ccb2fe4ab56672a0c3fd70b86499
diff --git a/dev-vcs/git/git-2.4.1.ebuild b/dev-vcs/git/git-2.4.3.ebuild
similarity index 99%
rename from dev-vcs/git/git-2.4.1.ebuild
rename to dev-vcs/git/git-2.4.3.ebuild
index 19ab791b4b07..bf9591827bad 100644
--- a/dev-vcs/git/git-2.4.1.ebuild
+++ b/dev-vcs/git/git-2.4.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.4.1.ebuild,v 1.1 2015/05/18 08:12:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.4.3.ebuild,v 1.1 2015/06/09 07:30:38 polynomial-c Exp $
EAPI=5
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index ecb5605fe5a5..d844d9b28ff8 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,3 +1,4 @@
DIST tortoisehg-3.3.2.tar.gz 8226128 SHA256 779beb06588897d1c42fc463fecc4b61498f7cac76681fe1c1f017ecd811719a SHA512 4b7e1422731507aa8947b0e8e7746a6daa004186833db200122927c4e5a2f2cb1fbbf12f89089e3ee82d1a22fdb3c7745465188cbf3e14d73d831b953f2b2d9f WHIRLPOOL 34fce6c6383ae94eb4d6fbca854068535ac39b50746dbcc3ee9460976231dc68c3c5f824dc31082838505bdaeaf3620306ceea867d8ac5571d00ee1f1192e867
DIST tortoisehg-3.3.3.tar.gz 8230380 SHA256 a22ec794b0152b25b085447a253594dde27f71863149b9471ec70669687fb47f SHA512 ed15a2ce76647f6c2d9df2daebc62f983eec6a27ea15a808060d83968cfee2c22f643b2ed6fb48bf06dd5d7cb9f4178e756e539eec2ca43e74fe4c8cfc7da4cf WHIRLPOOL d069dbe4ca109aaf2ebf9dd73f2d87343c2c71a8d5a894a5b7278a5edc878aa7eda56f9d53dca8968d1e730eea94a9f814a5cd76fb4af522a506753a5342cb47
+DIST tortoisehg-3.4.1.tar.gz 8236037 SHA256 0b85e92b76ef14eba2ea4a2476ef16f561711680089c3e4148e185a51bfb81b4 SHA512 06379ce04d6074a91f69cca6b56d081b57d21239aa7e1cf8368d25f76f04dfd09d00bcc67999380ef7539ff404cee0a0586131ad99722382e077b4f11aff2b14 WHIRLPOOL 8702417b63826d6fede4cac379a137cf912c5073ea4d83260a3d35e0b02dc7150df004c9b6716861c2b045d82e9aeffc26cebc4d2c7ba8ae28ef4542fc46ca88
DIST tortoisehg-3.4.tar.gz 8230401 SHA256 d3ac14e374b551e3f7ebc14f15648250b68f103de3fbfea24fd866110299145c SHA512 9c968529432bc32f8dd1ce14415623687c0b37755fc5de97f6f8acfb395b61084a7ea92501552d77ff162c9394cbebd372423ecbd5986b6b647eb172e74a3388 WHIRLPOOL fc827fc0410d58f6963e0fa12f7d8b509675acfd94d31ca92eb628102d5bdfb3687591302be58ee8bb95b7f502dbb163dd68807f4ad7bf490521f07a08161b01
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.4.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.4.1.ebuild
new file mode 100644
index 000000000000..7084d0e22e15
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-3.4.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-3.4.1.ebuild,v 1.1 2015/06/09 07:03:39 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+ HG_DEPEND=">=dev-vcs/mercurial-3.3 =dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+ if [[ ${LINGUAS+set} ]]; then
+ cd i18n/tortoisehg || die
+ local x y keep
+ for x in *.po; do
+ keep=false
+ for y in ${LINGUAS}; do
+ if [[ ${y} == ${x%.po}* ]]; then
+ keep=true
+ break
+ fi
+ done
+ ${keep} || rm "${x}" || die
+ done
+ cd "${S}" || die
+ fi
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+ if use doc ; then
+ dohtml -r doc/build/html/
+ fi
+ newicon -s scalable icons/scalable/apps/thg-logo.svg thg_logo.svg
+ domenu contrib/thg.desktop
+}
+
+pkg_postinst() {
+ elog "When startup of ${PN} fails with an API version mismatch error"
+ elog "between dev-python/sip and dev-python/PyQt4 please rebuild"
+ elog "dev-python/qscintilla-python."
+}
diff --git a/games-action/garden/garden-1.0.9.ebuild b/games-action/garden/garden-1.0.9.ebuild
index 1da6db8b1d27..606766d19727 100644
--- a/games-action/garden/garden-1.0.9.ebuild
+++ b/games-action/garden/garden-1.0.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/garden/garden-1.0.9.ebuild,v 1.2 2015/06/08 14:09:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/garden/garden-1.0.9.ebuild,v 1.3 2015/06/09 07:08:49 ago Exp $
EAPI=5
inherit eutils gnome2-utils autotools games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND="=sys-libs/ncurses-5.2-r5
+ X? (
+ x11-libs/libXaw
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ X? (
+ x11-proto/xproto
+ x11-apps/bdftopcf
+ x11-apps/mkfontdir
+ )"
+
+BINDIR="/usr/games/bin"
+HACKDIR="/usr/share/games/${PN}"
+STATEDIR="/var/games/${PN}"
+
+NETHACK_GROUP="gamestat"
+
+pkg_setup() {
+ enewgroup gamestat 36
+}
+
+src_prepare() {
+ # This copies the /sys/unix Makefile.*s to their correct places for
+ # seding and compiling.
+ cd "sys/unix" || die "Could not go into sys/unix directory"
+ source setup.sh || die
+
+ cd ../.. || die "Failed to get back to main directory"
+ epatch \
+ "${FILESDIR}"/${PV}-gentoo-paths.patch \
+ "${FILESDIR}"/${PV}-default-options.patch \
+ "${FILESDIR}"/${PV}-bison.patch \
+ "${FILESDIR}"/${PV}-macos.patch \
+ "${FILESDIR}"/${P}-gibc210.patch \
+ "${FILESDIR}"/${P}-recover.patch
+
+ epatch_user
+
+ mv doc/recover.6 doc/nethack-recover.6 || die "Could not rename recover.6 to nethack-recover.6"
+
+ sed -i \
+ -e "s:GENTOO_STATEDIR:${STATEDIR}:" include/unixconf.h \
+ || die "setting statedir"
+ sed -i \
+ -e "s:GENTOO_HACKDIR:${HACKDIR}:" include/config.h \
+ || die "setting hackdir"
+ # set the default pager from the environment bug #52122
+ if [[ -n "${PAGER}" ]] ; then
+ sed -i \
+ -e "115c\#define DEF_PAGER \"${PAGER}\"" \
+ include/unixconf.h \
+ || die "setting statedir"
+ # bug #57410
+ sed -i \
+ -e "s/^DATNODLB =/DATNODLB = \$(DATHELP)/" Makefile \
+ || die "sed Makefile failed"
+ fi
+
+ # sys-libs/ncurses[tinfo]
+ sed -i \
+ -e '/^WINTTYLIB/s| = .*| = '"$(
+ $(tc-getPKG_CONFIG) --libs ncurses
+ )"'|g' \
+ src/Makefile || die
+
+ if use X ; then
+ epatch "${FILESDIR}/${PV}-X-support.patch"
+ fi
+}
+
+src_compile() {
+ local lflags="${LDFLAGS}"
+
+ cd "${S}"/src || die "Failed to enter src directory"
+ append-flags -I../include
+
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LFLAGS="${lflags}" \
+ ../util/makedefs
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LFLAGS="${lflags}"
+ cd "${S}"/util || die "Failed to enter util directory"
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LFLAGS="${lflags}" \
+ recover
+}
+
+src_install() {
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LFLAGS="-L/usr/X11R6/lib" \
+ GAMEPERM=02755 \
+ GAMEUID="root" GAMEGRP="${NETHACK_GROUP}" \
+ PREFIX="${D}/usr" \
+ GAMEDIR="${D}/${HACKDIR}" \
+ SHELLDIR="${D}/${BINDIR}" \
+ install
+
+ # We keep this stuff in STATEDIR instead so tidy up.
+ rm -rf "${D}/${HACKDIR}/"{nethack,recover,save}
+
+ exeinto "${BINDIR}"
+ newexe src/nethack nethack-bin
+ newexe util/recover recover-nethack
+
+ # The final nethack is a sh script. This fixes the hard-coded
+ # HACKDIR directory so it doesn't point to ${D}/usr/share/nethackdir
+ # and points HACK to BINDIR/nethack-bin (see above)
+ sed -i \
+ -e "s:^\(HACKDIR=\).*$:\1${HACKDIR}:;
+ s:^\(HACK=\).*$:\1${BINDIR}/nethack-bin:" \
+ "${D}/${BINDIR}/nethack" \
+ || die "sed /${BINDIR}/nethack failed"
+
+ doman doc/*.6
+ dodoc doc/*.txt
+
+ # Can be copied to ~/.nethackrc to set options
+ # Add this to /etc/.skel as well, thats the place for default configs
+ insinto "${HACKDIR}"
+ doins "${FILESDIR}/dot.nethackrc"
+
+ local windowtypes="tty"
+ use X && windowtypes="${windowtypes} x11"
+ set -- ${windowtypes}
+ sed -i \
+ -e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
+ -e "s:GENTOO_DEFWINDOWTYPE:$1:" \
+ "${D}${HACKDIR}/dot.nethackrc" \
+ || die "sed ${HACKDIR}/dot.nethackrc failed"
+ insinto /etc/skel
+ newins "${D}/${HACKDIR}/dot.nethackrc" .nethackrc
+
+ if use X ; then
+ # install nethack fonts
+ cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
+ bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
+ bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
+ insinto "${HACKDIR}/fonts"
+ doins *.pcf
+ cd "${D}/${HACKDIR}/fonts" || die "Failed to enter fonts directory"
+ mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
+
+ # copy nethack x application defaults
+ cd "${S}/win/X11" || die "Failed to enter win/X11 directory again"
+ insinto /etc/X11/app-defaults
+ newins NetHack.ad NetHack
+ sed -i \
+ -e 's:^!\(NetHack.tile_file.*\):\1:' \
+ "${D}/etc/X11/app-defaults/NetHack" \
+ || die "sed /etc/X11/app-defaults/NetHack failed"
+ fi
+
+ keepdir "${STATEDIR}/save"
+ rm "${D}/${HACKDIR}/"{logfile,perm,record}
+ make_desktop_entry nethack "Nethack"
+
+ fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
+ fperms -R 660 "${STATEDIR}"
+ fperms 770 "${STATEDIR}" "${STATEDIR}/save"
+
+ fowners "root:${NETHACK_GROUP}" ${BINDIR}/nethack-bin
+ fperms g+s ${BINDIR}/nethack-bin
+}
+
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-3.4.3-r3" ; then
+ migration=true
+
+ # preserve STATEDIR/{logfile,record}
+ # (previous ebuild rev mistakenly removes it)
+ for f in "${ROOT}/${STATEDIR}/"{logfile,record} ; do
+ if [[ -e "$f" ]] ; then
+ cp "$f" "$T" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
+ else
+ touch "$T/$f" || die "Failed to preserve ${ROOT}/${STATEDIR} files"
+ fi
+ done
+ fi
+}
+
+pkg_postinst() {
+ cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
+
+ if [[ -v migration ]] ; then
+ cp "$T/"{logfile,record} . || \
+ die "Failed to preserve ${ROOT}/${STATEDIR} files"
+
+ chown -R root:"${NETHACK_GROUP}" . && \
+ chmod -R 660 . && \
+ chmod 770 . save || \
+ die "Adjustment of file permissions in ${ROOT}/${STATEDIR} failed"
+ fi
+
+ # we don't want to overwrite existing files, as they contain user data
+ local files="logfile perm record"
+
+ touch $files && \
+ chmod 660 $files && \
+ chown root:"${NETHACK_GROUP}" $files || \
+ die "Adjustment of file permissions in "${ROOT}/${STATEDIR}" failed"
+
+ elog "You may want to look at /etc/skel/.nethackrc for interesting options"
+}
diff --git a/games-strategy/lightyears/lightyears-1.4-r1.ebuild b/games-strategy/lightyears/lightyears-1.4-r1.ebuild
index 0374d084212a..ef66d59cda5b 100644
--- a/games-strategy/lightyears/lightyears-1.4-r1.ebuild
+++ b/games-strategy/lightyears/lightyears-1.4-r1.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.4-r1.ebuild,v 1.3 2015/01/26 09:47:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.4-r1.ebuild,v 1.5 2015/06/08 21:30:13 mr_bones_ Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit eutils python-single-r1 games
DESCRIPTION="a single-player game with a science-fiction theme"
-HOMEPAGE="http://www.jwhitham.org.uk/20kly/"
-SRC_URI="http://www.jwhitham.org.uk/20kly/${P}.tar.bz2"
+HOMEPAGE="http://www.jwhitham.org/20kly/"
+SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild b/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
index 4151f351a575..d1ca4fdcfc20 100644
--- a/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
+++ b/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild,v 1.1 2013/10/23 17:48:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild,v 1.2 2015/06/08 21:28:16 monsieurp Exp $
EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
DEPEND=""
RDEPEND="dev-java/glassfish-xmlrpc-api:0"
diff --git a/kde-base/blogilo/blogilo-4.14.3.ebuild b/kde-base/blogilo/blogilo-4.14.3.ebuild
index a847c23dc26f..db5b3dc0f2f8 100644
--- a/kde-base/blogilo/blogilo-4.14.3.ebuild
+++ b/kde-base/blogilo/blogilo-4.14.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.14.3.ebuild,v 1.5 2015/02/17 11:06:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.14.3.ebuild,v 1.6 2015/06/08 20:30:51 johu Exp $
EAPI=5
@@ -16,7 +16,7 @@ IUSE="debug"
DEPEND="
$(add_kdebase_dep kdepim-common-libs)
$(add_kdebase_dep kdepimlibs)
- >=net-libs/libkgapi-2.2.0
+ >=net-libs/libkgapi-2.2.0:4
"
RDEPEND="${DEPEND}"
diff --git a/kde-base/blogilo/blogilo-4.14.6.ebuild b/kde-base/blogilo/blogilo-4.14.6.ebuild
index 0369505b0606..674af01eee7b 100644
--- a/kde-base/blogilo/blogilo-4.14.6.ebuild
+++ b/kde-base/blogilo/blogilo-4.14.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.14.6.ebuild,v 1.1 2015/03/29 13:14:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.14.6.ebuild,v 1.2 2015/06/08 20:30:51 johu Exp $
EAPI=5
@@ -16,7 +16,7 @@ IUSE="debug"
DEPEND="
$(add_kdebase_dep kdepim-common-libs)
$(add_kdebase_dep kdepimlibs)
- >=net-libs/libkgapi-2.2.0
+ >=net-libs/libkgapi-2.2.0:4
"
RDEPEND="${DEPEND}"
diff --git a/kde-base/blogilo/blogilo-4.14.8.ebuild b/kde-base/blogilo/blogilo-4.14.8.ebuild
index 419f6d336dda..0d8e34b8c082 100644
--- a/kde-base/blogilo/blogilo-4.14.8.ebuild
+++ b/kde-base/blogilo/blogilo-4.14.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.14.8.ebuild,v 1.1 2015/05/15 16:30:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.14.8.ebuild,v 1.2 2015/06/08 20:30:51 johu Exp $
EAPI=5
@@ -17,7 +17,7 @@ IUSE="debug"
DEPEND="
$(add_kdebase_dep kdepim-common-libs)
$(add_kdebase_dep kdepimlibs)
- >=net-libs/libkgapi-2.2.0
+ >=net-libs/libkgapi-2.2.0:4
"
RDEPEND="${DEPEND}"
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild
index d7f01b9f28d3..4b53dfe0ba34 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild,v 1.6 2015/06/05 16:10:56 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild,v 1.7 2015/06/08 20:26:55 dilfridge Exp $
EAPI=5
inherit kde4-meta-pkg
@@ -39,7 +39,7 @@ RDEPEND="
)
(
$(add_kdeapps_dep kde4-l10n '' 4.14.3)
- $(add_kdebase_dep kdepim-l10n '' 4.14.3)
+ $(add_kdebase_dep kdepim-l10n '' 4.4.11.1-r1)
)
) )
"
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild
index 554594342d51..3823fa251a78 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild,v 1.5 2015/02/17 11:06:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild,v 1.6 2015/06/08 20:36:03 johu Exp $
EAPI=5
@@ -22,7 +22,7 @@ DEPEND="
$(add_kdebase_dep kdepimlibs)
x11-misc/shared-mime-info
facebook? ( net-libs/libkfbapi )
- google? ( >=net-libs/libkgapi-2.0 )
+ google? ( >=net-libs/libkgapi-2.0:4 )
kolab? ( >=net-libs/libkolab-0.5 )
"
RDEPEND="${DEPEND}
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.14.6.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.14.6.ebuild
index b18617dbe37e..0df3c4a03fba 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.14.6.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.14.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.14.6.ebuild,v 1.1 2015/03/29 13:14:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.14.6.ebuild,v 1.2 2015/06/08 20:36:03 johu Exp $
EAPI=5
@@ -22,7 +22,7 @@ DEPEND="
$(add_kdebase_dep kdepimlibs)
x11-misc/shared-mime-info
facebook? ( net-libs/libkfbapi )
- google? ( >=net-libs/libkgapi-2.0 )
+ google? ( >=net-libs/libkgapi-2.0:4 )
kolab? ( >=net-libs/libkolab-0.5 )
"
RDEPEND="${DEPEND}
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
index 77b20a2062d0..6f20a538ec9c 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild,v 1.1 2015/05/15 16:30:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild,v 1.2 2015/06/08 20:36:03 johu Exp $
EAPI=5
@@ -23,7 +23,7 @@ DEPEND="
$(add_kdebase_dep kdepimlibs)
x11-misc/shared-mime-info
facebook? ( net-libs/libkfbapi )
- google? ( >=net-libs/libkgapi-2.0 )
+ google? ( >=net-libs/libkgapi-2.0:4 )
kolab? ( >=net-libs/libkolab-0.5 )
"
RDEPEND="${DEPEND}
diff --git a/kde-misc/akonadi-google/akonadi-google-20131213.ebuild b/kde-misc/akonadi-google/akonadi-google-20131213.ebuild
index 3f08edb4caf7..dff5fa20030f 100644
--- a/kde-misc/akonadi-google/akonadi-google-20131213.ebuild
+++ b/kde-misc/akonadi-google/akonadi-google-20131213.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-google/akonadi-google-20131213.ebuild,v 1.3 2013/12/30 11:13:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-google/akonadi-google-20131213.ebuild,v 1.4 2015/06/08 20:34:12 johu Exp $
EAPI=5
@@ -21,7 +21,7 @@ DEPEND="
$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
dev-libs/libxslt
dev-libs/qjson
- >=net-libs/libkgapi-2
+ >=net-libs/libkgapi-2:4
!>=kde-base/kdepim-runtime-4.8.50
"
RDEPEND=${DEPEND}
diff --git a/kde-misc/tellico/tellico-2.3.10.ebuild b/kde-misc/tellico/tellico-2.3.10.ebuild
index 15630ca274ec..c25f8a60a004 100644
--- a/kde-misc/tellico/tellico-2.3.10.ebuild
+++ b/kde-misc/tellico/tellico-2.3.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-2.3.10.ebuild,v 1.3 2015/06/08 14:10:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-2.3.10.ebuild,v 1.4 2015/06/09 07:13:11 ago Exp $
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="http://tellico-project.org/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="addressbook cddb debug nepomuk pdf scanner taglib v4l xmp yaz"
RDEPEND="
diff --git a/mail-mta/exim/exim-4.85.ebuild b/mail-mta/exim/exim-4.85.ebuild
index 8ad1a74a9be2..fb13d594a1c8 100644
--- a/mail-mta/exim/exim-4.85.ebuild
+++ b/mail-mta/exim/exim-4.85.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.85.ebuild,v 1.4 2015/05/28 10:29:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.85.ebuild,v 1.5 2015/06/09 07:09:12 ago Exp $
EAPI="5"
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.exim.org/"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2
diff --git a/mail-mta/postfix/postfix-3.0.1-r1.ebuild b/mail-mta/postfix/postfix-3.0.1-r1.ebuild
index 7b12c1cdf78e..9be88c501ceb 100644
--- a/mail-mta/postfix/postfix-3.0.1-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-3.0.1-r1.ebuild,v 1.3 2015/06/08 14:09:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-3.0.1-r1.ebuild,v 1.4 2015/06/09 07:15:49 ago Exp $
EAPI=5
inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
@@ -19,7 +19,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
LICENSE="IBM"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
DEPEND=">=dev-libs/libpcre-3.4
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 8b0db78635f4..01b81f5cb985 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,2 +1,3 @@
DIST clutter-gst-2.0.14.tar.xz 357192 SHA256 5d7d8c1a31748e9039b7ba9dae9f412ec065715008adffdfde332dd34e7d0535 SHA512 9bbafb034968f9b584c2a14924d426e17fae32102b7b9eea298b4556d266dbbd051aa937c79c42a9379f9c67bcda7a350171375e047c13a436c71e346e3d86f9 WHIRLPOOL 0322cfa5085d1ab1bf3894745c0d59a255b4f87a42a28e41c3761a74edc6f77b7ce1da2c9642e72fb95cf3b5db5866be8e5bc5d364e530306d263e5c765da9a4
DIST clutter-gst-2.0.16.tar.xz 357380 SHA256 a944f84186937021aba6329c23954f6015d33bf151ba8994e13c59cefd742039 SHA512 ace0eceb8f99ad78190f6ebb9caf45ccc5597fff2e4dfda4e3bf539e87f41d3d60f66637219244bd28fe32f374460e3456c8dc5d0c60ac057cc73f2f1d60c764 WHIRLPOOL dd60f5722381f8e7678cd9e47b191a1e80c313c138d3cd5cb0acb1131d13ca565dd4f9e8117eda7ed1c81ae0b0bb9cca44530403615f3545ba44c012c12b70eb
+DIST clutter-gst-3.0.6.tar.xz 391404 SHA256 d6d5493ae57cc175deee479304569c419d2bb90de3be124e6f3350ae7e73df76 SHA512 bf8a4b7ae1f7ae92a05230564cb6aac8dc3d17bd7d07067bdc9a2055ca976d5c74ae92f33d91aa2315234df77e7b779e1b9b755ca62145cda47c585693eb9448 WHIRLPOOL d96b2bb4d9e293aaf3a038fb06df9d8e320f4f9fc403f005a705371d5b316bf6a08bcec71869c4252daa4f6b0caa18c31dfbea38d4e0f62740116c02a0742208
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.6.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.6.ebuild
new file mode 100644
index 000000000000..9c212c17c030
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-3.0.6.ebuild,v 1.1 2015/06/08 22:25:39 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+HOMEPAGE="http://www.clutter-project.org/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples +introspection"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+# FIXME:
+# - udev is automagic
+# - provide a USE flag for HW decode support (--enable-gl-texture-upload)
+COMMON_DEPEND="
+ >=dev-libs/glib-2.20:2
+ >=media-libs/clutter-1.20:1.0=[introspection?]
+ >=media-libs/cogl-1.18:1.0=[introspection?]
+ >=media-libs/gstreamer-1.4:1.0[introspection?]
+ >=media-libs/gst-plugins-bad-1.4:1.0
+ >=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+ virtual/libgudev
+ introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+ >=media-libs/gst-plugins-good-1.4:1.0
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/gtk-doc-am-1.11
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-maintainer-flags \
+ $(use_enable introspection)
+}
+
+src_compile() {
+ # Clutter tries to access dri without userpriv, upstream bug #661873
+ # Massive failure of a hack, see bug 360219, bug 360073, bug 363917
+ unset DISPLAY
+ gnome2_src_compile
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use examples; then
+ insinto /usr/share/doc/"${PF}"/examples
+ doins examples/{*.c,*.png,README}
+ fi
+}
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 66ed3b62f84b..90228438b8f2 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,4 @@
DIST clutter-1.18.4.tar.xz 5237900 SHA256 4eea1015cd6d4b4945cb5d4a60e52275b0d70e13852d6d99c9abc0cd4deeb60c SHA512 a2ef71c3114cda5861cc88a3c826e6144dc44b8e63a1ece58d2bb7999e731cea612231c1f67af85f2bdddf02bbd80d27e5e35b4867fb378d6698c7b1b654aa62 WHIRLPOOL f03d6aaeca310da29b03b273a0695cd3407a9b76507195a6eca64d60bc4f0de6fac3f01eaf16b71dc1f0e04c0c40dd2e08caeb6dd44d47728ad7ceb2903146e5
DIST clutter-1.20.0.tar.xz 5237780 SHA256 cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293 SHA512 2e6c582c0a31c61104c9f73fb870c61dd4331c247e111ecc3d9823c9cc3d24d9d3743f25d672498693170ca41419f13cc5ad2e1763e3a24bfd2c5c07b627b5e3 WHIRLPOOL 8e75af9837313db3d8a2c4d9191a1738140248b39a2e4bb5309c1c029a55825f7f306952d21677b2f9ad75b3d0d0a5488517955ba05a2a05274d3f866bc77868
DIST clutter-1.20.2.tar.xz 5255576 SHA256 8fa5287e964e1811c339d95252b434a2bc0c60f1f42f1c854f29c71c7efeca94 SHA512 c9d8283a9d562608f5af42b1a3d1199d83ab18262e7fde6d221e1440ed5cadd3a82f9cf3f41a67330178773b05e63d07f8c24d87efb55df52e1bf2dc9e668788 WHIRLPOOL 9743048c63030dbc83b00bb9380bcc50bd6fcf71b0a4d77f44510063a7e3f687d720b4e07537d7e215b0ce4423e0af78959bceb483fe7749703c32d9ffae8a67
+DIST clutter-1.22.2.tar.xz 5304752 SHA256 8e69d21d9f7e8e89eafc072e2615c289903260c470af39bcb578b081139c11ac SHA512 002ea924f97fca89cec96a9e5850f0351cd44b960eede898fa59ef3c0c1c08f9798b34747a9590b2c59108d0ae7cbcd5c67e96a61c4e9bab1f9f6075c863e21f WHIRLPOOL b75886894b64e0b4c87a9df76b717fa420a939ebda7088a1d7a57c36408e0a2084ff5187b74feeb6093b2879e51827f4d8677e9cbef8a3ee15bd7ab39b7b72c8
diff --git a/media-libs/clutter/clutter-1.22.2.ebuild b/media-libs/clutter/clutter-1.22.2.ebuild
new file mode 100644
index 000000000000..01b4cb11bc0b
--- /dev/null
+++ b/media-libs/clutter/clutter-1.22.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.22.2.ebuild,v 1.1 2015/06/08 22:23:32 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+
+LICENSE="LGPL-2.1+ FDL-1.1+"
+SLOT="1.0"
+IUSE="aqua debug doc egl gtk +introspection test wayland +X"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ wayland? ( egl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# NOTE: glx flavour uses libdrm + >=mesa-7.3
+# >=libX11-1.3.1 needed for X Generic Event support
+# do not depend on tslib, it does not build and is disable by default upstream
+RDEPEND="
+ >=dev-libs/glib-2.39.0:2
+ >=dev-libs/atk-2.5.3[introspection?]
+ >=dev-libs/json-glib-0.12[introspection?]
+ >=media-libs/cogl-1.20.0:1.0=[introspection?,pango,wayland?]
+ >=x11-libs/cairo-1.14:=[aqua?,glib]
+ >=x11-libs/pango-1.30[introspection?]
+
+ virtual/opengl
+ x11-libs/libdrm:=
+
+ egl? (
+ >=dev-libs/libinput-0.8
+ media-libs/cogl[gles2,kms]
+ >=virtual/libgudev-136
+ x11-libs/libxkbcommon
+ )
+ gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] )
+ introspection? ( >=dev-libs/gobject-introspection-1.39 )
+ X? (
+ media-libs/fontconfig
+ >=x11-libs/libX11-1.3.1
+ x11-libs/libXext
+ x11-libs/libXdamage
+ x11-proto/inputproto
+ >=x11-libs/libXi-1.3
+ >=x11-libs/libXcomposite-0.4 )
+ wayland? (
+ dev-libs/wayland
+ x11-libs/gdk-pixbuf:2 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ doc? (
+ >=dev-util/gtk-doc-1.20
+ >=app-text/docbook-sgml-utils-0.6.14[jadetex]
+ dev-libs/libxslt )
+ test? ( x11-libs/gdk-pixbuf )"
+
+# Tests fail with both swrast and llvmpipe
+# They pass under r600g or i965, so the bug is in mesa
+#RESTRICT="test"
+
+src_prepare() {
+ # We only need conformance tests, the rest are useless for us
+ sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
+ -i tests/Makefile.am || die "am tests sed failed"
+ sed -e 's/^\(SUBDIRS =\)[^\]*/\1 accessibility conform/g' \
+ -i tests/Makefile.in || die "in tests sed failed"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # XXX: Conformance test suite (and clutter itself) does not work under Xvfb
+ # (GLX error blabla)
+ # XXX: coverage disabled for now
+ # XXX: What about cex100/win32 backends?
+ gnome2_src_configure \
+ --disable-maintainer-flags \
+ --disable-mir-backend \
+ --disable-gcov \
+ --disable-cex100-backend \
+ --disable-win32-backend \
+ --disable-tslib-input \
+ $(use_enable aqua quartz-backend) \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
+ $(use_enable doc docs) \
+ $(use_enable egl egl-backend) \
+ $(use_enable egl evdev-input) \
+ $(use_enable gtk gdk-backend) \
+ $(use_enable introspection) \
+ $(use_enable test gdk-pixbuf) \
+ $(use_enable wayland wayland-backend) \
+ $(use_enable wayland wayland-compositor) \
+ $(use_enable X xinput) \
+ $(use_enable X x11-backend)
+}
+
+src_test() {
+ Xemake check -C tests/conform
+}
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 5e289d7d332f..48f3076d9a9f 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1 +1,2 @@
DIST cogl-1.18.2.tar.xz 1635384 SHA256 9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa SHA512 c8903a10c476850c77f71eba584854bccf26adae6f62a9232adf8baf728fe2b69273bd5cd5418e7cd72801a2c0e4c85ef8afc08e28ebd5016b81693aef2ecab8 WHIRLPOOL e7538b92af2efe2f3845fde5c97ba9744d53ddb7a05eadb3cf310c43a3536a41001e4a0596a593ae3cfede4a02115a1d9be8aa423e9c814675059f0f777ec4a5
+DIST cogl-1.20.0.tar.xz 1669620 SHA256 729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b SHA512 a7c50072ef5660a4fff8d3843ede86178e5c4bcc635eb24c1e16f73422f57596b91a2c78a73a5e01f6f4b9c96509c7c648729f748b2fec4b8ad0f332cd5e0bd1 WHIRLPOOL 9756e8b0c1503ff9e06b926d82620692d0e22ac7acf68f90461d4ae982d758733de47084fa4a80c531500f47b2ff109e07b3f0300aa9fcaf5b05f607a8252fa1
diff --git a/media-libs/cogl/cogl-1.20.0.ebuild b/media-libs/cogl/cogl-1.20.0.ebuild
new file mode 100644
index 000000000000..fc94998e5a61
--- /dev/null
+++ b/media-libs/cogl/cogl-1.20.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.20.0.ebuild,v 1.1 2015/06/08 22:21:49 eva Exp $
+
+EAPI="5"
+CLUTTER_LA_PUNT="yes"
+
+# Inherit gnome2 after clutter to download sources from gnome.org
+inherit clutter gnome2 multilib virtualx
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="http://www.cogl3d.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+# doc and profile disable for now due bugs #484750 and #483332
+IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
+REQUIRED_USE="wayland? ( gles2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ x11-libs/cairo:=
+ >=x11-libs/gdk-pixbuf-2:2
+ x11-libs/libX11
+ >=x11-libs/libXcomposite-0.4
+ x11-libs/libXdamage
+ x11-libs/libXext
+ >=x11-libs/libXfixes-3
+ >=x11-libs/libXrandr-1.2
+ virtual/opengl
+ gles2? ( media-libs/mesa[gles2] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+
+ introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
+ kms? (
+ media-libs/mesa[gbm]
+ x11-libs/libdrm:= )
+ pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+ wayland? (
+ >=dev-libs/wayland-1.1.90
+ media-libs/mesa[egl,wayland] )
+"
+# before clutter-1.7, cogl was part of clutter
+RDEPEND="${COMMON_DEPEND}
+ !=dev-util/gtk-doc-am-1.13
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ app-eselect/eselect-opengl
+ media-libs/mesa[classic] )
+"
+
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
+
+src_prepare() {
+ # Do not build examples
+ sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+ -i Makefile.am Makefile.in || die
+
+ if ! use test ; then
+ # For some reason the configure switch will not completely disable
+ # tests being built
+ sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
+ -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+ -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+ -i Makefile.am Makefile.in || die
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # TODO: think about quartz, sdl
+ # Prefer gl over gles2 if both are selected
+ # Profiling needs uprof, which is not available in portage yet, bug #484750
+ # FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
+ gnome2_src_configure \
+ --disable-examples-install \
+ --disable-maintainer-flags \
+ --enable-cairo \
+ --enable-deprecated \
+ --enable-gdk-pixbuf \
+ --enable-glib \
+ $(use_enable opengl glx) \
+ $(use_enable opengl gl) \
+ $(use_enable gles2) \
+ $(use_enable gles2 cogl-gles2) \
+ $(use_enable gles2 xlib-egl-platform) \
+ $(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+ $(use_enable gstreamer cogl-gst) \
+ $(use_enable introspection) \
+ $(use_enable kms kms-egl-platform) \
+ $(use_enable pango cogl-pango) \
+ $(use_enable test unit-tests) \
+ $(use_enable wayland wayland-egl-platform) \
+ $(use_enable wayland wayland-egl-server) \
+ --disable-profile
+# $(use_enable profile)
+}
+
+src_test() {
+ # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
+ # NOTE: recheck if this is needed after every mesa bump
+ if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
+ ewarn "Skipping tests because a binary OpenGL library is enabled. To"
+ ewarn "run tests for ${PN}, you need to enable the Mesa library:"
+ ewarn "# eselect opengl set xorg-x11"
+ return
+ fi
+ LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
+}
+
+src_install() {
+ DOCS="NEWS README"
+ EXAMPLES="examples/{*.c,*.jpg}"
+
+ clutter_src_install
+
+ # Remove silly examples-data directory
+ rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+}
diff --git a/media-libs/freeverb3/files/freeverb3-3.1.1-jack-compilation.patch b/media-libs/freeverb3/files/freeverb3-3.1.1-jack-compilation.patch
new file mode 100644
index 000000000000..768782021768
--- /dev/null
+++ b/media-libs/freeverb3/files/freeverb3-3.1.1-jack-compilation.patch
@@ -0,0 +1,67 @@
+From c2ab38ee2cd768ea4875450b146b12edbc28d656 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Tue, 9 Jun 2015 01:41:45 +0200
+Subject: [PATCH] Fix function name mis-match for JACK compilation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes compile error:
+
+../audacious/impulser2.cpp: In function ‘void slot_save(SlotConfiguration*, int)’:
+../audacious/impulser2.cpp:278:86: error: ‘aud_set_str’ was not declared in this scope
+ t_str (configSectionString, key_i("file",i), (gchar*)slot->filename.c_str());
+ ^
+../audacious/impulser2.cpp: In function ‘void slot_load(SlotConfiguration*, int)’:
+../audacious/impulser2.cpp:293:62: error: ‘aud_get_str’ was not declared in this scope
+ filename = aud_get_str(configSectionString, key_i("file",i));
+---
+ jack/configdb.h | 4 ++--
+ jack/configdb_rcfile.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/jack/configdb.h b/jack/configdb.h
+index c3e6c19..0f793fa 100644
+--- a/jack/configdb.h
++++ b/jack/configdb.h
+@@ -23,13 +23,13 @@ void bmp_cfg_db_set_float (ConfigDb *db, const gchar *section, const gchar *key,
+ void bmp_cfg_db_set_double(ConfigDb *db, const gchar *section, const gchar *key, gdouble value);
+ void bmp_cfg_db_unset_key (ConfigDb *db, const gchar *section, const gchar *key);
+
+-gchar * aud_get_string(const gchar *section, const gchar *key);
++gchar * aud_get_str (const gchar *section, const gchar *key);
+ gint aud_get_int (const gchar *section, const gchar *key);
+ gboolean aud_get_bool (const gchar *section, const gchar *key);
+ gfloat aud_get_float (const gchar *section, const gchar *key);
+ gdouble aud_get_double(const gchar *section, const gchar *key);
+
+-void aud_set_string(const gchar *section, const gchar *key, gchar *value);
++void aud_set_str (const gchar *section, const gchar *key, gchar *value);
+ void aud_set_int (const gchar *section, const gchar *key, gint value);
+ void aud_set_bool (const gchar *section, const gchar *key, gboolean value);
+ void aud_set_float (const gchar *section, const gchar *key, gfloat value);
+diff --git a/jack/configdb_rcfile.c b/jack/configdb_rcfile.c
+index c0125c8..69bb085 100644
+--- a/jack/configdb_rcfile.c
++++ b/jack/configdb_rcfile.c
+@@ -109,7 +109,7 @@ void bmp_cfg_db_unset_key(ConfigDb * db, const gchar * section, const gchar * ke
+ }
+
+ gchar * cfg_string;
+-gchar * aud_get_string(const gchar *section, const gchar *key)
++gchar * aud_get_str(const gchar *section, const gchar *key)
+ {
+ ConfigDb * cfg = bmp_cfg_db_open();
+ bmp_cfg_db_get_string(cfg,section,key,&cfg_string);
+@@ -153,7 +153,7 @@ gdouble aud_get_double(const gchar *section, const gchar *key)
+ return cfg_double;
+ }
+
+-void aud_set_string(const gchar *section, const gchar *key, gchar *value)
++void aud_set_str(const gchar *section, const gchar *key, gchar *value)
+ {
+ ConfigDb * cfg = bmp_cfg_db_open();
+ bmp_cfg_db_set_string(cfg,section,key,value);
+--
+2.4.0
+
diff --git a/media-libs/freeverb3/files/freeverb3-3.1.1-jack-linking.patch b/media-libs/freeverb3/files/freeverb3-3.1.1-jack-linking.patch
new file mode 100644
index 000000000000..d52d6d424fba
--- /dev/null
+++ b/media-libs/freeverb3/files/freeverb3-3.1.1-jack-linking.patch
@@ -0,0 +1,27 @@
+From e10a2a4eb6985731881ad145eac5e8e8ec45a1fd Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Tue, 9 Jun 2015 00:06:51 +0200
+Subject: [PATCH] Fix linking of JACK effect module
+
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/../../../../x86_64-pc-linux-gnu/bin/ld: ./.libs/libjack_common.a(libjack_common_la-jack_main.o): undefined
+reference to symbol 'gdk_threads_init'
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/../../../../lib64/libgdk-3.so: error adding symbols: DSO missing from command line
+---
+ jack/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/jack/Makefile.am b/jack/Makefile.am
+index 651a034..a18fe15 100644
+--- a/jack/Makefile.am
++++ b/jack/Makefile.am
+@@ -36,6 +36,7 @@ libbmp_int_la_CPPFLAGS = -DJACK $(AM_CPPFLAGS)
+ libbmp_int_la_SOURCES = configdb.h configdb_rcfile.c rcfile.c rcfile.h util.c util.h
+ libjack_common_la_CPPFLAGS = -DJACK $(AM_CPPFLAGS)
+ libjack_common_la_SOURCES = plugin.h jack_main.cpp ../samples/CArg.cpp ../samples/CArg.hpp ../audacious/so.c
++libjack_common_la_LIBADD = $(jack_LIBS) $(gtk3_LIBS)
+
+ I_LIBS += libbmp_int.la libjack_common.la
+
+--
+2.4.0
+
diff --git a/media-libs/freeverb3/freeverb3-3.1.1-r1.ebuild b/media-libs/freeverb3/freeverb3-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..af011bf00b0b
--- /dev/null
+++ b/media-libs/freeverb3/freeverb3-3.1.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/freeverb3-3.1.1-r1.ebuild,v 1.1 2015/06/08 23:57:54 sping Exp $
+
+EAPI=5
+inherit eutils multilib versionator
+
+DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
+HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
+
+_GTK_DEPEND=">=dev-libs/glib-2.4.7:2
+ >=x11-libs/gtk+-3.0.0:3
+ x11-libs/pango
+ x11-libs/cairo"
+
+RDEPEND=">=sci-libs/fftw-3.0.1
+ audacious? ( >=media-sound/audacious-3.5
+ ${_GTK_DEPEND}
+ media-libs/libsndfile )
+ jack? ( media-sound/jack-audio-connection-kit
+ ${_GTK_DEPEND}
+ media-libs/libsndfile )"
+DEPEND=${RDEPEND}
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-jack-compilation.patch
+ epatch "${FILESDIR}"/${P}-jack-linking.patch
+}
+
+src_configure() {
+ econf \
+ --disable-profile \
+ --enable-release \
+ --disable-autocflags \
+ --enable-undenormal \
+ $(use_enable threads pthread) \
+ $(use_enable forcefpu) \
+ --disable-force3dnow \
+ $(use_enable cpu_flags_x86_3dnow 3dnow) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable cpu_flags_x86_sse2 sse2) \
+ $(use_enable cpu_flags_x86_sse3 sse3) \
+ $(use_enable cpu_flags_x86_sse4_1 sse4) \
+ $(use_enable cpu_flags_x86_avx avx) \
+ --disable-fma \
+ --disable-fma4 \
+ $(use_enable openmp omp) \
+ --disable-sample \
+ $(use_enable jack) \
+ $(use_enable audacious) \
+ --disable-srcnewcoeffs \
+ $(use_enable plugdouble) \
+ --disable-pluginit \
+ || die "econf failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc ChangeLog README || die 'dodoc failed'
+
+ if use audacious ; then
+ find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die
+ fi
+
+ insinto /usr/share/${PN}/samples/IR
+ doins samples/IR/*.wav || die
+}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index c91b9288d347..c9bb6efb732f 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,2 +1,2 @@
DIST gegl-0.2.0.tar.bz2 7502040 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8 WHIRLPOOL 74e9c18b095526b1d053f0700b3c3776197a5c1066cb77adb7c83f154aae9087319f7b7f0379fb9e895a5ef3ac62ebf05e2158c1d18180bafcef41dff096c01d
-DIST gegl-0.3.0_pre20150304.tar.bz2 38012287 SHA256 627b92ec1449b3638a33dda059721edddce3becf0c9d994e27292f78bb224f37 SHA512 3faf57f4396e1b8f222b05830f188b4b53b486a74632f4011eff0596971164378c2812509c27475fe5e30c6370fa3322fcae51ec05c22bd73bed69f85889634b WHIRLPOOL f1676b6e06764a19ffdeb4e5c084989b760aafb6ea823265d84d82ce60bb78163ae24887a4e9e386f4d701f9b5960f51021c0f9dea0189df86a726800da79f82
+DIST gegl-0.3.0.tar.bz2 5463571 SHA256 f0fec8f2e7b8835979d3cf4e38b05d41bb79f68dc80cf899a846484da693bbf7 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6 WHIRLPOOL 4827d6e40025c36d4ef869b5856f4def1e93cc195757f430cfd2980742ce6b37c79833283d17ec51e93b569a144548aaf7021854b9bcdb241b90049b1321a99b
diff --git a/media-libs/gegl/gegl-0.3.0_pre20150304.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
similarity index 84%
rename from media-libs/gegl/gegl-0.3.0_pre20150304.ebuild
rename to media-libs/gegl/gegl-0.3.0.ebuild
index 4a9b4d817879..19637007fb4c 100644
--- a/media-libs/gegl/gegl-0.3.0_pre20150304.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -1,22 +1,23 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.3.0_pre20150304.ebuild,v 1.1 2015/05/25 23:49:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.3.0.ebuild,v 1.1 2015/06/09 01:19:26 tetromino Exp $
EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
# vala and introspection support is broken, bug #468208
VALA_MIN_API_VERSION=0.20
VALA_USE_DEPEND=vapigen
-inherit versionator gnome2-utils eutils autotools vala
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
if [[ ${PV} == *9999* ]]; then
inherit autotools git-r3
EGIT_REPO_URI="git://git.gnome.org/gegl"
SRC_URI=""
else
- SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${PN}-0.3.0-c9bbc81.tar.bz2 -> ${P}.tar.bz2"
- # ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
@@ -26,7 +27,7 @@ HOMEPAGE="http://www.gegl.org/"
LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0.3"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
REQUIRED_IUSE="vala? ( introspection )"
RDEPEND="
@@ -42,9 +43,7 @@ RDEPEND="
libav? ( media-video/libav:0= )
!libav? ( media-video/ffmpeg:0= )
)
- introspection? (
- >=dev-libs/gobject-introspection-1.32
- >=dev-python/pygobject-3.2:3 )
+ introspection? ( >=dev-libs/gobject-introspection-1.32 )
jpeg? ( virtual/jpeg:0= )
jpeg2k? ( >=media-libs/jasper-1.900.1 )
lcms? ( >=media-libs/lcms-2.2:2 )
@@ -64,11 +63,14 @@ DEPEND="${RDEPEND}
dev-lang/perl
virtual/pkgconfig
>=sys-devel/libtool-2.2
+ test? ( introspection? (
+ $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
vala? ( $(vala_depend) )
"
-# Only needed for snapshot
-S="${WORKDIR}/${PN}-0.3.0"
+pkg_setup() {
+ use test && use introspection && python-any-r1_pkg_setup
+}
src_prepare() {
# FIXME: the following should be proper patch sent to upstream
@@ -81,11 +83,16 @@ src_prepare() {
#epatch "${FILESDIR}"/${P}-g_log_domain.patch
- # gegl test fail on 64bits and a later commit switch the break to 32bits
- sed -e '/gegl.xml/d' \
- -e '/contrast-curve.xml/d' \
+ # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+ sed -e '/clones.xml/d' \
+ -e '/composite-transform.xml/d' \
-i tests/compositions/Makefile.am || die
+ # commit 11a283ab : test-image-compare needs >=babl-0.1.13 (not released yet)
+ # for the new CIE conversions
+ sed -e '/test-image-compare/d' \
+ -i tests/simple/Makefile.am || die
+
# Skip broken test with >=dev-python/pygobject-3.14
sed -e '/test_buffer/ i\ @unittest.skip("broken")\' \
-i tests/python/test-gegl-format.py || die
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index fdde3b501138..42f7fee05ec2 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,22 +1,23 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.11 2015/05/25 23:49:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.12 2015/06/09 01:19:26 tetromino Exp $
EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
# vala and introspection support is broken, bug #468208
VALA_MIN_API_VERSION=0.20
VALA_USE_DEPEND=vapigen
-inherit versionator gnome2-utils eutils autotools vala
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
if [[ ${PV} == *9999* ]]; then
inherit autotools git-r3
EGIT_REPO_URI="git://git.gnome.org/gegl"
SRC_URI=""
else
- SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${PN}-0.3.0-c9bbc81.tar.bz2 -> ${P}.tar.bz2"
- # ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
@@ -26,7 +27,7 @@ HOMEPAGE="http://www.gegl.org/"
LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0.3"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
REQUIRED_IUSE="vala? ( introspection )"
RDEPEND="
@@ -42,9 +43,7 @@ RDEPEND="
libav? ( media-video/libav:0= )
!libav? ( media-video/ffmpeg:0= )
)
- introspection? (
- >=dev-libs/gobject-introspection-1.32
- >=dev-python/pygobject-3.2:3 )
+ introspection? ( >=dev-libs/gobject-introspection-1.32 )
jpeg? ( virtual/jpeg:0= )
jpeg2k? ( >=media-libs/jasper-1.900.1 )
lcms? ( >=media-libs/lcms-2.2:2 )
@@ -64,9 +63,15 @@ DEPEND="${RDEPEND}
dev-lang/perl
virtual/pkgconfig
>=sys-devel/libtool-2.2
+ test? ( introspection? (
+ $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
vala? ( $(vala_depend) )
"
+pkg_setup() {
+ use test && use introspection && python-any-r1_pkg_setup
+}
+
src_prepare() {
# FIXME: the following should be proper patch sent to upstream
# fix OSX loadable module filename extension
@@ -78,11 +83,16 @@ src_prepare() {
#epatch "${FILESDIR}"/${P}-g_log_domain.patch
- # gegl test fail on 64bits and a later commit switch the break to 32bits
- sed -e '/gegl.xml/d' \
- -e '/contrast-curve.xml/d' \
+ # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+ sed -e '/clones.xml/d' \
+ -e '/composite-transform.xml/d' \
-i tests/compositions/Makefile.am || die
+ # commit 11a283ab : test-image-compare needs >=babl-0.1.13 (not released yet)
+ # for the new CIE conversions
+ sed -e '/test-image-compare/d' \
+ -i tests/simple/Makefile.am || die
+
# Skip broken test with >=dev-python/pygobject-3.14
sed -e '/test_buffer/ i\ @unittest.skip("broken")\' \
-i tests/python/test-gegl-format.py || die
diff --git a/media-libs/gmtk/gmtk-1.0.9.ebuild b/media-libs/gmtk/gmtk-1.0.9.ebuild
index 7b51deb22e4c..16bbf3099d12 100644
--- a/media-libs/gmtk/gmtk-1.0.9.ebuild
+++ b/media-libs/gmtk/gmtk-1.0.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gmtk/gmtk-1.0.9.ebuild,v 1.2 2015/06/08 14:09:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gmtk/gmtk-1.0.9.ebuild,v 1.3 2015/06/09 07:15:05 ago Exp $
EAPI=5
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.googlecode.com/svn/packages/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
IUSE="alsa +dconf pulseaudio"
COMMON_DEPEND=">=dev-libs/glib-2.30
diff --git a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
index 5b8ec89ae95d..a7b38c42a846 100644
--- a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
+++ b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild,v 1.3 2015/06/08 14:09:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild,v 1.4 2015/06/09 07:12:50 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="debug"
RDEPEND="
diff --git a/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild b/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild
index 36f4af4b5380..acb7024ee676 100644
--- a/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild
+++ b/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild,v 1.3 2015/06/08 16:09:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild,v 1.4 2015/06/09 07:06:43 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://liquidrescale.wikidot.com/local--files/en:download-page-sources/
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild
index 386f3dc93896..f20e746e2607 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild,v 1.2 2015/06/08 12:49:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild,v 1.3 2015/06/09 07:09:31 ago Exp $
EAPI=5
inherit eutils flag-o-matic multilib-minimal
@@ -19,7 +19,7 @@ SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}.tar.xz
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-libav-9-patches.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="libav +orc"
S=${WORKDIR}/${MY_P}
diff --git a/media-sound/mpd/mpd-0.19.9-r1.ebuild b/media-sound/mpd/mpd-0.19.9-r1.ebuild
index 5103ab19c5b8..556bb7e054cf 100644
--- a/media-sound/mpd/mpd-0.19.9-r1.ebuild
+++ b/media-sound/mpd/mpd-0.19.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.9-r1.ebuild,v 1.2 2015/06/08 16:08:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.9-r1.ebuild,v 1.3 2015/06/09 07:05:47 ago Exp $
EAPI=5
inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
@@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg
flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms
libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
index ea8602d384ce..a46c0da5b0eb 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild,v 1.2 2015/06/08 14:09:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild,v 1.3 2015/06/09 07:15:01 ago Exp $
EAPI=5
inherit fdo-mime gnome2-utils
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.googlecode.com/svn/packages/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE="alsa +dbus +dconf gda gnome ipod libnotify musicbrainz pulseaudio"
COMMON_DEPEND=">=dev-libs/glib-2.30
diff --git a/media-video/tovid/tovid-0.35.2.ebuild b/media-video/tovid/tovid-0.35.2.ebuild
index 7e533431072c..ed0ba37ca37f 100644
--- a/media-video/tovid/tovid-0.35.2.ebuild
+++ b/media-video/tovid/tovid-0.35.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.35.2.ebuild,v 1.1 2015/06/06 06:33:42 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.35.2.ebuild,v 1.3 2015/06/09 01:39:16 idella4 Exp $
EAPI=5
@@ -51,12 +51,12 @@ pkg_preinst() {
pkg_postinst() {
gnome2_icon_cache_update
elog "######################################################################"
- elog "You can install transcode for additional functionality - it will "
- elog "speed up the creation of animated submenus with faster seeking."
- elog "Other wise ffmpeg will be used."
+ elog "You can install media-video/transcode for additional functionality. It"
+ elog "will speed up the creation of animated submenus with faster seeking."
+ elog "Otherwise FFmpeg/Libav will be used."
elog "######################################################################"
elog""
- gnome2_icon_cache_update
+ gnome2_icon_cache_update
}
pkg_postinst() {
gnome2_icon_cache_update
@@ -65,4 +65,3 @@ pkg_postinst() {
pkg_postrm() {
gnome2_icon_cache_update
}
-
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
index 05a55695efbf..814bdc881b29 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild,v 1.2 2015/06/05 16:32:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild,v 1.3 2015/06/09 07:11:42 ago Exp $
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="libav"
RDEPEND="
diff --git a/media-video/winki/Manifest b/media-video/winki/Manifest
index f23a6bc792ff..ca593bb08528 100644
--- a/media-video/winki/Manifest
+++ b/media-video/winki/Manifest
@@ -1 +1 @@
-DIST winki-0.4.5.tar.gz 585135 SHA256 e27dc51dc698645a6d609df89da4cdc4815443741c819f4e9e68c93ff4e26666
+DIST winki-0.4.5.tar.gz 585135 SHA256 e27dc51dc698645a6d609df89da4cdc4815443741c819f4e9e68c93ff4e26666 SHA512 bc5dbc76e28470b1198c590ee49b56afdaa7840ea35ecd3a890d3d591731e3805c2024c51783ff8234d450265dbbf81004799173317030d4efde4b1640cbfa0b WHIRLPOOL cd8ceeaaa69acc367da206bcc9f3dc379fc59a38540e12e5248d3f392341e9fa29a3e2c67a97485c09eceb3af04db8cd529d22bf1e1d97d6166e7fd713b9be0a
diff --git a/media-video/winki/winki-0.4.5-r1.ebuild b/media-video/winki/winki-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..9f3ead820738
--- /dev/null
+++ b/media-video/winki/winki-0.4.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/winki/winki-0.4.5-r1.ebuild,v 1.1 2015/06/09 01:46:23 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python frontend to many popular encoding programs"
+HOMEPAGE="http://www.winki-the-ripper.de/"
+SRC_URI="http://www.winki-the-ripper.de/share/dist/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="css dvd matroska mjpeg mp3 ogg vcd"
+DEPEND=">=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
+ >=dev-python/pyorbit-2[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ media-video/mplayer[encode]
+ media-video/lsdvd
+ virtual/ffmpeg
+ dvd? ( media-video/dvdauthor )
+ mp3? ( media-sound/lame )
+ ogg? ( media-sound/ogmtools
+ media-sound/vorbis-tools )
+ vcd? ( media-video/vcdimager
+ media-libs/libdvb )
+ mjpeg? ( media-video/mjpegtools )
+ matroska? ( media-video/mkvtoolnix )
+ css? ( media-libs/libdvdcss )"
+
+DOCS="winkirip/README winkirip/CHANGELOG winkirip/TODO winkirip/AUTHORS"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4317c051de66..aba0441b24c3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Jun 2015 19:36:53 +0000
+Tue, 09 Jun 2015 09:07:07 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4317c051de66..aba0441b24c3 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Jun 2015 19:36:53 +0000
+Tue, 09 Jun 2015 09:07:07 +0000
diff --git a/metadata/md5-cache/app-admin/consul-0.5.2 b/metadata/md5-cache/app-admin/consul-0.5.2
index 0cd8b162f587..05606ae05654 100644
--- a/metadata/md5-cache/app-admin/consul-0.5.2
+++ b/metadata/md5-cache/app-admin/consul-0.5.2
@@ -9,4 +9,4 @@ LICENSE=MPL-2.0
SLOT=0
SRC_URI=https://github.com/hashicorp/consul/archive/v0.5.2.tar.gz -> consul-0.5.2.tar.gz https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz -> circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz -> bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz -> go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz -> memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz -> net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz -> raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz -> raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz -> scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz https://github.com/hashicorp/serf/archive/558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz -> serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz -> yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz -> dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz -> cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz -> columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747
-_md5_=4a99f91bd8a5d49a4076bd0aa51aec48
+_md5_=80bedec0a43ea4d3152cf3c41974429b
diff --git a/metadata/md5-cache/app-admin/consul-9999 b/metadata/md5-cache/app-admin/consul-9999
index 03e6d09485a7..910d92b54a58 100644
--- a/metadata/md5-cache/app-admin/consul-9999
+++ b/metadata/md5-cache/app-admin/consul-9999
@@ -7,4 +7,4 @@ IUSE=test web
LICENSE=MPL-2.0
SLOT=0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747
-_md5_=c52abfb7a603d3721893b5c30c8aded6
+_md5_=4d0096ffa0642d6f01af0d2f34e59726
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14 b/metadata/md5-cache/app-admin/syslog-summary-1.14
deleted file mode 100644
index e29a5d1fdacb..000000000000
--- a/metadata/md5-cache/app-admin/syslog-summary-1.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=Summarizes the contents of a syslog log file
-EAPI=2
-HOMEPAGE=http://github.com/dpaleino/syslog-summary
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=mirror://github/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 python 3a270b7b1d1e679847ff0faeac25c5a3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=b819e5ae5d5df69e663f2776db61b850
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14-r1 b/metadata/md5-cache/app-admin/syslog-summary-1.14-r1
index c49e792e1a56..1a9321a8ae7c 100644
--- a/metadata/md5-cache/app-admin/syslog-summary-1.14-r1
+++ b/metadata/md5-cache/app-admin/syslog-summary-1.14-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Summarizes the contents of a syslog log file
EAPI=5
HOMEPAGE=http://github.com/dpaleino/syslog-summary
IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~sparc ~x86
+KEYWORDS=amd64 ~sparc x86
LICENSE=GPL-3
RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=mirror://github/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=6645ad5c911010b48480a9435710f1e0
+_md5_=94af8f3f341ea4d69f808d26cb3c524a
diff --git a/metadata/md5-cache/app-admin/vault-0.1.2 b/metadata/md5-cache/app-admin/vault-0.1.2
index d1ffd7345c19..113718b25638 100644
--- a/metadata/md5-cache/app-admin/vault-0.1.2
+++ b/metadata/md5-cache/app-admin/vault-0.1.2
@@ -9,4 +9,4 @@ LICENSE=MPL-2.0
SLOT=0
SRC_URI=https://github.com/hashicorp/vault/archive/v0.1.2.tar.gz -> vault-0.1.2.tar.gz https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz -> gox-0.3.0.tar.gz https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz -> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fcaps eeefea88d5fef2853d4c1e3770340302 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747
-_md5_=faa9da1b9ee3929ebb0e4bd1086e7b06
+_md5_=5f441d9d33c5e2d8c2df68d076f8f02a
diff --git a/metadata/md5-cache/app-admin/vault-9999 b/metadata/md5-cache/app-admin/vault-9999
index 09371cb4f379..53b24e2bf946 100644
--- a/metadata/md5-cache/app-admin/vault-9999
+++ b/metadata/md5-cache/app-admin/vault-9999
@@ -7,4 +7,4 @@ IUSE=+filecaps
LICENSE=MPL-2.0
SLOT=0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fcaps eeefea88d5fef2853d4c1e3770340302 git-r3 3a2bd0ae504c33a50061885480f3def3 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747
-_md5_=f5c9f2532e251352d7b3761b766c2dfe
+_md5_=9b5770be4ae0064f0eab67eb7c8c9b5c
diff --git a/metadata/md5-cache/app-arch/gcab-0.6 b/metadata/md5-cache/app-arch/gcab-0.6
new file mode 100644
index 000000000000..6584daa32b9d
--- /dev/null
+++ b/metadata/md5-cache/app-arch/gcab-0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.22:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/msitools
+IUSE=+introspection vala
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.22:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-0.9.4 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gcab/0.6/gcab-0.6.tar.xz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 10c513def52488230abb60a4b19a03b9 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 vala a41415fe361172827ed11b6a32ee38fb versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=cf4a9212d12860082d3e8f5b514c1955
diff --git a/metadata/md5-cache/app-arch/lziprecover-1.15 b/metadata/md5-cache/app-arch/lziprecover-1.15
deleted file mode 100644
index 82d4b37d2bf4..000000000000
--- a/metadata/md5-cache/app-arch/lziprecover-1.15
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Lziprecover is a data recovery tool and decompressor for files in the lzip compressed data format
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/lzip/lziprecover.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover-1.15.tar.gz
-_eclasses_=multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=4509c45ad534b562715a8cc4a674ef15
diff --git a/metadata/md5-cache/app-arch/lziprecover-1.17_pre1 b/metadata/md5-cache/app-arch/lziprecover-1.17
similarity index 83%
rename from metadata/md5-cache/app-arch/lziprecover-1.17_pre1
rename to metadata/md5-cache/app-arch/lziprecover-1.17
index 0ac0c61b3d08..d5fbda045955 100644
--- a/metadata/md5-cache/app-arch/lziprecover-1.17_pre1
+++ b/metadata/md5-cache/app-arch/lziprecover-1.17
@@ -5,6 +5,6 @@ HOMEPAGE=http://www.nongnu.org/lzip/lziprecover.html
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover/lziprecover-1.17-pre1.tar.gz
+SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover/lziprecover-1.17.tar.gz
_eclasses_=multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=d1fa2e4f1d5fb9773a7c9daf6a7a76b0
+_md5_=2e20c04b34319bb38904f111d6b6adad
diff --git a/metadata/md5-cache/app-cdr/k3b-2.0.3-r2 b/metadata/md5-cache/app-cdr/k3b-2.0.3-r2
index 82a251bf0fa5..355d47119cec 100644
--- a/metadata/md5-cache/app-cdr/k3b-2.0.3-r2
+++ b/metadata/md5-cache/app-cdr/k3b-2.0.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=The CD/DVD Kreator for KDE
EAPI=5
HOMEPAGE=http://www.k3b.org/
IUSE=debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis linguas_ast linguas_be linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_ku linguas_lt linguas_lv linguas_mai linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2 FDL-1.2
RDEPEND=>=kde-apps/libkcddb-4.4:4[aqua=] media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libvorbis ) >=kde-base/kdelibs-4.4:4[aqua=,udev,udisks(+)] app-cdr/cdrdao media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) kde-apps/oxygen-icons linguas_ast? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ast(+)] ) linguas_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_csb(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hne(+)] ) linguas_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ku(+)] ) linguas_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_mr(+)] ) linguas_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=dev-qt/qtmultimedia-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
REQUIRED_USE=mp3? ( encode ) sox? ( encode )
SLOT=4
SRC_URI=mirror://kde/stable/k3b/k3b-2.0.3a.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5ef33a9cc648bd8c537a320b5c128263
+_md5_=461e60f08b45c078faaa76688cc4b8cb
diff --git a/metadata/md5-cache/app-crypt/ssh-multiadd-1.3.2-r1 b/metadata/md5-cache/app-crypt/ssh-multiadd-1.3.2-r1
index dbc44627f795..d6240ffe0ad8 100644
--- a/metadata/md5-cache/app-crypt/ssh-multiadd-1.3.2-r1
+++ b/metadata/md5-cache/app-crypt/ssh-multiadd-1.3.2-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Adds multiple ssh keys to the ssh authentication agent
EAPI=5
HOMEPAGE=http://code.fluffytapeworm.com/projects
IUSE=X python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=X? ( >=net-misc/x11-ssh-askpass-1.2.2 )
SLOT=0
SRC_URI=http://code.fluffytapeworm.com/projects/ssh-multiadd-1.3.2.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=19e535d4255f8f3deb3bd2c3b63ead87
+_md5_=5116c1f993c271b868839d701c364122
diff --git a/metadata/md5-cache/app-editors/adie-1.7.49 b/metadata/md5-cache/app-editors/adie-1.7.49
index c4c8ef91dcee..0946ba6199d4 100644
--- a/metadata/md5-cache/app-editors/adie-1.7.49
+++ b/metadata/md5-cache/app-editors/adie-1.7.49
@@ -4,10 +4,10 @@ DESCRIPTION=Text editor based on the FOX Toolkit
EAPI=5
HOMEPAGE=http://www.fox-toolkit.org/
IUSE=debug doc profile
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=~x11-libs/fox-1.7.49 x11-libs/libICE x11-libs/libSM
SLOT=0
SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.49.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de fox 26650ced206327e4fca3dec6cd441381 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6c323c53974798fa0592bbc51ee3d0a2
+_md5_=144ef56b03abae3193685f7ff55dc7e9
diff --git a/metadata/md5-cache/app-emulation/xen-4.5.0-r6 b/metadata/md5-cache/app-emulation/xen-4.5.0-r6
index c92ddff53d8d..fd8c1ef10484 100644
--- a/metadata/md5-cache/app-emulation/xen-4.5.0-r6
+++ b/metadata/md5-cache/app-emulation/xen-4.5.0-r6
@@ -4,7 +4,7 @@ DESCRIPTION=The Xen virtual machine monitor
EAPI=5
HOMEPAGE=http://xen.org/
IUSE=custom-cflags debug efi flask xsm
-KEYWORDS=amd64 ~arm ~arm64
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
PDEPEND=~app-emulation/xen-tools-4.5.0
REQUIRED_USE=flask? ( xsm ) arm? ( debug )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.5.0-upstream-patches-4.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-1.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 mount-boot 02dd3bb4c5f025fef0fc3ade0f27c217 multilib 62927b3db3a589b0806255f3a002d5d3 python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=7b2af70d50d5f305a90c38550aa7b023
+_md5_=4c982d3f02f779f4e324d7dc97a85d8f
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.5.0-r1 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.5.0-r1
index 3ac2fcaa6068..5e9f7e4291e6 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.5.0-r1
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.5.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest
EAPI=5
HOMEPAGE=http://xen.org/
IUSE=custom-cflags python_targets_python2_7
-KEYWORDS=amd64 -x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=app-emulation/xen-4.2.1
REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=7e5a5b0ab4db1577f85f251b460a40ea
+_md5_=2a67e81c3a6e50ee6d56e1b5e1321ff6
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.5.0-r5 b/metadata/md5-cache/app-emulation/xen-tools-4.5.0-r5
index 04c9c9c5d733..c20ed305a895 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.5.0-r5
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.5.0-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Xend daemon and tools
EAPI=5
HOMEPAGE=http://xen.org/
IUSE=api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 -x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
REQUIRED_USE=hvm? ( || ( qemu system-qemu ) ) python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) qemu? ( !system-qemu )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.5.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-1.7.5.tar.gz ovmf? ( http://dev.gentoo.org/~dlan/distfiles/ovmf-20131208.tar.bz2 http://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-0.tar.xz ) http://dev.gentoo.org/~dlan/distfiles/xen-4.5.0-upstream-patches-5.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-2.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-4.tar.xz
_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 udev da001465a2e939c93f7ae16947ce3438
-_md5_=ba11519980fba0a7a5f8115fcf81d50d
+_md5_=28089cf65ff36700da6d118371fdc049
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.14 b/metadata/md5-cache/app-i18n/scim-1.4.14
index 69a390259859..99323fe2dafb 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.14
+++ b/metadata/md5-cache/app-i18n/scim-1.4.14
@@ -4,10 +4,10 @@ DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development
EAPI=4
HOMEPAGE=http://www.scim-im.org/
IUSE=doc gtk3
-KEYWORDS=~alpha amd64 arm ~hppa ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ppc ~ppc64 ~sparc x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
SLOT=0
SRC_URI=mirror://sourceforge/scim/scim-1.4.14.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-utils dbce0f7913bd240fdf0ef428149855c0 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=597c1ec630d08c3bddc5476d6cfeee48
+_md5_=3cdf69e8ecc68297a3575b9ce771d225
diff --git a/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1 b/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
index 9acae5baa229..90f3ff23387d 100644
--- a/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
+++ b/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Japanese input method Anthy IMEngine for SCIM
EAPI=5
HOMEPAGE=http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMAnthy
IUSE=+gtk3 nls kasumi
-KEYWORDS=amd64 ~arm ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=>=app-i18n/scim-1.2[gtk3=] >=app-i18n/anthy-5900 nls? ( virtual/libintl ) gtk3? ( x11-libs/gtk+:3 ) kasumi? ( app-dicts/kasumi )
SLOT=0
SRC_URI=mirror://sourceforge.jp/scim-imengine/37309/scim-anthy-1.2.7.tar.gz gtk3? ( http://dev.gentoo.org/~heroxbd/scim-anthy-1.2.7-patches.tar.xz )
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=fb02104f639ff71678799d00ba39de08
+_md5_=f50df0e5cd5a670faa2327cd924711fd
diff --git a/metadata/md5-cache/app-misc/fsniper-1.3.1 b/metadata/md5-cache/app-misc/fsniper-1.3.1
deleted file mode 100644
index 358a161501f3..000000000000
--- a/metadata/md5-cache/app-misc/fsniper-1.3.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/libpcre sys-apps/file
-DESCRIPTION=Tool that monitors a given set of directories for new files
-HOMEPAGE=https://github.com/l3ib/fsniper/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre sys-apps/file
-SLOT=0
-SRC_URI=http://projects.l3ib.org/fsniper/files/fsniper-1.3.1.tar.gz
-_md5_=21cc39712a3bd9e93b7ed1ab35ef2823
diff --git a/metadata/md5-cache/app-misc/fsniper-1.3.1-r1 b/metadata/md5-cache/app-misc/fsniper-1.3.1-r1
index 997e58666426..472579680016 100644
--- a/metadata/md5-cache/app-misc/fsniper-1.3.1-r1
+++ b/metadata/md5-cache/app-misc/fsniper-1.3.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libpcre sys-apps/file
DESCRIPTION=Tool that monitors a given set of directories for new files
EAPI=5
HOMEPAGE=https://github.com/l3ib/fsniper/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/libpcre sys-apps/file
SLOT=0
SRC_URI=http://projects.l3ib.org/fsniper/files/fsniper-1.3.1.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-utils dbce0f7913bd240fdf0ef428149855c0 eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=c5b7462e0343da81b0a39aabb46c306e
+_md5_=a4e0403e166fa63e697ce895618ab7eb
diff --git a/metadata/md5-cache/app-misc/klavaro-3.0.1 b/metadata/md5-cache/app-misc/klavaro-3.0.1
index 9e30942bc98c..36fd0b1f5e62 100644
--- a/metadata/md5-cache/app-misc/klavaro-3.0.1
+++ b/metadata/md5-cache/app-misc/klavaro-3.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Another free touch typing tutor program
EAPI=5
HOMEPAGE=http://klavaro.sourceforge.net/
IUSE=+static-libs
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=net-misc/curl x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango
SLOT=0
SRC_URI=mirror://sourceforge/project/klavaro/klavaro-3.01.tar.bz2
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-utils dbce0f7913bd240fdf0ef428149855c0 eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=65d2dec1a627e67ece22e3dc28030166
+_md5_=a65c48692b1d977e44247cbf6dcf8abf
diff --git a/metadata/md5-cache/app-shells/sash-3.8 b/metadata/md5-cache/app-shells/sash-3.8
index c9446c1e91ee..fc796a430565 100644
--- a/metadata/md5-cache/app-shells/sash-3.8
+++ b/metadata/md5-cache/app-shells/sash-3.8
@@ -4,10 +4,10 @@ DESCRIPTION=A small (static) UNIX Shell
EAPI=4
HOMEPAGE=http://www.canb.auug.org.au/~dbell/
IUSE=static
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=freedist
RDEPEND=!static? ( static? ( sys-libs/zlib[static-libs] ) !static? ( >=sys-libs/zlib-1.2.3 ) )
SLOT=0
SRC_URI=http://www.canb.auug.org.au/~dbell/programs/sash-3.8.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=d0d33717b74aa304dd8a4a7bfd5fdd74
+_md5_=86bfca45e1de84d86a9b789765f88165
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.15-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.15-r1
index 6be6f0834541..ab730287d17e 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.15-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.15-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PD
EAPI=5
HOMEPAGE=http://ghostscript.com/
IUSE=cups dbus djvu gtk idn linguas_de static-libs X linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=AGPL-3 CPL-1.0
RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) djvu? ( app-text/djvu ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) idn? ( net-dns/libidn ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other !=dev-libs/glib-2.16:2= dev-libs/libsigc++:2= sys-libs/zlib:= >=x11-libs/gtk+-2.20:2= gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 ) spell? ( >=app-text/enchant-1.2 ) tools? ( dev-libs/libpcre:= dev-libs/libxml2:= virtual/mysql ) espeak? ( >=app-accessibility/espeak-1.29 )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/stardict-4/stardict-3.0.6.tar.bz2 pronounce? ( http://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 10c513def52488230abb60a4b19a03b9 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c2e42bcfa7c4f7675026b14609be7668
+_md5_=941ebd6ea675416203618a4fd70f00f9
diff --git a/metadata/md5-cache/app-text/writerperfect-0.9.2 b/metadata/md5-cache/app-text/writerperfect-0.9.2
index bc73d15a7755..ee77b3a7ea39 100644
--- a/metadata/md5-cache/app-text/writerperfect-0.9.2
+++ b/metadata/md5-cache/app-text/writerperfect-0.9.2
@@ -4,9 +4,9 @@ DESCRIPTION=Various formats to Open document format converter
EAPI=5
HOMEPAGE=http://libwpd.sf.net
IUSE=abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps
-KEYWORDS=amd64 ~x86 ~x86-linux ~x86-solaris
+KEYWORDS=amd64 x86 ~x86-linux ~x86-solaris
LICENSE=|| ( LGPL-2.1 MPL-2.0 )
RDEPEND==app-text/libodfgen-0.1* >=dev-libs/librevenge-0.0.1 abiword? ( =app-text/libabw-0.1* ) cdr? ( =media-libs/libcdr-0.1* ) ebook? ( =app-text/libebook-0.1* ) freehand? ( =media-libs/libfreehand-0.1* ) gsf? ( gnome-extra/libgsf ) keynote? ( =app-text/libetonyek-0.1* ) mspub? ( =app-text/libmspub-0.1* ) mwaw? ( =app-text/libmwaw-0.3* ) pagemaker? ( media-libs/libpagemaker ) visio? ( =media-libs/libvisio-0.1* ) wpd? ( app-text/libwpd:0.10 ) wpg? ( =app-text/libwpg-0.3* ) wps? ( =app-text/libwps-0.3* )
SLOT=0
SRC_URI=mirror://sourceforge/libwpd/writerperfect-0.9.2.tar.xz
-_md5_=c38296c9e3fb080d1b7b86170627b617
+_md5_=c33186448a29d017caf8c8d845ca2f5a
diff --git a/metadata/md5-cache/dev-go/go-crypto-1.4.2_p20150608 b/metadata/md5-cache/dev-go/go-crypto-1.4.2_p20150608
new file mode 100644
index 000000000000..c6a96fe51198
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-crypto-1.4.2_p20150608
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.4
+DESCRIPTION=Go supplementary cryptography libraries
+EAPI=5
+HOMEPAGE=https://godoc.org/golang.org/x/crypto
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/golang/crypto/archive/1e856cbfdf9bc25eefca75f83f25d55e35ae72e0.tar.gz -> go-crypto-1.4.2_p20150608.tar.gz
+_md5_=795b19159d0632e60c407d6a67fd4304
diff --git a/metadata/md5-cache/dev-go/go-crypto-9999 b/metadata/md5-cache/dev-go/go-crypto-9999
index 1989285669bd..4bcdca044081 100644
--- a/metadata/md5-cache/dev-go/go-crypto-9999
+++ b/metadata/md5-cache/dev-go/go-crypto-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://godoc.org/golang.org/x/crypto
LICENSE=BSD
SLOT=0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=14173d4f181e833ae3cd341c1a8d46d7
+_md5_=081672d9b82db2a468afaf8e84a52542
diff --git a/metadata/md5-cache/dev-go/go-net-1.4.2_p20150604 b/metadata/md5-cache/dev-go/go-net-1.4.2_p20150604
new file mode 100644
index 000000000000..ae8e792e79a0
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-net-1.4.2_p20150604
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.4 dev-go/go-text
+DESCRIPTION=Go supplementary network libraries
+EAPI=5
+HOMEPAGE=https://godoc.org/golang.org/x/net
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/golang/net/archive/dfe268fd2bb5c793f4c083803609fce9806c6f80.tar.gz -> go-net-1.4.2_p20150604.tar.gz
+_md5_=41e9db812cc9ada3af3c0e3918e13d3d
diff --git a/metadata/md5-cache/dev-go/go-net-9999 b/metadata/md5-cache/dev-go/go-net-9999
index 19cf7acb7bf5..9d932099b28c 100644
--- a/metadata/md5-cache/dev-go/go-net-9999
+++ b/metadata/md5-cache/dev-go/go-net-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://godoc.org/golang.org/x/net
LICENSE=BSD
SLOT=0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=7b5bc0701b323a8be30fd4814ee7c494
+_md5_=fa41f1d7ae960068fe6dc792fee614f4
diff --git a/metadata/md5-cache/dev-go/go-oauth2-1.4.2_p20150527 b/metadata/md5-cache/dev-go/go-oauth2-1.4.2_p20150527
new file mode 100644
index 000000000000..ede30dfa4cc6
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-oauth2-1.4.2_p20150527
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.4 dev-go/go-net
+DESCRIPTION=Go client implementation for OAuth 2.0 spec
+EAPI=5
+HOMEPAGE=https://godoc.org/golang.org/x/oauth2
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/golang/oauth2/archive/b5adcc2dcdf009d0391547edc6ecbaff889f5bb9.tar.gz -> go-oauth2-1.4.2_p20150527.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz -> gcloud-golang-629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz
+_md5_=44f5bf3604771f3566f18c271d53ab6c
diff --git a/metadata/md5-cache/dev-go/go-sys-1.4.2_p20150518 b/metadata/md5-cache/dev-go/go-sys-1.4.2_p20150518-r1
similarity index 90%
rename from metadata/md5-cache/dev-go/go-sys-1.4.2_p20150518
rename to metadata/md5-cache/dev-go/go-sys-1.4.2_p20150518-r1
index c80677c17c2c..14730ae09118 100644
--- a/metadata/md5-cache/dev-go/go-sys-1.4.2_p20150518
+++ b/metadata/md5-cache/dev-go/go-sys-1.4.2_p20150518-r1
@@ -7,4 +7,4 @@ KEYWORDS=~amd64
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/golang/sys/archive/58e109635f5d754f4b3a8a0172db65a52fcab866.tar.gz -> go-sys-1.4.2_p20150518.tar.gz
-_md5_=bfc585cf43a72fdc081236651ed45348
+_md5_=12ae6315667f2d229f5fb05bd7ebfba5
diff --git a/metadata/md5-cache/dev-go/go-sys-9999 b/metadata/md5-cache/dev-go/go-sys-9999
index d17c41430ea1..6c9af4a9e352 100644
--- a/metadata/md5-cache/dev-go/go-sys-9999
+++ b/metadata/md5-cache/dev-go/go-sys-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://godoc.org/golang.org/x/sys
LICENSE=BSD
SLOT=0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=d9f1dfb2aab07a7f96c4d58f8ea7dede
+_md5_=c585081108cb76cbbd5bd2d69fa9c4aa
diff --git a/metadata/md5-cache/dev-go/go-text-1.4.2_p20150604 b/metadata/md5-cache/dev-go/go-text-1.4.2_p20150604
new file mode 100644
index 000000000000..b4cf484764f6
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-text-1.4.2_p20150604
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.4
+DESCRIPTION=Go text processing support
+EAPI=5
+HOMEPAGE=https://godoc.org/golang.org/x/text
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/golang/text/archive/df923bbb63f8ea3a26bb743e2a497abd0ab585f7.tar.gz -> go-text-1.4.2_p20150604.tar.gz
+_md5_=8d8698a623397c4d083c3354a8e4f12f
diff --git a/metadata/md5-cache/dev-go/go-text-9999 b/metadata/md5-cache/dev-go/go-text-9999
index bae1e3799e29..e4ee3fb91704 100644
--- a/metadata/md5-cache/dev-go/go-text-9999
+++ b/metadata/md5-cache/dev-go/go-text-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://godoc.org/golang.org/x/text
LICENSE=BSD
SLOT=0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=b0f5272f5d8b2bbaf5308a09faf3ced6
+_md5_=f3b7835af63e352b375ef0eb5bb7b96a
diff --git a/metadata/md5-cache/dev-go/go-tools-1.4.2_p20150520 b/metadata/md5-cache/dev-go/go-tools-1.4.2_p20150520
deleted file mode 100644
index 042afaba3f07..000000000000
--- a/metadata/md5-cache/dev-go/go-tools-1.4.2_p20150520
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.4 dev-go/go-net
-DESCRIPTION=Go Tools
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/tools
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/golang/tools/archive/3d1847243ea4f07666a91110f48e79e43396603d.tar.gz -> go-tools-1.4.2_p20150520.tar.gz
-_md5_=29d68ac3f8d9570cecfa76c57f720d4e
diff --git a/metadata/md5-cache/dev-go/go-tools-1.4.2_p20150606 b/metadata/md5-cache/dev-go/go-tools-1.4.2_p20150606
new file mode 100644
index 000000000000..06886d3b6a70
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-tools-1.4.2_p20150606
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.4 dev-go/go-net
+DESCRIPTION=Go Tools
+EAPI=5
+HOMEPAGE=https://godoc.org/golang.org/x/tools
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/golang/tools/archive/ac303766f5f240c1796eeea3dc9bf34f1261aa35.tar.gz -> go-tools-1.4.2_p20150606.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
+_md5_=218b1b9e8c3cdc87e598937b4bd62582
diff --git a/metadata/md5-cache/dev-go/go-tools-9999 b/metadata/md5-cache/dev-go/go-tools-9999
index c8a2d2099ccf..22fe3142bfe4 100644
--- a/metadata/md5-cache/dev-go/go-tools-9999
+++ b/metadata/md5-cache/dev-go/go-tools-9999
@@ -7,4 +7,4 @@ LICENSE=BSD
SLOT=0
SRC_URI=http://golang.org/favicon.ico -> go-favicon.ico
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=63beac5ff054ccbf64b0af43eb19816d
+_md5_=6b823f5f29cae9afd11763f8d6b860ea
diff --git a/metadata/md5-cache/dev-haskell/aeson-pretty-0.7.1 b/metadata/md5-cache/dev-haskell/aeson-pretty-0.7.1
index 003ef46695df..3a026930ed21 100644
--- a/metadata/md5-cache/dev-haskell/aeson-pretty-0.7.1
+++ b/metadata/md5-cache/dev-haskell/aeson-pretty-0.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=JSON pretty-printing library and command-line tool
EAPI=5
HOMEPAGE=http://github.com/informatikr/aeson-pretty
IUSE=lib-only doc hscolour profile
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-6.10.4:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] )
SLOT=0/0.7.1
SRC_URI=mirror://hackage/packages/archive/aeson-pretty/0.7.1/aeson-pretty-0.7.1.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de ghc-package 48ae4e0fd75e1c8047c4b7f507d5debc haskell-cabal eee03ecca8dca7a927272dcea2ca53f4 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=55871d94cfebe8db37bf72dfe3566018
+_md5_=7d1b8c51ae89e0e467bf4670f2c9cabb
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.13.5 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.13.5
index 61c45385f753..fc0df609f300 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.13.5
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.13.5
@@ -4,10 +4,10 @@ DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pre
EAPI=5
HOMEPAGE=http://code.haskell.org/haskell-src-exts
IUSE=doc hscolour profile
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
LICENSE=BSD
RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-6.10.4:=
SLOT=0/1.13.5
SRC_URI=mirror://hackage/packages/archive/haskell-src-exts/1.13.5/haskell-src-exts-1.13.5.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de ghc-package 48ae4e0fd75e1c8047c4b7f507d5debc haskell-cabal eee03ecca8dca7a927272dcea2ca53f4 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f66e4d53b42f450d4f5e9135bca92175
+_md5_=e9fddfc0171fb599941553a2290638fd
diff --git a/metadata/md5-cache/dev-haskell/hspec-1.8.1.1 b/metadata/md5-cache/dev-haskell/hspec-1.8.1.1
index 76f03a700bd7..2519c4ec12a1 100644
--- a/metadata/md5-cache/dev-haskell/hspec-1.8.1.1
+++ b/metadata/md5-cache/dev-haskell/hspec-1.8.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Behavior-Driven Development for Haskell
EAPI=5
HOMEPAGE=http://hspec.github.io/
IUSE=doc hscolour profile test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.5.0:=[profile?] =dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] =dev-haskell/transformers-0.2.2.0:=[profile?] =dev-lang/ghc-7.4.1:=
SLOT=0/1.8.1.1
SRC_URI=mirror://hackage/packages/archive/hspec/1.8.1.1/hspec-1.8.1.1.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de ghc-package 48ae4e0fd75e1c8047c4b7f507d5debc haskell-cabal eee03ecca8dca7a927272dcea2ca53f4 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9369ce3dc8c097761715efd81da488df
+_md5_=ddbf1f06f52498b0e0ee178da172be00
diff --git a/metadata/md5-cache/dev-haskell/list-0.5.2 b/metadata/md5-cache/dev-haskell/list-0.5.2
index 3218de448aa7..b66ae8d6505b 100644
--- a/metadata/md5-cache/dev-haskell/list-0.5.2
+++ b/metadata/md5-cache/dev-haskell/list-0.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=List monad transformer and class
EAPI=5
HOMEPAGE=http://github.com/yairchu/generator/tree
IUSE=doc hscolour profile
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
SLOT=0/0.5.2
SRC_URI=mirror://hackage/packages/archive/List/0.5.2/List-0.5.2.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de ghc-package 48ae4e0fd75e1c8047c4b7f507d5debc haskell-cabal eee03ecca8dca7a927272dcea2ca53f4 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=359ccf2d13cf3c4fbff94b83fb8e3ca5
+_md5_=5365b4a2768be31ca32405fe4ef57199
diff --git a/metadata/md5-cache/dev-haskell/logict-0.6.0.2 b/metadata/md5-cache/dev-haskell/logict-0.6.0.2
index 73a99af36d20..20b2ca90cd92 100644
--- a/metadata/md5-cache/dev-haskell/logict-0.6.0.2
+++ b/metadata/md5-cache/dev-haskell/logict-0.6.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=A backtracking logic-programming monad
EAPI=5
HOMEPAGE=http://code.haskell.org/~dolio/
IUSE=doc hscolour profile
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
LICENSE=BSD
RDEPEND=>=dev-haskell/mtl-2:=[profile?] =dev-lang/ghc-6.10.4:=
SLOT=0/0.6.0.2
SRC_URI=mirror://hackage/packages/archive/logict/0.6.0.2/logict-0.6.0.2.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de ghc-package 48ae4e0fd75e1c8047c4b7f507d5debc haskell-cabal eee03ecca8dca7a927272dcea2ca53f4 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=92669ef84999d1afe0c7f211acafdc73
+_md5_=2643e5f4a8a72767b59ced18e69ce9ff
diff --git a/metadata/md5-cache/dev-haskell/text-1.1.1.3 b/metadata/md5-cache/dev-haskell/text-1.1.1.3
index 187f98e254b8..0c930925a071 100644
--- a/metadata/md5-cache/dev-haskell/text-1.1.1.3
+++ b/metadata/md5-cache/dev-haskell/text-1.1.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=An efficient packed Unicode text type
EAPI=5
HOMEPAGE=https://github.com/bos/text
IUSE=developer doc hscolour profile test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=BSD
RDEPEND=>=dev-lang/ghc-7.4.1:=
RESTRICT=test
SLOT=0/1.1.1.3
SRC_URI=mirror://hackage/packages/archive/text/1.1.1.3/text-1.1.1.3.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de ghc-package 48ae4e0fd75e1c8047c4b7f507d5debc haskell-cabal eee03ecca8dca7a927272dcea2ca53f4 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fb2fe67899ff04134217664ef0801353
+_md5_=769221c1a17d93e8cd1297c1341780a4
diff --git a/metadata/md5-cache/dev-java/cglib-3.0 b/metadata/md5-cache/dev-java/cglib-3.0
index a5046ca2b157..514f30cf306e 100644
--- a/metadata/md5-cache/dev-java/cglib-3.0
+++ b/metadata/md5-cache/dev-java/cglib-3.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/junit:4 ) dev-java/asm:4 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=cglib is a powerful, high performance and quality Code Generation Library
EAPI=5
HOMEPAGE=http://cglib.sourceforge.net
IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~ppc ~ppc64
LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/asm:4 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=3
SRC_URI=mirror://sourceforge/cglib/cglib-src-3.0.jar
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=22a4dfc8a12200027496541593a2c1aa
+_md5_=09d985f2a0fb29169186654d5cf9548c
diff --git a/metadata/md5-cache/dev-java/cglib-3.1 b/metadata/md5-cache/dev-java/cglib-3.1
index cdc39e7ac19e..d102d3597ad3 100644
--- a/metadata/md5-cache/dev-java/cglib-3.1
+++ b/metadata/md5-cache/dev-java/cglib-3.1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) dev-java/asm:4 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=cglib is a powerful, high performance and quality Code Generation Library
EAPI=5
HOMEPAGE=https://github.com/cglib/cglib
IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~ppc ~ppc64
LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=3
SRC_URI=mirror://sourceforge/cglib/cglib-src-3.1.jar
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dc2ba03250d147d5acc7ccf3c20d2c2a
+_md5_=87e051d4acdb72e092350cb941c3a7e7
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r1 b/metadata/md5-cache/dev-java/commons-digester-3.2-r1
index 09d482abcaf8..781c9621d494 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Reads XML configuration files to provide initialization of various J
EAPI=5
HOMEPAGE=http://commons.apache.org/digester/
IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~ppc ~ppc64
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
RESTRICT=test
SLOT=3.2
SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=58e3405b2aee03fc3c67fce6cba371c9
+_md5_=85760803ab2550a4257762b1522d50f4
diff --git a/metadata/md5-cache/dev-java/easymock-3.2-r1 b/metadata/md5-cache/dev-java/easymock-3.2-r1
index ec051d0818a8..42a975846974 100644
--- a/metadata/md5-cache/dev-java/easymock-3.2-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.2-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:2.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
DESCRIPTION=Provides Mock Objects for interfaces in JUnit tests by generating them on the fly
EAPI=5
HOMEPAGE=http://www.easymock.org/
IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=>=virtual/jre-1.5 dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:2.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=3.2
SRC_URI=mirror://sourceforge/easymock/EasyMock/3.2/easymock-3.2.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-pkg-simple 28dc6c3e6fa8ed51b88360dfd5fee53e java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f42fe04404027575b72081f534aa4223
+_md5_=28ba93488374f36ad93bf30830cc55a7
diff --git a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2 b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
index 982e8f4d44a4..c64599f1eb92 100644
--- a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
+++ b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Project GlassFish Enterprise JavaBean API
EAPI=5
HOMEPAGE=https://glassfish.java.net/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.7 java-virtuals/xmlrpc-api:0 java-virtuals/transaction-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/glassfish-ejb-api-3.2.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=88d528586b3456fbfcb0c50826b1e75d
+_md5_=7ed245a50c1386343bc0a34195e59160
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
index 14a88eb52a38..5e481a41ab9d 100644
--- a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Project GlassFish XML RPC API
EAPI=5
HOMEPAGE=https://glassfish.java.net/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
+KEYWORDS=~x86 ~amd64
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=79cf3a662f379f527876e0e7644b811f
+_md5_=70e5b43d69d7e77d05d8700254e07c7e
diff --git a/metadata/md5-cache/dev-java/jsr101-1.4-r2 b/metadata/md5-cache/dev-java/jsr101-1.4-r2
new file mode 100644
index 000000000000..b5bd8eb943ce
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jsr101-1.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 java-virtuals/servlet-api:2.5 java-virtuals/saaj-api:0 >=dev-java/java-config-2.2.0
+DESCRIPTION=Java(TM) API for XML-Based RPC Specification Interface Classes
+EAPI=5
+HOMEPAGE=http://jcp.org/aboutJava/communityprocess/first/jsr101/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:2.5 java-virtuals/saaj-api:0 >=dev-java/java-config-2.2.0
+SLOT=0
+SRC_URI=mirror://apache/ws/axis/1_4/axis-src-1_4.tar.gz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=49f37f8b5be7bd809b097eee39b136e2
diff --git a/metadata/md5-cache/dev-java/mojarra-2.2.9 b/metadata/md5-cache/dev-java/mojarra-2.2.9
new file mode 100644
index 000000000000..5ae8f4948792
--- /dev/null
+++ b/metadata/md5-cache/dev-java/mojarra-2.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/glassfish-persistence:0 dev-java/glassfish-ejb-api:0 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-jstl-impl:1.2.5 dev-java/validation-api:1.0 dev-java/javax-inject:0 dev-java/cdi-api:1.2 >=dev-java/java-config-2.2.0
+DESCRIPTION=Project Mojarra - GlassFish's Implementation for JavaServer Faces API
+EAPI=5
+HOMEPAGE=https://javaserverfaces.dev.java.net/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=CDDL
+RDEPEND=>=virtual/jre-1.6 dev-java/glassfish-persistence:0 dev-java/glassfish-ejb-api:0 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-jstl-impl:1.2.5 dev-java/validation-api:1.0 dev-java/javax-inject:0 dev-java/cdi-api:1.2 >=dev-java/java-config-2.2.0
+SLOT=2.2
+SRC_URI=https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.2.9/javax.faces-2.2.9-sources.jar
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-pkg-simple 28dc6c3e6fa8ed51b88360dfd5fee53e java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3f584ee812a8497b345ca0b08abde6dd
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5 b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5
index 2149b1495750..c5def4e78a44 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) dev-java/tomcat-jstl-impl:1.2.5 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-jstl-impl:1.2.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=JSP Standard Tag Library (JSTL) - Compat jar
EAPI=5
HOMEPAGE=ttps://tomcat.apache.org/taglibs/standard/
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/tomcat-jstl-impl:1.2.5 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-jstl-impl:1.2.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.2.5
SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6827f90c8c463e972daeeb311fef64ac
+_md5_=da7e23d4804dc35de72bd1c5b5e64d28
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5 b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5
index e59013bafdfb..192260672aa1 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) dev-java/tomcat-jstl-impl:1.2.5 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-impl:1.2.5 dev-java/tomcat-jstl-spec:1.2.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=JSP Standard Tag Library (JSTL) - EL jar
EAPI=5
HOMEPAGE=ttps://tomcat.apache.org/taglibs/standard/
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/tomcat-jstl-impl:1.2.5 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-impl:1.2.5 dev-java/tomcat-jstl-spec:1.2.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.2.5
SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5f481c3ccde7cbbda2062a168aea6263
+_md5_=8f3d09841b82427eb147b5c3aa75740d
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5 b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5
index 33749d220b02..ce82e8890f5a 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=JSP Standard Tag Library (JSTL) - Specification jar
EAPI=5
HOMEPAGE=ttps://tomcat.apache.org/taglibs/standard/
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.2.5
SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9bb5ec2203aa5ceca88979ffad16c9fa
+_md5_=f5063dc355246d21a694ce820c49b221
diff --git a/metadata/md5-cache/dev-libs/apr-1.5.2 b/metadata/md5-cache/dev-libs/apr-1.5.2
index 22f984c3a4cf..d02ce7ba6b68 100644
--- a/metadata/md5-cache/dev-libs/apr-1.5.2
+++ b/metadata/md5-cache/dev-libs/apr-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Portable Runtime Library
EAPI=5
HOMEPAGE=http://apr.apache.org/
IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-apache )
SLOT=1
SRC_URI=mirror://apache/apr/apr-1.5.2.tar.bz2
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=6beab9d26b7d8502c5199549a4906965
+_md5_=f70801d6f764b22e8098c4910b73fb32
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.5.4 b/metadata/md5-cache/dev-libs/apr-util-1.5.4
index 72afbafcc271..5803d2e9e4bb 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.5.4
+++ b/metadata/md5-cache/dev-libs/apr-util-1.5.4
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Portable Runtime Utility Library
EAPI=4
HOMEPAGE=http://apr.apache.org/
IUSE=berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=dev-libs/expat >=dev-libs/apr-1.4.6:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 )
SLOT=1
SRC_URI=mirror://apache/apr/apr-util-1.5.4.tar.bz2
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2fb16077f2e089b091f396e1d4b7bae1
+_md5_=7b27456698de229e40e15521c1099c8c
diff --git a/metadata/md5-cache/dev-libs/atk-2.16.0 b/metadata/md5-cache/dev-libs/atk-2.16.0
new file mode 100644
index 000000000000..1877323363d4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/atk-2.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) >=dev-lang/perl-5 dev-util/gtk-doc-am >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( sys-devel/gettext ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
+EAPI=5
+HOMEPAGE=http://projects.gnome.org/accessibility/
+IUSE=+introspection nls test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://gnome/sources/atk/2.16/atk-2.16.0.tar.xz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 10c513def52488230abb60a4b19a03b9 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b023894a5b6c1ddf65dc248966e1ffa1
diff --git a/metadata/md5-cache/dev-libs/glib-2.44.1 b/metadata/md5-cache/dev-libs/glib-2.44.1
new file mode 100644
index 000000000000..c12aa2b3064c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/glib-2.44.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=!=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.44.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.20 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.44.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=The GLib library of C routines
+EAPI=5
+HOMEPAGE=http://www.gtk.org/
+IUSE=dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr debug python_targets_python2_7 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=LGPL-2+
+PDEPEND=!=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.44.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
+SLOT=2
+SRC_URI=mirror://gnome/sources/glib/2.44/glib-2.44.1.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
+_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 10c513def52488230abb60a4b19a03b9 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 8cbc678e083c23e4ad546ca6509cf304 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pax-utils dfe060cb70d89757fde5c1ff8405e950 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=c2d9710bb8b22b203df4404fb5eebf2b
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.44.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.44.0
new file mode 100644
index 000000000000..c3e4fd0d7dbb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.44.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/gobject-introspection-common-1.44.0 >=dev-libs/glib-2.44:2 doctool? ( dev-python/mako ) virtual/libffi:= virtual/pkgconfig !=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-util/gtk-doc-am-1.19 sys-devel/bison sys-devel/flex app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Introspection infrastructure for generating gobject library bindings for various languages
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
+IUSE=cairo doctool test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+ GPL-2+
+PDEPEND=cairo? ( x11-libs/cairo[glib] )
+RDEPEND=>=dev-libs/gobject-introspection-common-1.44.0 >=dev-libs/glib-2.44:2 doctool? ( dev-python/mako ) virtual/libffi:= virtual/pkgconfig !=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7 test? ( cairo )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gobject-introspection/1.44/gobject-introspection-1.44.0.tar.xz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 10c513def52488230abb60a4b19a03b9 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=32274c103efee2d33028f26928a083c0
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.44.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.44.0
new file mode 100644
index 000000000000..94eba4a088ca
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.44.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Build infrastructure for GObject Introspection
+EAPI=5
+HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=HPND
+RDEPEND=!=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=Jinja2 adapter for Django
+EAPI=5
+HOMEPAGE=http://github.com/coffin/coffin
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/C/Coffin/Coffin-2.0.1.tar.gz
+_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
+_md5_=fd0ccece7d6283482bbdcadbf91bd39a
diff --git a/metadata/md5-cache/dev-python/datashape-0.4.2 b/metadata/md5-cache/dev-python/datashape-0.4.2
deleted file mode 100644
index fc281752de66..000000000000
--- a/metadata/md5-cache/dev-python/datashape-0.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/multipledispatch[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Language defining a data description protocol
-EAPI=5
-HOMEPAGE=https://github.com/ContinuumIO/datashape
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/multipledispatch[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/ContinuumIO/datashape/archive/0.4.2.tar.gz -> datashape-0.4.2.tar.gz
-_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=262252abe0f8226b3747f4a11c7d5c3c
diff --git a/metadata/md5-cache/dev-python/datashape-0.4.4 b/metadata/md5-cache/dev-python/datashape-0.4.4
index e96f8398fd79..83a99ea7328d 100644
--- a/metadata/md5-cache/dev-python/datashape-0.4.4
+++ b/metadata/md5-cache/dev-python/datashape-0.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Language defining a data description protocol
EAPI=5
HOMEPAGE=https://github.com/ContinuumIO/datashape
IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/multipledispatch[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
SLOT=0
SRC_URI=https://github.com/ContinuumIO/datashape/archive/0.4.4.tar.gz -> datashape-0.4.4.tar.gz
_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=a79126354b9cc48b07af318299c540b1
+_md5_=e5129654dfff043f6a9ae526efb296c7
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.22.3-r4 b/metadata/md5-cache/dev-python/m2crypto-0.22.3-r4
index af31f36de3ae..0c9c769e6203 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.22.3-r4
+++ b/metadata/md5-cache/dev-python/m2crypto-0.22.3-r4
@@ -4,7 +4,7 @@ DESCRIPTION=M2Crypto: A Python crypto and SSL toolkit
EAPI=5
HOMEPAGE=https://github.com/martinpaljak/M2Crypto http://pypi.python.org/pypi/M2Crypto
IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=BSD
RDEPEND=>=dev-libs/openssl-0.9.8:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.22.3.tar.gz
_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=b6edaf5a5db3bfb95f144a0acbc09c44
+_md5_=4454856366ac00919171903980289521
diff --git a/metadata/md5-cache/dev-python/python-cluster-1.1.1_beta3 b/metadata/md5-cache/dev-python/python-cluster-1.1.1_beta3
deleted file mode 100644
index a8717c620a8b..000000000000
--- a/metadata/md5-cache/dev-python/python-cluster-1.1.1_beta3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/python
-DESCRIPTION=Allows grouping a list of arbitrary objects into related groups (clusters)
-EAPI=3
-HOMEPAGE=http://python-cluster.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://sourceforge/python-cluster/cluster-1.1.1b3.tar.gz
-_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 python 3a270b7b1d1e679847ff0faeac25c5a3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=77a32f6ac76490f952bd243827a7b758
diff --git a/metadata/md5-cache/dev-python/python-cluster-1.2.2 b/metadata/md5-cache/dev-python/python-cluster-1.2.2
index b2bbe9476912..44b01e20f84a 100644
--- a/metadata/md5-cache/dev-python/python-cluster-1.2.2
+++ b/metadata/md5-cache/dev-python/python-cluster-1.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Allows grouping a list of arbitrary objects into related groups (clu
EAPI=5
HOMEPAGE=https://github.com/exhuma/python-cluster
IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
SLOT=0
SRC_URI=mirror://pypi/c/cluster/cluster-1.2.2.tar.gz
_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=65e8f6d926af7bd061bd2167f93a4aeb
+_md5_=31bab0b821678f42232c53741c77a3bf
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.8.5 b/metadata/md5-cache/dev-python/simpleeval-0.8.5
new file mode 100644
index 000000000000..6955f66ea379
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simpleeval-0.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=A simple, safe single expression evaluator library
+EAPI=5
+HOMEPAGE=https://github.com/danthedeckie/simpleeval
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/setuptools python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.8.5.tar.gz
+_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
+_md5_=30dd9ecea446f3e9047b1ca3e9aa7530
diff --git a/metadata/md5-cache/dev-ruby/builder-3.0.4-r1 b/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
index 98a1c4535114..58cbea649f78 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A builder to facilitate programatic generation of XML markup
EAPI=5
HOMEPAGE=http://rubyforge.org/projects/builder/
IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
SLOT=3
SRC_URI=mirror://rubygems/builder-3.0.4.gem
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bfd9cb89c1595053713ff4298e9d1dc3
+_md5_=9b3c113dc72fd8ccb84cbfb6921d4032
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.7.13 b/metadata/md5-cache/dev-ruby/bundler-1.7.13
index 0d731d414e1e..1e0734d6a8a9 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.7.13
+++ b/metadata/md5-cache/dev-ruby/bundler-1.7.13
@@ -4,7 +4,7 @@ DESCRIPTION=An easy way to vendor gem dependencies
EAPI=5
HOMEPAGE=http://github.com/carlhuda/bundler
IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) dev-vcs/git ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://rubygems/bundler-1.7.13.gem
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=803daaf9e8aab39560cb092b17e51364
+_md5_=45f25802cfb5c923b435e10875b5a54c
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
index bc0e6f98dea3..7a4bc98e83d1 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A distributed application deployment system
EAPI=5
HOMEPAGE=http://capistranorb.com/
IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby19] >=dev-ruby/highline-1.2.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby20] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby20] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby20] >=dev-ruby/highline-1.2.7[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
SLOT=2
SRC_URI=mirror://rubygems/capistrano-2.15.5.gem
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d7ea9a083a76b67c151ca519f1c97ec6
+_md5_=f0e9b5480fb6a6775b7ede8a4bf4c275
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.1.9-r1 b/metadata/md5-cache/dev-ruby/daemons-1.1.9-r1
index 506a7948194d..207b5c6e40aa 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.1.9-r1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.1.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
EAPI=5
HOMEPAGE=https://github.com/thuehlinger/daemons
IUSE=examples elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
SLOT=0
SRC_URI=mirror://rubygems/daemons-1.1.9.gem
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c8e5be8e15adfe8b08cd5ded204ee1ff
+_md5_=4af9d8a7e3c2eae8bac5f760b15fc52a
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
index af56e1c5f9e7..2b5d2e33adb2 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=EventMachine is a fast, simple event-processing library for Ruby pro
EAPI=5
HOMEPAGE=http://rubyeventmachine.com
IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=|| ( GPL-2 Ruby )
RDEPEND=dev-libs/openssl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
SLOT=0
SRC_URI=mirror://rubygems/eventmachine-1.0.3.gem
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8b60adca8a7ad95cde98f3e71d4ce0ce
+_md5_=4872806e1dda5d5bfd028ebf9bc0b35a
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997
index 21edb8bf7775..1f4cc5618aaa 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997
@@ -4,7 +4,7 @@ DESCRIPTION=RubyODBC - For accessing ODBC data sources from the Ruby language
EAPI=5
HOMEPAGE=http://www.ch-werner.de/rubyodbc/
IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=|| ( GPL-2 Ruby )
RDEPEND=>=dev-db/unixODBC-2.0.6 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99997.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cf0e9137ed1b5fa2b1c40a4fe62284a1
+_md5_=01124f702d19a8d1ab19c3e1a9eae73b
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.6.0 b/metadata/md5-cache/dev-ruby/ruby-openid-2.6.0
index c1204c05a1ce..2e4f021f64fa 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.6.0
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=A robust library for verifying and serving OpenID identities
EAPI=5
HOMEPAGE=http://ruby-openid.rubyforge.org/
IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=amd64 ~ppc ~x86 ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~x86-macos
LICENSE=GPL-2
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
SLOT=0
SRC_URI=https://github.com/openid/ruby-openid/archive/v2.6.0.tar.gz -> ruby-openid-2.6.0.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=62bd48c741fe95f5aa6fe3c022c61ae7
+_md5_=d975d96032633ebbea12b5abe546633a
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.4 b/metadata/md5-cache/dev-ruby/temple-0.6.10
similarity index 54%
rename from metadata/md5-cache/dev-ruby/temple-0.7.4
rename to metadata/md5-cache/dev-ruby/temple-0.6.10
index 5d6e46d1c14c..af7df0a50368 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.7.4
+++ b/metadata/md5-cache/dev-ruby/temple-0.6.10
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] dev-ruby/tilt[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby
EAPI=5
-HOMEPAGE=http://github.com/judofyr/temple
+HOMEPAGE=https://github.com/judofyr/temple
IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
SLOT=0
-SRC_URI=mirror://rubygems/temple-0.7.4.gem
+SRC_URI=mirror://rubygems/temple-0.6.10.gem
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=984a28dd17eb45bda03b954c425f6c2e
+_md5_=86bd85673fb8429246445a91a492f5cd
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.5 b/metadata/md5-cache/dev-ruby/temple-0.7.5
index d869ac95552d..25f7bf83d2e0 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.7.5
+++ b/metadata/md5-cache/dev-ruby/temple-0.7.5
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
+SLOT=0.7
SRC_URI=mirror://rubygems/temple-0.7.5.gem
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=298ec878be234afbfff69cbe384f58d9
+_md5_=af91a118dbec8c0a2fc409f39e8940c4
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.6 b/metadata/md5-cache/dev-ruby/temple-0.7.6
new file mode 100644
index 000000000000..6f6b72b3d554
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/temple-0.7.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] dev-ruby/erubis[ruby_targets_ruby19] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] dev-ruby/erubis[ruby_targets_ruby20] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby
+EAPI=5
+HOMEPAGE=https://github.com/judofyr/temple
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0.7
+SRC_URI=mirror://rubygems/temple-0.7.6.gem
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng a23e4bd47d827c96336af5ad0fe254cf ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=68c23d23d41e800d9474e0cb3c07269f
diff --git a/metadata/md5-cache/dev-util/android-studio-1.2.0.12.141.1890965 b/metadata/md5-cache/dev-util/android-studio-1.2.0.12.141.1890965
index 1ca804d486f6..116229470e33 100644
--- a/metadata/md5-cache/dev-util/android-studio-1.2.0.12.141.1890965
+++ b/metadata/md5-cache/dev-util/android-studio-1.2.0.12.141.1890965
@@ -4,11 +4,11 @@ DESCRIPTION=A new Android development environment based on IntelliJ IDEA
EAPI=5
HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
IUSE=selinux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.5[abi_x86_32(-)] >=media-libs/libpng-1.2.51[abi_x86_32(-)] >=media-libs/mesa-10.2.8[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)]
RESTRICT=strip
SLOT=0
SRC_URI=http://dl.google.com/dl/android/studio/ide-zips/1.2.0.12/android-studio-ide-141.1890965-linux.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c4076d78a5123ed2aa3ff8974e1d30fd
+_md5_=03040af5b1664a9882e6d38c45a80f65
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.44.1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.44.1
new file mode 100644
index 000000000000..744c9bd1e3cc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.44.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=GDBus code and documentation generator
+EAPI=5
+HOMEPAGE=http://www.gtk.org/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2+
+PDEPEND=>=dev-libs/glib-2.44.1:2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib/2.44/glib-2.44.1.tar.xz
+_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de gnome.org 8fef8f967214f56e08fa92d61163d891 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=941c9faef12835c352c853a4f4736509
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.16.3 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.16.3
new file mode 100644
index 000000000000..da12b989f8d9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.16.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !=dev-util/intltool-0.50.1 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=GTK update icon cache
+EAPI=5
+HOMEPAGE=http://www.gtk.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
SLOT=0
-SRC_URI=http://git-core.googlecode.com/files/git-2.4.1.tar.xz mirror://kernel/software/scm/git/git-2.4.1.tar.xz http://git-core.googlecode.com/files/git-manpages-2.4.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.4.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.4.1.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.4.1.tar.xz )
+SRC_URI=http://git-core.googlecode.com/files/git-2.4.3.tar.xz mirror://kernel/software/scm/git/git-2.4.3.tar.xz http://git-core.googlecode.com/files/git-manpages-2.4.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.4.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.4.3.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.4.3.tar.xz )
_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 9a16929c1a6aec7e1c903289983e114c eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 79253b64b2972a3e513329a729242b27 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=a8234b2164260726803d1e28752fa91e
+_md5_=d9bc06685f9d630e1b798c4864232da9
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-3.4.1 b/metadata/md5-cache/dev-vcs/tortoisehg-3.4.1
new file mode 100644
index 000000000000..a9b16863f19e
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-3.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-vcs/mercurial-3.3 =dev-python/sphinx-1.0.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Set of graphical tools for Mercurial
+EAPI=5
+HOMEPAGE=http://tortoisehg.bitbucket.org
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-3.3 =dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-3.4.1.tar.gz
+_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
+_md5_=1980f6cad8c3fa7b4a7a340797c06aa0
diff --git a/metadata/md5-cache/games-action/garden-1.0.9 b/metadata/md5-cache/games-action/garden-1.0.9
index 0cd3bbb1191e..4212d9465bde 100644
--- a/metadata/md5-cache/games-action/garden-1.0.9
+++ b/metadata/md5-cache/games-action/garden-1.0.9
@@ -3,10 +3,10 @@ DEPEND==sys-apps/sed-4 !=sys-libs/ncurses-5.2-r5 X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXt ) virtual/pkgconfig X? ( x11-proto/xproto x11-apps/bdftopcf x11-apps/mkfontdir )
+DESCRIPTION=The ultimate old-school single player dungeon exploration game
+EAPI=5
+HOMEPAGE=http://www.nethack.org/
+IUSE=X
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=nethack
+RDEPEND=>=sys-libs/ncurses-5.2-r5 X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXt )
+SLOT=0
+SRC_URI=mirror://sourceforge/nethack/nethack-343-src.tgz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747
+_md5_=1b568b5262045990467abce572f91358
diff --git a/metadata/md5-cache/games-strategy/lightyears-1.4-r1 b/metadata/md5-cache/games-strategy/lightyears-1.4-r1
index 14457ce8da24..9db9e0720dd7 100644
--- a/metadata/md5-cache/games-strategy/lightyears-1.4-r1
+++ b/metadata/md5-cache/games-strategy/lightyears-1.4-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
DEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
DESCRIPTION=a single-player game with a science-fiction theme
EAPI=5
-HOMEPAGE=http://www.jwhitham.org.uk/20kly/
+HOMEPAGE=http://www.jwhitham.org/20kly/
IUSE=python_targets_python2_7
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] games-misc/games-envd
REQUIRED_USE=python_targets_python2_7
SLOT=0
-SRC_URI=http://www.jwhitham.org.uk/20kly/lightyears-1.4.tar.bz2
+SRC_URI=http://www.jwhitham.org/20kly/lightyears-1.4.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 9fb270e417e0e83d64ca52586c4a79de games 1ad3205dbf62a2c98249f2f59b0a2d39 multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747
-_md5_=f39ddd72e4ad22ee60457197205d6773
+_md5_=8496824d8cd3b317f6acf113497f82be
diff --git a/metadata/md5-cache/java-virtuals/xmlrpc-api-0 b/metadata/md5-cache/java-virtuals/xmlrpc-api-0
index 88fe7c83d055..0f083dd29d82 100644
--- a/metadata/md5-cache/java-virtuals/xmlrpc-api-0
+++ b/metadata/md5-cache/java-virtuals/xmlrpc-api-0
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for XML RPC API (javax.xml.rpc)
EAPI=5
HOMEPAGE=http://www.gentoo.org
IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
LICENSE=public-domain
RDEPEND=dev-java/glassfish-xmlrpc-api:0 >=dev-java/java-config-2.2.0
SLOT=0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 4a7c80c1feba48616b58c79d977e084c java-virtuals-2 3f6b3450d42c285ae53f6b9da9fb5ba3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9b271da1c43eb09f30dc3cf73f6691b2
+_md5_=5e5146c7febcdd09b12b9f664d01dc6e
diff --git a/metadata/md5-cache/kde-base/blogilo-4.14.3 b/metadata/md5-cache/kde-base/blogilo-4.14.3
index 281964d7d4d6..2f1391414723 100644
--- a/metadata/md5-cache/kde-base/blogilo-4.14.3
+++ b/metadata/md5-cache/kde-base/blogilo-4.14.3
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kdepim-common-libs-4.14.3:4[aqua=] >=kde-base/kdepimlibs-4.14.3:4[aqua=] >=net-libs/libkgapi-2.2.0 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+DEPEND=>=kde-base/kdepim-common-libs-4.14.3:4[aqua=] >=kde-base/kdepimlibs-4.14.3:4[aqua=] >=net-libs/libkgapi-2.2.0:4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
DESCRIPTION=KDE Blogging Client
EAPI=5
HOMEPAGE=http://www.kde.org/applications/internet/blogilo
IUSE=debug +handbook aqua
KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=>=kde-base/kdepim-common-libs-4.14.3:4[aqua=] >=kde-base/kdepimlibs-4.14.3:4[aqua=] >=net-libs/libkgapi-2.2.0 kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RDEPEND=>=kde-base/kdepim-common-libs-4.14.3:4[aqua=] >=kde-base/kdepimlibs-4.14.3:4[aqua=] >=net-libs/libkgapi-2.2.0:4 kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
SLOT=4/4.14
SRC_URI=mirror://kde/stable/4.14.3/src/kdepim-4.14.3.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4b80d6794e4b80587efcbd2f80fb0b9e
+_md5_=7deeb03f8f98d48d46b958702129eeca
diff --git a/metadata/md5-cache/kde-base/blogilo-4.14.6 b/metadata/md5-cache/kde-base/blogilo-4.14.6
index 1dc4b1c72f72..801baf6d5629 100644
--- a/metadata/md5-cache/kde-base/blogilo-4.14.6
+++ b/metadata/md5-cache/kde-base/blogilo-4.14.6
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kdepim-common-libs-4.14.6:4[aqua=] >=kde-base/kdepimlibs-4.14.6:4[aqua=] >=net-libs/libkgapi-2.2.0 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.6:4[aqua=]
+DEPEND=>=kde-base/kdepim-common-libs-4.14.6:4[aqua=] >=kde-base/kdepimlibs-4.14.6:4[aqua=] >=net-libs/libkgapi-2.2.0:4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.6:4[aqua=]
DESCRIPTION=KDE Blogging Client
EAPI=5
HOMEPAGE=http://www.kde.org/applications/internet/blogilo
IUSE=debug +handbook aqua
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=>=kde-base/kdepim-common-libs-4.14.6:4[aqua=] >=kde-base/kdepimlibs-4.14.6:4[aqua=] >=net-libs/libkgapi-2.2.0 kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.6:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.6:4[aqua=]
+RDEPEND=>=kde-base/kdepim-common-libs-4.14.6:4[aqua=] >=kde-base/kdepimlibs-4.14.6:4[aqua=] >=net-libs/libkgapi-2.2.0:4 kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.6:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.6:4[aqua=]
SLOT=4/4.14
SRC_URI=mirror://kde/stable/applications/14.12.3/src/kdepim-4.14.6.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9cedb47cba5e01944e0976f9ceb45ca1
+_md5_=87fcb3e8038c8aa150b9e7956df4fd88
diff --git a/metadata/md5-cache/kde-base/blogilo-4.14.8 b/metadata/md5-cache/kde-base/blogilo-4.14.8
index 1f8d1bc964ff..3f5e022331d6 100644
--- a/metadata/md5-cache/kde-base/blogilo-4.14.8
+++ b/metadata/md5-cache/kde-base/blogilo-4.14.8
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kdepim-common-libs-4.14.8:4[aqua=] >=kde-base/kdepimlibs-4.14.8:4[aqua=] >=net-libs/libkgapi-2.2.0 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.8:4[aqua=]
+DEPEND=>=kde-base/kdepim-common-libs-4.14.8:4[aqua=] >=kde-base/kdepimlibs-4.14.8:4[aqua=] >=net-libs/libkgapi-2.2.0:4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.8:4[aqua=]
DESCRIPTION=KDE Blogging Client
EAPI=5
HOMEPAGE=http://www.kde.org/applications/internet/blogilo
IUSE=debug +handbook aqua
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=>=kde-base/kdepim-common-libs-4.14.8:4[aqua=] >=kde-base/kdepimlibs-4.14.8:4[aqua=] >=net-libs/libkgapi-2.2.0 kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.8:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.8:4[aqua=]
+RDEPEND=>=kde-base/kdepim-common-libs-4.14.8:4[aqua=] >=kde-base/kdepimlibs-4.14.8:4[aqua=] >=net-libs/libkgapi-2.2.0:4 kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.8:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.8:4[aqua=]
SLOT=4/4.14
SRC_URI=mirror://kde/stable/applications/15.04.1/src/kdepim-4.14.8.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1c6af9c8fe674fc2b7891d4639ded7d4
+_md5_=1997fb1ddf025c153bf077651111e753
diff --git a/metadata/md5-cache/kde-base/kdepim-meta-4.4.11.1-r1 b/metadata/md5-cache/kde-base/kdepim-meta-4.4.11.1-r1
index 1b9c5d18af84..b6d559d50200 100644
--- a/metadata/md5-cache/kde-base/kdepim-meta-4.4.11.1-r1
+++ b/metadata/md5-cache/kde-base/kdepim-meta-4.4.11.1-r1
@@ -5,7 +5,7 @@ HOMEPAGE=http://www.kde.org/
IUSE=+akonadi nls aqua
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=metapackage
-RDEPEND=>=kde-base/akregator-4.4.11.1:4[aqua=] >=kde-base/blogilo-4.4.11.1:4[aqua=] >=kde-base/kabcclient-4.4.11.1:4[aqua=] >=kde-base/kaddressbook-4.4.11.1:4[aqua=] >=kde-base/kalarm-4.4.11.1:4[aqua=] >=kde-base/kdepim-icons-4.4.11.1:4[aqua=] >=kde-base/kdepim-kresources-4.4.11.1:4[aqua=] >=kde-base/kdepim-runtime-4.4.11.1:4[aqua=] >=kde-base/kdepim-strigi-analyzer-4.4.11.1:4[aqua=] >=kde-base/kdepim-wizards-4.4.11.1:4[aqua=] >=kde-base/kjots-4.4.11.1:4[aqua=] >=kde-base/kleopatra-4.4.11.1:4[aqua=] >=kde-base/kmail-4.4.11.1:4[aqua=] >=kde-base/knode-4.4.11.1:4[aqua=] >=kde-base/knotes-4.4.11.1:4[aqua=] >=kde-base/konsolekalendar-4.4.11.1:4[aqua=] >=kde-base/kontact-4.4.11.1:4[aqua=] >=kde-base/korganizer-4.4.11.1:4[aqua=] >=kde-base/ktimetracker-4.4.11.1:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/libkleo-4.4.11.1:4[aqua=] >=kde-base/libkpgp-4.4.11.1:4[aqua=] akonadi? ( >=kde-base/akonadi-4.4.11.1:4[aqua=] ) nls? ( || ( ( >=kde-apps/kde4-l10n-15.04.0:4[aqua=] ) ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] >=kde-base/kdepim-l10n-4.14.3:4[aqua=] ) ) )
+RDEPEND=>=kde-base/akregator-4.4.11.1:4[aqua=] >=kde-base/blogilo-4.4.11.1:4[aqua=] >=kde-base/kabcclient-4.4.11.1:4[aqua=] >=kde-base/kaddressbook-4.4.11.1:4[aqua=] >=kde-base/kalarm-4.4.11.1:4[aqua=] >=kde-base/kdepim-icons-4.4.11.1:4[aqua=] >=kde-base/kdepim-kresources-4.4.11.1:4[aqua=] >=kde-base/kdepim-runtime-4.4.11.1:4[aqua=] >=kde-base/kdepim-strigi-analyzer-4.4.11.1:4[aqua=] >=kde-base/kdepim-wizards-4.4.11.1:4[aqua=] >=kde-base/kjots-4.4.11.1:4[aqua=] >=kde-base/kleopatra-4.4.11.1:4[aqua=] >=kde-base/kmail-4.4.11.1:4[aqua=] >=kde-base/knode-4.4.11.1:4[aqua=] >=kde-base/knotes-4.4.11.1:4[aqua=] >=kde-base/konsolekalendar-4.4.11.1:4[aqua=] >=kde-base/kontact-4.4.11.1:4[aqua=] >=kde-base/korganizer-4.4.11.1:4[aqua=] >=kde-base/ktimetracker-4.4.11.1:4[aqua=] >=kde-base/libkdepim-4.4.11.1:4[aqua=] >=kde-base/libkleo-4.4.11.1:4[aqua=] >=kde-base/libkpgp-4.4.11.1:4[aqua=] akonadi? ( >=kde-base/akonadi-4.4.11.1:4[aqua=] ) nls? ( || ( ( >=kde-apps/kde4-l10n-15.04.0:4[aqua=] ) ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] >=kde-base/kdepim-l10n-4.4.11.1-r1:4[aqua=] ) ) )
SLOT=4
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta-pkg c803ab12295a2918961b64111d6682fa multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=076ab6b4d2ffa4f9c98e5de1c1d44cca
+_md5_=6bed6ff1277c90d20aa8beec8a86b46d
diff --git a/metadata/md5-cache/kde-base/kdepim-runtime-4.14.3 b/metadata/md5-cache/kde-base/kdepim-runtime-4.14.3
index 8cbee8220df1..0304a0235d1a 100644
--- a/metadata/md5-cache/kde-base/kdepim-runtime-4.14.3
+++ b/metadata/md5-cache/kde-base/kdepim-runtime-4.14.3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.3:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0 ) kolab? ( >=net-libs/libkolab-0.5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+DEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.3:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
DESCRIPTION=KDE PIM runtime plugin collection
EAPI=5
HOMEPAGE=http://www.kde.org/
IUSE=debug facebook google kolab aqua
KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.3:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0 ) kolab? ( >=net-libs/libkolab-0.5 ) >=kde-base/kdepim-icons-4.14.3:4[aqua=] !kde-misc/akonadi-google kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.3:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=kde-base/kdepim-icons-4.14.3:4[aqua=] !kde-misc/akonadi-google kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
RESTRICT=test
SLOT=4/4.14
SRC_URI=mirror://kde/stable/4.14.3/src/kdepim-runtime-4.14.3.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c981e53bb07eea5474a8844a01d82ec2
+_md5_=97324c4758ab586d7fd7b0fbfdb35937
diff --git a/metadata/md5-cache/kde-base/kdepim-runtime-4.14.6 b/metadata/md5-cache/kde-base/kdepim-runtime-4.14.6
index a51c64d1586d..c78f6fba4765 100644
--- a/metadata/md5-cache/kde-base/kdepim-runtime-4.14.6
+++ b/metadata/md5-cache/kde-base/kdepim-runtime-4.14.6
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.6:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0 ) kolab? ( >=net-libs/libkolab-0.5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.6:4[aqua=]
+DEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.6:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.6:4[aqua=]
DESCRIPTION=KDE PIM runtime plugin collection
EAPI=5
HOMEPAGE=http://www.kde.org/
IUSE=debug facebook google kolab aqua
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.6:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0 ) kolab? ( >=net-libs/libkolab-0.5 ) >=kde-base/kdepim-icons-4.14.6:4[aqua=] !kde-misc/akonadi-google kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.6:4[aqua=]
+RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.6:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=kde-base/kdepim-icons-4.14.6:4[aqua=] !kde-misc/akonadi-google kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.6:4[aqua=]
RESTRICT=test
SLOT=4/4.14
SRC_URI=mirror://kde/stable/applications/14.12.3/src/kdepim-runtime-4.14.6.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f038dde3824154475357b0d07fb2b307
+_md5_=aa4dc394e7932d1938d9ab5deb31845c
diff --git a/metadata/md5-cache/kde-base/kdepim-runtime-4.14.8 b/metadata/md5-cache/kde-base/kdepim-runtime-4.14.8
index 96672634fd38..9f2fb81d08de 100644
--- a/metadata/md5-cache/kde-base/kdepim-runtime-4.14.8
+++ b/metadata/md5-cache/kde-base/kdepim-runtime-4.14.8
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.8:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0 ) kolab? ( >=net-libs/libkolab-0.5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.8:4[aqua=]
+DEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.8:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.8:4[aqua=]
DESCRIPTION=KDE PIM runtime plugin collection
EAPI=5
HOMEPAGE=http://www.kde.org/
IUSE=debug facebook google kolab aqua
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.8:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0 ) kolab? ( >=net-libs/libkolab-0.5 ) >=kde-base/kdepim-icons-4.14.8:4[aqua=] !kde-misc/akonadi-google kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.8:4[aqua=]
+RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.8:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=kde-base/kdepim-icons-4.14.8:4[aqua=] !kde-misc/akonadi-google kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.8:4[aqua=]
RESTRICT=test
SLOT=4/4.14
SRC_URI=mirror://kde/stable/applications/15.04.1/src/kdepim-runtime-4.14.8.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f50063d07f54e712158bed1d6997112d
+_md5_=45012ad6519505373ed0444a9dc3dc7d
diff --git a/metadata/md5-cache/kde-misc/akonadi-google-20131213 b/metadata/md5-cache/kde-misc/akonadi-google-20131213
index 2a2f4d6b25a9..fe8f5f74da72 100644
--- a/metadata/md5-cache/kde-misc/akonadi-google-20131213
+++ b/metadata/md5-cache/kde-misc/akonadi-google-20131213
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop(+)] dev-libs/libxslt dev-libs/qjson >=net-libs/libkgapi-2 !>=kde-base/kdepim-runtime-4.8.50 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+DEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop(+)] dev-libs/libxslt dev-libs/qjson >=net-libs/libkgapi-2:4 !>=kde-base/kdepim-runtime-4.8.50 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
DESCRIPTION=Google services integration in Akonadi
EAPI=5
HOMEPAGE=https://projects.kde.org/projects/unmaintained/akonadi-googledata-resource
IUSE=aqua
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop(+)] dev-libs/libxslt dev-libs/qjson >=net-libs/libkgapi-2 !>=kde-base/kdepim-runtime-4.8.50 kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop(+)] dev-libs/libxslt dev-libs/qjson >=net-libs/libkgapi-2:4 !>=kde-base/kdepim-runtime-4.8.50 kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
SLOT=4
SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/akonadi-google-20131213.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=78e0dea35f422bb559f7a35ef1a76e87
+_md5_=9c6fe734d00d2379e8a7965c85931d37
diff --git a/metadata/md5-cache/kde-misc/tellico-2.3.10 b/metadata/md5-cache/kde-misc/tellico-2.3.10
index 120329475e65..c398137eff1c 100644
--- a/metadata/md5-cache/kde-misc/tellico-2.3.10
+++ b/metadata/md5-cache/kde-misc/tellico-2.3.10
@@ -4,11 +4,11 @@ DESCRIPTION=A collection manager for the KDE environment
EAPI=5
HOMEPAGE=http://tellico-project.org/
IUSE=addressbook cddb debug nepomuk pdf scanner taglib v4l xmp yaz linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ia linguas_it linguas_ja linguas_kk linguas_lt linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson dev-qt/qtdbus:4 media-libs/qimageblitz addressbook? ( >=kde-base/kdepimlibs-4.13.1:4[aqua=] ) cddb? ( >=kde-apps/libkcddb-4.13.1:4[aqua=] ) nepomuk? ( >=kde-base/kdelibs-4.13.1:4[aqua=,nepomuk?] ) pdf? ( app-text/poppler[qt4] ) scanner? ( >=kde-apps/libksane-4.13.1:4[aqua=] ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2 ) kde-apps/oxygen-icons linguas_bg? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_hu(+)] ) linguas_ia? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_ia(+)] ) linguas_it? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_kk(+)] ) linguas_lt? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_lt(+)] ) linguas_mr? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_mr(+)] ) linguas_ms? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-l10n-4.13.1:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.13.1:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.1:4[aqua=]
RESTRICT=test
SLOT=4
SRC_URI=http://tellico-project.org/files/tellico-2.3.10.tar.bz2
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e4a63937c69924de43503f8997361e02
+_md5_=7caa1a7dc07e06be11cc5f34a2c0bd78
diff --git a/metadata/md5-cache/mail-mta/exim-4.85 b/metadata/md5-cache/mail-mta/exim-4.85
index 1d9d43795561..8ad779ae1f7b 100644
--- a/metadata/md5-cache/mail-mta/exim-4.85
+++ b/metadata/md5-cache/mail-mta/exim-4.85
@@ -4,11 +4,11 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
EAPI=5
HOMEPAGE=http://www.exim.org/
IUSE=dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2 dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/radiusclient ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
REQUIRED_USE=spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )
SLOT=0
SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.85.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-html-4.85.tar.bz2 )
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=9c104050816c72ee17c7e9898c6d0fb8
+_md5_=16882ae12f935ba5c335bd168d256594
diff --git a/metadata/md5-cache/mail-mta/postfix-3.0.1-r1 b/metadata/md5-cache/mail-mta/postfix-3.0.1-r1
index 7ea0eedd03c5..8d17467f035e 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.0.1-r1
+++ b/metadata/md5-cache/mail-mta/postfix-3.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
EAPI=5
HOMEPAGE=http://www.postfix.org/
IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
LICENSE=IBM
RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g:* ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
SLOT=0
SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.0.1.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed ssl-cert b53367370fde96e19beca78050a47c61 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6e0712f9651b53564a247c462dfc364f
+_md5_=62da03aaa93dfac6b5770c58df8ace57
diff --git a/metadata/md5-cache/media-libs/clutter-1.22.2 b/metadata/md5-cache/media-libs/clutter-1.22.2
new file mode 100644
index 000000000000..e56d502522a6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/clutter-1.22.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.39.0:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] >=media-libs/cogl-1.20.0:1.0=[introspection?,pango,wayland?] >=x11-libs/cairo-1.14:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= egl? ( >=dev-libs/libinput-0.8 media-libs/cogl[gles2,kms] >=virtual/libgudev-136 x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-1.39 ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage x11-proto/inputproto >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( dev-libs/wayland x11-libs/gdk-pixbuf:2 ) >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.20 >=app-text/docbook-sgml-utils-0.6.14[jadetex] dev-libs/libxslt ) test? ( x11-libs/gdk-pixbuf ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Clutter is a library for creating graphical user interfaces
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/Clutter
+IUSE=aqua debug doc egl gtk +introspection test wayland +X test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.39.0:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] >=media-libs/cogl-1.20.0:1.0=[introspection?,pango,wayland?] >=x11-libs/cairo-1.14:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= egl? ( >=dev-libs/libinput-0.8 media-libs/cogl[gles2,kms] >=virtual/libgudev-136 x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-1.39 ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage x11-proto/inputproto >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( dev-libs/wayland x11-libs/gdk-pixbuf:2 )
+REQUIRED_USE=|| ( aqua wayland X ) wayland? ( egl )
+SLOT=1.0
+SRC_URI=mirror://gnome/sources/clutter/1.22/clutter-1.22.2.tar.xz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 10c513def52488230abb60a4b19a03b9 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=cf350b2b768e1821898a16a412139213
diff --git a/metadata/md5-cache/media-libs/clutter-gst-3.0.6 b/metadata/md5-cache/media-libs/clutter-gst-3.0.6
new file mode 100644
index 000000000000..e310ca2e100e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/clutter-gst-3.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.20:1.0=[introspection?] >=media-libs/cogl-1.18:1.0=[introspection?] >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0[introspection?] virtual/libgudev introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=GStreamer integration library for Clutter
+EAPI=5
+HOMEPAGE=http://www.clutter-project.org/
+IUSE=examples +introspection debug
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.20:1.0=[introspection?] >=media-libs/cogl-1.18:1.0=[introspection?] >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0[introspection?] virtual/libgudev introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) >=media-libs/gst-plugins-good-1.4:1.0
+SLOT=3.0
+SRC_URI=mirror://gnome/sources/clutter-gst/3.0/clutter-gst-3.0.6.tar.xz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 10c513def52488230abb60a4b19a03b9 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2cb1e3f57eeb8a03e2d1cea63bb09e05
diff --git a/metadata/md5-cache/media-libs/cogl-1.20.0 b/metadata/md5-cache/media-libs/cogl-1.20.0
new file mode 100644
index 000000000000..ab36fdc219a7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/cogl-1.20.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2 ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) >=dev-util/gtk-doc-am-1.13 sys-devel/gettext virtual/pkgconfig test? ( app-eselect/eselect-opengl media-libs/mesa[classic] ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A library for using 3D graphics hardware to draw pretty pictures
+EAPI=5
+HOMEPAGE=http://www.cogl3d.org/
+IUSE=examples gles2 gstreamer +introspection +kms +opengl +pango test wayland debug test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT BSD
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2 ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) !=sci-libs/fftw-3.0.1 audacious? ( >=media-sound/audacious-3.5 >=dev-libs/glib-2.4.7:2 >=x11-libs/gtk+-3.0.0:3 x11-libs/pango x11-libs/cairo media-libs/libsndfile ) jack? ( media-sound/jack-audio-connection-kit >=dev-libs/glib-2.4.7:2 >=x11-libs/gtk+-3.0.0:3 x11-libs/pango x11-libs/cairo media-libs/libsndfile )
+DESCRIPTION=High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins
+EAPI=5
+HOMEPAGE=https://savannah.nongnu.org/projects/freeverb3
+IUSE=cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 audacious forcefpu jack openmp plugdouble threads
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sci-libs/fftw-3.0.1 audacious? ( >=media-sound/audacious-3.5 >=dev-libs/glib-2.4.7:2 >=x11-libs/gtk+-3.0.0:3 x11-libs/pango x11-libs/cairo media-libs/libsndfile ) jack? ( media-sound/jack-audio-connection-kit >=dev-libs/glib-2.4.7:2 >=x11-libs/gtk+-3.0.0:3 x11-libs/pango x11-libs/cairo media-libs/libsndfile )
+SLOT=0
+SRC_URI=mirror://nongnu/freeverb3/freeverb3-3.1.1.tar.xz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=8e74e9af1d0ae30a55596cbbbf4c6e90
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.0 b/metadata/md5-cache/media-libs/gegl-0.3.0
new file mode 100644
index 000000000000..ba04f1c70aca
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) >=sys-apps/sed-4 !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A graph based image processing framework
+EAPI=5
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
+SLOT=0.3
+SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.0.tar.bz2
+_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 vala a41415fe361172827ed11b6a32ee38fb versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=6e4494a1c762014ba4b0bdce6f27d519
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.0_pre20150304 b/metadata/md5-cache/media-libs/gegl-0.3.0_pre20150304
deleted file mode 100644
index 58b24640b05e..000000000000
--- a/metadata/md5-cache/media-libs/gegl-0.3.0_pre20150304
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 >=dev-python/pygobject-3.2:3 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) >=sys-apps/sed-4 !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A graph based image processing framework
-EAPI=5
-HOMEPAGE=http://www.gegl.org/
-IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg umfpack vala v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 >=dev-python/pygobject-3.2:3 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
-SLOT=0.3
-SRC_URI=http://dev.gentoo.org/~eva/distfiles/gegl/gegl-0.3.0-c9bbc81.tar.bz2 -> gegl-0.3.0_pre20150304.tar.bz2
-_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 vala a41415fe361172827ed11b6a32ee38fb versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=392721c295d36e7a1c998363c1ef5f08
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 6e3a152ce430..edfd4b6f09f0 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 >=dev-python/pygobject-3.2:3 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) >=sys-apps/sed-4 !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) >=sys-apps/sed-4 !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
DESCRIPTION=A graph based image processing framework
EAPI=5
HOMEPAGE=http://www.gegl.org/
-IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg umfpack vala v4l webp
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp
LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 >=dev-python/pygobject-3.2:3 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
+RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
SLOT=0.3
-_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 vala a41415fe361172827ed11b6a32ee38fb versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=eb13cac0e30853eeb8a057c24b0533d1
+_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 vala a41415fe361172827ed11b6a32ee38fb versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=98b7d3c81c39b18a7ea9c7e4519ef68a
diff --git a/metadata/md5-cache/media-libs/gmtk-1.0.9 b/metadata/md5-cache/media-libs/gmtk-1.0.9
index b4923dcdc530..0f39c2bd23d5 100644
--- a/metadata/md5-cache/media-libs/gmtk-1.0.9
+++ b/metadata/md5-cache/media-libs/gmtk-1.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ widget and function libraries for gnome-mplayer
EAPI=5
HOMEPAGE=http://code.google.com/p/gmtk/
IUSE=alsa +dconf pulseaudio
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.30 >=x11-libs/gtk+-3.2:3 x11-libs/libX11 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) dconf? ( gnome-base/dconf )
SLOT=0
SRC_URI=http://gmtk.googlecode.com/svn/packages/gmtk-1.0.9.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=9858f4c6e3c77eb12718d7b501992c38
+_md5_=1b63ddb02c1d1f3c3dfa4c0bdfda6dd8
diff --git a/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1 b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
index fb716fecf2bb..d601a7310b41 100644
--- a/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
+++ b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Unofficial taglib plugins maintained by the Amarok team
EAPI=5
HOMEPAGE=http://developer.kde.org/~wheeler/taglib.html
IUSE=debug
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=>=media-libs/taglib-1.6
SLOT=0
SRC_URI=mirror://kde/stable/taglib-extras/1.0.1/src/taglib-extras-1.0.1.tar.gz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=72c0b7d738eab4dda5e1104bf645eb9f
+_md5_=25d6ddee4df20bd31f197a2efc19816f
diff --git a/metadata/md5-cache/media-plugins/gimp-lqr-0.7.2 b/metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
index db79610ac5e1..d6c86a7b9a09 100644
--- a/metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
+++ b/metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
@@ -3,9 +3,9 @@ DEPEND=>=media-gfx/gimp-2.8 media-libs/liblqr
DESCRIPTION=Content-aware resizing for the GIMP
EAPI=5
HOMEPAGE=http://liquidrescale.wikidot.com/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=media-gfx/gimp-2.8 media-libs/liblqr
SLOT=0
SRC_URI=http://liquidrescale.wikidot.com/local--files/en:download-page-sources/gimp-lqr-plugin-0.7.2.tar.bz2
-_md5_=31f22ed3b267413ceebb031d07b1d5af
+_md5_=5b57df91ff5061ed9359200a638ec57a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r4 b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r4
index 9aefc1d455e2..5751ed7e1c80 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r4
@@ -4,10 +4,10 @@ DESCRIPTION=FFmpeg based gstreamer plugin
EAPI=5
HOMEPAGE=http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html
IUSE=libav +orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-2
RDEPEND=>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libav? ( >=media-video/libav-11.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpostproc-10.20140517-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)] )
SLOT=0.10
SRC_URI=http://dev.gentoo.org/~tetromino/distfiles/gst-plugins-ffmpeg/gst-ffmpeg-0.10.13_p201211.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gst-plugins-ffmpeg/gst-ffmpeg-0.10.13_p201211-libav-9-patches.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=60de519bf3ac32fdf7c019b8dde99064
+_md5_=8001b8cbad1f700b9c6e02e3b9562d7e
diff --git a/metadata/md5-cache/media-sound/mpd-0.19.9-r1 b/metadata/md5-cache/media-sound/mpd-0.19.9-r1
index 5f712caf1904..709ba13a3e6d 100644
--- a/metadata/md5-cache/media-sound/mpd-0.19.9-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.19.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Music Player Daemon (mpd)
EAPI=5
HOMEPAGE=http://www.musicpd.org
IUSE=adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack wildmidi zeroconf zip
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos
LICENSE=GPL-2
RDEPEND=!=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( || ( =net-fs/samba-4.0.25 ) ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) libsoxr? ( media-libs/soxr ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) selinux? ( sec-policy/selinux-mpd )
REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) ao? ( glib ) gme? ( glib ) jack? ( glib ) network? ( || ( audiofile flac lame twolame vorbis ) glib ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) sid? ( glib ) soundcloud? ( glib ) sqlite? ( glib ) opus? ( ogg ) upnp? ( expat ) vorbis? ( glib ) wavpack? ( glib )
SLOT=0
SRC_URI=http://www.musicpd.org/download/mpd/0.19/mpd-0.19.9.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 linux-info 8cbc678e083c23e4ad546ca6509cf304 multilib 62927b3db3a589b0806255f3a002d5d3 readme.gentoo 106edea5533517715013de909a333abd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e5ef4fdfbf9caa9fe2f0f40df55fd231
+_md5_=03843952566982f9856ef32355e3e3a5
diff --git a/metadata/md5-cache/media-video/gnome-mplayer-1.0.9 b/metadata/md5-cache/media-video/gnome-mplayer-1.0.9
index 99243fe768c1..2a8fbe7a5e8c 100644
--- a/metadata/md5-cache/media-video/gnome-mplayer-1.0.9
+++ b/metadata/md5-cache/media-video/gnome-mplayer-1.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK+ interface to MPlayer
EAPI=5
HOMEPAGE=http://code.google.com/p/gnome-mplayer/
IUSE=alsa +dbus +dconf gda gnome ipod libnotify musicbrainz pulseaudio
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.30 >=media-libs/gmtk-1.0.9[dconf=] >=x11-libs/gtk+-3.2:3 x11-libs/libX11 x11-libs/libXScrnSaver alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.100 ) gda? ( gnome-extra/libgda:5 ) gnome? ( gnome-base/nautilus ) ipod? ( >=media-libs/libgpod-0.7 ) libnotify? ( >=x11-libs/libnotify-0.7 ) musicbrainz? ( media-libs/musicbrainz:3 net-misc/curl ) pulseaudio? ( >=media-sound/pulseaudio-0.9.14 ) x11-themes/gnome-icon-theme-symbolic || ( >=media-video/mplayer-1.0_rc4_p20100101[libass] media-video/mplayer2[libass] )
SLOT=0
SRC_URI=http://gnome-mplayer.googlecode.com/svn/packages/gnome-mplayer-1.0.9.tar.gz
_eclasses_=fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=77d9146fa2d448bd383267276e24f5c5
+_md5_=d44b17086963ac12d739f2bb2c5df01c
diff --git a/metadata/md5-cache/media-video/tovid-0.35.2 b/metadata/md5-cache/media-video/tovid-0.35.2
index 61170268375a..5cf39d750cfe 100644
--- a/metadata/md5-cache/media-video/tovid-0.35.2
+++ b/metadata/md5-cache/media-video/tovid-0.35.2
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=https://github.com/tovid-suite/tovid/archive/v0.35.2.tar.gz -> tovid-0.35.2.tar.gz
_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=0ff9b0c3af975297d933c70b82156e5a
+_md5_=46809e51bf9eb10f7a56cefe5cf0a21b
diff --git a/metadata/md5-cache/media-video/vdr2jpeg-0.2.0 b/metadata/md5-cache/media-video/vdr2jpeg-0.2.0
index ef85d07362d0..387494cf5afd 100644
--- a/metadata/md5-cache/media-video/vdr2jpeg-0.2.0
+++ b/metadata/md5-cache/media-video/vdr2jpeg-0.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Addon needed for XXV - WWW Admin for the Video Disk Recorder
EAPI=5
HOMEPAGE=http://projects.vdr-developer.org/projects/xxv
IUSE=libav
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=libav? ( media-video/libav ) !libav? ( media-video/ffmpeg:0 )
RESTRICT=strip
SLOT=0
SRC_URI=mirror://vdr-developerorg/1911/vdr2jpeg-0.2.0.tgz mirror://gentoo/vdr2jpeg-0.2.0.tgz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=f48e7bd009e7d40dcb13234665ff62a2
+_md5_=43565730e5536993f0822b4be600a778
diff --git a/metadata/md5-cache/media-video/winki-0.4.5-r1 b/metadata/md5-cache/media-video/winki-0.4.5-r1
new file mode 100644
index 000000000000..8ce9f49a6d78
--- /dev/null
+++ b/metadata/md5-cache/media-video/winki-0.4.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyorbit-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A Python frontend to many popular encoding programs
+EAPI=5
+HOMEPAGE=http://www.winki-the-ripper.de/
+IUSE=css dvd matroska mjpeg mp3 ogg vcd python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyorbit-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-video/mplayer[encode] media-video/lsdvd virtual/ffmpeg dvd? ( media-video/dvdauthor ) mp3? ( media-sound/lame ) ogg? ( media-sound/ogmtools media-sound/vorbis-tools ) vcd? ( media-video/vcdimager media-libs/libdvb ) mjpeg? ( media-video/mjpegtools ) matroska? ( media-video/mkvtoolnix ) css? ( media-libs/libdvdcss ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://www.winki-the-ripper.de/share/dist/winki-0.4.5.tar.gz
+_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
+_md5_=2355d0494b5cbf62c61e147b698697ff
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.6 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.6
index c2a53ef88166..081f69ed3a06 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.6
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
EAPI=5
HOMEPAGE=http://www.xelerance.com/services/software/xl2tpd/
IUSE=dnsretry
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~mips ~ppc ppc64 ~x86
LICENSE=GPL-2
RDEPEND=net-libs/libpcap net-dialup/ppp
SLOT=0
SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.6.tar.gz -> xl2tpd-1.3.6.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=774eb693684621e6b23a161aa9eb9fbf
+_md5_=46c2ce5c008587b57c0c4be65bb1ebff
diff --git a/metadata/md5-cache/net-libs/libbluedevil-2.1 b/metadata/md5-cache/net-libs/libbluedevil-2.1
index 641cfcf6dc81..5a6ad8ccecc8 100644
--- a/metadata/md5-cache/net-libs/libbluedevil-2.1
+++ b/metadata/md5-cache/net-libs/libbluedevil-2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Qt wrapper for bluez used in the KDE bluetooth stack
EAPI=5
HOMEPAGE=http://projects.kde.org/projects/playground/libs/libbluedevil
IUSE=debug aqua
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=>=net-wireless/bluez-5 kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
SLOT=4
SRC_URI=mirror://kde/stable/libbluedevil/2.1/src/libbluedevil-2.1.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0eabd1e4e72095d8bba608fbb556fdec
+_md5_=38aecc2eaec6d9e987a41189239ac0f5
diff --git a/metadata/md5-cache/net-libs/phodav-0.4 b/metadata/md5-cache/net-libs/phodav-0.4
index 67c17a0cae76..cdfe469e6422 100644
--- a/metadata/md5-cache/net-libs/phodav-0.4
+++ b/metadata/md5-cache/net-libs/phodav-0.4
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/glib net-libs/libsoup:2.4 dev-libs/libxml2 avahi? ( net-dns/avahi ) >=dev-util/intltool-0.40.0 >=dev-util/gtk-doc-am-1.10 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=dev-libs/glib:2 net-libs/libsoup:2.4 dev-libs/libxml2 avahi? ( net-dns/avahi ) >=dev-util/intltool-0.40.0 >=dev-util/gtk-doc-am-1.10 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=WebDav server implementation using libsoup
EAPI=5
HOMEPAGE=https://wiki.gnome.org/phodav
IUSE=avahi spice systemd
KEYWORDS=~alpha amd64 arm ppc ppc64 ~x86
LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib net-libs/libsoup:2.4 dev-libs/libxml2 avahi? ( net-dns/avahi )
-SLOT=0
+RDEPEND=dev-libs/glib:2 net-libs/libsoup:2.4 dev-libs/libxml2 avahi? ( net-dns/avahi )
+SLOT=1.0
SRC_URI=mirror://gnome/sources/phodav/0.4/phodav-0.4.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 10c513def52488230abb60a4b19a03b9 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 udev da001465a2e939c93f7ae16947ce3438 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=814fc5f3e122bc1c357bcd60e4c7dbbe
+_md5_=44f814bb82cc18d089b608c1e708a4be
diff --git a/metadata/md5-cache/net-libs/phodav-2.0 b/metadata/md5-cache/net-libs/phodav-2.0-r1
similarity index 66%
rename from metadata/md5-cache/net-libs/phodav-2.0
rename to metadata/md5-cache/net-libs/phodav-2.0-r1
index 9109236dbc44..0f2e8a6bbea7 100644
--- a/metadata/md5-cache/net-libs/phodav-2.0
+++ b/metadata/md5-cache/net-libs/phodav-2.0-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/glib:2 >=net-libs/libsoup-2.48.0:2.4 dev-libs/libxml2 zeroconf? ( net-dns/avahi ) >=dev-util/intltool-0.40.0 >=dev-util/gtk-doc-am-1.10 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=dev-libs/glib:2 >=net-libs/libsoup-2.48:2.4 dev-libs/libxml2 zeroconf? ( net-dns/avahi ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=WebDav server implementation using libsoup
EAPI=5
HOMEPAGE=https://wiki.gnome.org/phodav
IUSE=spice systemd zeroconf
KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 >=net-libs/libsoup-2.48.0:2.4 dev-libs/libxml2 zeroconf? ( net-dns/avahi )
-SLOT=0
+RDEPEND=dev-libs/glib:2 >=net-libs/libsoup-2.48:2.4 dev-libs/libxml2 zeroconf? ( net-dns/avahi )
+SLOT=2.0
SRC_URI=mirror://gnome/sources/phodav/2.0/phodav-2.0.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 10c513def52488230abb60a4b19a03b9 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 udev da001465a2e939c93f7ae16947ce3438 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7f8e4aed02de44f66584efcef5ecb75c
+_md5_=fc803b50d5c188636ec9f5fbcffaa37f
diff --git a/metadata/md5-cache/net-libs/zeromq-4.1.1 b/metadata/md5-cache/net-libs/zeromq-4.1.1
index cd9ec08f9852..83dad8d8d1df 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.1.1
+++ b/metadata/md5-cache/net-libs/zeromq-4.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=A brokerless kernel
EAPI=5
HOMEPAGE=http://www.zeromq.org/
IUSE=pgm static-libs test
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-3
RDEPEND=dev-libs/libsodium:= pgm? ( =net-libs/openpgm-5.2.122 )
SLOT=0/4
SRC_URI=http://download.zeromq.org/zeromq-4.1.1.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-utils dbce0f7913bd240fdf0ef428149855c0 eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=38a336a93fb036ecfd664ae2d5b126be
+_md5_=89652ec81bd465cc2a370136120e67d5
diff --git a/metadata/md5-cache/net-misc/connman-1.29 b/metadata/md5-cache/net-misc/connman-1.29
index f79fe6415817..4ed244aacbf2 100644
--- a/metadata/md5-cache/net-misc/connman-1.29
+++ b/metadata/md5-cache/net-misc/connman-1.29
@@ -4,10 +4,10 @@ DESCRIPTION=Provides a daemon for managing internet connections
EAPI=5
HOMEPAGE=https://01.org/connman
IUSE=bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ppc64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-misc/openconnect ) openvpn? ( net-misc/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls )
SLOT=0
SRC_URI=mirror://kernel/linux/network/connman/connman-1.29.tar.xz
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=b22eed911814ea54614946cf97739b6a
+_md5_=a1f51bcc60cff8efef50664a3f639269
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.25-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.25-r1
index e0c80b44de10..464b283dfac8 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.25-r1
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.25-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:1.0 ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
EAPI=5
HOMEPAGE=http://spice-space.org http://gitorious.org/spice-gtk
IUSE=dbus doc gstreamer gtk3 +introspection policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav python_targets_python2_7
KEYWORDS=~alpha amd64 arm ppc ppc64 ~x86
LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav )
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:1.0 )
REQUIRED_USE=python_targets_python2_7 ?? ( pulseaudio gstreamer )
SLOT=0
SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.25.tar.bz2
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 vala a41415fe361172827ed11b6a32ee38fb
-_md5_=5901769106fd4fd47d620cbb0699b90a
+_md5_=8487b48f41ac1007cf5f01b943656c61
diff --git a/metadata/md5-cache/net-nntp/inn-2.5.5 b/metadata/md5-cache/net-nntp/inn-2.5.5
new file mode 100644
index 000000000000..0c271466e29e
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/inn-2.5.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure install postinst postrm prepare setup
+DEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl )
+DESCRIPTION=The Internet News daemon, fully featured NNTP server
+EAPI=5
+HOMEPAGE=https://www.isc.org/software/inn
+IUSE=berkdb innkeywords inntaggedhash ipv6 kerberos perl python sasl ssl python_targets_python2_7 ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=ISC GPL-2+ public-domain BSD-4 BSD-2 RSA BSD MIT GPL-2
+RDEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) berkdb? ( sys-libs/db )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=ftp://ftp.isc.org/isc/inn/inn-2.5.5.tar.gz
+_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd ssl-cert b53367370fde96e19beca78050a47c61 toolchain-funcs 42408102d713fbad60ca21349865edb4
+_md5_=fda061fbf9a5006b659ac0d52381400b
diff --git a/metadata/md5-cache/net-nntp/tin-2.2.1 b/metadata/md5-cache/net-nntp/tin-2.2.1
index 22247453ad9e..af5d18e0148c 100644
--- a/metadata/md5-cache/net-nntp/tin-2.2.1
+++ b/metadata/md5-cache/net-nntp/tin-2.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
EAPI=5
HOMEPAGE=http://www.tin.org/
IUSE=cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode
-KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) net-misc/urlview nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses[unicode?] unicode? ( dev-libs/icu:= )
SLOT=0
SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/v2.2/tin-2.2.1.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=35482f5f016d81bf91396200a382274f
+_md5_=702d5f383985387ba79b3544e3ba4acd
diff --git a/metadata/md5-cache/net-wireless/bluedevil-2.1.1 b/metadata/md5-cache/net-wireless/bluedevil-2.1.1
index bc541542c2b8..a691c145415a 100644
--- a/metadata/md5-cache/net-wireless/bluedevil-2.1.1
+++ b/metadata/md5-cache/net-wireless/bluedevil-2.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Bluetooth stack for KDE
EAPI=5
HOMEPAGE=http://projects.kde.org/projects/extragear/base/bluedevil
IUSE=debug linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_mai linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@Latn linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
LICENSE=GPL-2+
RDEPEND=>=net-libs/libbluedevil-2.1:4 x11-misc/shared-mime-info kde-apps/oxygen-icons linguas_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_mr(+)] ) linguas_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
SLOT=4
SRC_URI=mirror://kde/stable/bluedevil/2.1.1/src/bluedevil-2.1.1.tar.xz
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 663527bca3046b1913286e764cdaada3 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7cb8f023de283c0a4aa618a5521aead2
+_md5_=58b378be8fe78953988415e868add8d3
diff --git a/metadata/md5-cache/net-wireless/wireless-regdb-20150605 b/metadata/md5-cache/net-wireless/wireless-regdb-20150605
new file mode 100644
index 000000000000..bcef82834eff
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/wireless-regdb-20150605
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Binary regulatory database for CRDA
+EAPI=5
+HOMEPAGE=http://wireless.kernel.org/en/developers/Regulatory
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2015.06.05.tar.xz
+_md5_=799aaba08f6275afefc4000919e9f19c
diff --git a/metadata/md5-cache/perl-core/Module-Metadata-1.0.11-r1 b/metadata/md5-cache/perl-core/Module-Metadata-1.0.11-r1
index 889d84c12026..838474e5a7a0 100644
--- a/metadata/md5-cache/perl-core/Module-Metadata-1.0.11-r1
+++ b/metadata/md5-cache/perl-core/Module-Metadata-1.0.11-r1
@@ -3,10 +3,9 @@ DEPEND=>=virtual/perl-version-0.870 dev-lang/perl:=[-build(-)]
DESCRIPTION=Gather package and POD information from perl module files
EAPI=5
HOMEPAGE=http://search.cpan.org/dist/Module-Metadata/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=virtual/perl-version-0.870 dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/A/AP/APEIRON/Module-Metadata-1.000011.tar.gz
_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 79253b64b2972a3e513329a729242b27 toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=ad52927d9da61789dc23dab799d1705d
+_md5_=ad33ac34466133815e4b6f95cbf237e7
diff --git a/metadata/md5-cache/perl-core/Net-Ping-2.41-r1 b/metadata/md5-cache/perl-core/Net-Ping-2.41-r1
index 35c601d8e3b5..2557ac92f1fc 100644
--- a/metadata/md5-cache/perl-core/Net-Ping-2.41-r1
+++ b/metadata/md5-cache/perl-core/Net-Ping-2.41-r1
@@ -3,10 +3,9 @@ DEPEND=dev-lang/perl:=[-build(-)]
DESCRIPTION=check a remote host for reachability
EAPI=5
HOMEPAGE=http://search.cpan.org/dist/Net-Ping/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/S/SM/SMPETERS/Net-Ping-2.41.tar.gz
_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 79253b64b2972a3e513329a729242b27 toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=8440a1b417f45cae2b70202bcc48b2da
+_md5_=70bb0e9feb40143a94d89ad5fd7377c4
diff --git a/metadata/md5-cache/perl-core/Package-Constants-0.20.0-r1 b/metadata/md5-cache/perl-core/Package-Constants-0.60.0
similarity index 59%
rename from metadata/md5-cache/perl-core/Package-Constants-0.20.0-r1
rename to metadata/md5-cache/perl-core/Package-Constants-0.60.0
index 74d31faca7c9..fcaa1ae0313f 100644
--- a/metadata/md5-cache/perl-core/Package-Constants-0.20.0-r1
+++ b/metadata/md5-cache/perl-core/Package-Constants-0.60.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
DESCRIPTION=List all constants declared in a package
EAPI=5
HOMEPAGE=http://search.cpan.org/dist/Package-Constants/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KANE/Package-Constants-0.02.tar.gz
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz
_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 79253b64b2972a3e513329a729242b27 toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=8b4d60bf221a7a0992399cd5f815b01b
+_md5_=b6e9d2f54fb17551756d017fe7dd97b4
diff --git a/metadata/md5-cache/perl-core/Params-Check-0.360.0-r1 b/metadata/md5-cache/perl-core/Params-Check-0.360.0-r1
deleted file mode 100644
index 971eba986efd..000000000000
--- a/metadata/md5-cache/perl-core/Params-Check-0.360.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=virtual/perl-Locale-Maketext-Simple dev-lang/perl:=[-build(-)]
-DESCRIPTION=A generic input parsing/checking mechanism
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Params-Check/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Locale-Maketext-Simple dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Params-Check-0.36.tar.gz
-_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 79253b64b2972a3e513329a729242b27 toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=cbcc3e9675a9f7fec51203b283dd337c
diff --git a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.400-r1 b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.400-r1
deleted file mode 100644
index 32c3ca9f6b39..000000000000
--- a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.400-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Parse META.yml and other similar CPAN metadata files
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Parse-CPAN-Meta/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4404.tar.gz
-_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 79253b64b2972a3e513329a729242b27 toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=e1571d0b60a6e8fddbc0549eaf020316
diff --git a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.900-r1 b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.900-r1
index 167b38360772..9c21f60a75c4 100644
--- a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.900-r1
+++ b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.900-r1
@@ -3,10 +3,9 @@ DEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 dev-la
DESCRIPTION=Parse META.yml and other similar CPAN metadata files
EAPI=5
HOMEPAGE=http://search.cpan.org/dist/Parse-CPAN-Meta/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4409.tar.gz
_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 79253b64b2972a3e513329a729242b27 toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=9aac32842b4b8db0f9d76d0a1f1aad3f
+_md5_=e5ec927176bc042c7844e3ca9851085b
diff --git a/metadata/md5-cache/perl-core/Perl-OSType-1.3.0 b/metadata/md5-cache/perl-core/Perl-OSType-1.3.0
index fe300550c767..5652bdcf38e4 100644
--- a/metadata/md5-cache/perl-core/Perl-OSType-1.3.0
+++ b/metadata/md5-cache/perl-core/Perl-OSType-1.3.0
@@ -4,10 +4,9 @@ DESCRIPTION=Map Perl operating system names to generic types
EAPI=5
HOMEPAGE=http://search.cpan.org/dist/Perl-OSType/
IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Perl-OSType-1.003.tar.gz
_eclasses_=alternatives 326031758c86cd08f5844f475f03ac01 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 79253b64b2972a3e513329a729242b27 toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52
-_md5_=77a6740d0a7802eb52227eaebf3576c9
+_md5_=5c0fabc1adb8681c558fe2c646341058
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.3 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.3
index 5ea459c3fcff..c85c5e6c50ca 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.3
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Astronomical routines for the python programming language
EAPI=5
HOMEPAGE=http://rhodesmill.org/pyephem/
IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-3
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
SLOT=0
SRC_URI=mirror://pypi/p/pyephem/pyephem-3.7.5.3.tar.gz
_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=163765b4607acccfade06dae94f0bd70
+_md5_=7f67952073eb6c5c119bb9b6b3854601
diff --git a/metadata/md5-cache/sci-biology/rebase-1505 b/metadata/md5-cache/sci-biology/rebase-1505
index d872bea4fee5..cc01b5d248fe 100644
--- a/metadata/md5-cache/sci-biology/rebase-1505
+++ b/metadata/md5-cache/sci-biology/rebase-1505
@@ -4,10 +4,10 @@ DESCRIPTION=A restriction enzyme database
EAPI=5
HOMEPAGE=http://rebase.neb.com
IUSE=emboss minimal
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=public-domain
RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
RESTRICT=binchecks strip
SLOT=0
SRC_URI=http://dev.gentoo.org/~jlec/distfiles/rebase-1505.tar.xz
-_md5_=08b12718f9103d08940e6431bfd59153
+_md5_=c6a98c0ee43596e99e3206c77324ec14
diff --git a/metadata/md5-cache/sci-calculators/calculator-1.7.49 b/metadata/md5-cache/sci-calculators/calculator-1.7.49
index ba54ad91b9fc..efb0664eeb2a 100644
--- a/metadata/md5-cache/sci-calculators/calculator-1.7.49
+++ b/metadata/md5-cache/sci-calculators/calculator-1.7.49
@@ -4,10 +4,10 @@ DESCRIPTION=Scientific calculator based on the FOX Toolkit
EAPI=5
HOMEPAGE=http://www.fox-toolkit.org/
IUSE=debug doc profile
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=~x11-libs/fox-1.7.49 x11-libs/libICE x11-libs/libSM
SLOT=0
SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.49.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de fox 26650ced206327e4fca3dec6cd441381 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6a5ce8fed3cf2f8ad5191b263c13426a
+_md5_=6db65226eb9209d876f6f73e4e4b1bf8
diff --git a/metadata/md5-cache/sci-mathematics/4ti2-1.6.6 b/metadata/md5-cache/sci-mathematics/4ti2-1.6.6
new file mode 100644
index 000000000000..b711faf56a14
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/4ti2-1.6.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-mathematics/glpk:0[gmp] dev-libs/gmp[cxx] !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Software package for algebraic, geometric and combinatorial problems
+EAPI=5
+HOMEPAGE=http://www.4ti2.de/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86 ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sci-mathematics/glpk:0[gmp] dev-libs/gmp[cxx]
+SLOT=0
+SRC_URI=http://4ti2.de/version_1.6.6/4ti2-1.6.6.tar.gz
+_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-utils dbce0f7913bd240fdf0ef428149855c0 eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
+_md5_=70a5276be4d885dff37593b8e7ffc24b
diff --git a/metadata/md5-cache/sci-physics/cernlib-2006-r5 b/metadata/md5-cache/sci-physics/cernlib-2006-r5
index 8eb03d25139c..5c24c4de1082 100644
--- a/metadata/md5-cache/sci-physics/cernlib-2006-r5
+++ b/metadata/md5-cache/sci-physics/cernlib-2006-r5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/motif:0 virtual/lapack dev-lang/cfortran x11-misc/imake x11-misc
DESCRIPTION=CERN program library for High Energy Physics
EAPI=5
HOMEPAGE=https://cernlib.web.cern.ch/cernlib/
-KEYWORDS=amd64 hppa ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 hppa ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2 LGPL-2 BSD
RDEPEND=x11-libs/motif:0 virtual/lapack dev-lang/cfortran virtual/fortran
SLOT=0
SRC_URI=mirror://debian/pool/main/c/cernlib/cernlib_20061220+dfsg3.orig.tar.gz mirror://debian/pool/main/c/cernlib/cernlib_20061220+dfsg3-2.debian.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fortran-2 db8710b355fc5598015c4bc3aad3bdb0 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=37a95567a8fcea526d51e020df84b939
+_md5_=bff13f6aba2af912406d0119585ab739
diff --git a/metadata/md5-cache/sci-physics/cernlib-montecarlo-2006-r3 b/metadata/md5-cache/sci-physics/cernlib-montecarlo-2006-r3
index 4e518db1597a..f08782fd77a1 100644
--- a/metadata/md5-cache/sci-physics/cernlib-montecarlo-2006-r3
+++ b/metadata/md5-cache/sci-physics/cernlib-montecarlo-2006-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Monte-carlo library and tools for the cernlib
EAPI=5
HOMEPAGE=https://cernlib.web.cern.ch/cernlib/
IUSE=+herwig
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2 LGPL-2 BSD
RDEPEND=x11-libs/motif:0 dev-lang/cfortran sci-physics/cernlib herwig? ( !sci-physics/herwig ) virtual/fortran
SLOT=0
SRC_URI=mirror://debian/pool/main/m/mclibs/mclibs_20061220+dfsg3.orig.tar.gz mirror://debian/pool/main/m/mclibs/mclibs_20061220+dfsg3-1.debian.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fortran-2 db8710b355fc5598015c4bc3aad3bdb0 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=478438ab13066f2bff413a6efaaa3bdc
+_md5_=8a73054a0a55af4952fdc2215a1f8fa4
diff --git a/metadata/md5-cache/sci-physics/paw-2.14.04-r4 b/metadata/md5-cache/sci-physics/paw-2.14.04-r4
index 275a4b60f009..7252c3394c20 100644
--- a/metadata/md5-cache/sci-physics/paw-2.14.04-r4
+++ b/metadata/md5-cache/sci-physics/paw-2.14.04-r4
@@ -3,10 +3,10 @@ DEPEND=sci-physics/cernlib x11-libs/libXaw >=x11-libs/motif-2.3:0 x11-libs/xbae
DESCRIPTION=CERN's Physics Analysis Workstation data analysis program
EAPI=5
HOMEPAGE=https://paw.web.cern.ch/paw/
-KEYWORDS=amd64 hppa ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 hppa ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2 LGPL-2 BSD
RDEPEND=sci-physics/cernlib x11-libs/libXaw >=x11-libs/motif-2.3:0 x11-libs/xbae virtual/fortran
SLOT=0
SRC_URI=mirror://debian/pool/main/p/paw/paw_2.14.04.dfsg.2.orig.tar.gz mirror://debian/pool/main/p/paw/paw_2.14.04.dfsg.2-8.debian.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fortran-2 db8710b355fc5598015c4bc3aad3bdb0 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=37de2a0f0bc5cae8bd4396dc543ba113
+_md5_=7c31694e301ef5ca6531696c8cdc53bf
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.20.2 b/metadata/md5-cache/sys-apps/fakeroot-1.20.2
index cb9b9b17762a..74d2facf5e43 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.20.2
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.20.2
@@ -4,9 +4,9 @@ DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP)
EAPI=4
HOMEPAGE=http://packages.qa.debian.org/f/fakeroot.html
IUSE=acl debug static-libs test
-KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.20.2.orig.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=78d070c91e548404f3d5c65ff26e5303
+_md5_=d01d5156c222942971fe92a8798019b2
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.45 b/metadata/md5-cache/sys-apps/hdparm-9.45
index 5a4bbf9f5cef..c0ea23b50d44 100644
--- a/metadata/md5-cache/sys-apps/hdparm-9.45
+++ b/metadata/md5-cache/sys-apps/hdparm-9.45
@@ -3,9 +3,9 @@ DESCRIPTION=Utility to change hard drive performance parameters
EAPI=4
HOMEPAGE=http://sourceforge.net/projects/hdparm/
IUSE=static
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=BSD GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/hdparm/hdparm-9.45.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=0b1b4c47e0e16d717688ed97414ab149
+_md5_=b595287a054dca2fef80e74f0c01dd86
diff --git a/metadata/md5-cache/sys-apps/openrc-0.16.4 b/metadata/md5-cache/sys-apps/openrc-0.16.4
index 5878a9ce2b06..f6b13eceeb5b 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.16.4
+++ b/metadata/md5-cache/sys-apps/openrc-0.16.4
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
EAPI=5
HOMEPAGE=http://www.gentoo.org/proj/en/base/openrc/
IUSE=audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs tools unicode kernel_linux kernel_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=BSD-2
PDEPEND=netifrc? ( net-misc/netifrc )
RDEPEND=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 virtual/pam ) tools? ( dev-lang/perl ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( sec-policy/selinux-base-policy sec-policy/selinux-openrc )
SLOT=0
SRC_URI=http://dev.gentoo.org/~williamh/dist/openrc-0.16.4.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=a1b34ed4ebd8e468e9e942b15f088d42
+_md5_=2e2e3f923227b2ad02eca3c04758f232
diff --git a/metadata/md5-cache/sys-apps/usbutils-008-r1 b/metadata/md5-cache/sys-apps/usbutils-008-r1
index 91c0e0ca4f7a..589ad6087657 100644
--- a/metadata/md5-cache/sys-apps/usbutils-008-r1
+++ b/metadata/md5-cache/sys-apps/usbutils-008-r1
@@ -4,11 +4,11 @@ DESCRIPTION=USB enumeration utilities
EAPI=5
HOMEPAGE=http://linux-usb.sourceforge.net/
IUSE=python python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=virtual/libusb:1= virtual/libudev:= sys-apps/hwids python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-008.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=f942f91240241fbdfc3c5ed176726321
+_md5_=14f42f249e45c43c2ffa431291c6aaf4
diff --git a/metadata/md5-cache/sys-cluster/ploop-1.13.2 b/metadata/md5-cache/sys-cluster/ploop-1.13.2
index 46edc0c31efe..8b525b932267 100644
--- a/metadata/md5-cache/sys-cluster/ploop-1.13.2
+++ b/metadata/md5-cache/sys-cluster/ploop-1.13.2
@@ -4,10 +4,10 @@ DESCRIPTION=openvz tool and a library to control ploop block devices
EAPI=5
HOMEPAGE=http://wiki.openvz.org/Download/ploop
IUSE=debug static-libs
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/libxml2 !=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 )
SLOT=0
SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2014.2.15.tgz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 8cbc678e083c23e4ad546ca6509cf304 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 udev da001465a2e939c93f7ae16947ce3438 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1950cc3c1b62ad91b28797813b258e6f
+_md5_=cb98e65653a3cbe4d26f15bfa2732fb5
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.1 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.2
similarity index 89%
rename from metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.1
rename to metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.2
index e3dee90e4a42..485614a7ae20 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.1
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.2
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
LICENSE=GPL-2 freedist
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=2.6.32.108.1
-SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab108.1/patches/patch-042stab108.1-combined.gz
+SLOT=2.6.32.108.2
+SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab108.2/patches/patch-042stab108.2-combined.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de kernel-2 4da0de8e87de8d48f4576790a3034be2 multilib 62927b3db3a589b0806255f3a002d5d3 python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d8b7fb163f5a1cdd38cdd41725845359
+_md5_=c44c1bf7f3a44677fe5c696680db4326
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.93.4 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.93.4
deleted file mode 100644
index 414e274879fc..000000000000
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.93.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Kernel sources with OpenVZ patchset
-EAPI=5
-HOMEPAGE=http://www.openvz.org
-IUSE=symlink build deblob
-KEYWORDS=amd64 ~ppc64 ~sparc x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=2.6.32.93.4
-SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.32-gnu/deblob-2.6.32 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.32-gnu/deblob-check -> deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab093.4/patches/patch-042stab093.4-combined.gz
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de kernel-2 4da0de8e87de8d48f4576790a3034be2 multilib 62927b3db3a589b0806255f3a002d5d3 python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=32bcaec27dd45b1620b062aca058b13c
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.18-r1 b/metadata/md5-cache/sys-libs/openipmi-2.0.18-r1
index 887d6700cac0..aa77f1a0728a 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.18-r1
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.18-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Library interface to IPMI
EAPI=5
HOMEPAGE=http://sourceforge.net/projects/openipmi/
IUSE=crypt snmp perl tcl python python_targets_python2_7
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ia64 ~ppc x86
LICENSE=LGPL-2.1 GPL-2
RDEPEND=dev-libs/glib:2 sys-libs/gdbm crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= )
REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.18.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=ff73f22bf391b8422d048588a54d5472
+_md5_=4ae98d2b6e9e885b1d7130473975c020
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.23 b/metadata/md5-cache/sys-power/acpid-2.0.23
index bd33710a875e..398dc42b992c 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.23
+++ b/metadata/md5-cache/sys-power/acpid-2.0.23
@@ -4,10 +4,10 @@ DESCRIPTION=Daemon for Advanced Configuration and Power Interface
EAPI=5
HOMEPAGE=http://sourceforge.net/projects/acpid2
IUSE=selinux
-KEYWORDS=amd64 ~ia64 -ppc ~x86
+KEYWORDS=amd64 ~ia64 -ppc x86
LICENSE=GPL-2
RDEPEND=selinux? ( sec-policy/selinux-apm )
SLOT=0
SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.23.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de linux-info 8cbc678e083c23e4ad546ca6509cf304 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8713245c6e51b57846e3f1b2ddfddfe8
+_md5_=850860c7563de96675a39857e316aabb
diff --git a/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r4 b/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r5
similarity index 67%
rename from metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r4
rename to metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r5
index ac80568ca918..498b68a790cd 100644
--- a/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r4
+++ b/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r5
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Module-Loaded
EAPI=5
KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-RDEPEND=|| ( =dev-lang/perl-5.20* =dev-lang/perl-5.18* ~perl-core/Module-Loaded-0.80.0 ) !perl-core/Module-Loaded-0.80.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/Module-Loaded-0.80.0 ) !perl-core/Module-Loaded-0.80.0-r999
SLOT=0
-_md5_=5b9c8b1ec4fd1cb28e2b03552b3ffd90
+_md5_=b1efa295b7ef60a67a9866f2b0cb97f5
diff --git a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.11-r1 b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.11-r1
deleted file mode 100644
index 3137738f6756..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.11-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-Metadata
-EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Module-Metadata-1.0.11 ) !perl-core/Module-Metadata-1.0.11-r999
-SLOT=0
-_md5_=abe27591eb066020f398db2058970222
diff --git a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.26 b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.26
new file mode 100644
index 000000000000..21cae63abfec
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.26
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Module-Metadata
+EAPI=5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=|| ( =dev-lang/perl-5.22* ~perl-core/Module-Metadata-1.0.26 ) !perl-core/Module-Metadata-1.0.26-r999
+SLOT=0
+_md5_=2ed95a951b4c6285681aaa843d9933d5
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.41-r1 b/metadata/md5-cache/virtual/perl-Net-Ping-2.41-r1
deleted file mode 100644
index 6dc711c3cd9f..000000000000
--- a/metadata/md5-cache/virtual/perl-Net-Ping-2.41-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Net-Ping
-EAPI=5
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Net-Ping-2.41 ) !perl-core/Net-Ping-2.41-r999
-SLOT=0
-_md5_=f454fa1fd064cefc395205edcdc3cf9f
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.430.0 b/metadata/md5-cache/virtual/perl-Net-Ping-2.430.0
deleted file mode 100644
index 73841b73d745..000000000000
--- a/metadata/md5-cache/virtual/perl-Net-Ping-2.430.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Net-Ping
-EAPI=5
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Net-Ping-2.430.0 ) !perl-core/Net-Ping-2.430.0-r999
-SLOT=0
-_md5_=e1ba53a5f9afbde44980d6be7ebd9883
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.430.0-r1 b/metadata/md5-cache/virtual/perl-Net-Ping-2.430.0-r1
new file mode 100644
index 000000000000..221f688038ba
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Net-Ping-2.430.0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Net-Ping
+EAPI=5
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+RDEPEND=|| ( =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/Net-Ping-2.430.0 ) !perl-core/Net-Ping-2.430.0-r999
+SLOT=0
+_md5_=e6b084958da1d3c0aa0188fdc7d58555
diff --git a/metadata/md5-cache/virtual/perl-Package-Constants-0.20.0-r5 b/metadata/md5-cache/virtual/perl-Package-Constants-0.20.0-r5
deleted file mode 100644
index dd36392242f2..000000000000
--- a/metadata/md5-cache/virtual/perl-Package-Constants-0.20.0-r5
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Package-Constants
-EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Package-Constants-0.20.0 ) !perl-core/Package-Constants-0.20.0-r999
-SLOT=0
-_md5_=ddab9e5ee35e8aee41a4c4fd409e40db
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.900 b/metadata/md5-cache/virtual/perl-Package-Constants-0.60.0
similarity index 71%
rename from metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.900
rename to metadata/md5-cache/virtual/perl-Package-Constants-0.60.0
index 4f3cbecc869e..3ecf07d1ea92 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.900
+++ b/metadata/md5-cache/virtual/perl-Package-Constants-0.60.0
@@ -1,6 +1,7 @@
DEFINED_PHASES=-
-DESCRIPTION=Virtual for Parse-CPAN-Meta
+DESCRIPTION=Virtual for Package-Constants
+EAPI=5
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=~perl-core/Parse-CPAN-Meta-1.440.900
+RDEPEND=~perl-core/Package-Constants-0.60.0
SLOT=0
-_md5_=fb4bb8d2e2cfb819a7cba579a3944f62
+_md5_=a73dbbf5b72babb78c90920a26f1ac52
diff --git a/metadata/md5-cache/virtual/perl-Params-Check-0.360.0-r1 b/metadata/md5-cache/virtual/perl-Params-Check-0.360.0-r1
deleted file mode 100644
index b9f551f41a84..000000000000
--- a/metadata/md5-cache/virtual/perl-Params-Check-0.360.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Params-Check
-EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Params-Check-0.360.0 ) !perl-core/Params-Check-0.360.0-r999
-SLOT=0
-_md5_=463c396e95d0d80635ba055dfbe65e8c
diff --git a/metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r1 b/metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r2
similarity index 64%
rename from metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r1
rename to metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r2
index 1ed79d3b243b..d5aa39e81c1e 100644
--- a/metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r1
+++ b/metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Params-Check
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Params-Check-0.380.0 ) !perl-core/Params-Check-0.380.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/Params-Check-0.380.0 ) !perl-core/Params-Check-0.380.0-r999
SLOT=0
-_md5_=65333b1468ca74420c3cfc1fe8c24447
+_md5_=7ca66d113b23439732024c0e08f545c5
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400
deleted file mode 100644
index b839dd0712fb..000000000000
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Parse-CPAN-Meta
-EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Parse-CPAN-Meta-1.441.400 ) !perl-core/Parse-CPAN-Meta-1.441.400-r999
-SLOT=0
-_md5_=1a4046100687ad578b184307bba9ecd4
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.400-r1 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400-r1
similarity index 63%
rename from metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.400-r1
rename to metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400-r1
index 310b287f832f..d5b6e58a8d4b 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.400-r1
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400-r1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for Parse-CPAN-Meta
EAPI=5
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Parse-CPAN-Meta-1.440.400 ) !perl-core/Parse-CPAN-Meta-1.440.400-r999
+RDEPEND=|| ( =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/Parse-CPAN-Meta-1.441.400 ) !perl-core/Parse-CPAN-Meta-1.441.400-r999
SLOT=0
-_md5_=2dea51695da0b762b8bbd7f4f73d8820
+_md5_=c3430bfff79b07f302862a3241d3874a
diff --git a/metadata/md5-cache/virtual/perl-Perl-OSType-1.3.0-r1 b/metadata/md5-cache/virtual/perl-Perl-OSType-1.3.0-r1
deleted file mode 100644
index 8045f499fd85..000000000000
--- a/metadata/md5-cache/virtual/perl-Perl-OSType-1.3.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Perl-OSType
-EAPI=5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Perl-OSType-1.3.0 ) !perl-core/Perl-OSType-1.3.0-r999
-SLOT=0
-_md5_=5ca621a5a313c29b570d4a6611d71844
diff --git a/metadata/md5-cache/virtual/perl-Perl-OSType-1.8.0 b/metadata/md5-cache/virtual/perl-Perl-OSType-1.8.0
new file mode 100644
index 000000000000..4f149b4a6c8c
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Perl-OSType-1.8.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Perl-OSType
+EAPI=5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=|| ( =dev-lang/perl-5.22* ~perl-core/Perl-OSType-1.8.0 ) !perl-core/Perl-OSType-1.8.0-r999
+SLOT=0
+_md5_=276ca0b1cf7ad2fcb89ed8b3065ff2e2
diff --git a/metadata/md5-cache/www-client/chromium-44.0.2403.4 b/metadata/md5-cache/www-client/chromium-44.0.2403.30
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-44.0.2403.4
rename to metadata/md5-cache/www-client/chromium-44.0.2403.30
index 99fd14db75d3..f6101df8e8be 100644
--- a/metadata/md5-cache/www-client/chromium-44.0.2403.4
+++ b/metadata/md5-cache/www-client/chromium-44.0.2403.30
@@ -9,6 +9,6 @@ LICENSE=BSD
RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= >=media-libs/libvpx-1.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=5
+HOMEPAGE=http://chromium.org/
+IUSE=cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
SLOT=0
-SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera/desktop/29.0.1795.47/linux/opera-stable_29.0.1795.47_amd64.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera/desktop/30.0.1835.52/linux/opera-stable_30.0.1835.52_amd64.deb )
_eclasses_=chromium ee8d79e69886593b65f7ee5e9d2710b4 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 linux-info 8cbc678e083c23e4ad546ca6509cf304 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9143003453ec18d0f04cd16ad40cbd20
+_md5_=392adac895509bc45f4cdafbe042ef42
diff --git a/metadata/md5-cache/www-client/vivaldi-1.0.178.2_p1 b/metadata/md5-cache/www-client/vivaldi-1.0.196.2_p1
similarity index 85%
rename from metadata/md5-cache/www-client/vivaldi-1.0.178.2_p1
rename to metadata/md5-cache/www-client/vivaldi-1.0.196.2_p1
index ce213d038d26..1e9d15c8e801 100644
--- a/metadata/md5-cache/www-client/vivaldi-1.0.178.2_p1
+++ b/metadata/md5-cache/www-client/vivaldi-1.0.196.2_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
RESTRICT=bindist mirror
SLOT=0
-SRC_URI=amd64? ( http://vivaldi.com/download/download.php?f=vivaldi-snapshot_1.0.178.2-1_amd64.deb -> vivaldi-1.0.178.2_p1-amd64.deb ) x86? ( http://vivaldi.com/download/download.php?f=vivaldi-snapshot_1.0.178.2-1_i386.deb -> vivaldi-1.0.178.2_p1-i386.deb )
+SRC_URI=amd64? ( http://vivaldi.com/download/snapshot/vivaldi-snapshot_1.0.196.2-1_amd64.deb -> vivaldi-1.0.196.2_p1-amd64.deb ) x86? ( http://vivaldi.com/download/snapshot/vivaldi-snapshot_1.0.196.2-1_i386.deb -> vivaldi-1.0.196.2_p1-i386.deb )
_eclasses_=chromium ee8d79e69886593b65f7ee5e9d2710b4 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 linux-info 8cbc678e083c23e4ad546ca6509cf304 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a7ba17c2d008fe070b858f0901b2fc19
+_md5_=2fbd35aba9fa57dd71b1413139135398
diff --git a/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.9 b/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.9
index e127a01e3c3c..901e907314eb 100644
--- a/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.9
+++ b/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=A browser plugin that uses GNOME MPlayer
EAPI=5
HOMEPAGE=http://code.google.com/p/gecko-mediaplayer/
IUSE=+curl
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 dev-libs/nspr >=media-libs/gmtk-1.0.9 >=media-video/gnome-mplayer-1.0.9[dbus] curl? ( net-misc/curl )
SLOT=0
SRC_URI=http://gecko-mediaplayer.googlecode.com/svn/packages/gecko-mediaplayer-1.0.9.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de mozextension ba6829881080a663d68531424a3dfbc6 multilib 62927b3db3a589b0806255f3a002d5d3 nsplugins 7ea51b2f6cbd5b36b9c0163cc3ee03a2 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=46541b860724b23df5f9c828e9303be7
+_md5_=70396726b5cb4894e610c45b866263fc
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.59 b/metadata/md5-cache/www-servers/tomcat-7.0.59
index de6ce5878e9a..4ad34837f8d1 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.59
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.59
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.59 extra-webapps? ( dev-java/jakarta-jstl:0 ) websockets? ( >=virtual/jdk-1.7 ) !websockets? ( >=virtual/jdk-1.6 ) >=dev-java/ant-core-1.8.1:0 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.59 extra-webapps? ( dev-java/jakarta-jstl:0 ) websockets? ( >=virtual/jdk-1.6 ) !websockets? ( >=virtual/jdk-1.6 ) >=dev-java/ant-core-1.8.1:0 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
EAPI=5
HOMEPAGE=http://tomcat.apache.org/
IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 x86 ~ppc ~ppc64 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.59 extra-webapps? ( dev-java/jakarta-jstl:0 ) websockets? ( >=virtual/jre-1.7 ) !websockets? ( >=virtual/jre-1.6 ) !=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.59 extra-webapps? ( dev-java/jakarta-jstl:0 ) websockets? ( >=virtual/jre-1.6 ) !websockets? ( >=virtual/jre-1.6 ) !=dev-java/java-config-2.2.0 source? ( app-arch/zip )
RESTRICT=test
SLOT=7
SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.59/src/apache-tomcat-7.0.59-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 d562d1b6cbce43112feccc8b7632f1bf java-utils-2 4a7c80c1feba48616b58c79d977e084c multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0cb9ba4257a94540b13052afad801ec9
+_md5_=db6942aeb25fc38dc9d42588cd184889
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.25-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.25-r1
deleted file mode 100644
index 699546c80ff5..000000000000
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.25-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[X] >=x11-libs/gdk-pixbuf-2.30.7:2[X] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.20 sys-devel/gettext >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/inputproto-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/damageproto-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( x11-themes/hicolor-icon-theme media-fonts/font-misc-misc media-fonts/font-cursor-misc ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=5
-HOMEPAGE=http://www.gtk.org/
-IUSE=aqua cups debug examples +introspection test vim-syntax xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=arm
-LICENSE=LGPL-2+
-PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[X] >=x11-libs/gdk-pixbuf-2.30.7:2[X] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[X] >=x11-libs/gdk-pixbuf-2.30.7:2[X] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.20 sys-devel/gettext >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/inputproto-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/damageproto-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( x11-themes/hicolor-icon-theme media-fonts/font-misc-misc media-fonts/font-cursor-misc ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=5
-HOMEPAGE=http://www.gtk.org/
-IUSE=aqua cups examples +introspection test vim-syntax xinerama debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[X] >=x11-libs/gdk-pixbuf-2.30.7:2[X] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[X] >=x11-libs/gdk-pixbuf-2.30.7:2[X] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.20 sys-devel/gettext >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/inputproto-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/damageproto-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( x11-themes/hicolor-icon-theme media-fonts/font-misc-misc media-fonts/font-cursor-misc ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=5
-HOMEPAGE=http://www.gtk.org/
-IUSE=aqua cups examples +introspection test vim-syntax xinerama debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[X] >=x11-libs/gdk-pixbuf-2.30.7:2[X] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !=dev-libs/atk-2.7.5[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.39.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.32.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39 ) wayland? ( >=dev-libs/wayland-1.3.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt >=dev-util/gdbus-codegen-2.38.2 >=dev-util/gtk-doc-am-1.20 sys-devel/gettext virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/damageproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-proto/xineramaproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.43.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.7[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39 ) wayland? ( >=dev-libs/wayland-1.5.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.38.2 >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.18.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/damageproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-proto/xineramaproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) examples? ( media-libs/libcanberra[gtk3] ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Gimp ToolKit +
EAPI=5
HOMEPAGE=http://www.gtk.org/
-IUSE=aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=arm
+IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2+
-PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.7.5[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.39.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.32.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39 ) wayland? ( >=dev-libs/wayland-1.3.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.43.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.7[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39 ) wayland? ( >=dev-libs/wayland-1.5.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !=x11-themes/adwaita-icon-theme-3.14 X? ( !=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://sourceforge.net/projects/calise/files/calise-beta/0.4.2/calise-0.4.2.tar.gz
_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de linux-info 8cbc678e083c23e4ad546ca6509cf304 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7ac775539f861b09d5c51569a797c8d9
+_md5_=4e58275aa2a029e224ff64c467f67753
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.28 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.28
index 8b3d4339bb5d..6fa463e53fdc 100644
--- a/metadata/md5-cache/x11-plugins/wmbiff-0.4.28
+++ b/metadata/md5-cache/x11-plugins/wmbiff-0.4.28
@@ -4,10 +4,10 @@ DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 ma
EAPI=5
HOMEPAGE=http://windowmaker.org/dockapps/?name=wmbiff
IUSE=crypt
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 )
SLOT=0
SRC_URI=http://dev.gentoo.org/~voyageur/distfiles/wmbiff-0.4.28.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=0f299d1b65b0c2d98d4600e046aa22ac
+_md5_=6711f753dfa9c1ffc32a738698495ec2
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r2 b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r2
new file mode 100644
index 000000000000..1eb7fdc77f2c
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage ) bidi? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) x11-proto/xextproto
+DESCRIPTION=Fluxbox is an X11 window manager featuring tabs and an iconbar
+EAPI=5
+HOMEPAGE=http://www.fluxbox.org
+IUSE=nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage )
+REQUIRED_USE=systray? ( toolbar )
+SLOT=0
+SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.7.tar.xz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4
+_md5_=3f11c2a9d3aacf943c9a1ae82dc4619f
diff --git a/metadata/md5-cache/x11-wm/spectrwm-2.6.2 b/metadata/md5-cache/x11-wm/spectrwm-2.6.2
index 27f349c79bf8..825df8bbaacf 100644
--- a/metadata/md5-cache/x11-wm/spectrwm-2.6.2
+++ b/metadata/md5-cache/x11-wm/spectrwm-2.6.2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXtst x
DESCRIPTION=Small dynamic tiling window manager for X11
EAPI=4
HOMEPAGE=https://opensource.conformal.com/wiki/spectrwm
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=ISC
RDEPEND=x11-misc/dmenu
SLOT=0
SRC_URI=http://opensource.conformal.com/snapshots/spectrwm/spectrwm-2.6.2.tgz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=f7270a595240a616bf035bd410615df0
+_md5_=3a039cc4ae8e203f043337bf50847d4a
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c6a2e7f049dd..6f37d3a86fab 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Jun 2015 19:36:56 +0000
+Tue, 09 Jun 2015 09:07:11 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d3cbf206d647..7c6858487f6f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jun 8 19:36:52 UTC 2015
+Tue Jun 9 09:07:07 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 85568ec6c800..919351702085 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Jun 2015 20:00:01 +0000
+Tue, 09 Jun 2015 09:30:02 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 139e9ad36dfd..4979cb47cc3a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1433792101 Mon 08 Jun 2015 07:35:01 PM UTC
+1433840701 Tue 09 Jun 2015 09:05:01 AM UTC
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild
index 8f6137e12e8c..194fecde13b5 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild,v 1.3 2015/04/17 05:22:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild,v 1.4 2015/06/09 04:25:08 jer Exp $
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ppc64 ~x86"
IUSE="dnsretry"
DEPEND="net-libs/libpcap"
diff --git a/net-libs/libbluedevil/libbluedevil-2.1.ebuild b/net-libs/libbluedevil/libbluedevil-2.1.ebuild
index a0ef2bd89443..6c13e569f4d4 100644
--- a/net-libs/libbluedevil/libbluedevil-2.1.ebuild
+++ b/net-libs/libbluedevil/libbluedevil-2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbluedevil/libbluedevil-2.1.ebuild,v 1.2 2015/06/08 14:09:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbluedevil/libbluedevil-2.1.ebuild,v 1.3 2015/06/09 07:12:27 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
IUSE="debug"
RDEPEND=">=net-wireless/bluez-5"
diff --git a/net-libs/phodav/phodav-0.4.ebuild b/net-libs/phodav/phodav-0.4.ebuild
index e95f95c1640c..18a25478a02e 100644
--- a/net-libs/phodav/phodav-0.4.ebuild
+++ b/net-libs/phodav/phodav-0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-0.4.ebuild,v 1.9 2015/05/15 12:55:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-0.4.ebuild,v 1.10 2015/06/08 22:01:37 eva Exp $
EAPI=5
@@ -13,11 +13,12 @@ DESCRIPTION="WebDav server implementation using libsoup"
HOMEPAGE="https://wiki.gnome.org/phodav"
LICENSE="LGPL-2.1+"
-SLOT="0"
+SLOT="1.0"
KEYWORDS="~alpha amd64 arm ppc ppc64 ~x86"
IUSE="avahi spice systemd"
-RDEPEND="dev-libs/glib
+RDEPEND="
+ dev-libs/glib:2
net-libs/libsoup:2.4
dev-libs/libxml2
avahi? ( net-dns/avahi )"
diff --git a/net-libs/phodav/phodav-2.0.ebuild b/net-libs/phodav/phodav-2.0-r1.ebuild
similarity index 56%
rename from net-libs/phodav/phodav-2.0.ebuild
rename to net-libs/phodav/phodav-2.0-r1.ebuild
index 3ac8b7cca90f..d06ebe7769ac 100644
--- a/net-libs/phodav/phodav-2.0.ebuild
+++ b/net-libs/phodav/phodav-2.0-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0.ebuild,v 1.1 2015/06/07 14:07:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v 1.1 2015/06/08 22:01:37 eva Exp $
-EAPI=5
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -12,26 +12,44 @@ DESCRIPTION="WebDav server implementation using libsoup"
HOMEPAGE="https://wiki.gnome.org/phodav"
LICENSE="LGPL-2.1+"
-SLOT="0"
+SLOT="2.0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="spice systemd zeroconf"
RDEPEND="
dev-libs/glib:2
- >=net-libs/libsoup-2.48.0:2.4
+ >=net-libs/libsoup-2.48:2.4
dev-libs/libxml2
zeroconf? ( net-dns/avahi )
"
DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40.0
>=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.40.0
sys-devel/gettext
virtual/pkgconfig
"
+src_prepare() {
+ # Make doc parallel installable
+ cd "${S}"/doc/reference
+ sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
+ -e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
+ -i Makefile.am Makefile.in || die
+ sed -e "s/\(=dev-libs/cyrus-sasl-2 )
+ ssl? ( dev-libs/openssl )
+ python? ( ${PYTHON_DEPS} )
+ berkdb? ( sys-libs/db )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.5.3-ar.patch
+ epatch "${FILESDIR}"/${PN}-2.5.3-tests.patch
+
+ sed -e 's: -B .OLD::' -i Makefile.global.in || die
+
+ # Do not treat LDFLAGS as if it contained libraries to link to
+ sed -e 's:LDFLAGS::g' -i m4/python.m4 || die
+
+ # We do not have the biff service, but we do have comsat
+ sed -e 's:"biff":"comsat":g' -i tests/lib/getnameinfo-t.c || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export AR
+
+ econf \
+ --prefix=/usr/$(get_libdir)/news \
+ --sysconfdir=/etc/news \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --with-control-dir=/usr/$(get_libdir)/news/bin/control \
+ --with-filter-dir=/usr/$(get_libdir)/news/bin/filter \
+ --with-db-dir=/var/spool/news/db \
+ --with-doc-dir=/usr/share/doc/${PF} \
+ --with-spool-dir=/var/spool/news \
+ --with-log-dir=/var/log/news \
+ --with-run-dir=/run/news \
+ --with-tmp-dir=/var/spool/news/tmp \
+ --disable-libtool \
+ --with-gnu-ld \
+ --enable-setgid-inews \
+ --enable-uucp-rnews \
+ $(use_with perl) \
+ $(use_with python) \
+ $(use_with kerberos kerberos /usr) \
+ $(use_with sasl) \
+ $(use_with ssl openssl) \
+ $(use_with berkdb berkeleydb /usr) \
+ $(use_enable ipv6) \
+ $(use_enable !inntaggedhash largefiles) \
+ $(use_enable inntaggedhash tagged-hash) \
+ $(use_enable innkeywords keywords)
+}
+
+src_install() {
+ emake DESTDIR="${D}/" P="" SPECIAL="" install
+
+ chown -R root:0 \
+ "${D}"/usr/$(get_libdir)/news/$(get_libdir) \
+ "${D}"/usr/$(get_libdir)/news/include \
+ "${D}"/usr/share/doc \
+ "${D}"/usr/share/man \
+ || die
+ chmod 644 "${D}"/etc/news/* || die
+ chmod 640 \
+ "${D}"/etc/news/control.ctl \
+ "${D}"/etc/news/expire.ctl \
+ "${D}"/etc/news/incoming.conf \
+ "${D}"/etc/news/innfeed.conf \
+ "${D}"/etc/news/nntpsend.ctl \
+ "${D}"/etc/news/passwd.nntp \
+ "${D}"/etc/news/readers.conf \
+ || die
+
+ # Prevent old db/* files from being overwritten
+ insinto /usr/share/inn/dbexamples
+ newins site/active.minimal active
+ newins site/newsgroups.minimal newsgroups
+
+ keepdir \
+ /var/log/news \
+ /var/spool/news/archive \
+ /var/spool/news/articles \
+ /var/spool/news/db \
+ /var/spool/news/incoming \
+ /var/spool/news/incoming/bad \
+ /var/spool/news/innfeed \
+ /var/spool/news/outgoing \
+ /var/spool/news/overview \
+ /var/spool/news/tmp
+
+ fowners news:news /var/log/news
+
+ dodoc ChangeLog MANIFEST README* doc/checklist
+ use ipv6 && dodoc doc/IPv6-info
+
+ # So other programs can build against INN
+ insinto /usr/$(get_libdir)/news/include
+ doins include/*.h
+
+ newinitd "${FILESDIR}"/innd-r1 innd
+}
+
+pkg_postinst() {
+ for db_file in active newsgroups
+ do
+ [[ -f ${ROOT}var/spool/news/db/${db_file} ]] && continue
+
+ if [[ -f ${ROOT}usr/share/inn/dbexamples/${db_file} ]]
+ then
+ cp "${ROOT}"usr/share/inn/dbexamples/${db_file} \
+ "${ROOT}"var/spool/news/db/${db_file}
+ else
+ touch "${ROOT}"var/spool/news/db/${db_file}
+ fi
+
+ chown news:news "${ROOT}"var/spool/news/db/${db_file}
+ chmod 664 "${ROOT}"var/spool/news/db/${db_file}
+ done
+
+ elog "It is recommended to run emerge --config ${CATEGORY}/${PN}"
+ elog "now to finish setting up this package."
+ elog
+ elog "Do not forget to update your cron entries, and also run"
+ elog "makedbz if you need to. If this is a first-time installation"
+ elog "a minimal active file has been installed. You will need to"
+ elog "touch history and run 'makedbz -i' to initialize the history"
+ elog "database. See INSTALL for more information."
+ elog
+ elog "You need to assign a real shell to the news user, or else"
+ elog "starting inn will fail. You can use 'usermod -s /bin/bash news'"
+ elog "for this."
+
+ if use ssl
+ then
+ install_cert /etc/news/cert/cert
+ chown news:news \
+ "${ROOT}"etc/news/cert/cert.{crt,csr,key,pem}
+
+ elog
+ elog "You may want to start nnrpd manually for native ssl support."
+ elog "If you choose to do so, automating this with a bootscript might"
+ elog "also be a good choice."
+ elog "Have a look at man nnrpd for valid parameters."
+ elog
+ elog "The certificate location in /etc/news/sasl.conf has been changed"
+ elog "to /etc/news/cert!"
+
+ fi
+}
+
+pkg_postrm() {
+ elog
+ elog "If you want your newsspool or altered configuration files"
+ elog "to be removed, please do so now manually."
+ elog
+}
+
+pkg_config() {
+ NEWSSPOOL_DIR="${ROOT}var/spool/news"
+ NEWS_SHELL="$( awk -F':' '/^news:/ {print $7;}' ${ROOT}etc/passwd )"
+ NEWS_ERRFLAG="0"
+
+ if [[ ${NEWS_SHELL} == /bin/false || ${NEWS_SHELL} == /dev/null ]]; then
+ einfo "Changing shell to /bin/bash for user news..."
+ usermod -s /bin/bash news
+ else
+ einfo "Shell for user news unchanged ('${NEWS_SHELL}')."
+ if [[ ${NEWS_SHELL} != /bin/sh && ${NEWS_SHELL} != /bin/bash ]]; then
+ ewarn "You might want to change it to '/bin/bash', though."
+ fi
+ fi
+
+ if [[ ! -e ${NEWSSPOOL_DIR}/db/history ]]; then
+ if [[ ! -f ${NEWSSPOOL_DIR}/db/history.dir \
+ && ! -f ${NEWSSPOOL_DIR}/db/history.pag \
+ && ! -f ${NEWSSPOOL_DIR}/db/history.hash \
+ && ! -f ${NEWSSPOOL_DIR}/db/history.index ]]
+ then
+ einfo "Building history database ..."
+
+ touch "${NEWSSPOOL_DIR}"/db/history
+ chown news:news "${NEWSSPOOL_DIR}"/db/history
+ chmod 644 "${NEWSSPOOL_DIR}"/db/history
+
+ einfo "Running makedbz -i ..."
+ su - news -c "/usr/$(get_libdir)/news/bin/makedbz -i"
+
+ einfo "Moving files into place ..."
+ [[ -f ${NEWSSPOOL_DIR}/db/history.n.dir ]] && \
+ mv -vf "${NEWSSPOOL_DIR}"/db/history.n.dir \
+ "${NEWSSPOOL_DIR}"/db/history.dir
+ [[ -f ${NEWSSPOOL_DIR}/db/history.n.pag ]] && \
+ mv -vf "${NEWSSPOOL_DIR}"/db/history.n.pag \
+ "${NEWSSPOOL_DIR}"/db/history.pag
+ [[ -f ${NEWSSPOOL_DIR}/db/history.n.hash ]] && \
+ mv -vf "${NEWSSPOOL_DIR}"/db/history.n.hash \
+ "${NEWSSPOOL_DIR}"/db/history.hash
+ [[ -f ${NEWSSPOOL_DIR}/db/history.n.index ]] && \
+ mv -vf "${NEWSSPOOL_DIR}"/db/history.n.index \
+ "${NEWSSPOOL_DIR}"/db/history.index
+
+ einfo "Running makehistory ..."
+ su - news -c /usr/$(get_libdir)/news/bin/makehistory
+ else
+ NEWS_ERRFLAG="1"
+ eerror "Your installation seems to be screwed up."
+ eerror "${NEWSSPOOL_DIR}/db/history does not exist, but there's"
+ eerror "one of the files history.dir, history.hash or history.index"
+ eerror "within ${NEWSSPOOL_DIR}/db."
+ eerror "Use your backup to restore the history database."
+ fi
+ else
+ einfo "${NEWSSPOOL_DIR}/db/history found."
+ einfo "Leaving history database as it is."
+ fi
+
+ INNCFG_INODES=$(
+ sed /etc/news/inn.conf \
+ -e '/innwatchspoolnodes/ ! d; s:[^ ]*[ ]*\([^ ]*\):\1:'
+ )
+ INNSPOOL_INODES=$(
+ df -Pi ${NEWSSPOOL_DIR} | \
+ sed -e 's:[^ ]*[ ]*\([^ ]*\).*:\1:; 1 d'
+ )
+ if [[ ${INNCFG_INODES} -gt ${INNSPOOL_INODES} ]]; then
+ ewarn "Setting innwatchspoolinodes to zero, because the filesystem behind"
+ ewarn "$NEWSSPOOL_DIR works without inodes."
+ ewarn
+ cp /etc/news/inn.conf /etc/news/inn.conf.OLD
+ einfo "A copy of your old inn.conf has been saved to /etc/news/inn.conf.OLD."
+ sed -i /etc/news/inn.conf \
+ -e '/innwatchspoolnodes/ s:\([^ ]*\)\([ ]*\).*:\1\20:'
+ chown news:news /etc/news/inn.conf
+ chmod 644 /etc/news/inn.conf
+ fi
+
+ INNCHECK_LINES=$(
+ su - news -c "/usr/$(get_libdir)/news/bin/inncheck | wc -l"
+ )
+ if [[ ${INNCHECK_LINES} -gt 0 ]]; then
+ NEWS_ERRFLAG="1"
+ ewarn "inncheck most certainly found an error."
+ ewarn "Please check its output:"
+ eerror "`su - news -c /usr/$(get_libdir)/news/bin/inncheck`"
+ fi
+
+ if [[ ${NEWS_ERRFLAG} -gt 0 ]]; then
+ eerror "There were one or more errors/warnings checking your"
+ eerror "configuration. Please read inn's documentation and"
+ eerror "fix them accordingly."
+ else
+ einfo "INN configuration tests passed successfully."
+ ewarn "Please ensure you have configured inn properly."
+ fi
+}
diff --git a/net-nntp/tin/tin-2.2.1.ebuild b/net-nntp/tin/tin-2.2.1.ebuild
index 15c789ed5153..18e60058d72b 100644
--- a/net-nntp/tin/tin-2.2.1.ebuild
+++ b/net-nntp/tin/tin-2.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-2.2.1.ebuild,v 1.2 2015/05/28 10:29:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-2.2.1.ebuild,v 1.3 2015/06/09 07:16:10 ago Exp $
EAPI=5
inherit eutils toolchain-funcs versionator
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/v${TIN_PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode"
RDEPEND="
diff --git a/net-wireless/bluedevil/bluedevil-2.1.1.ebuild b/net-wireless/bluedevil/bluedevil-2.1.1.ebuild
index 8039de968396..087ea8f240b1 100644
--- a/net-wireless/bluedevil/bluedevil-2.1.1.ebuild
+++ b/net-wireless/bluedevil/bluedevil-2.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/bluedevil-2.1.1.ebuild,v 1.2 2015/06/08 14:09:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/bluedevil-2.1.1.ebuild,v 1.3 2015/06/09 07:12:32 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
IUSE="debug"
RDEPEND="
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index a9bb098fcc4e..eae835137bc6 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,3 +1,4 @@
DIST wireless-regdb-2013.02.13.tar.xz 12752 SHA256 314415cf9699b385e7f8fa770097069790987f9d5c6e5b944aceba3c0a3a29be SHA512 93e4ac80f420155ca08d15fee99c209d27c0d068dd3d3bc10cb26ebbe1d834b7ce495fe041d8b2dc0c9ba477c0252f9d5c24d42ed3da252af3e19deddeb2b739 WHIRLPOOL 36278fe7f865980552f025ca90e3dd44a6efc064f099b5c3f76094038f02a7eeaa840d5001a540d78b7ada1ad10397c9ea8e82283475de4219fb62250fd77052
DIST wireless-regdb-2014.11.18.tar.xz 15036 SHA256 eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd SHA512 a55b7d8b0917aa171fedcff53a58fcdf770721597628da1fe9ad22e2119a80773e06e12e21b21fc1b95c1a5969870415f3cc3c22b3580be07a6872777659a1c5 WHIRLPOOL a5d835af9298b14e0d2da7382b138cc66612e8a6d4872becaf673afee2d99ecf59d84f84d7506d6eabcc265d1d688c7fe1066dc42ecec775614622957921256c
DIST wireless-regdb-2015.03.13.tar.xz 15116 SHA256 5e6f00b8e23391de9b068b2400ac3172324e5f590fc424018bb5a1389ffe6f84 SHA512 4215637bd8f242f172e1940cbfd05ac826f68ac76474a1587774e7e030bb5886cb47fef1f2bb6cd0a870275d44c5b5af487b44745e4ec87175ecdf75f1dfedb0 WHIRLPOOL f3d66a7f4e16cb38120963ff3f7a8e8d6d7f909f0da4ea8f3fafbe24fb54d21b9ede83f56aa6891e6977d9574b59109b83c3efa5f3115a9a3772c6ff85703f66
+DIST wireless-regdb-2015.06.05.tar.xz 15392 SHA256 69306cfd5ae97ae5f905e0e1e167b6ac8d28e49b58880621ad0024b59f4f8564 SHA512 91de8e6464f3f7cf01c79bf2169c4a25549c14f9f2f8d3806a02a97ec1b81dac0e12caff9bc8709d36f62486b5f43a947cbaf5ae7ec6db349d176caf8c2f8d11 WHIRLPOOL 5ae910b287816f82847ee079e886de0b371d6ca2d0b2e21d3e47f7a427ac87e2487fc21ad55d88baf3df1fd94cc695a3aa13187d15ea7bf87a3cedd4f059cb10
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20150605.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20150605.ebuild
new file mode 100644
index 000000000000..6e5b5118a2cb
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20150605.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20150605.ebuild,v 1.1 2015/06/08 21:57:42 zerochaos Exp $
+
+EAPI=5
+
+MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
+DESCRIPTION="Binary regulatory database for CRDA"
+HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
+}
+
+src_install() {
+ # This file is not ABI-specific, and crda itself always hardcodes
+ # this path. So install into a common location for all ABIs to use.
+ insinto /usr/lib/crda
+ doins regulatory.bin
+
+ insinto /etc/wireless-regdb/pubkeys
+ doins sforshee.key.pub.pem
+
+ doman regulatory.bin.5
+ dodoc README db.txt
+}
diff --git a/perl-core/Module-Metadata/Module-Metadata-1.0.11-r1.ebuild b/perl-core/Module-Metadata/Module-Metadata-1.0.11-r1.ebuild
index a13f6b07bf18..274158cc9fa4 100644
--- a/perl-core/Module-Metadata/Module-Metadata-1.0.11-r1.ebuild
+++ b/perl-core/Module-Metadata/Module-Metadata-1.0.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Metadata/Module-Metadata-1.0.11-r1.ebuild,v 1.1 2014/07/26 14:08:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Metadata/Module-Metadata-1.0.11-r1.ebuild,v 1.2 2015/06/08 20:15:59 dilfridge Exp $
EAPI=5
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Gather package and POD information from perl module files"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS=""
IUSE=""
RDEPEND=">=virtual/perl-version-0.870"
diff --git a/perl-core/Net-Ping/Net-Ping-2.41-r1.ebuild b/perl-core/Net-Ping/Net-Ping-2.41-r1.ebuild
index b4fae398fdab..29d84a9254f9 100644
--- a/perl-core/Net-Ping/Net-Ping-2.41-r1.ebuild
+++ b/perl-core/Net-Ping/Net-Ping-2.41-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Net-Ping/Net-Ping-2.41-r1.ebuild,v 1.1 2014/07/24 22:29:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Net-Ping/Net-Ping-2.41-r1.ebuild,v 1.2 2015/06/08 20:21:14 dilfridge Exp $
EAPI=5
@@ -13,7 +13,7 @@ inherit perl-module
DESCRIPTION="check a remote host for reachability"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS=""
IUSE=""
# online tests
diff --git a/perl-core/Package-Constants/Manifest b/perl-core/Package-Constants/Manifest
index 84a505aae0a6..13ac81b07737 100644
--- a/perl-core/Package-Constants/Manifest
+++ b/perl-core/Package-Constants/Manifest
@@ -1 +1 @@
-DIST Package-Constants-0.02.tar.gz 2761 SHA256 11d4728cec54c0ddfb59ecf49164060bcd76bcfe5e827c646672df2b21fa4605 SHA512 36fd2ee7bf91e0de7d97ec7182e7e9ab26e40726ffc7f7ed66e46060cbee6930e5e482ce8f1d55e4bf7c4a680c4a806b3955fe0323c68a6ea3ae15bd6ad06623 WHIRLPOOL f0c4c53a907d62c344af3e614de8a568c0244d5750238dcd661eb1b828e186a3c411aaf286b70a134cd4aa48eee1146d4ed8483483533bb8df18f50eacab537a
+DIST Package-Constants-0.06.tar.gz 3767 SHA256 0b58be78706ccc4e4bd9bbad41767470427fd7b2cfad749489de101f85bc5df5 SHA512 a3f855435a989252551dfbd50492dcae5bdfb01efe14c2ef40679722305bb67097eb4c969023df1da00ee22d92f88e39439ebdeaae0b1f3a3fc6c561f3fa8481 WHIRLPOOL e6ebaf3d739e7913ced0b51c3bf660c02ea962c280071f2ebb6ceec24d46fb30a3f4c646c9c3c5a037eb79b194b3ee68dab821a990b1fb4a13131d942992352f
diff --git a/perl-core/Package-Constants/Package-Constants-0.20.0-r1.ebuild b/perl-core/Package-Constants/Package-Constants-0.20.0-r1.ebuild
deleted file mode 100644
index 41efd26ec007..000000000000
--- a/perl-core/Package-Constants/Package-Constants-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Package-Constants/Package-Constants-0.20.0-r1.ebuild,v 1.1 2014/07/25 21:04:38 dilfridge Exp $
-
-EAPI=5
-
-MODULE_VERSION=0.02
-MODULE_AUTHOR=KANE
-inherit perl-module
-
-DESCRIPTION="List all constants declared in a package"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST=do
diff --git a/perl-core/Package-Constants/Package-Constants-0.60.0.ebuild b/perl-core/Package-Constants/Package-Constants-0.60.0.ebuild
new file mode 100644
index 000000000000..d7d390c059de
--- /dev/null
+++ b/perl-core/Package-Constants/Package-Constants-0.60.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Package-Constants/Package-Constants-0.60.0.ebuild,v 1.1 2015/06/08 20:33:59 dilfridge Exp $
+
+EAPI=5
+
+MODULE_VERSION=0.06
+MODULE_AUTHOR=BINGOS
+inherit perl-module
+
+DESCRIPTION="List all constants declared in a package"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SRC_TEST=do
diff --git a/perl-core/Params-Check/Manifest b/perl-core/Params-Check/Manifest
index b079708e26f2..9674b678d1aa 100644
--- a/perl-core/Params-Check/Manifest
+++ b/perl-core/Params-Check/Manifest
@@ -1,2 +1 @@
-DIST Params-Check-0.36.tar.gz 11818 SHA256 b5c3fd3753850f1dfe135b8f397fdde55a16869b3cdc982ed6b82f65656a006b SHA512 62a400f697d12688e2dcd661fdf4128a89bb01b28df80a1e0c0befc512491044598f9ba0dd814c01853e566425bb898173ecc48b3bdc365183b0568c530f6dd2 WHIRLPOOL 5a40e1c34590a82837566e0eafff73c84aa1e416a83fc7e745f87393c6cfb746111177bcf893b74d66eaac07d5cafeeb2a6e67c7acd001d95ed163ca9e0ea8c3
DIST Params-Check-0.38.tar.gz 11994 SHA256 f0c9d33876c36b1bca1475276d26d2efaf449b256d7cc8118fae012e89a26290 SHA512 f8ef3a7c3b6d422d0ba5e8e5791695994df4ad01d7c053d5149beb3b7d6d80e4c86c57bf2682106a53f6c2c1d6aad3643446af79918bdc1ecbda83770bc23901 WHIRLPOOL 141e2e12c2a1580069b10f73bc6e299a2d457b3de4e88f7442f62d73889a78bf6b5c5c9eea2a14f68dd8d129a595eb207a55b67ef3ca678cc9926cdfc05bb196
diff --git a/perl-core/Params-Check/Params-Check-0.360.0-r1.ebuild b/perl-core/Params-Check/Params-Check-0.360.0-r1.ebuild
deleted file mode 100644
index 32ce841dca9a..000000000000
--- a/perl-core/Params-Check/Params-Check-0.360.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Params-Check/Params-Check-0.360.0-r1.ebuild,v 1.1 2014/07/26 13:46:22 dilfridge Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=BINGOS
-MODULE_VERSION=0.36
-inherit perl-module
-
-DESCRIPTION="A generic input parsing/checking mechanism"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/perl-Locale-Maketext-Simple"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/perl-core/Parse-CPAN-Meta/Manifest b/perl-core/Parse-CPAN-Meta/Manifest
index fb039c1ddc59..facd42ecc548 100644
--- a/perl-core/Parse-CPAN-Meta/Manifest
+++ b/perl-core/Parse-CPAN-Meta/Manifest
@@ -1,2 +1 @@
-DIST Parse-CPAN-Meta-1.4404.tar.gz 7829 SHA256 b03ad539129a30fc76311a4d341878172a5aade8338c4d7a0184ce5961c995f8 SHA512 e05bc835e543803301c5297d723e138fcaa8d674d970db8926dfdef813557c9c005287fb96c65ba65baafee48ced355964dea6cbab4f06b6a347b3012299b2fd WHIRLPOOL af673e37aa2fb15b48d897317d5e883f4ff36c9a46528d83efcdfc67d666dbe59309f979fa0a430245377da1c9ffd32313b75363764f86b9d866cd0f68dec3d8
DIST Parse-CPAN-Meta-1.4409.tar.gz 21191 SHA256 2920b5213c6131d473c036a921fbec0a80b5c41a1799041471bc4af5d1b9ec2c SHA512 66db554d1725e98e48a4ecf89045a0b88e412844cff849526774ab667c5f81ef697d11e495597e505f3c2803d79ea0ecf3ffc07ed4f55a04ca30fc95fdb27f0e WHIRLPOOL 82365315d43fcb79fd7f09d23e7b204375fbe0fed168bf71228e6eebd22b8434bf611adec985884767b98481749e5f729bbb82e327d8085fb4ac8068e1a3b04e
diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400-r1.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400-r1.ebuild
deleted file mode 100644
index 69161632d894..000000000000
--- a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400-r1.ebuild,v 1.1 2014/07/26 14:10:16 dilfridge Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=1.4404
-inherit perl-module
-
-DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- >=virtual/perl-CPAN-Meta-YAML-0.8.0
- >=virtual/perl-JSON-PP-2.272.0
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900-r1.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900-r1.ebuild
index 51c8dca20b44..6bea3f91aa2e 100644
--- a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900-r1.ebuild
+++ b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900-r1.ebuild,v 1.1 2014/07/26 14:10:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900-r1.ebuild,v 1.2 2015/06/08 20:41:01 dilfridge Exp $
EAPI=5
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS=""
IUSE=""
RDEPEND="
diff --git a/perl-core/Perl-OSType/Perl-OSType-1.3.0.ebuild b/perl-core/Perl-OSType/Perl-OSType-1.3.0.ebuild
index 4b31d745f770..810e49e0b0e4 100644
--- a/perl-core/Perl-OSType/Perl-OSType-1.3.0.ebuild
+++ b/perl-core/Perl-OSType/Perl-OSType-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Perl-OSType/Perl-OSType-1.3.0.ebuild,v 1.2 2014/10/18 19:22:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Perl-OSType/Perl-OSType-1.3.0.ebuild,v 1.3 2015/06/08 20:46:57 dilfridge Exp $
EAPI=5
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Map Perl operating system names to generic types"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS=""
IUSE="test"
RDEPEND=""
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index ef3ccacfc331..4e46239c2f02 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.stable.mask,v 1.10 2015/06/08 18:13:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.stable.mask,v 1.11 2015/06/09 04:28:31 jer Exp $
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -18,10 +18,6 @@
#--- END OF EXAMPLES ---
-# Pacho Ramos (02 Jun 2015)
-# Missing stable
-net-misc/connman l2tp
-
# Pacho Ramos (15 May 2015)
# Missing stable
dev-libs/protobuf python
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 8a0c57eac8d4..fe38b48385a4 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc32/package.use.stable.mask,v 1.7 2015/05/15 12:19:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc32/package.use.stable.mask,v 1.8 2015/06/09 04:28:31 jer Exp $
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -20,7 +20,7 @@
# Pacho Ramos (15 May 2015)
# Missing keywords
-net-misc/connman openconnect
+net-misc/connman l2tp openconnect
# Pacho Ramos (02 Jul 2014)
# Mask due Gnome3 not going to be stabilized on this arch
@@ -34,4 +34,4 @@ media-gfx/gimp webkit
>=net-libs/webkit-gtk-2.4 geoloc
net-libs/libproxy webkit
>=x11-libs/gtk+-3.12.2 cloudprint
-x11-libs/gksu gnome
\ No newline at end of file
+x11-libs/gksu gnome
diff --git a/profiles/package.mask b/profiles/package.mask
index 23bd5ab407d3..deee78626bd9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16583 2015/06/08 07:33:00 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16587 2015/06/09 02:56:55 tetromino Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,157 @@
#--- END OF EXAMPLES ---
+# Gilles Dartiguelongue (08 June 2015)
+# Gnome 3.16 mask
+>=app-accessibility/at-spi2-atk-2.15
+>=app-accessibility/at-spi2-core-2.15
+>=app-accessibility/orca-3.15
+>=app-admin/packagekit-base-1
+>=app-admin/packagekit-gtk-1
+>=app-arch/file-roller-3.15
+>=app-crypt/gcr-3.15
+>=app-crypt/seahorse-3.15
+>=app-dicts/gnome-dictionary-3.15
+>=app-editors/gedit-3.15
+>=app-editors/gedit-plugins-3.15
+>=app-misc/bijiben-3.15
+>=app-misc/gnote-3.15
+>=app-misc/tracker-1.3
+>=app-text/evince-3.15
+>=app-text/yelp-tools-3.15
+>=dev-cpp/glibmm-2.43
+>=dev-cpp/gtkmm-3.15
+>=dev-lang/vala-0.27
+>=dev-libs/atk-2.15
+>=dev-libs/folks-0.11
+>=dev-libs/gdl-3.15
+>=dev-libs/gjs-1.43
+>=dev-libs/glib-2.43
+>=dev-libs/gobject-introspection-1.43
+>=dev-libs/gobject-introspection-common-1.43
+>=dev-libs/libgdata-0.17
+>=dev-libs/libgweather-3.15
+>=dev-libs/libpeas-1.13
+>=dev-libs/libunistring-0.9.5
+>=dev-libs/vala-common-0.27
+>=dev-python/pyatspi-2.15
+>=dev-python/pygobject-3.15
+>=dev-util/anjuta-3.15
+>=dev-util/devhelp-3.15
+>=dev-util/dogtail-0.8
+>=dev-util/gdbus-codegen-2.43
+>=dev-util/gnome-devel-docs-3.15
+>=dev-util/gtk-update-icon-cache-3.15
+>=dev-vcs/gitg-3.15
+>=games-arcade/gnome-nibbles-3.15
+>=games-arcade/gnome-robots-3.15
+>=games-board/aisleriot-3.15
+>=games-board/four-in-a-row-3.15
+>=games-board/gnome-chess-3.15
+>=games-board/gnome-mahjongg-3.15
+>=games-board/gnome-mines-3.15
+>=games-board/iagno-3.15
+>=games-board/tali-3.15
+>=games-puzzle/atomix-3.15
+>=games-puzzle/five-or-more-3.15
+>=games-puzzle/gnome-klotski-3.15
+>=games-puzzle/gnome-sudoku-3.15
+>=games-puzzle/gnome-taquin-3.15
+>=games-puzzle/gnome-tetravex-3.15
+>=games-puzzle/hitori-3.15
+>=games-puzzle/lightsoff-3.15
+>=games-puzzle/quadrapassel-3.15
+>=games-puzzle/swell-foop-3.15
+>=gnome-base/dconf-0.23
+>=gnome-base/dconf-editor-3.15
+>=gnome-base/gdm-3.15
+>=gnome-base/gnome-3.15
+>=gnome-base/gnome-control-center-3.15
+>=gnome-base/gnome-core-apps-3.15
+>=gnome-base/gnome-core-libs-3.15
+>=gnome-base/gnome-desktop-3.15
+>=gnome-base/gnome-extra-apps-3.15
+>=gnome-base/gnome-keyring-3.15
+>=gnome-base/gnome-session-3.15
+>=gnome-base/gnome-settings-daemon-3.15
+>=gnome-base/gnome-shell-3.15
+>=gnome-base/gsettings-desktop-schemas-3.15
+>=gnome-base/gvfs-1.23
+>=gnome-base/nautilus-3.15
+>=gnome-extra/at-spi-2.15
+>=gnome-extra/evolution-data-server-3.13
+>=gnome-extra/gnome-boxes-3.15
+>=gnome-extra/gnome-builder-3.15
+>=gnome-extra/gnome-calculator-3.15
+>=gnome-extra/gnome-calendar-3.15
+>=gnome-extra/gnome-characters-3.15
+>=gnome-extra/gnome-clocks-3.15
+>=gnome-extra/gnome-color-manager-3.15
+>=gnome-extra/gnome-contacts-3.15
+>=gnome-extra/gnome-documents-3.15
+>=gnome-extra/gnome-getting-started-docs-3.15
+>=gnome-extra/gnome-logs-3.15
+>=gnome-extra/gnome-packagekit-3.15
+>=gnome-extra/gnome-power-manager-3.15
+>=gnome-extra/gnome-shell-extensions-3.15
+>=gnome-extra/gnome-software-3.15
+>=gnome-extra/gnome-system-monitor-3.15
+>=gnome-extra/gnome-tweak-tool-3.15
+>=gnome-extra/gnome-user-docs-3.15
+>=gnome-extra/gnome-weather-3.15
+>=gnome-extra/gucharmap-3.15
+>=gnome-extra/nautilus-tracker-tags-1.3
+>=gnome-extra/sushi-3.15
+>=gnome-extra/yelp-3.15
+>=gnome-extra/yelp-xsl-3.15
+>=gnome-extra/zenity-3.15
+>=mail-client/evolution-3.13
+>=media-gfx/eog-3.15
+>=media-gfx/eog-plugins-3.15
+>=media-gfx/gnome-font-viewer-3.15
+>=media-gfx/gnome-photos-3.15
+>=media-gfx/gnome-screenshot-3.15
+>=media-libs/clutter-1.21
+>=media-libs/clutter-gst-2.90
+>=media-libs/cogl-1.21
+>=media-libs/grilo-0.2.12
+>=media-plugins/grilo-plugins-0.2.14
+>=media-sound/gnome-music-3.15
+>=media-sound/gnome-sound-recorder-3.15
+>=media-sound/sound-juicer-3.15
+>=media-video/cheese-3.15
+>=media-video/totem-3.15
+>=net-irc/polari-3.15
+>=net-libs/dleyna-connector-dbus-0.2
+>=net-libs/dleyna-core-0.5
+>=net-libs/dleyna-renderer-0.5
+>=net-libs/dleyna-server-0.5
+>=net-libs/glib-networking-2.43
+>=net-libs/gnome-online-accounts-3.15
+>=net-libs/libsoup-2.49
+>=net-libs/libsoup-gnome-2.49
+>=net-libs/phodav-1.90
+>=net-libs/webkit-gtk-2.7
+>=net-misc/rygel-0.25
+>=net-misc/spice-gtk-0.28
+>=net-misc/vinagre-3.15
+>=net-misc/vino-3.15
+>=net-wireless/gnome-bluetooth-3.15
+>=sci-geosciences/geocode-glib-3.15
+>=sci-geosciences/gnome-maps-3.15
+>=sys-apps/baobab-3.15
+>=sys-apps/gnome-disk-utility-3.15
+>=www-client/epiphany-3.15
+>=x11-libs/gnome-pty-helper-0.39
+>=x11-libs/gtk+-3.15
+>=x11-libs/gtksourceview-3.15
+>=x11-libs/vte-0.39
+>=x11-terms/gnome-terminal-3.15
+>=x11-themes/adwaita-icon-theme-3.15
+>=x11-themes/gnome-backgrounds-3.15
+>=x11-themes/gnome-themes-standard-3.15
+>=x11-wm/mutter-3.15
+
# Fabian Groffen (08 Jun 2015)
# Release candidates for 4.86, feel free to test
=mail-mta/exim-4.86_rc1
@@ -70,6 +221,8 @@
=virtual/perl-Math-BigInt-1.999.700
=virtual/perl-Math-BigRat-0.260.800
=virtual/perl-Module-Load-Conditional-0.640.0
+=virtual/perl-Module-Metadata-1.0.26
+=virtual/perl-Perl-OSType-1.8.0
# Michał Górny (04 Jun 2015)
# New version of PyPy. Masked for testing and binary package build.
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
index 862833ffc209..b7e288f004b7 100644
--- a/profiles/updates/2Q-2015
+++ b/profiles/updates/2Q-2015
@@ -229,3 +229,6 @@ move kde-base/thumbnailers kde-apps/thumbnailers
move kde-base/umbrello kde-apps/umbrello
move kde-base/zeroconf-ioslave kde-apps/zeroconf-ioslave
move dev-db/pygresql dev-python/pygresql
+slotmove =net-libs/phodav-0.4* 0 1.0
+slotmove =net-libs/phodav-2.0* 0 2.0
+slotmove =dev-ruby/temple-0.7.5 0 0.7
diff --git a/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild b/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild
index ae7d129d12f1..6be5d1573d97 100644
--- a/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild
+++ b/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild,v 1.4 2015/06/08 16:08:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/pyephem/pyephem-3.7.5.3.ebuild,v 1.5 2015/06/09 07:05:06 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
DEPEND="
diff --git a/sci-biology/rebase/rebase-1505.ebuild b/sci-biology/rebase/rebase-1505.ebuild
index 6f16cd7626c0..0e032576f066 100644
--- a/sci-biology/rebase/rebase-1505.ebuild
+++ b/sci-biology/rebase/rebase-1505.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/rebase/rebase-1505.ebuild,v 1.2 2015/06/08 14:09:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/rebase/rebase-1505.ebuild,v 1.3 2015/06/09 07:20:34 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
SLOT="0"
LICENSE="public-domain"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emboss minimal"
RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
diff --git a/sci-calculators/calculator/calculator-1.7.49.ebuild b/sci-calculators/calculator/calculator-1.7.49.ebuild
index 2e938a67f969..e1df5a384e06 100644
--- a/sci-calculators/calculator/calculator-1.7.49.ebuild
+++ b/sci-calculators/calculator/calculator-1.7.49.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/calculator/calculator-1.7.49.ebuild,v 1.1 2014/11/11 21:13:18 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/calculator/calculator-1.7.49.ebuild,v 1.2 2015/06/09 07:13:48 ago Exp $
EAPI="5"
@@ -10,7 +10,7 @@ DESCRIPTION="Scientific calculator based on the FOX Toolkit"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND="~x11-libs/fox-${PV}
diff --git a/sci-mathematics/4ti2/4ti2-1.6.6.ebuild b/sci-mathematics/4ti2/4ti2-1.6.6.ebuild
new file mode 100644
index 000000000000..39b1b498c9be
--- /dev/null
+++ b/sci-mathematics/4ti2/4ti2-1.6.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.6.6.ebuild,v 1.1 2015/06/09 05:45:20 tomka Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+# The swig subdir is not used, so we can skip running autotools in it. #518000
+AT_NO_RECURSIVE=1
+
+inherit autotools-utils
+
+DESCRIPTION="Software package for algebraic, geometric and combinatorial problems"
+HOMEPAGE="http://www.4ti2.de/"
+SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE="static-libs"
+
+DEPEND="
+ sci-mathematics/glpk:0[gmp]
+ dev-libs/gmp[cxx]"
+RDEPEND="${DEPEND}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.2-gold.patch
+ )
+
+src_prepare() {
+ sed \
+ -e "s:^CXX.*$:CXX=$(tc-getCXX):g" \
+ -i m4/glpk-check.m4 || die
+ autotools-utils_src_prepare
+}
diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest
index 25053207a100..eda26f1f47d0 100644
--- a/sci-mathematics/4ti2/Manifest
+++ b/sci-mathematics/4ti2/Manifest
@@ -1,2 +1,3 @@
DIST 4ti2-1.6.2.tar.gz 5531651 SHA256 e1b39c5c051904e41deefce5419b16d723b1f403c616ddd6e3610e260d4b5711 SHA512 ff68f767b8677ce0ce94cca39fa3ef87835d77a951f0ec6ae28ab171bf09ae25c551d88c2cdf5bf3115b33bd32366b063533a1c22576130a00f542f9370bcd7b WHIRLPOOL f125cee526f8d2693b01978fd39cc36c900e7611ac0b8026f33c68ec8ccb0bb29cdffdf5c11adc6a5f7041389d34e6cacff173437c4be725c9b390a25e24e397
DIST 4ti2-1.6.5.tar.gz 5640117 SHA256 079abe725fb1cc811184eca1d079a51f701a20c02c894422be59cd923c2cd21b SHA512 90dc105d99659e3c2213b484b6d21e877d7484ca0ad0373ece066df26de7c0e0cce614faaae9f7b678d03fa54f987fe95ab6d3f958477b1294a2dc00733a3a08 WHIRLPOOL b72d84e4e9557f85cadd3d93305b19162e85321bbc8dc974febe5f01e4a218c61d5e831de0ae8fc294e0f21c2469c663e53dde41f2e943db9df6011b758c1ccf
+DIST 4ti2-1.6.6.tar.gz 5640126 SHA256 2ae9f7dd6a387fd6f0454b4bc2d02cf389f504230cc9f782c35bb5ea4a8df10a SHA512 89f36aaf3d8f41bb31b37b44a013ea966d9664880473ad0d6d1825ffb00afec1eff3139c09ac6b684f0679e2ae0d201a84396bb721aa1f63dc1deca592392c41 WHIRLPOOL c5255ffe43eb65ec7d19f8cf24de3ab69e5f2466a91009a336a367cfab768d882781a91ab82d3077600edc08c6fb3f6f3686536e8e5bcbc6a1ca16f1feaa0ef0
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
index 7fcb0e465b88..d1d26ceae686 100644
--- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
+++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v 1.8 2015/05/28 10:29:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v 1.9 2015/06/09 07:20:54 ago Exp $
EAPI=5
@@ -20,7 +20,7 @@ SRC_URI="
SLOT="0"
LICENSE="GPL-2 LGPL-2 BSD"
IUSE="+herwig"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
x11-libs/motif:0
diff --git a/sci-physics/cernlib/cernlib-2006-r5.ebuild b/sci-physics/cernlib/cernlib-2006-r5.ebuild
index 9c8d3e811ed4..fe70701b7cb5 100644
--- a/sci-physics/cernlib/cernlib-2006-r5.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r5.ebuild,v 1.5 2015/06/01 05:12:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r5.ebuild,v 1.6 2015/06/09 07:21:13 ago Exp $
EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="
SLOT="0"
LICENSE="GPL-2 LGPL-2 BSD"
-KEYWORDS="amd64 hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/sci-physics/paw/paw-2.14.04-r4.ebuild b/sci-physics/paw/paw-2.14.04-r4.ebuild
index a499db7b9268..2126c4cda39b 100644
--- a/sci-physics/paw/paw-2.14.04-r4.ebuild
+++ b/sci-physics/paw/paw-2.14.04-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/paw-2.14.04-r4.ebuild,v 1.5 2015/06/01 05:12:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/paw/paw-2.14.04-r4.ebuild,v 1.6 2015/06/09 07:21:33 ago Exp $
EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="
SLOT="0"
LICENSE="GPL-2 LGPL-2 BSD"
-KEYWORDS="amd64 hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/sys-apps/fakeroot/fakeroot-1.20.2.ebuild b/sys-apps/fakeroot/fakeroot-1.20.2.ebuild
index d6fe1968cfe7..1f81348f2b8e 100644
--- a/sys-apps/fakeroot/fakeroot-1.20.2.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.20.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-1.20.2.ebuild,v 1.3 2015/06/08 16:07:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-1.20.2.ebuild,v 1.4 2015/06/09 07:06:24 ago Exp $
EAPI=4
inherit eutils flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="acl debug static-libs test"
DEPEND="acl? ( sys-apps/acl )
diff --git a/sys-apps/hdparm/hdparm-9.45.ebuild b/sys-apps/hdparm/hdparm-9.45.ebuild
index b30e0582ae58..d91cbf3bb1fc 100644
--- a/sys-apps/hdparm/hdparm-9.45.ebuild
+++ b/sys-apps/hdparm/hdparm-9.45.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.45.ebuild,v 1.5 2015/06/08 05:09:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.45.ebuild,v 1.6 2015/06/09 07:06:05 ago Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
LICENSE="BSD GPL-2" # GPL-2 only
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="static"
src_prepare() {
diff --git a/sys-apps/openrc/openrc-0.16.4.ebuild b/sys-apps/openrc/openrc-0.16.4.ebuild
index f91224c40b9e..bf498315fcb7 100644
--- a/sys-apps/openrc/openrc-0.16.4.ebuild
+++ b/sys-apps/openrc/openrc-0.16.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.16.4.ebuild,v 1.1 2015/06/03 21:38:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.16.4.ebuild,v 1.2 2015/06/09 08:57:51 zlogene Exp $
EAPI=5
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
fi
LICENSE="BSD-2"
diff --git a/sys-apps/usbutils/usbutils-008-r1.ebuild b/sys-apps/usbutils/usbutils-008-r1.ebuild
index 7a4b14d3708e..d09c65f1863e 100644
--- a/sys-apps/usbutils/usbutils-008-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-008-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-008-r1.ebuild,v 1.6 2015/06/08 05:11:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-008-r1.ebuild,v 1.7 2015/06/09 07:07:22 ago Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-cluster/ploop/ploop-1.13.2.ebuild b/sys-cluster/ploop/ploop-1.13.2.ebuild
index e8bf6e29d101..cd513d620b8c 100644
--- a/sys-cluster/ploop/ploop-1.13.2.ebuild
+++ b/sys-cluster/ploop/ploop-1.13.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ploop-1.13.2.ebuild,v 1.2 2015/06/08 12:49:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ploop-1.13.2.ebuild,v 1.3 2015/06/09 07:05:24 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug static-libs"
DEPEND="
diff --git a/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
index 7314d29f4bba..386bbb90c1a7 100644
--- a/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild,v 1.3 2015/06/08 16:09:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild,v 1.4 2015/06/09 07:07:42 ago Exp $
EAPI=5
inherit eutils linux-info udev toolchain-funcs autotools
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
RDEPEND="!perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.26.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.26.ebuild
new file mode 100644
index 000000000000..41f3e9126b87
--- /dev/null
+++ b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.26.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.26.ebuild,v 1.1 2015/06/08 20:16:07 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.22* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.41-r1.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.41-r1.ebuild
deleted file mode 100644
index 93ae0a79f435..000000000000
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.41-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Net-Ping/perl-Net-Ping-2.41-r1.ebuild,v 1.9 2014/09/23 09:58:06 ago Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- || ( =dev-lang/perl-5.18* ~perl-core/Net-Ping-${PV} )
- !perl-core/Net-Ping-${PV}-r999
-"
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.430.0.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.430.0-r1.ebuild
similarity index 75%
rename from virtual/perl-Net-Ping/perl-Net-Ping-2.430.0.ebuild
rename to virtual/perl-Net-Ping/perl-Net-Ping-2.430.0-r1.ebuild
index 9d52c003bc55..95d07e0b238d 100644
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.430.0.ebuild
+++ b/virtual/perl-Net-Ping/perl-Net-Ping-2.430.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Net-Ping/perl-Net-Ping-2.430.0.ebuild,v 1.9 2015/02/18 08:38:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Net-Ping/perl-Net-Ping-2.430.0-r1.ebuild,v 1.1 2015/06/08 20:21:24 dilfridge Exp $
EAPI=5
@@ -15,7 +15,7 @@ IUSE=""
DEPEND=""
RDEPEND="
- || ( =dev-lang/perl-5.20* ~perl-core/Net-Ping-${PV} )
+ || ( =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/Net-Ping-${PV} )
!perl-core/Net-Ping-${PV}-r999
"
diff --git a/virtual/perl-Package-Constants/perl-Package-Constants-0.20.0-r5.ebuild b/virtual/perl-Package-Constants/perl-Package-Constants-0.20.0-r5.ebuild
deleted file mode 100644
index 1b1e463c4690..000000000000
--- a/virtual/perl-Package-Constants/perl-Package-Constants-0.20.0-r5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Package-Constants/perl-Package-Constants-0.20.0-r5.ebuild,v 1.1 2014/11/08 16:25:38 dilfridge Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
- !perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild b/virtual/perl-Package-Constants/perl-Package-Constants-0.60.0.ebuild
similarity index 65%
rename from virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild
rename to virtual/perl-Package-Constants/perl-Package-Constants-0.60.0.ebuild
index 90e9cb1ec7d5..1c992287776a 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild
+++ b/virtual/perl-Package-Constants/perl-Package-Constants-0.60.0.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild,v 1.4 2015/04/04 23:48:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Package-Constants/perl-Package-Constants-0.60.0.ebuild,v 1.1 2015/06/08 20:34:56 dilfridge Exp $
+
+EAPI=5
DESCRIPTION="Virtual for ${PN#perl-}"
HOMEPAGE=""
@@ -11,4 +13,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
+RDEPEND="
+ ~perl-core/${PN#perl-}-${PV}
+"
+
+# removed from core; stabilize this together with dev-lang/perl-5.22
diff --git a/virtual/perl-Params-Check/perl-Params-Check-0.360.0-r1.ebuild b/virtual/perl-Params-Check/perl-Params-Check-0.360.0-r1.ebuild
deleted file mode 100644
index 11b18b2515d3..000000000000
--- a/virtual/perl-Params-Check/perl-Params-Check-0.360.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Params-Check/perl-Params-Check-0.360.0-r1.ebuild,v 1.1 2014/07/11 22:51:32 dilfridge Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
- !perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild b/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r2.ebuild
similarity index 80%
rename from virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild
rename to virtual/perl-Params-Check/perl-Params-Check-0.380.0-r2.ebuild
index cfdbb1cb89c2..375c45302fc7 100644
--- a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild
+++ b/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild,v 1.11 2015/04/05 02:10:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r2.ebuild,v 1.1 2015/06/08 20:37:40 dilfridge Exp $
EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
IUSE=""
RDEPEND="
- || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ || ( =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
!perl-core/${PN#perl-}-${PV}-r999
"
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400-r1.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400-r1.ebuild
similarity index 80%
rename from virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400-r1.ebuild
rename to virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400-r1.ebuild
index 960b807d6ec6..b20b4b41dda8 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400-r1.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400-r1.ebuild,v 1.3 2015/04/04 23:48:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400-r1.ebuild,v 1.1 2015/06/08 20:41:02 dilfridge Exp $
EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
IUSE=""
RDEPEND="
- || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
+ || ( =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
!perl-core/${PN#perl-}-${PV}-r999
"
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild
deleted file mode 100644
index a3010d1a3055..000000000000
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild,v 1.13 2015/04/04 23:48:12 vapier Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
- !perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.3.0-r1.ebuild b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.3.0-r1.ebuild
deleted file mode 100644
index 356a323cb39f..000000000000
--- a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Perl-OSType/perl-Perl-OSType-1.3.0-r1.ebuild,v 1.11 2014/10/18 19:34:32 vapier Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- || ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
- !perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.8.0.ebuild b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.8.0.ebuild
new file mode 100644
index 000000000000..567def82efc2
--- /dev/null
+++ b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.8.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Perl-OSType/perl-Perl-OSType-1.8.0.ebuild,v 1.1 2015/06/08 20:46:54 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+ || ( =dev-lang/perl-5.22* ~perl-core/${PN#perl-}-${PV} )
+ !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1ca965e22a7f..54d7608891b7 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,6 @@
DIST chromium-43.0.2357.65.tar.xz 309208380 SHA256 3f8f87d982b5ee14862e49dcfa44e02009e401cb29f9758e253f9fd952c57eed SHA512 d08043c33ab46054c46f6c38873c75f2c8b2a82837d24f7c23a94aa993c663497ae2602ac1951b2bc519ac3db44f92ebf2bf14ce6e4e7a08daeea45acccff5fa WHIRLPOOL e9b02a9cad0e711fbd1c3a767d865f7eadf82d87c60cb65ba279542ddd77d6317ab136261a60c986cadcd4e9fcce3227a35d4f9972384df7c40a62407457ef61
DIST chromium-43.0.2357.73.tar.xz 309192528 SHA256 489c66bc6e5d0f07df5b446af0903bb690e3333a95cbbb9566c75e2990f10dee SHA512 3fad45ae54033c8376ee8953c1a6c7127d9d58ca8d9ba59a74d10ea5d725515bd0bac1d642448e9949b2416b597127fab04e2b7a150814e77f00be359a390208 WHIRLPOOL 68b833e3f9318ad43763f2fc25cdd611a17cb4930ee6f2080aa941a837d891e814ccba3c20f5f18806f66707eab4339a2f11b4cd52d8872896eb610b3fa00fe2
DIST chromium-44.0.2403.18.tar.xz 307086188 SHA256 a5abaf7c2527ca4f629c35230543e6d2e2c40026825b1380ec35447211644a4d SHA512 505f40dc341779d7be00fcf6ae5901a0b83a65d37d60c4deddcc1af30b349a0d6d931abab7c9c504c4de6e4d9b9bb46bc45c2d28638c729e7731a23e91f7e27a WHIRLPOOL 613dacd01449cbb15b80a9068878fe0006d88ceaee2ae99b0a6245a9b2aa5a51b4e09424fe54ece6e34244e6f0605a28ee051c02bfc5003982ef745981edc779
-DIST chromium-44.0.2403.4.tar.xz 311973572 SHA256 450a2599f1392d8bf5b0263d655bfbe5092a0dcfa1c784760728fd32a656a5ff SHA512 aa4f33beacfd796cecffc32dc60b28242b2969a8d4ccb46870d96d271f03f26561388de18398ec58fad6e0fc451cd4cea1bd6d42085aa605f9ca6bc2cc9b66f7 WHIRLPOOL 46b746ecdf56c02c92c312809e8a3ae80fc7f2ad8d0fef012ad77b5c948b051cf5f608ec701619928c075f013a94021659d529d5fe322dfc82f8240f6218d4bf
+DIST chromium-44.0.2403.30.tar.xz 307231808 SHA256 7e524d95841aaf9596e04720876015f34b9f80cb6394fedc3e29108987856026 SHA512 85bdb45c555e5d54ce2a77b875d3bb0631e513836464105f3c24df04b79655bff12136e7976369ed6abcdffe9b0ad4fd28c3bad166f399e47669cdbaf3c79c45 WHIRLPOOL f19c220707572cd729ccb294bb85ef5ec579fb2c0c3c918d6cb1d8b29f0a477961f49e404920f7d459491cac314a2c75c6312625cbf695cee8d7f676f48300e5
DIST chromium-45.0.2414.0.tar.xz 309668080 SHA256 2cc0ea9d876a818807e9a112f4dccbc56513b59cb1cdb543387e73d661852212 SHA512 68524700cffbead95282957bc27598b250d8b2a3a4c34c919216ce7c9bbd35fb2551789a712365ae0de6d95e68ae45956dadf64a1e761f2165bc8f486e9a7eab WHIRLPOOL 754d0721e9705e1d963a9343f01c9d69be12cee7da0a71b239875ddd84c0196676a0c7b3441d18ed6df7952d0b7f9efad934fd9eb97b11ff74a438074fb3abaa
+DIST chromium-45.0.2421.0.tar.xz 310110988 SHA256 53c34e85619d2c1c600af339c0c8c0dc8cb2ded49a0d7677eedb7258810788e1 SHA512 e2d0c2eb6655f6ab8a7b85013a0b1238a1f58ea55318c1d9daf75c2ba62bd31d8749249a31a9a9da05bdeafc21a9bdcc6f7f4cf8091d8ffc5c6a809a7ed67fd4 WHIRLPOOL c0c834a88f6be38caee7e649ff14a02d6b19f2336b7403e121603dce77679c2116fc17a53ed60088b98dd4aaa197829c68a50554cb77061742fff3d594600488
diff --git a/www-client/chromium/chromium-44.0.2403.4.ebuild b/www-client/chromium/chromium-44.0.2403.30.ebuild
similarity index 99%
rename from www-client/chromium/chromium-44.0.2403.4.ebuild
rename to www-client/chromium/chromium-44.0.2403.30.ebuild
index 1391ea70d0df..20bc6dc29915 100644
--- a/www-client/chromium/chromium-44.0.2403.4.ebuild
+++ b/www-client/chromium/chromium-44.0.2403.30.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2403.4.ebuild,v 1.3 2015/06/04 19:06:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2403.30.ebuild,v 1.1 2015/06/09 02:17:33 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
diff --git a/www-client/chromium/chromium-45.0.2421.0.ebuild b/www-client/chromium/chromium-45.0.2421.0.ebuild
new file mode 100644
index 000000000000..9dea02d1e46b
--- /dev/null
+++ b/www-client/chromium/chromium-45.0.2421.0.ebuild
@@ -0,0 +1,625 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-45.0.2421.0.ebuild,v 1.1 2015/06/08 20:32:00 phajdan.jr Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+ sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+ portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc"
+RESTRICT="proprietary-codecs? ( bindist )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+ app-arch/bzip2:=
+ app-arch/snappy:=
+ cups? ( >=net-print/cups-1.3.11:= )
+ >=dev-libs/elfutils-0.149
+ dev-libs/expat:=
+ dev-libs/glib:=
+ >=dev-libs/jsoncpp-0.5.0-r1:=
+ >=dev-libs/libevent-1.4.13:=
+ dev-libs/libxml2:=[icu]
+ dev-libs/libxslt:=
+ dev-libs/nspr:=
+ >=dev-libs/nss-3.14.3:=
+ dev-libs/re2:=
+ gnome? ( >=gnome-base/gconf-2.24.0:= )
+ gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+ >=media-libs/alsa-lib-1.0.19:=
+ media-libs/flac:=
+ media-libs/fontconfig:=
+ media-libs/freetype:=
+ media-libs/harfbuzz:=[icu(+)]
+ media-libs/libexif:=
+ >=media-libs/libjpeg-turbo-1.2.0-r1:=
+ media-libs/libpng:0=
+ >=media-libs/libwebp-0.4.0:=
+ media-libs/speex:=
+ pulseaudio? ( media-sound/pulseaudio:= )
+ sys-apps/dbus:=
+ sys-apps/pciutils:=
+ >=sys-libs/libcap-2.22:=
+ sys-libs/zlib:=[minizip]
+ virtual/udev
+ x11-libs/cairo:=
+ x11-libs/gdk-pixbuf:=
+ x11-libs/gtk+:2=
+ x11-libs/libdrm
+ x11-libs/libX11:=
+ x11-libs/libXcomposite:=
+ x11-libs/libXcursor:=
+ x11-libs/libXdamage:=
+ x11-libs/libXext:=
+ x11-libs/libXfixes:=
+ >=x11-libs/libXi-1.6.0:=
+ x11-libs/libXinerama:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/libXScrnSaver:=
+ x11-libs/libXtst:=
+ x11-libs/pango:=
+ kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+ !arm? (
+ dev-lang/yasm
+ )
+ dev-lang/perl
+ dev-perl/JSON
+ >=dev-util/gperf-3.0.3
+ dev-util/ninja
+ sys-apps/hwids[usb(+)]
+ >=sys-devel/bison-2.4.3
+ sys-devel/flex
+ virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+ !=www-client/chromium-9999
+ ! "${T}/flapper_version.h" || die
+ myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+ # Use system-provided libraries.
+ # TODO: use_system_hunspell (upstream changes needed).
+ # TODO: use_system_icu (needs http://bugs.icu-project.org/trac/ticket/11358)
+ # TODO: use_system_libsrtp (bug #459932).
+ # TODO: use_system_libusb (http://crbug.com/266149).
+ # TODO: use_system_libvpx (http://crbug.com/494939).
+ # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+ # TODO: use_system_protobuf (bug #525560).
+ # TODO: use_system_ssl (http://crbug.com/58087).
+ # TODO: use_system_sqlite (http://crbug.com/22208).
+ myconf+="
+ -Duse_system_bzip2=1
+ -Duse_system_flac=1
+ -Duse_system_harfbuzz=1
+ -Duse_system_jsoncpp=1
+ -Duse_system_libevent=1
+ -Duse_system_libjpeg=1
+ -Duse_system_libpng=1
+ -Duse_system_libwebp=1
+ -Duse_system_libxml=1
+ -Duse_system_libxslt=1
+ -Duse_system_minizip=1
+ -Duse_system_nspr=1
+ -Duse_system_re2=1
+ -Duse_system_snappy=1
+ -Duse_system_speex=1
+ -Duse_system_xdg_utils=1
+ -Duse_system_zlib=1"
+
+ # Needed for system icu - we don't need additional data files.
+ myconf+=" -Dicu_use_data_file_flag=0"
+
+ # TODO: patch gyp so that this arm conditional is not needed.
+ if ! use arm; then
+ myconf+="
+ -Duse_system_yasm=1"
+ fi
+
+ # Optional dependencies.
+ # TODO: linux_link_kerberos, bug #381289.
+ myconf+="
+ $(gyp_use cups)
+ $(gyp_use gnome use_gconf)
+ $(gyp_use gnome-keyring use_gnome_keyring)
+ $(gyp_use gnome-keyring linux_link_gnome_keyring)
+ $(gyp_use hidpi enable_hidpi)
+ $(gyp_use kerberos)
+ $(gyp_use pulseaudio)
+ $(gyp_use tcmalloc use_allocator tcmalloc none)"
+
+ # Use explicit library dependencies instead of dlopen.
+ # This makes breakages easier to detect by revdep-rebuild.
+ myconf+="
+ -Dlinux_link_gsettings=1
+ -Dlinux_link_libpci=1
+ -Dlinux_link_libspeechd=1
+ -Dlibspeechd_h_prefix=speech-dispatcher/"
+
+ # TODO: use the file at run time instead of effectively compiling it in.
+ myconf+="
+ -Dusb_ids_path=/usr/share/misc/usb.ids"
+
+ # Save space by removing DLOG and DCHECK messages (about 6% reduction).
+ myconf+="
+ -Dlogging_like_official_build=1"
+
+ if [[ $(tc-getCC) == *clang* ]]; then
+ myconf+=" -Dclang=1"
+ else
+ myconf+=" -Dclang=0"
+ fi
+
+ # Never use bundled gold binary. Disable gold linker flags for now.
+ # Do not use bundled clang.
+ myconf+="
+ -Dclang_use_chrome_plugins=0
+ -Dhost_clang=0
+ -Dlinux_use_bundled_binutils=0
+ -Dlinux_use_bundled_gold=0
+ -Dlinux_use_gold_flags=0"
+
+ ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+ myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+ # Note: these are for Gentoo use ONLY. For your own distribution,
+ # please get your own set of keys. Feel free to contact chromium@gentoo.org
+ # for more info.
+ myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+ -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+ -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ local myarch="$(tc-arch)"
+ if [[ $myarch = amd64 ]] ; then
+ target_arch=x64
+ ffmpeg_target_arch=x64
+ elif [[ $myarch = x86 ]] ; then
+ target_arch=ia32
+ ffmpeg_target_arch=ia32
+ elif [[ $myarch = arm ]] ; then
+ target_arch=arm
+ ffmpeg_target_arch=$(usex neon arm-neon arm)
+ # TODO: re-enable NaCl (NativeClient).
+ local CTARGET=${CTARGET:-${CHOST}}
+ if [[ $(tc-is-softfloat) == "no" ]]; then
+
+ myconf+=" -Darm_float_abi=hard"
+ fi
+ filter-flags "-mfpu=*"
+ use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+ if [[ ${CTARGET} == armv[78]* ]]; then
+ myconf+=" -Darmv7=1"
+ else
+ myconf+=" -Darmv7=0"
+ fi
+ myconf+=" -Dsysroot=
+ $(gyp_use neon arm_neon)
+ -Ddisable_nacl=1"
+ else
+ die "Failed to determine target arch, got '$myarch'."
+ fi
+
+ myconf+=" -Dtarget_arch=${target_arch}"
+
+ # Make sure that -Werror doesn't get added to CFLAGS by the build system.
+ # Depending on GCC version the warnings are different and we don't want
+ # the build to fail because of that.
+ myconf+=" -Dwerror="
+
+ # Disable fatal linker warnings, bug 506268.
+ myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+ # Avoid CFLAGS problems, bug #352457, bug #390147.
+ if ! use custom-cflags; then
+ replace-flags "-Os" "-O2"
+ strip-flags
+
+ # Prevent linker from running out of address space, bug #471810 .
+ if use x86; then
+ filter-flags "-g*"
+ fi
+
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984.
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
+ fi
+ fi
+
+ # Make sure the build system will use the right tools, bug #340795.
+ tc-export AR CC CXX RANLIB
+
+ # Tools for building programs to be executed on the build system, bug #410883.
+ export AR_host=$(tc-getBUILD_AR)
+ export CC_host=$(tc-getBUILD_CC)
+ export CXX_host=$(tc-getBUILD_CXX)
+ export LD_host=${CXX_host}
+
+ # Bug 491582.
+ export TMPDIR="${WORKDIR}/temp"
+ mkdir -m 755 "${TMPDIR}" || die
+
+ local build_ffmpeg_args=""
+ if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+ build_ffmpeg_args+=" --disable-asm"
+ fi
+
+ # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+ einfo "Configuring bundled ffmpeg..."
+ pushd third_party/ffmpeg > /dev/null || die
+ chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+ --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+ chromium/scripts/copy_config.sh || die
+ chromium/scripts/generate_gyp.py || die
+ popd > /dev/null || die
+
+ third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+ einfo "Configuring Chromium..."
+ build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+ egyp_chromium ${myconf} || die
+}
+
+eninja() {
+ if [[ -z ${NINJAOPTS+set} ]]; then
+ local jobs=$(makeopts_jobs)
+ local loadavg=$(makeopts_loadavg)
+
+ if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+ NINJAOPTS+=" -j ${jobs}"
+ fi
+ if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+ NINJAOPTS+=" -l ${loadavg}"
+ fi
+ fi
+ set -- ninja -v ${NINJAOPTS} "$@"
+ echo "$@"
+ "$@"
+}
+
+src_compile() {
+ local ninja_targets="chrome chrome_sandbox chromedriver"
+
+ # Build mksnapshot and pax-mark it.
+ eninja -C out/Release mksnapshot || die
+ pax-mark m out/Release/mksnapshot
+
+ # Even though ninja autodetects number of CPUs, we respect
+ # user's options, for debugging with -j 1 or any other reason.
+ eninja -C out/Release ${ninja_targets} || die
+
+ pax-mark m out/Release/chrome
+}
+
+src_install() {
+ exeinto "${CHROMIUM_HOME}"
+ doexe out/Release/chrome || die
+
+ newexe out/Release/chrome_sandbox chrome-sandbox || die
+ fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+ doexe out/Release/chromedriver || die
+
+ # if ! use arm; then
+ # doexe out/Release/nacl_helper{,_bootstrap} || die
+ # insinto "${CHROMIUM_HOME}"
+ # doins out/Release/nacl_irt_*.nexe || die
+ # doins out/Release/libppGoogleNaClPluginChrome.so || die
+ # fi
+
+ local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+ if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+ sedargs+=(
+ -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+ -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+ -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+ )
+ fi
+ sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+ doexe chromium-launcher.sh
+
+ # It is important that we name the target "chromium-browser",
+ # xdg-utils expect it; bug #355517.
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+ # keep the old symlink around for consistency
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+ dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+ # Allow users to override command-line options, bug #357629.
+ dodir /etc/chromium || die
+ insinto /etc/chromium
+ newins "${FILESDIR}/chromium.default" "default" || die
+
+ pushd out/Release/locales > /dev/null || die
+ chromium_remove_language_paks
+ popd
+
+ insinto "${CHROMIUM_HOME}"
+ doins out/Release/*.bin || die
+ doins out/Release/*.pak || die
+
+ doins -r out/Release/locales || die
+ doins -r out/Release/resources || die
+
+ newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+ newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+ doexe out/Release/libffmpegsumo.so || die
+
+ # Install icons and desktop entry.
+ local branding size
+ for size in 16 22 24 32 48 64 128 256 ; do
+ case ${size} in
+ 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+ *) branding="chrome/app/theme/chromium" ;;
+ esac
+ newicon -s ${size} "${branding}/product_logo_${size}.png" \
+ chromium-browser${CHROMIUM_SUFFIX}.png
+ done
+
+ local mime_types="text/html;text/xml;application/xhtml+xml;"
+ mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+ mime_types+="x-scheme-handler/ftp;" # bug #412185
+ mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+ make_desktop_entry \
+ chromium-browser${CHROMIUM_SUFFIX} \
+ "Chromium${CHROMIUM_SUFFIX}" \
+ chromium-browser${CHROMIUM_SUFFIX} \
+ "Network;WebBrowser" \
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+ sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+ # Install GNOME default application entry (bug #303100).
+ if use gnome; then
+ dodir /usr/share/gnome-control-center/default-apps || die
+ insinto /usr/share/gnome-control-center/default-apps
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+ if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+ sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+ "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+ fi
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ readme.gentoo_print_elog
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 5c015e73537c..6c92d693d991 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,5 +2,5 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60
DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
-DIST opera-stable_29.0.1795.47_amd64.deb 42413902 SHA256 7183b0741844b24c454d0d40f34ef185474296af579470b03a7bc82a64c320b9 SHA512 066d003aac15c195d9745669d3db39e733fa0debb1bdcd7c569d35dc12879dbcbaae4172343304e00f55473402b08f41dd3abd99fb0da94dea7d9a55ab58d33c WHIRLPOOL c8ec0645d017d42c0fc87b58a2d696e481e8ec5878886fa52dae667621413ad8fd7c4f1a16c1ca5f3aa8529138af8c9ff8ec6806f7ddaf152bc73819ab170fa8
DIST opera-stable_29.0.1795.60_amd64.deb 42054384 SHA256 2ffc96b13f3647483de438c902390c51459a64aaaa09d667f86bfaf2e2f6256f SHA512 70bc50c437a10ad2922911fed91eb34ed4e43e7eafb20c0b43bf0674a4fc357c1d09c347a67a664a05242fe472c20913858e0f1185e870058bc7e67125b17fbb WHIRLPOOL a3a4554a687ba5edcf70c54c265e82c155ea3a481c29050aa186895ec9531b285e1b64060209cee51e007438cc9dd3a7fb742853d59de16efccf9a343376522d
+DIST opera-stable_30.0.1835.52_amd64.deb 42565882 SHA256 6cc5560b3a8ec06eb6383b43d7d47d94f321e3076518c9a7d1c667f6dda9b99d SHA512 e031961f8e4bf69e8d302cd15095bd5997d66c811dfc849f547ce224193f1eea9400f6b90342d4aee38d9d635bab940e6e97144311c4ee136e413b280686d4eb WHIRLPOOL f8a36ace57f7bdb85731e91927b08dc6e8e136afee8ac3bfa0426585fae225375522645b4d60484ea7fc40ff11d789fb43736d2637f7e9e9eaaa33b0529637e0
diff --git a/www-client/opera/opera-29.0.1795.47.ebuild b/www-client/opera/opera-30.0.1835.52.ebuild
similarity index 94%
rename from www-client/opera/opera-29.0.1795.47.ebuild
rename to www-client/opera/opera-30.0.1835.52.ebuild
index 1b8f57ebb923..0da0f1aaab77 100644
--- a/www-client/opera/opera-29.0.1795.47.ebuild
+++ b/www-client/opera/opera-30.0.1835.52.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-29.0.1795.47.ebuild,v 1.1 2015/04/29 04:39:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-30.0.1835.52.ebuild,v 1.1 2015/06/09 05:23:07 jer Exp $
EAPI=5
CHROMIUM_LANGS="
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 7624d87980c8..500c16f16137 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,4 +1,4 @@
-DIST vivaldi-1.0.178.2_p1-amd64.deb 39300262 SHA256 92e594c34a5cb30749cfcefcc461a41e3f312b04cc90cbc65902efae5a57d15c SHA512 455e61b1054b248f73c82bfcdac1e0c111012232b00cb1d1e7b63e3ffc2d5278f4cc77789279f8221b2294ee823f4a0ed8630349b8eff24c2264d2b514f2b363 WHIRLPOOL 3c85574c81d4e47571db383f96eeb282fcdb22e536710522d753a899b87389a6ea35842d46b76e05d7714ce5e73d631fff13b4c2dbc3490a548015fe525e8488
-DIST vivaldi-1.0.178.2_p1-i386.deb 38961154 SHA256 babf55b32c7a532599effef96739049008544de1cd1973430b7934d22a3ce4cb SHA512 63b15074927e769c02f35d5a877ffab3d2ddb86ecd1f0f14796b6c4822eaaf6e04118f05e6327478eab3fd6c7654a924f5673dd3d47fe3177e16730855615ed2 WHIRLPOOL f76a42973426ecc0b660742efe5ff5c8f6a8f93b9390258cef4b58e42cd58e04edc0372ae25b6c2d5ed0a16030ef5750e4f276e22b751a057ec3120e403f0411
DIST vivaldi-1.0.190.2_p1-amd64.deb 39591126 SHA256 6a5d375d960ba84e4a928b68388c1f74c1677b67ad1e3e2b44fbbd144736886e SHA512 78b70a96d154f83386dc1d20e76a8a6b5844c185de9b822eeb1e84595a06606fec9c31c808eac21d4130d355083f3d8ff2a4a757b3dd559546a3fdd4a54a4156 WHIRLPOOL d3cdcab6bc408b309d86e1afe4090204bea7c79fb4f5ccebae03b65f4f1c26b528118facc3930b89c7176980626d9c0f05247f502068bb4cd27ba6730362b300
DIST vivaldi-1.0.190.2_p1-i386.deb 39275878 SHA256 32b403d6731888592dec1ff88ef65ff7144e58084e95f0fd26316bb856547646 SHA512 554cef25db3fb439a135432dbb5691f844bfc3215ee51f8940ad69e52bdd027d3438ec7c843b4a54121b38492b07782ad8d0fe3d9c96d1980d012d93da6e5062 WHIRLPOOL 131b8053b598dfa9ce733f52f451950c6724cea2772b2cd1ed11acea63c0acf6a598baf390151b638a4659cdd89484ebdff0cc42254b6107438ed08e2c9a6229
+DIST vivaldi-1.0.196.2_p1-amd64.deb 39665034 SHA256 30d1ced236d709f036ebb3d858c17eff3fcf2a0da3d5623e8576f0a707d17823 SHA512 29bb7a1cddb067f54a3ab0170d599e117826d24e2bb31f9007c9ed3b832f999d15221c1cead4b0b8807365112255f6cfece9f2722dce7162cfa8f6a963529776 WHIRLPOOL 4dfbc6c4a074378574f7c10b804df8acba18ac344c9a4a125f190d03240a9051c83b38fdb7ee1eea4b8c2e87b81bfdfcec7488e98bfaa88afedd063452b9b5ca
+DIST vivaldi-1.0.196.2_p1-i386.deb 39255412 SHA256 0f13290d1a40c1639645ee6bd6d96927e5121b90e91facbf52597cfa72d15080 SHA512 fd51ab52b31869b69391afe4d4219c45528820a31297e2f884df36924152e7f4641616f17fa52a9d4000b3d65fe2ad83583cdc06cf3d752e077cae862c4b466f WHIRLPOOL 7961e50b4131b76c7210d82d30904457eaec8230a3da28dd8965d0e6ded65f79247934ff213372b979717b3f0c439d64569bdf4a2b9208938590295cb3634c71
diff --git a/www-client/vivaldi/vivaldi-1.0.178.2_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.196.2_p1.ebuild
similarity index 94%
rename from www-client/vivaldi/vivaldi-1.0.178.2_p1.ebuild
rename to www-client/vivaldi/vivaldi-1.0.196.2_p1.ebuild
index d0d3bc047395..f6e98c00ed2c 100644
--- a/www-client/vivaldi/vivaldi-1.0.178.2_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.0.196.2_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/vivaldi/vivaldi-1.0.178.2_p1.ebuild,v 1.1 2015/05/19 04:37:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/vivaldi/vivaldi-1.0.196.2_p1.ebuild,v 1.1 2015/06/09 04:33:08 jer Exp $
EAPI=5
CHROMIUM_LANGS="
@@ -12,7 +12,7 @@ inherit chromium multilib unpacker toolchain-funcs
DESCRIPTION="A new browser for our friends"
HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="${HOMEPAGE}download/download.php?f=${PN}-snapshot_${PV/_p/-}_"
+VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
SRC_URI="
amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.9.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.9.ebuild
index f2a620d3a679..54a6dabf00fd 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.9.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.9.ebuild,v 1.2 2015/06/08 14:09:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.9.ebuild,v 1.3 2015/06/09 07:15:09 ago Exp $
EAPI=5
inherit multilib nsplugins
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.googlecode.com/svn/packages/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="+curl"
RDEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/www-servers/tomcat/tomcat-7.0.59.ebuild b/www-servers/tomcat/tomcat-7.0.59.ebuild
index 3f9c01b94996..ad1f61c0ea10 100644
--- a/www-servers/tomcat/tomcat-7.0.59.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.59.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v 1.3 2015/06/05 09:00:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v 1.4 2015/06/08 22:28:50 monsieurp Exp $
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="7"
-KEYWORDS="amd64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc ~ppc64 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="extra-webapps websockets"
RESTRICT="test" # can we run them on a production system?
@@ -29,11 +29,11 @@ COMMON_DEP="
~dev-java/tomcat-servlet-api-${PV}
extra-webapps? ( dev-java/jakarta-jstl:0 )"
RDEPEND="${COMMON_DEP}
- websockets? ( >=virtual/jre-1.7 )
+ websockets? ( >=virtual/jre-1.6 )
!websockets? ( >=virtual/jre-1.6 )
!=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
- x11-misc/shared-mime-info
-
- cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- !aqua? (
- >=x11-libs/cairo-1.12.14-r4:=[X]
- >=x11-libs/gdk-pixbuf-2.30.7:2[X]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/gobject-introspection-common
- >=dev-util/gtk-doc-am-1.20
- sys-devel/gettext
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- !aqua? (
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
- )
- test? (
- x11-themes/hicolor-icon-theme
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
- ! "${T}/gtkrc"
- insinto /usr/share/gtk-2.0
- doins "${T}"/gtkrc
-
- dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
- # dev-util/gtk-builder-convert split off into a separate package, #402905
- rm "${ED}"usr/bin/gtk-builder-convert || die
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make immodules.cache belongs to gtk+ alone
- local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
- multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_query_immodules_gtk2 \
- || die "Update immodules cache failed (for ${ABI})"
- }
- multilib_parallel_foreach_abi multilib_pkg_postinst
-
- set_gtk2_confdir
-
- if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
- elog "aware location. Removing deprecated file."
- rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
- fi
-
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
- elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
- elog "Removing deprecated file."
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
- fi
-
- # pixbufs are now handled by x11-libs/gdk-pixbuf
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
- elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
- elog "Removing deprecated file."
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
- fi
-
- # two checks needed since we dropped multilib conditional
- if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
- elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
- elog "Removing deprecated file."
- rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
- fi
-
- if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
- elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
- elog "to do that you can use qfile from portage-utils:"
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
- fi
-
- if ! has_version "app-text/evince"; then
- elog "Please install app-text/evince for print preview functionality."
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
- elog "add it to your gtkrc."
- fi
-
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild
deleted file mode 100644
index 8f365c851b1f..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild,v 1.2 2015/04/25 18:40:54 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="aqua cups examples +introspection test vim-syntax xinerama"
-REQUIRED_USE="
- xinerama? ( !aqua )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-COMMON_DEPEND="
- >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
- x11-misc/shared-mime-info
-
- cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- !aqua? (
- >=x11-libs/cairo-1.12.14-r4:=[X]
- >=x11-libs/gdk-pixbuf-2.30.7:2[X]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/gobject-introspection-common
- >=dev-util/gtk-doc-am-1.20
- sys-devel/gettext
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- !aqua? (
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
- )
- test? (
- x11-themes/hicolor-icon-theme
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
- ! "${T}/gtkrc"
- echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
- echo 'gtk-icon-theme-name = "gnome"' >> "${T}/gtkrc"
- echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
-
- insinto /usr/share/gtk-2.0
- doins "${T}"/gtkrc
-
- dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
- # dev-util/gtk-builder-convert split off into a separate package, #402905
- rm "${ED}"usr/bin/gtk-builder-convert || die
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make immodules.cache belongs to gtk+ alone
- local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
- multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_query_immodules_gtk2 \
- || die "Update immodules cache failed (for ${ABI})"
- }
- multilib_parallel_foreach_abi multilib_pkg_postinst
-
- set_gtk2_confdir
-
- if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
- elog "aware location. Removing deprecated file."
- rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
- fi
-
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
- elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
- elog "Removing deprecated file."
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
- fi
-
- # pixbufs are now handled by x11-libs/gdk-pixbuf
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
- elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
- elog "Removing deprecated file."
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
- fi
-
- # two checks needed since we dropped multilib conditional
- if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
- elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
- elog "Removing deprecated file."
- rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
- fi
-
- if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
- elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
- elog "to do that you can use qfile from portage-utils:"
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
- fi
-
- if ! has_version "app-text/evince"; then
- elog "Please install app-text/evince for print preview functionality."
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
- elog "add it to your gtkrc."
- fi
-
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.24.28.ebuild b/x11-libs/gtk+/gtk+-2.24.28.ebuild
deleted file mode 100644
index 32bfbbe82e1c..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.28.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.28.ebuild,v 1.1 2015/05/17 10:13:32 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="aqua cups examples +introspection test vim-syntax xinerama"
-REQUIRED_USE="
- xinerama? ( !aqua )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-COMMON_DEPEND="
- >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
- x11-misc/shared-mime-info
-
- cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- !aqua? (
- >=x11-libs/cairo-1.12.14-r4:=[X]
- >=x11-libs/gdk-pixbuf-2.30.7:2[X]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/gobject-introspection-common
- >=dev-util/gtk-doc-am-1.20
- sys-devel/gettext
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- !aqua? (
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
- )
- test? (
- x11-themes/hicolor-icon-theme
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
- ! "${T}/gtkrc"
- echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
- echo 'gtk-icon-theme-name = "gnome"' >> "${T}/gtkrc"
- echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
-
- insinto /usr/share/gtk-2.0
- doins "${T}"/gtkrc
-
- dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
- # dev-util/gtk-builder-convert split off into a separate package, #402905
- rm "${ED}"usr/bin/gtk-builder-convert || die
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make immodules.cache belongs to gtk+ alone
- local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
- multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_query_immodules_gtk2 \
- || die "Update immodules cache failed (for ${ABI})"
- }
- multilib_parallel_foreach_abi multilib_pkg_postinst
-
- set_gtk2_confdir
-
- if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
- elog "aware location. Removing deprecated file."
- rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
- fi
-
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
- elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
- elog "Removing deprecated file."
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
- fi
-
- # pixbufs are now handled by x11-libs/gdk-pixbuf
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
- elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
- elog "Removing deprecated file."
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
- fi
-
- # two checks needed since we dropped multilib conditional
- if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
- elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
- elog "Removing deprecated file."
- rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
- fi
-
- if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
- elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
- elog "to do that you can use qfile from portage-utils:"
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
- fi
-
- if ! has_version "app-text/evince"; then
- elog "Please install app-text/evince for print preview functionality."
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
- elog "add it to your gtkrc."
- fi
-
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild b/x11-libs/gtk+/gtk+-3.16.3.ebuild
similarity index 68%
rename from x11-libs/gtk+/gtk+-3.12.2-r2.ebuild
rename to x11-libs/gtk+/gtk+-3.16.3.ebuild
index fd7b4b0e5ddf..b458382f50b7 100644
--- a/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild,v 1.4 2015/05/17 10:13:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.16.3.ebuild,v 1.1 2015/06/08 22:12:44 eva Exp $
EAPI="5"
-GCONF_DEBUG="no"
+GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
@@ -13,30 +13,24 @@ HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="3"
-# NOTE: This gtk+ has multi-gdk-backend support, see:
-# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
-# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# I tried this and got it all compiling, but the end result is unusable as it
-# horribly mixes up the backends -- grobian
-IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
REQUIRED_USE="
|| ( aqua wayland X )
xinerama? ( X )
"
-KEYWORDS=" arm"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# FIXME: introspection data is built against system installation of gtk+:3
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# Use gtk+:2 for gtk-update-icon-cache
COMMON_DEPEND="
- >=dev-libs/atk-2.7.5[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.39.5:2[${MULTILIB_USEDEP}]
+ >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?,${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.32.4[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
x11-misc/shared-mime-info
cloudprint? (
@@ -46,7 +40,7 @@ COMMON_DEPEND="
cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.39 )
wayland? (
- >=dev-libs/wayland-1.3.90[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
media-libs/mesa[wayland,${MULTILIB_USEDEP}]
>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
)
@@ -68,9 +62,10 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xsl-stylesheets
app-text/docbook-xml-dtd:4.1.2
dev-libs/libxslt
+ dev-libs/gobject-introspection-common
>=dev-util/gdbus-codegen-2.38.2
>=dev-util/gtk-doc-am-1.20
- sys-devel/gettext
+ >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
virtual/pkgconfig[${MULTILIB_USEDEP}]
X? (
x11-proto/xextproto[${MULTILIB_USEDEP}]
@@ -82,21 +77,28 @@ DEPEND="${COMMON_DEPEND}
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
+ examples? ( media-libs/libcanberra[gtk3] )
"
# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
# >=xorg-server-1.11.4 needed for
# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
RDEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-update-icon-cache-3
!=x11-themes/adwaita-icon-theme-3.14
X? ( !=x11-themes/gnome-themes-standard-3.6[gtk]'; then
- ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
- ewarn "is not installed. Please re-run tests after installing the"
- ewarn "required version of gnome-themes-standard."
- return 0
- fi
-
# FIXME: this should be handled at eclass level
"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
@@ -201,11 +189,11 @@ multilib_src_test() {
multilib_src_install() {
gnome2_src_install
- # add -framework Carbon to the .pc files
+ # add -framework Carbon to the .pc files, bug #???
if use aqua ; then
for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
sed -e "s:Libs\: :Libs\: -framework Carbon :" \
- -i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+ -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
done
fi
}
@@ -221,7 +209,7 @@ pkg_preinst() {
gnome2_pkg_preinst
multilib_pkg_preinst() {
- # Make sure loaders.cache belongs to gdk-pixbuf alone
+ # Make immodules.cache belongs to gtk+ alone
local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
if [[ -e ${EROOT}${cache} ]]; then
@@ -235,7 +223,12 @@ pkg_preinst() {
pkg_postinst() {
gnome2_pkg_postinst
- gnome2_query_immodules_gtk3
+
+ multilib_pkg_postinst() {
+ gnome2_query_immodules_gtk3 \
+ || die "Update immodules cache failed (for ${ABI})"
+ }
+ multilib_parallel_foreach_abi multilib_pkg_postinst
if ! has_version "app-text/evince"; then
elog "Please install app-text/evince for print preview functionality."
diff --git a/x11-misc/calise/calise-0.4.2.ebuild b/x11-misc/calise/calise-0.4.2.ebuild
index 209625f09433..097547eaac52 100644
--- a/x11-misc/calise/calise-0.4.2.ebuild
+++ b/x11-misc/calise/calise-0.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/calise/calise-0.4.2.ebuild,v 1.3 2015/06/08 16:08:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/calise/calise-0.4.2.ebuild,v 1.4 2015/06/09 07:05:02 ago Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://sourceforge.net/projects/${PN}/files/${PN}-beta/${PV}/${P}.tar.g
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
IUSE=""
CDEPEND="${RDEPEND}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
index b36b3071913a..d1de7a18e518 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild,v 1.2 2015/06/08 16:09:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild,v 1.3 2015/06/09 07:08:30 ago Exp $
EAPI=5
inherit autotools eutils
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="crypt"
RDEPEND="x11-libs/libX11
diff --git a/x11-wm/fluxbox/files/fix-hidden-toolbar.patch b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
new file mode 100644
index 000000000000..e5e5a552c392
--- /dev/null
+++ b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
@@ -0,0 +1,92 @@
+--- a/src/Toolbar.cc
++++ b/src/Toolbar.cc
+@@ -80,18 +80,18 @@ const struct {
+ unsigned int shape;
+ } _values[] = {
+ { /* unused */ },
+- { Toolbar::TOPLEFT, "TopLeft", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+- { Toolbar::TOPCENTER, "TopCenter", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+- { Toolbar::TOPRIGHT, "TopRight", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+- { Toolbar::BOTTOMLEFT, "BottomLeft", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+- { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+- { Toolbar::BOTTOMRIGHT, "BottomRight", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+- { Toolbar::LEFTBOTTOM, "LeftBottom", FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+- { Toolbar::LEFTCENTER, "LeftCenter", FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+- { Toolbar::LEFTTOP, "LeftTop", FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+- { Toolbar::RIGHTBOTTOM, "RightBottom", FbTk::ROT90, FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+- { Toolbar::RIGHTCENTER, "RightCenter", FbTk::ROT90, FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+- { Toolbar::RIGHTTOP, "RightTop", FbTk::ROT90, FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
++ { Toolbar::TOPLEFT, "TopLeft", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT },
++ { Toolbar::TOPCENTER, "TopCenter", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT },
++ { Toolbar::TOPRIGHT, "TopRight", FbTk::ROT0, FbTk::Shape::BOTTOMLEFT },
++ { Toolbar::BOTTOMLEFT, "BottomLeft", FbTk::ROT0, FbTk::Shape::TOPRIGHT },
++ { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT },
++ { Toolbar::BOTTOMRIGHT, "BottomRight", FbTk::ROT0, FbTk::Shape::TOPLEFT },
++ { Toolbar::LEFTBOTTOM, "LeftBottom", FbTk::ROT270, FbTk::Shape::TOPRIGHT },
++ { Toolbar::LEFTCENTER, "LeftCenter", FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT },
++ { Toolbar::LEFTTOP, "LeftTop", FbTk::ROT270, FbTk::Shape::BOTTOMRIGHT },
++ { Toolbar::RIGHTBOTTOM, "RightBottom", FbTk::ROT90, FbTk::Shape::TOPLEFT },
++ { Toolbar::RIGHTCENTER, "RightCenter", FbTk::ROT90, FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT },
++ { Toolbar::RIGHTTOP, "RightTop", FbTk::ROT90, FbTk::Shape::BOTTOMLEFT },
+ };
+
+ }
+@@ -648,24 +648,29 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+ break;
+ case TOPCENTER:
+ frame.x += (head_w - static_cast(frame.width))/2 - bw;
++ frame.x_hidden = frame.x;
+ frame.y_hidden += pixel - bw - static_cast(frame.height);
+ break;
+ case TOPRIGHT:
+ frame.x += head_w - static_cast(frame.width) - bw*2;
++ frame.x_hidden = frame.x;
+ frame.y_hidden += pixel - bw - static_cast(frame.height);
+ break;
+ case BOTTOMRIGHT:
+ frame.x += head_w - static_cast(frame.width) - bw*2;
+ frame.y += head_h - static_cast(frame.height) - bw*2;
++ frame.x_hidden = frame.x;
+ frame.y_hidden += head_h - bw - pixel;
+ break;
+ case BOTTOMCENTER: // default is BOTTOMCENTER
+ frame.x += (head_w - static_cast(frame.width))/2 - bw;
+ frame.y += head_h - static_cast(frame.height) - bw*2;
++ frame.x_hidden = frame.x;
+ frame.y_hidden += head_h - bw - pixel;
+ break;
+ case LEFTCENTER:
+ frame.y += (head_h - static_cast(frame.height))/2 - bw;
++ frame.y_hidden = frame.y;
+ frame.x_hidden += pixel - static_cast(frame.width) - bw;
+ break;
+ case LEFTTOP:
+@@ -673,21 +678,24 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+ break;
+ case LEFTBOTTOM:
+ frame.y = head_h - static_cast(frame.height) - bw*2;
++ frame.y_hidden = frame.y;
+ frame.x_hidden += pixel - static_cast(frame.width) - bw;
+ break;
+ case RIGHTCENTER:
+ frame.x += head_w - static_cast(frame.width) - bw*2;
+- frame.y += (head_h - static_cast(frame.height))/2 * bw;
+- frame.x_hidden += static_cast(frame.width) + bw - pixel;
++ frame.y += (head_h - static_cast(frame.height))/2 - bw;
++ frame.x_hidden += head_w - bw - pixel;
++ frame.y_hidden = frame.y;
+ break;
+ case RIGHTTOP:
+ frame.x += head_w - static_cast(frame.width) - bw*2;
+- frame.x_hidden += static_cast(frame.width) + bw - pixel;
++ frame.x_hidden += head_w - bw - pixel;
+ break;
+ case RIGHTBOTTOM:
+ frame.x += head_w - static_cast(frame.width) - bw*2;
+ frame.y += head_h - static_cast(frame.height) - bw*2;
+- frame.x_hidden += static_cast(frame.width) + bw - pixel;
++ frame.x_hidden += head_w - bw - pixel;
++ frame.y_hidden = frame.y;
+ break;
+ }
+
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
new file mode 100644
index 000000000000..606d892703b0
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild,v 1.1 2015/06/09 03:42:47 zlg Exp $
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs prefix
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ !!<=x11-misc/fbdesk-1.2.1
+ !!<=x11-misc/fluxconf-0.9.9
+ !!=dev-libs/fribidi-0.19.2 )
+ imlib? ( >=media-libs/imlib2-1.2.0[X] )
+ truetype? ( media-libs/freetype )
+ vim-syntax? ( app-vim/fluxbox-syntax )
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
+ || ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+ ${RDEPEND}
+ bidi? ( virtual/pkgconfig )
+ nls? ( sys-devel/gettext )
+ x11-proto/xextproto
+"
+
+src_prepare() {
+ # We need to be able to include directories rather than just plain
+ # files in menu [include] items. This patch will allow us to do clever
+ # things with style ebuilds.
+ epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
+
+ eprefixify util/fluxbox-generate_menu.in
+
+ epatch "${FILESDIR}"/osx-has-otool.patch
+
+ # Fix bug #551522; 1.3.8 will render this obsolete
+ epatch "${FILESDIR}"/fix-hidden-toolbar.patch
+
+ # Add in the Gentoo -r number to fluxbox -version output.
+ if [[ "${PR}" == "r0" ]] ; then
+ suffix="gentoo"
+ else
+ suffix="gentoo-${PR}"
+ fi
+ sed -i \
+ -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+ version.h.in || die "version sed failed"
+}
+
+src_configure() {
+ use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
+
+ econf $(use_enable bidi fribidi ) \
+ $(use_enable imlib imlib2) \
+ $(use_enable nls) \
+ $(use_enable slit ) \
+ $(use_enable systray ) \
+ $(use_enable toolbar ) \
+ $(use_enable truetype xft) \
+ $(use_enable xinerama) \
+ --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+ --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+ default
+
+ ebegin "Creating a menu file (may take a while)"
+ mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+ # Call fluxbox-generate_menu through bash since it lacks +x
+ # chmod 744 may be an equal fix
+ MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+ CHECKINIT="no. go away." HOME="${T}/home" \
+ bash "${S}/util/fluxbox-generate_menu" -is -ds \
+ || die "menu generation failed"
+ eend $?
+}
+
+src_install() {
+ emake DESTDIR="${D}" STRIP="" install
+ dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+ # Install the generated menu
+ insinto /usr/share/fluxbox
+ doins data/menu
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}"/${PN}.desktop
+
+ exeinto /etc/X11/Sessions
+ newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+ # Styles menu framework
+ insinto /usr/share/fluxbox/menu.d/styles
+ doins "${FILESDIR}"/styles-menu-fluxbox
+ doins "${FILESDIR}"/styles-menu-commonbox
+ doins "${FILESDIR}"/styles-menu-user
+}
diff --git a/x11-wm/spectrwm/spectrwm-2.6.2.ebuild b/x11-wm/spectrwm/spectrwm-2.6.2.ebuild
index 6ee5b79a6aed..a05004fc0b99 100644
--- a/x11-wm/spectrwm/spectrwm-2.6.2.ebuild
+++ b/x11-wm/spectrwm/spectrwm-2.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/spectrwm-2.6.2.ebuild,v 1.2 2015/06/08 14:09:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/spectrwm/spectrwm-2.6.2.ebuild,v 1.3 2015/06/09 07:24:01 ago Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="x11-misc/dmenu"