Sync with portage [Sat Jul 18 22:34:49 MSK 2015].

2015-07-18 22:34:49 +03:00 · 2015-07-18 22:34:49 +03:00 · b8c6608594
commit b8c6608594
parent c26525dadb
9139 changed files with 19149 additions and 17655 deletions
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.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-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild,v 1.10 2015/06/07 10:07:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild,v 1.11 2015/07/17 15:31:50 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"

 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

 COMMON_DEPEND="
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.14.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-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild,v 1.8 2015/06/07 10:07:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild,v 1.9 2015/07/17 15:31:55 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="+X +introspection"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"

 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
--- a/app-admin/glance/glance-2015.1.0.ebuild
+++ b/app-admin/glance/glance-2015.1.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/app-admin/glance/glance-2015.1.0.ebuild,v 1.5 2015/05/22 06:08:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.0.ebuild,v 1.6 2015/07/18 11:52:59 zlogene Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc mysql postgres +sqlite +swift test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"

--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@ -0,0 +1 @@
+DIST puppetdb-3.0.1.tar.gz 24693952 SHA256 b5e86d36845c62d75c078816cffd5d38d97f014da8886506819b21a6c2719366 SHA512 00960de13270a8063de1845f7f0c42a3fa4bdec10ab2b8f66ce0dba27acda1b78974c57c0f3c6e2c09187f63e85d799b94f95de563bcbc179e9d692470a1e902 WHIRLPOOL ec136a91b2712b9249defaff6ea24b6f1ed917e519850515d8c0b995c5dcbc049550b2ac9efbe585c197a5747edcdb10e490a016de2067b593c833e02d8a7426
--- a/app-admin/puppetdb/files/puppetdb.initd
+++ b/app-admin/puppetdb/files/puppetdb.initd
@ -0,0 +1,65 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/files/puppetdb.initd,v 1.2 2015/07/18 09:11:01 prometheanfire Exp $
+
+extra_commands="checkconfig"
+
+LOGDIR="/var/log/puppetlabs/puppetdb"
+RUNDIR="/run/puppetlabs/puppetdb"
+
+checkconfig() {
+    if [ ! -x $JAVA_BIN ]; then
+        eerror "Missing JAVA_BIN."
+        eend 1
+    fi
+    if [ ! -d $INSTALL_DIR ]; then
+        eerror "Missing INSTALL_DIR."
+        eend 1
+    fi
+    if [ ! -a $BOOTSTRAP_CONFIG ]; then
+        eerror "Missing BOOTSTRAP_CONFIG."
+        eend 1
+    fi
+    if [ ! -e $CONFIG ]; then
+        eerror "Missing CONFIG."
+        eend 1
+    fi
+    if [ ! -n $USER ]; then
+        eerror "Missing USER."
+        eend 1
+    fi
+    if [ ! -n $GROUP ]; then
+        eerror "Missing GROUP."
+        eend 1
+    fi
+
+    checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+    checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+    JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppetdb.jar' clojure.main -m puppetlabs.puppetdb.main \
+    --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}'"
+
+    EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError \
+    -XX:HeapDumpPath=/var/log/puppetlabs/puppetdb -Djava.security.egd=/dev/urandom ${JAVA_ARGS}"
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting PuppetDB"
+    start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+        --exec ${EXEC} --pidfile "${RUNDIR}/puppetdb.pid" \
+        -- >> "${LOGDIR}/puppetdb-daemon.log"
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting puppetdb."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping PuppetDB"
+    start-stop-daemon --stop --pidfile "${RUNDIR}/puppetdb.pid"
+    eend $?
+}
--- a/app-admin/puppetdb/metadata.xml
+++ b/app-admin/puppetdb/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		PuppetDB collects data generated by Puppet. It enables advanced Puppet features like exported resources, and can be the foundation for other applications that use Puppet’s data.
+	</longdescription>
+</pkgmetadata>
--- a/app-admin/puppetdb/puppetdb-3.0.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-3.0.1.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/puppetdb-3.0.1.ebuild,v 1.4 2015/07/18 09:11:01 prometheanfire Exp $
+
+EAPI=5
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="virtual/jdk:1.7"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/export
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/import
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
--- a/app-arch/gcab/gcab-0.6.ebuild
+++ b/app-arch/gcab/gcab-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-arch/gcab/gcab-0.6.ebuild,v 1.2 2015/07/15 05:22:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gcab/gcab-0.6.ebuild,v 1.3 2015/07/17 06:10:29 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"

--- a/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-2.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/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild,v 1.2 2015/06/07 07:43:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild,v 1.5 2015/07/18 11:40:43 zlogene Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""

 DEPEND=">=dev-libs/openssl-0.9.6:0"
--- a/app-crypt/gcr/gcr-3.14.0.ebuild
+++ b/app-crypt/gcr/gcr-3.14.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/app-crypt/gcr/gcr-3.14.0.ebuild,v 1.11 2015/06/07 10:08:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.14.0.ebuild,v 1.12 2015/07/17 15:32:05 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"

 COMMON_DEPEND="
 	>=app-crypt/gnupg-2
--- a/app-crypt/libsecret/libsecret-0.18.2.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.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-crypt/libsecret/libsecret-0.18.2.ebuild,v 1.6 2015/07/07 20:38:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.18.2.ebuild,v 1.7 2015/07/17 15:32:08 ago Exp $

 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@ -16,7 +16,7 @@ LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
 SLOT="0"
 IUSE="+crypt debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"

 RDEPEND="
 	>=dev-libs/glib-2.38:2
--- a/app-crypt/pinentry/files/pinentry-0.9.5-build.patch
+++ b/app-crypt/pinentry/files/pinentry-0.9.5-build.patch
@ -0,0 +1,52 @@
+From 29384a828ad83644df9093bb292194d1ac6e689b Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 18 Jul 2015 10:14:49 +0300
+Subject: [PATCH] build: add pkg-config initialization and modify detection
+
+add PKG_PROG_PKG_CONFIG as the qt4 detection and curses detection are
+already using pkg.m4 which require proper initialization.
+
+modify the manual detection of pkg-config based on the error value of
+the PKG_PROG_PKG_CONFIG and not the manual one as there is a conflict
+between empty and 'no'.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b71cb17..7afa318 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -85,6 +85,7 @@ AC_PROG_RANLIB
+ # for Qt and autoconf does does not allow that.
+ AC_PROG_CXX
+ AC_PROG_LN_S
+PKG_PROG_PKG_CONFIG
+ AC_CHECK_TOOL(WINDRES, windres, :)
+ AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog,
+                [build-aux/gitlog-to-changelog])
+@@ -430,8 +431,7 @@ AC_ARG_ENABLE(pinentry-gnome3,
+ 
+ dnl check for pkg-config
+ if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
+-        AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-	if test x"${PKG_CONFIG}" = xno ; then
+	if test -z "${PKG_CONFIG}"; then
+ 		pinentry_gtk_2=no
+ 		pinentry_gnome_3=no
+ 	fi
+@@ -504,8 +504,7 @@ AC_ARG_ENABLE(libsecret,
+ 
+ dnl check for pkg-config
+ if test "$libsecret" != "no"; then
+-        AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-	if test x"${PKG_CONFIG}" = xno ; then
+	if test -z "${PKG_CONFIG}" ; then
+ 		libsecret=no
+ 	fi
+ fi
+-- 
+2.3.6
+
--- a/app-crypt/pinentry/pinentry-0.9.5.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.5.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.5.ebuild,v 1.1 2015/07/01 15:50:00 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.5.ebuild,v 1.3 2015/07/18 08:18:39 alonbl Exp $

 EAPI=5

-inherit qmake-utils multilib eutils flag-o-matic toolchain-funcs
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs

 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://gnupg.org/aegypten2/index.html"
@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="clipboard gtk ncurses qt4 caps gnome-keyring static"
+IUSE="clipboard emacs gtk ncurses qt4 caps gnome-keyring static"

 RDEPEND="
 	>=dev-libs/libgpg-error-1.17
@ -27,8 +27,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	gtk? ( virtual/pkgconfig )
-	qt4? ( virtual/pkgconfig )
+	virtual/pkgconfig
 	gnome-keyring? ( app-crypt/libsecret )
 "
 REQUIRED_USE="
@ -42,6 +41,8 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )

 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
+	eautoreconf
 }

 src_configure() {
@ -53,6 +54,7 @@ src_configure() {

 	econf \
 		--enable-pinentry-tty \
+		$(use_enable emacs pinentry-emacs) \
 		$(use_enable gtk pinentry-gtk2) \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable ncurses fallback-curses) \
--- a/app-crypt/qca/qca-2.1.0.3.ebuild
+++ b/app-crypt/qca/qca-2.1.0.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/app-crypt/qca/qca-2.1.0.3.ebuild,v 1.14 2015/07/12 18:42:30 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild,v 1.16 2015/07/18 12:07:27 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"

 IUSE="botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
 REQUIRED_USE="|| ( qt4 qt5 )"
--- a/app-doc/root-docs/Manifest
+++ b/app-doc/root-docs/Manifest
@ -6,5 +6,5 @@ DIST root-banner.png 132555 SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53d
 DIST root6-banner.jpg 32319 SHA256 9d6d226bbe61db257a1796a3ad04dfe97b3bb500a29349ff76bf6a929ed1e104 SHA512 f01dd253f24d59c374042efd239ce023e5ca82d3d617ca6763daf9720b169c4fb27a0f4573ea95d807f0e12095924606372df4940f65ce7d859164314d22b9af WHIRLPOOL 69976abe240235a4f4eb25d61a0ceb183dc5ad5f9e57e9130ae10615329dd23125848f45608e1ad2d65a286d1f191f95336316f7c8f1cc052d396c31433cbe4c
 DIST root_v5.32.03.source.tar.gz 55529362 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6 SHA512 2e067eb9c6bbda5cf4df6973a3cf5307540247fb07c349f7ee74c0cf6a4abbb63f585a9ff67139cae985250fc5c5106b5ea03d7d9d2bcd20269e0ec8760ebd02 WHIRLPOOL 87dbf6f55f82001e07afc3b467e95f841f185f1f67d1dbd953f73e8aa9127ef8485db84100d6e9a08f0ae6aa5b45a565398eb6723145fff16c07e5158bb3e3ab
 DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c
-DIST root_v5.34.28.source.tar.gz 75178811 SHA256 aae8fbcd86ad78ded68e764f294ab493d6d814ebe0baadd5bdf33034cda874d1 SHA512 2985def942affedc6654b33c440b3828c104d74b92fffe9a2b47ea329ff2e572219142d751794b332b4ceb92532ca06401928f340bebd42809c0616ed14baee2 WHIRLPOOL 4062d6eae5bfe68447c60bd37cdd6e27447c1b4f45ce9a377bbffc16300c5bec58111ea1fb1483aaf87bbe03fb72834cb2c4a53f10d69b89f06160b86c45caae
+DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e
 DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955
--- a/app-doc/root-docs/root-docs-5.34.32.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.32.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-doc/root-docs/root-docs-5.34.28.ebuild,v 1.3 2015/06/14 19:25:46 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.32.ebuild,v 1.1 2015/07/18 13:43:44 bircoph Exp $

 EAPI=5

@ -78,9 +78,9 @@ src_configure() {
 			--prefix="${EPREFIX}/usr" \
 			--etcdir="${EPREFIX}/etc/root" \
 			--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
-			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-			--tutdir="${EPREFIX}/usr/share/doc/${PF}/examples/tutorials" \
-			--testdir="${EPREFIX}/usr/share/doc/${PF}/examples/tests" \
+			--docdir="${EPREFIX}${DOC_DIR}" \
+			--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials" \
+			--testdir="${EPREFIX}${DOC_DIR}/examples/tests" \
 			--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
 			--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" \
 			--nohowto
@ -108,7 +108,7 @@ src_compile() {
 		# if root.exe crashes, return code will be 0 due to gdb attach,
 		# so we need to check if last html file was generated;
 		# this check is volatile and can't catch crash on the last file.
-		[[ -f htmldoc/tableDescriptor_st.html ]] || die "html doc generation crashed"
+		[[ -f htmldoc/timespec.html ]] || die "html doc generation crashed"
 	fi
 }

--- a/app-editors/nvi/nvi-1.81.6-r5.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-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-editors/nvi/nvi-1.81.6-r5.ebuild,v 1.3 2015/03/31 17:32:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r5.ebuild,v 1.4 2015/07/17 15:32:29 neurogeek Exp $

 EAPI=4

@ -26,7 +26,7 @@ SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="perl tcl unicode"

 CDEPEND="|| ( ${DBDEPENDS} )
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.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/xemacs/xemacs-21.4.24.ebuild,v 1.2 2015/06/19 22:28:26 matsl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.24.ebuild,v 1.4 2015/07/18 11:57:46 matsl Exp $

 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@ -18,7 +18,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"

 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
@ -48,7 +48,8 @@ RDEPEND="
 	>=sys-libs/ncurses-5.2
 	>=app-eselect/eselect-emacs-1.15"

-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-5"

 PDEPEND="app-xemacs/xemacs-base
 	mule? ( app-xemacs/mule-base )"
--- a/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.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-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild,v 1.7 2015/06/28 12:58:45 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild,v 1.8 2015/07/17 12:31:11 zlogene Exp $

 EAPI=5

@ -13,7 +13,7 @@ SRC_URI="mirror://ruby/ruby-${MY_PV}.tar.bz2"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"

 S="${WORKDIR}/ruby-${MY_PV}/misc"
 DOCS="README"
--- a/app-i18n/fcitx/fcitx-4.2.8.5.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.8.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/app-i18n/fcitx/fcitx-4.2.8.5.ebuild,v 1.5 2015/05/15 11:18:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.8.5.ebuild,v 1.6 2015/07/18 07:50:56 jer Exp $

 EAPI=5
 inherit cmake-utils eutils gnome2-utils fdo-mime multilib readme.gentoo
@ -11,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/fcitx/${P}_dict.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 hppa ppc ppc64 ~x86"
 IUSE="+X +autostart +cairo +dbus debug +enchant gtk gtk3 icu introspection lua
 nls opencc +pango qt4 static-libs +table test +xml"

--- a/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild
+++ b/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.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/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild,v 1.5 2013/04/02 20:55:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild,v 1.6 2015/07/18 07:50:27 jer Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 IUSE="+nls static-libs"

 DEPEND="nls? ( sys-devel/gettext )"
--- a/app-misc/freemind/freemind-1.0.1-r2.ebuild
+++ b/app-misc/freemind/freemind-1.0.1-r2.ebuild
@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-1.0.1-r2.ebuild,v 1.1 2015/07/17 13:01:29 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Mind-mapping software written in Java"
+HOMEPAGE="http://freemind.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="groovy latex pdf svg"
+
+CDEPEND="
+	dev-java/javahelp:0
+	dev-java/jgoodies-forms:0
+	dev-java/jibx:0
+	dev-java/jortho:0
+	>=dev-java/simplyhtml-0.13.1:0
+	groovy? ( dev-java/groovy )
+	latex? ( dev-java/hoteqn:0 )
+	pdf? (
+		dev-java/batik:1.8
+		dev-java/fop:2
+	)
+	svg? (
+		dev-java/batik:1.8
+		dev-java/fop:0
+	)"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	pdf? ( dev-java/avalon-framework:4.2 )
+	svg? ( dev-java/avalon-framework:4.2 )"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	chmod +x check_for_duplicate_resources.sh || die
+
+	# someone got it all wrong (set/unset vs. bool)
+	sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
+
+	# disable dmg build on Mac OS X
+	sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
+
+	use groovy || rm plugins/build_scripting.xml || die
+	use latex || rm plugins/build_latex.xml || die
+	use pdf || use svg || rm plugins/build_svg.xml || die
+	# not compatible with releases of jmapviewer
+	rm plugins/build_map.xml || die
+
+	rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
+}
+
+src_configure() {
+	local build_files=( $(find "${S}" -name 'build*.xml') )
+	JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
+	JAVA_ANT_REWRITE_CLASSPATH="yes"
+	JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+	JAVA_ANT_ENCODING="utf-8"
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	local svg_deps svg_build_deps
+	if use pdf || use svg; then
+		svg_deps="batik-1.8,fop-2"
+		svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
+	fi
+	EANT_GENTOO_CLASSPATH="
+		jgoodies-forms,jibx,javahelp,jortho,simplyhtml
+		$(usex groovy groovy '')
+		$(usex latex hoteqn '')
+		${svg_deps}"
+	EANT_GENTOO_CLASSPATH_EXTRA="lib/bindings.jar${svg_build_deps}"
+	EANT_BUILD_TARGET="dist"
+	EANT_DOC_TARGET="doc"
+	EANT_ANT_TASKS="jibx"
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	cd "${WORKDIR}"/bin/dist || die
+	local dest="/usr/share/${PN}/"
+
+	java-pkg_dojar lib/*.jar
+
+	if use doc; then
+		java-pkg_dojavadoc doc/javadoc
+		rm -r doc/javadoc
+	fi
+
+	insinto "${dest}"
+	doins -r accessories browser doc plugins patterns.xml
+
+	# register plugins for java-dep-check
+	local plugins="help"
+	use groovy && plugins+=" script"
+	use latex && plugins+=" latex"
+	if use pdf || use svg; then
+		plugins+=" svg"
+	fi
+	local plugin
+	for plugin in ${plugins}; do
+		java-pkg_regjar "${ED}"${dest}/plugins/${plugin}/*jar
+	done
+
+	java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${EPREFIX}${dest}" \
+		--pwd "${EPREFIX}${dest}" --main freemind.main.FreeMindStarter
+
+	newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
+
+	make_desktop_entry freemind Freemind freemind Utility
+}
--- a/app-misc/wcd/wcd-5.2.7.ebuild
+++ b/app-misc/wcd/wcd-5.2.7.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/wcd/wcd-5.2.7.ebuild,v 1.3 2015/06/26 09:04:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/wcd-5.2.7.ebuild,v 1.4 2015/07/17 20:04:21 maekke Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 IUSE="nls unicode"

 CDEPEND="
--- a/app-office/lyx/lyx-2.1.3.ebuild
+++ b/app-office/lyx/lyx-2.1.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/app-office/lyx/lyx-2.1.3.ebuild,v 1.10 2015/05/11 06:22:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.1.3.ebuild,v 1.11 2015/07/18 14:26:21 pacho Exp $

 EAPI=5

@ -34,7 +34,7 @@ DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )

 COMMONDEPEND="dev-qt/qtgui:4
 	dev-qt/qtcore:4
-	>=dev-libs/boost-1.34
+	>=dev-libs/boost-1.34:=
 	${PYTHON_DEPS}"

 RDEPEND="${COMMONDEPEND}
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.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-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild,v 1.2 2015/07/15 16:56:32 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild,v 1.3 2015/07/17 10:15:33 klausman Exp $

 EAPI=5
 DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
@ -8,7 +8,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 SRC_URI="https://raw.githubusercontent.com/gentoo/portage/779a9e686d89e31af43e33b1163b01aeff65d7ea/misc/emerge-delta-webrsync -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""

 DEPEND=""
--- a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.2-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-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild,v 1.1 2015/01/27 20:32:50 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild,v 1.2 2015/07/18 13:49:55 zlogene Exp $

 EAPI="5"

@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""

-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"

 RDEPEND="
 	dev-util/dialog
--- a/app-shells/dash/dash-0.5.8.2.ebuild
+++ b/app-shells/dash/dash-0.5.8.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-shells/dash/dash-0.5.8.2.ebuild,v 1.7 2015/07/16 23:55:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.8.2.ebuild,v 1.8 2015/07/17 19:59:17 maekke Exp $

 EAPI="4"

@ -18,7 +18,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libedit static"

 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
--- a/app-text/aspell/aspell-0.60.6.1-r2.ebuild
+++ b/app-text/aspell/aspell-0.60.6.1-r2.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1-r2.ebuild,v 1.1 2015/07/18 09:53:13 pacho Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic libtool toolchain-funcs
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+PDEPEND="app-dicts/aspell-en"
+LANGS="af be bg br ca cs cy da de el en eo es et fi fo fr ga gl he hr hu hy is it la
+lt nl no pl pt pt_BR ro ru sk sl sr sv uk vi"
+for lang in ${LANGS}; do
+	dep="linguas_${lang}? ( app-dicts/aspell-${lang/pt_BR/pt-br} )"
+	if [[ ${lang} == de ]] ; then
+		dep="linguas_${lang}? (
+			|| (
+				app-dicts/aspell-${lang}
+				app-dicts/aspell-${lang}-alt
+			)
+		)"
+	fi
+	PDEPEND+=" ${dep}"
+	IUSE+=" linguas_${lang}"
+done
+unset dep
+
+COMMON_DEPEND="
+	>=sys-libs/ncurses-5.2
+	nls? ( virtual/libintl )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+# English dictionary 0.5 is incompatible with aspell-0.6
+RDEPEND="${COMMON_DEPEND}
+	!=app-dicts/aspell-en-0.5*
+"
+
+src_prepare() {
+	# fix for bug #467602
+	if has_version ">=sys-devel/automake-1.13" ; then
+		sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
+			"${S}"/configure.ac || die
+	fi
+
+	epatch \
+		"${FILESDIR}/${PN}-0.60.5-nls.patch" \
+		"${FILESDIR}/${PN}-0.60.5-solaris.patch" \
+		"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+
+	rm m4/lt* m4/libtool.m4
+	eautoreconf
+	elibtoolize --reverse-deps
+
+	# Parallel install of libtool libraries doesn't always work.
+	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
+	# This has to be after automake has run so that we don't clobber
+	# the default target that automake creates for us.
+	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+
+}
+
+src_configure() {
+	if has_version "sys-libs/ncurses[unicode]" ; then
+		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncursesw)"
+	else
+		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
+	fi
+
+	CURSES_LIB="${CURSES_LIB}" econf \
+		$(use_enable nls) \
+		--disable-static \
+		--sysconfdir="${EPREFIX}"/etc/aspell \
+		--enable-docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc README* TODO
+	dohtml -r manual/aspell{,-dev}.html
+	docinto examples
+	dodoc "${S}"/examples/*.c
+
+	# install ispell/aspell compatibility scripts
+	newbin scripts/ispell ispell-aspell
+	newbin scripts/spell spell-aspell
+
+	prune_libtool_files --modules
+}
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/metadata.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
--- a/app-text/mupdf/mupdf-1.5-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.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/app-text/mupdf/mupdf-1.5-r1.ebuild,v 1.4 2015/06/27 12:34:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild,v 1.6 2015/07/17 06:32:51 jer Exp $

 EAPI=5

@ -13,7 +13,7 @@ SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbb
 LICENSE="AGPL-3"
 MY_SOVER=1.5
 SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X vanilla +curl +openssl static static-libs"

 LIB_DEPEND="dev-libs/openssl[static-libs?]
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@ -4,7 +4,6 @@ DIST pandoc-1.12.3.1.tar.gz 1081035 SHA256 ec06bb322950c900f1a69426756fcffa0f5b9
 DIST pandoc-1.12.3.3.tar.gz 1071822 SHA256 ba08dbddac8b3c4e4786ac9213068a77aa5ee41126884fe13d73fc3c12dcfc6c SHA512 3730375823d776185d6e121f509783dd968439fe321a2294f1ae9703d480e7c5e6400c12eb3b5a8874c71fec5352ea77ebd55aa62e524071ca25a7c4e90b4d6a WHIRLPOOL cf209189f564d7b4ae2477e068df84eaa6e193939d2e1eef5282069d94fd5548d30b8f5df24f45d874f49a0ef856334b95a6b093576468e43c622864ad6c11c2
 DIST pandoc-1.12.4.2.tar.gz 1048263 SHA256 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45 SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743 WHIRLPOOL 795a27f9106d9848abb1cf120cdfe92fdaf839e5097e5bb17533859f4b56f958d92b5027483cb08dd7a4d448e106487fd9d37f2a9d67ed4479647acca2ed77a1
 DIST pandoc-1.12.4.tar.gz 1046258 SHA256 3efb11b90a7af9c22b1e4b33252a6163c38d52142ee1a3cae5e7170586b9fb36 SHA512 5eb566723276a6196114f0416946488ca26d4077d57540cf1b6578d78f826ff97e7fa14bc21a640eccd014155efc5644d287247146e6cebdb8a6df1444cd70f7 WHIRLPOOL 994c3fc53478acd3c742e55a397bf44e3f0caad629e891a30277a2c81296f19eba3976b8af0fbab87c7e99670877baac623b152e027b9fd14ade9ea513b196c9
-DIST pandoc-1.12.tar.gz 1161163 SHA256 89781e9a4cb31eec368fd8520394c75ee616636513c6abf5fc0f9d95ab795612 SHA512 082f2c4e726bbe76796dafdbfee79ac4034a1595edabc2966f9f19ea7a1d54b385e403f87af6edfd60ecef9ae9dab6db3290e562e4b69c35b5da5e23a6787e69 WHIRLPOOL b4d9f48f72d6cc6615d0c733b73a9d72cc23694759188722d797018461eab6ebda18bad242c73edb536e5f533a1371e023de06edbc65c5f51b198756c6d4a886
 DIST pandoc-1.13.1.tar.gz 1823730 SHA256 7b1bb9b7d66edfbac33796a3f5d3218c2add786b95ea9dfbd497dc0e8ed27e6f SHA512 da699d56916da118159b10306c323f435db2fe0e13a988c319e2ee9faf0082c359b3c7efda03110c20007ae1d23693d0270af095bda90b60dc362f47bf377b8e WHIRLPOOL bcf3ec37e69a76f1bc5a93a34f0822a17516347ec983e3906edbe298cebf3bcfa8e3a1f6136878ca8c69645a7dbcd9122093a3add1911ba54ba03ff8d98497dd
 DIST pandoc-1.13.2.1.tar.gz 1999641 SHA256 66da6eb690b8de41eccf05620e165630854d74c08cf69dbfb68d0ea84589785f SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d WHIRLPOOL 2413041022e237454439f60e32cd7a2bb38452abe7ff78ce72594e54fa05122db6802713c7fa2145b0e23b0a085fa883c5cc5e7ad899d24ae3d5a47a4e1f6622
 DIST pandoc-1.13.2.tar.gz 1980729 SHA256 e65c445f4454e9efcf1bc8c28754260d7108803bd8979bc2ff3c34705e386d8a SHA512 abaf6e7e2b9fe27048044097e15f0ee2891bfab53c148079aa4b8542d76977ee3ea7492c92924c007a1d16a026f5117d7087d3b3cdebae66789dbd2238025b24 WHIRLPOOL f87e05f601058d5f80c7bdd1f8231b5ed9257f66827bd24d3e1d58095911fba011d753b11462d625d56448ca2fe4e0206605b0b6693c831ae12d865e1cc19c02
--- a/app-text/pandoc/pandoc-1.12.1-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.12.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-text/pandoc/pandoc-1.12.ebuild,v 1.5 2015/02/18 21:20:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.1-r1.ebuild,v 1.2 2015/07/18 12:47:02 slyfox Exp $

 EAPI=5

@ -30,15 +30,14 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
 	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
 	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
 	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?]
-	>=dev-haskell/pandoc-types-1.12:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
 	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	>=dev-haskell/stringable-0.1:=[profile?] <dev-haskell/stringable-0.2:=[profile?]
 	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
 	>=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
 	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?]
 	>=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
 	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
 	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
 	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
@ -51,8 +50,8 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
 	dev-haskell/alex
+	>=dev-haskell/cabal-1.10.0.0
 	dev-haskell/happy
 	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
 		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
@ -63,17 +62,13 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
 "

+src_prepare() {
+	cabal_chdeps \
+		'text >= 0.11 && < 0.12' 'text >= 0.11'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag embed_data_files embed_data_files) \
 		$(cabal_flag http-conduit http-conduit)
 }
-
-src_install() {
-	cabal_src_install
-
-	doman "${S}/man/man1/${PN}.1"
-
-	# COPYING is installed by the Cabal eclass
-	dodoc README COPYRIGHT changelog
-}
--- a/app-text/yelp-tools/yelp-tools-3.14.1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.14.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-text/yelp-tools/yelp-tools-3.14.1.ebuild,v 1.8 2015/06/07 10:08:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.14.1.ebuild,v 1.9 2015/07/17 15:32:11 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"

 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""

 RDEPEND="
--- a/dev-cpp/atkmm/atkmm-2.22.7-r1.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.22.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/dev-cpp/atkmm/atkmm-2.22.7-r1.ebuild,v 1.7 2015/06/07 10:09:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.7-r1.ebuild,v 1.8 2015/07/17 15:32:13 ago Exp $

 EAPI=5
 GCONF_DEBUG="no"
@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"

 COMMON_DEPEND="
--- a/dev-cpp/cairomm/cairomm-1.10.0-r1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.10.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/dev-cpp/cairomm/cairomm-1.10.0-r1.ebuild,v 1.7 2015/06/07 10:09:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/cairomm-1.10.0-r1.ebuild,v 1.8 2015/07/17 15:32:20 ago Exp $

 EAPI=5
 GCONF_DEBUG="no"
@ -13,7 +13,7 @@ SRC_URI="http://cairographics.org/releases/${P}.tar.gz"

 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc +svg"

 # FIXME: svg support is automagic
--- a/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.42.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/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild,v 1.8 2015/06/07 10:17:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild,v 1.9 2015/07/17 15:32:22 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug examples test"

 COMMON_DEPEND="
--- a/dev-cpp/gtkmm/gtkmm-2.24.4-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.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-cpp/gtkmm/gtkmm-2.24.4-r1.ebuild,v 1.7 2015/06/07 10:20:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.4-r1.ebuild,v 1.8 2015/07/17 15:32:25 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"

 COMMON_DEPEND="
--- a/dev-cpp/gtkmm/gtkmm-3.14.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.14.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/dev-cpp/gtkmm/gtkmm-3.14.0-r1.ebuild,v 1.7 2015/06/07 10:20:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.14.0-r1.ebuild,v 1.8 2015/07/17 15:32:25 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aqua doc examples test wayland +X"
 REQUIRED_USE="|| ( aqua wayland X )"

--- a/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.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/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild,v 1.8 2015/06/07 10:21:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild,v 1.9 2015/07/17 15:32:28 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-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="doc examples"

 COMMON_DEPEND="
--- a/dev-cpp/pangomm/pangomm-2.36.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.36.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-cpp/pangomm/pangomm-2.36.0.ebuild,v 1.6 2015/07/13 04:10:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pangomm/pangomm-2.36.0.ebuild,v 1.7 2015/07/17 15:32:31 ago Exp $

 EAPI=5
 GCONF_DEBUG="no"
@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"

 COMMON_DEPEND="
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@ -0,0 +1,2 @@
+DIST mysql-connector-c-6.1.5-src.tar.gz 3455028 SHA256 278f2b40f3980079bc7ad247cb2bf08967ce56ef79da468ae26ff2e2a560be66 SHA512 be47ed70865744ff9ecb9376972208504327514f03635e54c05e81d324bcf9ba777300a12738d8ca32b95c9c31d734dc9f6ebb7bb24fd11821560a6b0f09bb56 WHIRLPOOL bfdd17908cae63ef5b5006bdf28432bb12738044fe99960fdddab6da527ab41211a48396270a778ce500c5758c2f5d50c1fd850a92c684996612ab7c38637c61
+DIST mysql-connector-c-6.1.6-src.tar.gz 3475044 SHA256 2222433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 SHA512 2a3db4aec5b8e5357fa407d6e2b52534f7aa9c0b78c4ebe9a61e2e25dc5f7dc1f1962f6e6fd847107ce53ca369e0babe7118b947a87189495212596348cfd760 WHIRLPOOL 6a0a55a47a88606c12511f9fd155bafcf5d73b1ffa2c4877b838bca018f4a8a8f4427ac6af6e4c567eced7e1108dba4a613255f813ab481e8ea948b3a6cdff33
--- a/dev-db/mysql-connector-c/files/conn-c-includes.patch
+++ b/dev-db/mysql-connector-c/files/conn-c-includes.patch
@ -0,0 +1,15 @@
+diff -aurN a/include/CMakeLists.txt b/include/CMakeLists.txt
+--- a/include/CMakeLists.txt	2015-07-14 13:06:04.424091000 -0400
+++ b/include/CMakeLists.txt	2015-07-14 13:24:43.434091000 -0400
+@@ -55,6 +55,11 @@
+   byte_order_generic_x86.h
+   little_endian.h
+   big_endian.h
+  my_thread_local.h
+  thr_cond.h
+  thr_lock.h
+  thr_mutex.h
+  thr_rwlock.h
+   ${HEADERS_GEN_CONFIGURE}
+ )
+ 
--- a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
+++ b/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
@ -0,0 +1,12 @@
+diff -aurN a/cmake/ssl.cmake b/cmake/ssl.cmake
+--- a/cmake/ssl.cmake	2014-11-21 00:39:51.000000000 -0500
+++ b/cmake/ssl.cmake	2015-01-27 08:45:36.771744344 -0500
+@@ -166,7 +166,7 @@
+     # Encoded as MNNFFPPS: major minor fix patch status
+     FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
+       OPENSSL_VERSION_NUMBER
+-      REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+      REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+     )
+     STRING(REGEX REPLACE
+       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
--- a/dev-db/mysql-connector-c/metadata.xml
+++ b/dev-db/mysql-connector-c/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<use>
+</use>
+</pkgmetadata>
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild,v 1.1 2015/07/17 16:53:19 grknight Exp $
+
+EAPI=5
+CMAKE_MIN_VERSION="2.8.12"
+
+inherit cmake-multilib eutils
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mysql/my_config.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
+LICENSE="GPL-2"
+
+SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/18"
+IUSE="+ssl static-libs"
+
+CDEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	"
+RDEPEND="${CDEPEND}
+	!dev-db/mysql[client-libs(+)]
+	!dev-db/mysql-cluster[client-libs(+)]
+	!dev-db/mariadb[client-libs(+)]
+	!dev-db/mariadb-connector-c[mysqlcompat]
+	!dev-db/mariadb-galera[client-libs(+)]
+	!dev-db/percona-server[client-libs(+)]
+	"
+DEPEND="${CDEPEND}"
+
+DOCS=( README Docs/ChangeLog )
+
+src_prepare() {
+	epatch "${FILESDIR}/openssl-cmake-detection.patch"
+	epatch_user
+}
+
+multilib_src_configure() {
+	mycmakeargs+=(
+		-DINSTALL_LAYOUT=RPM
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
+		-DWITH_DEFAULT_FEATURE_SET=OFF
+		-DENABLED_LOCAL_INFILE=ON
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_ZLIB=system
+		-DENABLE_DTRACE=OFF
+		-DWITH_SSL=$(usex ssl system bundled)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c/mysql-connector-c-6.1.6.ebuild,v 1.1 2015/07/17 16:53:19 grknight Exp $
+
+EAPI=5
+CMAKE_MIN_VERSION="2.8.12"
+
+inherit cmake-multilib eutils
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mysql/my_config.h
+)
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
+LICENSE="GPL-2"
+
+SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0/18"
+IUSE="+ssl static-libs"
+
+CDEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	"
+RDEPEND="${CDEPEND}
+	!dev-db/mysql[client-libs(+)]
+	!dev-db/mysql-cluster[client-libs(+)]
+	!dev-db/mariadb[client-libs(+)]
+	!dev-db/mariadb-connector-c[mysqlcompat]
+	!dev-db/mariadb-galera[client-libs(+)]
+	!dev-db/percona-server[client-libs(+)]
+	"
+DEPEND="${CDEPEND}"
+
+DOCS=( README Docs/ChangeLog )
+
+src_prepare() {
+	epatch "${FILESDIR}/openssl-cmake-detection.patch" \
+		"${FILESDIR}/conn-c-includes.patch"
+	epatch_user
+}
+
+multilib_src_configure() {
+	mycmakeargs+=(
+		-DINSTALL_LAYOUT=RPM
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
+		-DWITH_DEFAULT_FEATURE_SET=OFF
+		-DENABLED_LOCAL_INFILE=ON
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_ZLIB=system
+		-DENABLE_DTRACE=OFF
+		-DWITH_SSL=$(usex ssl system bundled)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.13.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-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild,v 1.1 2015/05/16 02:40:56 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild,v 1.6 2015/07/17 15:05:20 klausman Exp $

 EAPI="5"

@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.6.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-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild,v 1.1 2015/05/16 02:40:56 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild,v 1.6 2015/07/17 16:40:24 klausman Exp $

 EAPI="5"

@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/postgresql/postgresql-9.0.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.22.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-db/postgresql/postgresql-9.0.22.ebuild,v 1.2 2015/07/15 15:55:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.22.ebuild,v 1.3 2015/07/17 12:30:40 klausman Exp $

 EAPI="5"

@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.1.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.18.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-db/postgresql/postgresql-9.1.18.ebuild,v 1.2 2015/07/15 15:55:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.18.ebuild,v 1.3 2015/07/17 12:55:21 klausman Exp $

 EAPI="5"

@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.2.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.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-db/postgresql/postgresql-9.2.13.ebuild,v 1.2 2015/07/15 15:55:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.13.ebuild,v 1.3 2015/07/17 12:56:36 klausman Exp $

 EAPI="5"

@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@ -1,2 +1,2 @@
-DIST tiled-0.10.2.tar.gz 2180092 SHA256 32c62b459aa74c411f28860b96b3e0a48b3cd2ca51fabddd7421704b361d975c SHA512 bceabaed47289abaeb5a395415625d02d058c3b86410484d03fb1fd899963e7d7fe573ec6032d18539f31b2f6443602f87dacfa2701a4d4b50c323b87b322ba2 WHIRLPOOL 35c6f47bf92252f972314851bc6d87faa8862162854ac339cb76ac1c9b03d47b82d9edd32732f2b2a0fd24c46ca6737d924ce443f886779bb2960ac126afbcdf
 DIST tiled-0.11.0.tar.gz 2324668 SHA256 0d4b028902dfe08f18b542bfd9eaaf08886c1f685b2e176f438c3bf9d72e410d SHA512 c3eb230225a144938069b54bcedfe9927dd42358ca91d8922f56a4e566f0041b4b33aef3d87ef4b3b58634e9e98efd98a7132f419c2dd18d563f28393df066f8 WHIRLPOOL f28764e1d0904acecef826b4c35d7f56513c9b0cee682fbe1abf45989a1c6076d9eaa0285dff3daa64d88b8061dd3aec1fbae52208e1ea3510a2b4f167ed2270
+DIST tiled-0.12.3.tar.gz 2372813 SHA256 8078b266cc4902451e14b1efb6c8eba69f610e5056fcb74d1d30b5b236253200 SHA512 a8b5cb2201806e6b5a0e5079a9e12fbffcbb79f2df0a193e3c3e80424df1c8c4c94ae23c1553a82a1813d4bc65d9da54d79faa41a8983233aa67023e2348cc4b WHIRLPOOL 6deb8f40aea684619c5aee3746080f0543c8a7d3dfc37d76afbd447bc34923afdbb4b676553e6e33d187a0702dfa0514ec4b567a02a95dbd4a5e87bc28c7fa92
--- a/dev-games/tiled/metadata.xml
+++ b/dev-games/tiled/metadata.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>kensington@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">tiled</remote-id>
-    <remote-id type="github">bjorn/tiled</remote-id>
-  </upstream>
+	<maintainer>
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tiled</remote-id>
+		<remote-id type="github">bjorn/tiled</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-games/tiled/tiled-0.12.3.ebuild
+++ b/dev-games/tiled/tiled-0.12.3.ebuild
@ -1,18 +1,17 @@
-# 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-games/tiled/tiled-0.10.2.ebuild,v 1.1 2014/10/27 15:58:28 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/tiled/tiled-0.12.3.ebuild,v 1.1 2015/07/18 14:32:09 kensington Exp $

 EAPI=5

-PLOCALES="cs de en es fr he it ja lv nl pt pt_BR ru zh zh_TW"
 PYTHON_COMPAT=( python2_7 )
-inherit multilib l10n python-single-r1 qt4-r2
+inherit fdo-mime multilib python-single-r1 qt4-r2

 DESCRIPTION="A general purpose tile map editor"
 HOMEPAGE="http://www.mapeditor.org/"
 SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"

-LICENSE="BSD GPL-2"
+LICENSE="BSD-2 GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="examples python"
@ -34,8 +33,6 @@ pkg_setup() {

 src_prepare() {
 	rm -r src/zlib || die
-	sed -e "s/^LANGUAGES =.*/LANGUAGES = $(l10n_get_locales)/" \
-		-i translations/translations.pro || die
 }

 src_configure() {
@ -50,3 +47,13 @@ src_install() {
 		dodoc -r examples
 	fi
 }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
--- a/dev-haskell/nanospec/Manifest
+++ b/dev-haskell/nanospec/Manifest
@ -1,2 +1,3 @@
 DIST nanospec-0.1.0.tar.gz 3408 SHA256 604aab074552e580a52bcfda8fce7cb2a48316f4f903801ea5d9a29b52b0179b SHA512 6e38bcee0d9a5f2e6b42566bb3e4aec57a61115dd649cb441721cb79193caac5aaf59aeef54a30dccb7e939e6512632221ec9e03b86142e5cb7671ef3433d4e9 WHIRLPOOL 0185abd0ad4a374a65f8b63168a74a66175b63db3f85deb3277ac6dd06c945486711aa1333501f104b59e400a9c6a176459fbf95b90f9a2e297325631edaa673
 DIST nanospec-0.2.0.tar.gz 3451 SHA256 1b0bae00eb01e9f4b04c167ebe0c7a27025429ce7709db3f2a798ccd0ca2203c SHA512 318458a205bc0bb48d83f9291cb8f047d6ca20b03174ae6a4a00d9f1b921a058641f80870e12f8eda3f238bd1b98dca96cb324161ea14cf2f0f3da1314edade4 WHIRLPOOL 40580a70e8592ce822bbdb36987e4a5a9a0df5850e769fe1c7e9bdbb2ea7a48e57fefc5b0dc6d44038e8305c48ab0f449e4bafc50840c7cf94b26679308d89f5
+DIST nanospec-0.2.1.tar.gz 3478 SHA256 dbcbd9baa57fc9aa573cc2e291bb93c787dc0d7aac9793b2a10c125f69a0024b SHA512 ee5b5080fefc5a213b59c8d146054f59b73dbfc8ed909ea308ec2646cd3e071a7de6115563a13fb683434725e3756fa71acbfcec77e85e3dfaa9400c7e249769 WHIRLPOOL 6263a278336c2ef8b5538ba9e3b273fbe0909c97379299fd733ecc9da0dbb1e34d2331c93c71439e48bd9e8f2131cc7097b5519a8936ddf34a2f525ce119ef36
--- a/dev-haskell/nanospec/nanospec-0.2.1.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/nanospec/nanospec-0.2.1.ebuild,v 1.1 2015/07/18 00:03:18 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
+HOMEPAGE="http://hackage.haskell.org/package/nanospec"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		>=dev-haskell/silently-1.2.4 )
+"
--- a/dev-haskell/snap-core/Manifest
+++ b/dev-haskell/snap-core/Manifest
@ -2,3 +2,4 @@ DIST snap-core-0.9.5.0.tar.gz 90539 SHA256 a4520d108be8fffe42fcdbd14637c22b719bd
 DIST snap-core-0.9.6.3.tar.gz 91549 SHA256 81b70058ec42b9344b779b3fac0c86086f96e9510d7a88b53954c4df67a06f44 SHA512 48633ceed40381ea3626fe58b3ace2d71de6ad315f110a7c4bf3afb77d98476e79e385d9949cb5d126d1d82656220b0603b1d91df01f6c4bf60379df7398f2cc WHIRLPOOL 830937fe4f2de9b5c2ffef4bdb841db4d0c44c555d934fb894e74f4340c39ee7ab929c424d7a91ec46e95099e527894ade28ddb051c5f0ce1e484262c205eb26
 DIST snap-core-0.9.6.4.tar.gz 91632 SHA256 71d3e4133a5da4d0ec8b3feb71996f60c9280bc84a01472bca9151167d2fef2b SHA512 2432f055a207d4b35e7300309c0f3929201f4fecd77360969f8dbb2b8d3d9329b350d85d23afb94201cc7ccffe09f87ba846190fdc0099337da5586f9c91f9d6 WHIRLPOOL 2366f1488d36ecb5c47b6c0d14fa4261fe6683aa288e59c77f5e2c187187b0cfa97a23e1ebc72eeae33385472e2a6a4d77d7753007ecfce8f7937c250b061045
 DIST snap-core-0.9.7.0.tar.gz 91626 SHA256 dc9a11cbfc6a2dffd59b9d8ff803096c18f50a91c6932a0ce7e6ec32f099ab2a SHA512 73661a8da45bca471d5711b6b65705fce1a144652b80f25d0042561d404d3e6f1041699a924ae7e288aad4c542389dc8295e65622b915bc93d29d605f15c5761 WHIRLPOOL 27a6ab8e668405085ba90d37b83c7622ae0b33f3fc96b6fadf8108d8d57093e601383e1803e63fd84e8049b77b2544cc81dd9ff87bfe8209ca34e767dacfd3ab
+DIST snap-core-0.9.7.2.tar.gz 91604 SHA256 526a8ebb758c8da5e966a37449fdb072af333275c1b7726ab6317ac93875f651 SHA512 b07e69a636d148d7f9ce107fd056e92aef8de7dcb7a422e6f4fa69db84abf46caae635bca9b5d6d7e25f597449b9f6dcb082b3c01119c7c56f5c296950bad21b WHIRLPOOL 36ee6a2d118218b839b7c45514423ca09a1923be31e62d0fb2c0e16a2ece6429da2b71b3629c08161c487f63d2737e98d517f904795c7524ee5a4fc6cc73038f
--- a/dev-haskell/snap-core/snap-core-0.9.7.2.ebuild
+++ b/dev-haskell/snap-core/snap-core-0.9.7.2.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/snap-core/snap-core-0.9.7.2.ebuild,v 1.1 2015/07/17 10:37:33 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
+HOMEPAGE="http://snapframework.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug portable"
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-builder-enumerator-0.2:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?]
+	>=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
+	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
+	>=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
+	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-haskell/zlib-enum-0.2.1:=[profile?] <dev-haskell/zlib-enum-0.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	|| ( ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.2:=[profile?] )
+		( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
+	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
+	!portable? ( >=dev-haskell/bytestring-mmap-0.2.2:=[profile?] <dev-haskell/bytestring-mmap-0.3:=[profile?]
+			>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug) \
+		$(cabal_flag portable portable)
+}
--- a/dev-haskell/snap-server/Manifest
+++ b/dev-haskell/snap-server/Manifest
@ -2,3 +2,4 @@ DIST snap-server-0.9.3.4.tar.gz 56320 SHA256 08b96faade7472eb6f976861f064759c8de
 DIST snap-server-0.9.4.5.tar.gz 58643 SHA256 37ae3557c43dcecf6938df76af1ee274b575e50a8085d12b8f80c587e94e6924 SHA512 9f935c2f199d99652e211f46ed57ad47ded9ef7f1b57972b74ded82d7b3c1d0eb370ead8d3542b86673622bbfc3f7b22752f28cd5621d43936a1c0f1515ca416 WHIRLPOOL 5095f8751e1e8fd7cdccf807a3e57a50d695158237bd3494edf8a84669b20d58769905d0ddd3eac297bcc19048329d6a7e47514fbbf276f7bf2bf3d6c61dde74
 DIST snap-server-0.9.4.6.tar.gz 58954 SHA256 f766d84fb2399f345c0f3eac857db318fe448fa51af85d340106733c0cc30e07 SHA512 e5021744a3d6500c99b004e34292721f03fc5905c4b9b9c7bb8afbca55425a3fb1d649e9717b9e8b063b21acac00827872513e3327291cf0456f482d26b08fa3 WHIRLPOOL d06212c1a97f4997c99807e146ef2850b1eb17666c5df3faf513e2db66b07adf02b26516a93f2e831ac311e3cef9461e822e7b7fff5b23f3b5d1f778141ed6da
 DIST snap-server-0.9.5.0.tar.gz 59058 SHA256 1160d42d7ffec40ecd179bc30f2c6f20f1878296a4c143e87d96219afb1f56e7 SHA512 45335348f97acd27a22c6187eea2731b403abe14b848534f62e8964adcad2b825400e1952f65150a4c9c082795c9bd1acd98d2a04f5aab3ffd96c1fb9d2af9fd WHIRLPOOL e00c107e341bbb6f7defe2bb2ed6efa9c837ead3eb553a76bb5611c4f722884865108a5408d09631fef48421fe34913a219724c5a983c07b81007ef6162ee4cb
+DIST snap-server-0.9.5.1.tar.gz 59062 SHA256 af8f2344b90f701dd1924743d6073546206384d5a904a1338bb784e18c8d3ea3 SHA512 6320401c349fd7c376e798959274a9fb3aff49cf11c8b6d9edd513c6311c3daf23eeaf03087cda3c0afb11686203a422b0e36e8391d418b6b47e791505db50e3 WHIRLPOOL c51eda3a8430f3e47386c69b2974c3a1ae47a8ce53d173616ba24c675edd661ef23593af59d75d3488dc7e59ad24e99ca05a3040e081c965dbf8da9cc9c1cb85
--- a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
+++ b/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild,v 1.1 2015/07/17 10:38:25 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A fast, iteratee-based, epoll-enabled web server for the Snap Framework"
+HOMEPAGE="http://snapframework.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug openssl portable"
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-builder-enumerator-0.2.0:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?]
+	>=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
+	>=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	>=dev-haskell/snap-core-0.9.3:=[profile?] <dev-haskell/snap-core-0.10:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	openssl? ( >=dev-haskell/hsopenssl-0.10:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'attoparsec                >= 0.10     && < 0.13' 'attoparsec                >= 0.10     && < 0.14'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug) \
+		$(cabal_flag openssl openssl) \
+		$(cabal_flag portable portable)
+}
--- a/dev-haskell/system-filepath/Manifest
+++ b/dev-haskell/system-filepath/Manifest
@ -1,7 +1,2 @@
-DIST system-filepath-0.4.12.tar.gz 15860 SHA256 a2714835ac25263b64c340a497e4d9409b8475181b885bb1836995f63855d969 SHA512 294734775bc31116e035d62cea7f510f13be5d53865afd3753ba5d49d9f95b5a1d2a372aead2546715cf2fb24781c403ae7aa76db58d75f7e4170fe751d27ddd WHIRLPOOL 3e9d8b169873f1a67ce17788bfc087a6d5d969ff3228a4d1fd43f16bad448bcf265cb6a8c1c5d66df671f9c518a974f5cf0e5d144e5312eb4d5b34bd2243c0c0
-DIST system-filepath-0.4.13.1.tar.gz 16088 SHA256 a411b0d389ca403f4423190a0d709b6aca88e3268829f7b5697dc8a3c1fb302d SHA512 e471d79d837407e86ef62b1afef37e325ec98547ed199226ba6d466b42fd8897b5c9862b332c17fabe6343f3002ffea5095204f595fb705f7a9e24b187030087 WHIRLPOOL fc3ac3e042f038547c7ae1814c055b66533ffc15796669e8e21297a9ae50146832641b276520a128e58d59a7f7b08533531be4dbaed4d9b079e9163e370759e3
 DIST system-filepath-0.4.13.2.tar.gz 16126 SHA256 52b3a8adfb4ae9b2c268e1b580c7af1416584b86e2b2de0c96b19eb93c54bf5a SHA512 902d73d05817b4721e8d0d0be0bdc9b8e61376e690cbaa99060653d86ce71dafddc93ba272d98ed3691585e00c8f4a392294adc474526d2b9657f9f09af4a5b4 WHIRLPOOL c3cee16e52ff14d9eb142238c80b3f5f9ccc7bdfe9b74e3ce944893f8e418a894da0b57a1bc3d18b453b6727aa6386dac870c0ce0e640f73ef3a8dca2af28db5
-DIST system-filepath-0.4.13.tar.gz 16073 SHA256 8ad97ffd780de5271c5302cc9c023fba70aba2324f63c4fc0e47ef545055343c SHA512 acf7fae6c69d27442e50886f4185a16e5bc45348863f017d5da71442708b1608c500bb52f1ac44ed584fb7d12659ab834f374bbd0c717294afbfe9bc2a56733a WHIRLPOOL b2637fe804fbd4b3006d4e7ebeebd801e5a59b21a03fec53ee277963dc71a55f90fa6d52cd3a957f6b774441b5f1b98c0e2b3973b4b68008185b7226bf8ba5d5
-DIST system-filepath-0.4.7.tar.gz 13989 SHA256 09d93ad801ed0f9ea166c9e7bfb1d761c056f5019a5f9297f2d3fa6cfeab0b81 SHA512 6c9d9adccf9727c65ccde5e37018827042e893c856e1c211af6423911a1f759ec053edad6faf4aecb04c7675ce63b307c2f1e62e7585762d5894a475d1864712 WHIRLPOOL 7adc4030ce0fb785348b448aec9914c858340240f129155027b0abf48559e2efa949de005976923845c1719ec416df26d25dd4f2dca8dfa75b026377a2313129
 DIST system-filepath-0.4.8.tar.gz 14497 SHA256 7cf6218b310498cef168e5b0b05befc8a8e2f7bf84820cdfc62d633c55f7a097 SHA512 ee23a468186f1e709ec8b39d3b6855038a9f5a7fa4b37b37407b8dbed7668ddb4efe21e877a51b94b20bc3d9a59dd9a525b7378783ac9a0c7a4183ba615b01be WHIRLPOOL 86a4c23282381ddb6430c9a2d4febd9c38c21f3884bcc0b826684e9d36ab11ffc3bd8f433c391daf42ae6485f1b00ff611968d72ae740c19527f06b4e55b0f3e
-DIST system-filepath-0.4.9.tar.gz 14861 SHA256 40c750c9b4e28ca7a5f485539a07aa0c29b12f39e766260cf7ef486af08aab63 SHA512 f926675737b6f04d34899d029fe7751e62c00762b03c954f20813e48dbe9a1af6934bd8a1661b711aaf9cf24f73c276441b883c78f602b18cdc740c65a85590e WHIRLPOOL ce23c8326a852a6d2ec795c372bda966907aec70a44dfa8acf411ad7be1cd465514beea042f57dded0d58899580535965b82e221df96b9a466d129113a789d90
--- a/dev-haskell/system-filepath/system-filepath-0.4.12.ebuild
+++ b/dev-haskell/system-filepath/system-filepath-0.4.12.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/system-filepath/system-filepath-0.4.12.ebuild,v 1.1 2014/07/02 13:58:50 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations"
-HOMEPAGE="https://john-millikin.com/software/haskell-filesystem/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		dev-haskell/quickcheck )
-"
--- a/dev-haskell/system-filepath/system-filepath-0.4.13.1.ebuild
+++ b/dev-haskell/system-filepath/system-filepath-0.4.13.1.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/system-filepath/system-filepath-0.4.13.1.ebuild,v 1.1 2015/01/03 02:32:05 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations"
-HOMEPAGE="https://github.com/fpco/haskell-filesystem"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11.0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		dev-haskell/quickcheck )
-"
--- a/dev-haskell/system-filepath/system-filepath-0.4.13.ebuild
+++ b/dev-haskell/system-filepath/system-filepath-0.4.13.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/system-filepath/system-filepath-0.4.13.ebuild,v 1.1 2014/12/22 06:31:39 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations"
-HOMEPAGE="https://github.com/fpco/haskell-filesystem"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11.0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		dev-haskell/quickcheck )
-"
--- a/dev-haskell/system-filepath/system-filepath-0.4.7-r1.ebuild
+++ b/dev-haskell/system-filepath/system-filepath-0.4.7-r1.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/system-filepath/system-filepath-0.4.7-r1.ebuild,v 1.1 2013/06/20 05:08:58 qnikst Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations"
-HOMEPAGE="https://john-millikin.com/software/haskell-filesystem/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/deepseq-1.1:=[profile?]
-		<dev-haskell/deepseq-1.4:=[profile?]
-		>=dev-haskell/text-0.7.1:=[profile?]
-		<dev-haskell/text-0.12:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
--- a/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
+++ b/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
@ -1,10 +1,10 @@
-# 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-haskell/system-filepath/system-filepath-0.4.9.ebuild,v 1.1 2014/03/09 05:17:25 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild,v 1.2 2015/07/18 12:30:41 slyfox Exp $

 EAPI=5

-# ebuild generated by hackport 0.3.6.9999
+# ebuild generated by hackport 0.3.4.9999

 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@ -15,12 +15,18 @@ 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/text-0.7.1:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.6.0.3
 "
+
+src_prepare() {
+	cabal_chdeps \
+		'deepseq >= 1.1 && < 1.4' 'deepseq >= 1.1' \
+		'text >= 0.7.1 && < 0.12' 'text >= 0.7.1'
+}
--- a/dev-haskell/tasty/Manifest
+++ b/dev-haskell/tasty/Manifest
@ -1,3 +1,4 @@
+DIST tasty-0.10.1.2.tar.gz 26285 SHA256 91e0b26ebe5263069747d92b6bdc3937d5513c2797c849b369f1282ca941b730 SHA512 11171cb42b0c88cee04fc3c42c6003c6e501a16734f86ca4dcb33b7e28bc282fd4af56e88d398f6508ce9bd3da666a954fd3b50b8c89cf27906ea8694d753d3e WHIRLPOOL b36026976527533a8ac622791cfe77434de25a7f197826e0513953dc607c2bf34fad058e036195c95d959c4a776ed016cdd0516022cf54e62d3d1c3fbe1f550e
 DIST tasty-0.10.1.tar.gz 26224 SHA256 855699f3b1d7bc8aea5b10345eaa5550064f994b059aa23543753814c0810ad1 SHA512 b7380e269c650e0343b2282ad52d9387570b355eb65a971bdfa5140708b2d40f88e2da74a679608e5df5ff644f12876cd40c762b13f07dd1deed20769aa01b84 WHIRLPOOL d753762f06497d2f0260f28418d71ad3b9184887a3444f74fa8d7af0e17708bb0029255fb2560456018c3b53c8e44a82d74f0b3ef0632c78cca3011932c7a9e8
 DIST tasty-0.2.tar.gz 11948 SHA256 185dea647885229c076cee4087c8107fda78f7536cec7df452c72c0ee8220dea SHA512 f0f5aef19334f95061a48cb71572f750169f945ae9910cb964cb611d306f26bb49a5698b418e40b64357f5fb503bfb3914247bfc7eb5682353f046ad54b825a7 WHIRLPOOL b7101b6bea90d06edb63cc1d33ff0ea9e9c04088d0c00fdaf4989a3d6cbf2b647ff6dfd9b7af9eb839496597789d25d9c2eadccf8a1aa181040d631282741a42
 DIST tasty-0.3.1.tar.gz 12145 SHA256 60ddc6503d45d5abc8c598dfb5b063f7b29a84a7def3088b06e47dee6f6ef646 SHA512 aa727d8fcab7cbde07f721ad8eafc957f3fb6f01827a8ffc329bd1dba86bb40dbeb9e17c86becdd44aba592d57e29d07a5435ffbc8fabaa3c92fa0d0fa544e39 WHIRLPOOL b221c0581a5ee725d8d7301e9df4bcf13cfccb542c0cc10be6bf5fffefa56493dffaf80c019b37c0ef1488f78c05e2d2feefa6c1cfc4fe802b869e5e46543153
--- a/dev-haskell/tasty/tasty-0.10.1.2.ebuild
+++ b/dev-haskell/tasty/tasty-0.10.1.2.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-haskell/tasty/tasty-0.10.1.2.ebuild,v 1.1 2015/07/17 09:22:38 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Modern and extensible testing framework"
+HOMEPAGE="http://documentup.com/feuerbach/tasty"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/optparse-applicative-0.11:=[profile?]
+	>=dev-haskell/regex-tdfa-rc-1.1.8.2:=[profile?]
+	>=dev-haskell/stm-2.3:=[profile?]
+	>=dev-haskell/tagged-0.5:=[profile?]
+	>=dev-haskell/unbounded-delays-0.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
--- a/dev-haskell/time-locale-compat/Manifest
+++ b/dev-haskell/time-locale-compat/Manifest
@ -0,0 +1 @@
+DIST time-locale-compat-0.1.1.0.tar.gz 1933 SHA256 25a04d0099482c2f367fb80e557ab59ba09c99aec6061c2b52733178420cb455 SHA512 1192841b9065f052cd03672f587e4dad04fb6ee983159014c582c31da6b2d09dec6ea0c728554ee3aa04478de686d155075dbed9cc5cc258927df2d9d896e5b6 WHIRLPOOL efa6fb209519c05c5fc6767bcb628479a6948426c3d3f043a41b6f49d09b6f9621f27245759aba83ae2e31b72d4850d7c3c6b844f1cb036842e547ccebef2bc0
--- a/dev-haskell/time-locale-compat/metadata.xml
+++ b/dev-haskell/time-locale-compat/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		This package contains wrapped name module for TimeLocale.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.0.ebuild
+++ b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.0.ebuild,v 1.1 2015/07/17 10:36:52 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility of TimeLocale between old-locale and time-1.5"
+HOMEPAGE="http://twitter.com/khibino/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/old-locale:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
--- a/dev-haskell/timezone-olson/Manifest
+++ b/dev-haskell/timezone-olson/Manifest
@ -2,3 +2,4 @@ DIST timezone-olson-0.1.2.tar.gz 11598 SHA256 3ee1eb5401607750d328cc6ec3dc6b93f4
 DIST timezone-olson-0.1.3.tar.gz 11601 SHA256 ec2168f0318e698233cb48fe23edddedbd9f61c2769bcd7287f20b3800e6a30b SHA512 8b76b58b41c32e6b6ae0ad958beb4516f5724d9e2983571e251266faf4b8a5be720d54e2ff82db1741e54e3eef4a68ef6f50129a9a4dc27da2a03d8ccee76607 WHIRLPOOL 0821c875ebb7a3bc345efed02bbd9630e6b5b7b47ede6526a044461f7f658460ce33137316e9a445c64c2f5b8dc9d667597cbe36cf9c77d854d1eb01d8655c87
 DIST timezone-olson-0.1.4.tar.gz 11639 SHA256 b38853e003bb8d8db927ba393a0d1c0aa64ffc1a7b1feba23e9dee14f133b2d0 SHA512 40b902acbf33cd839a8217b66946a6fe2b0923e8ed7b42c05c2507a1b0c3c232e2fa93eccc1961efdc845fb7a90d0338460e8316121ad098ed449b424fda05af WHIRLPOOL 0787fb8cf18367e692d26246f9dbdba06166cfe665a59dcfb3efa2dc6114a2e7f66d381a908ce290b974606cf2f15c8424638800402b5b127f337395496b162b
 DIST timezone-olson-0.1.6.tar.gz 11751 SHA256 1f2c2d53e393ca40c1460877847e0b9473f00d3e4628631222add4591076e13d SHA512 ff830dd2529c306d257f24e53f3d950f5eddb1410e0f29a598999f2d51114e1c98d65732fbff45fd271914dd9e3e66697fde17d72464f1908c6d36dd4764d680 WHIRLPOOL 4d1a91ef16fb9171a0683787d8adb70ece538d27d13bc8eb1e579b37625a4369302e2e4a46b2a2859b73acd203ccc4b375fe120b491b165e206bd94fe7053e41
+DIST timezone-olson-0.1.7.tar.gz 11313 SHA256 232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa SHA512 136bca829b40edd3c46f83e2d19b496da7b6e7268825ff017fa598f9dc8a9de5fd65101f417e9c22ae8b845c61c98347944971f8f41072be60d894ea148a4e0a WHIRLPOOL 5bd447caf561127c0a789aef105edacc2de746880765d2d6fa8c47e5a1f46b9fee2d254bd2fb552d565976cc5f16562362a2cef9229e9922648d88f2741ca1c5
--- a/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild
+++ b/dev-haskell/timezone-olson/timezone-olson-0.1.7.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-haskell/timezone-olson/timezone-olson-0.1.7.ebuild,v 1.1 2015/07/17 09:28:19 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
+HOMEPAGE="http://projects.haskell.org/time-ng/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
--- a/dev-haskell/timezone-series/Manifest
+++ b/dev-haskell/timezone-series/Manifest
@ -1,3 +1,4 @@
 DIST timezone-series-0.1.2.tar.gz 5923 SHA256 f719e45de1679c130759df553385739a58ebffcd6f93b3e02a2df6ca67a89b32 SHA512 c76f2bd94423c9ad2bcfc164465cf7a4f354bc71d4b188157f22af27cee326fd4c390e666d8ab88bd4d2e53acf258fc551426954792ccfc46c4a3f2d68b171ba WHIRLPOOL 47a273bdd241fb262d057d9f63e39820eaeb8bf45058d0282907d38dec99e2efde7906be0cd6186ab72207adad67fe9acdf6887cf7fd0dcdf00267714a78d9cd
 DIST timezone-series-0.1.3.tar.gz 5416 SHA256 e37034f21c309b700fcb1a50527f325c25e47969e3faf954a0ee659e4452232c SHA512 37b6d803c2f41309230656a180cb78814e8bcd1f2a9e7af64f11cded0425570dbb65a567efceef3761632cec67bdc3fe97f486368c0febb198a20c10827431ed WHIRLPOOL 3b309e81a761d74b61c96b77b6eb0668406b397e2f28fc2e70b828fa5881131dbc2759614a607ec14fed85abc91a71a2fa1a94cdc3b0f4dbfcca782c3409d0d5
 DIST timezone-series-0.1.4.tar.gz 5426 SHA256 8038d73de99d7d2c3a06dca9bd441489503afe84933f0082ca95c31a1bd8e51a SHA512 a32e76cff4527d498a8d55427ef4d29e54e5ec745d403becdfee9316aedef9c3880e9023c80bc0dfe02071400f70ebeb61ce1b89ca7a7eda4fd240007e7e0d2a WHIRLPOOL 2d2bc00d53c0550ba7a1b28e475e180f869908a69d6fde8ad4b8709cf68477d9425f57eafd5b31891a6672edf65554943088ccbc73fd771f145e33b28cbd26ef
+DIST timezone-series-0.1.5.1.tar.gz 5330 SHA256 d244dda23a90f019884e6684a6bd7ec43f77875edf382861890ef1c68b2e7a56 SHA512 7f080455f58c8aefb8ac7e34e9b91724a294537069d8acf65865cc481fd3053816dd3e5ce3ef7a41c85f7d983764b7c472c13e47cc20d458c74a256c394f2d03 WHIRLPOOL bd112a8bc5f90698694bff86917c47fe75c756612c020ea3d3962b941965a98c3dbb2e509b92b84a2dd3650c0be7b604f4eacd363989cc65ac9c6a87d919cee2
--- a/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild
+++ b/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild,v 1.1 2015/07/17 09:29:11 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Enhanced timezone handling for Data.Time"
+HOMEPAGE="http://projects.haskell.org/time-ng/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
--- a/dev-java/fop/fop-2.0-r1.ebuild
+++ b/dev-java/fop/fop-2.0-r1.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/dev-java/fop/fop-2.0-r1.ebuild,v 1.1 2015/07/17 12:58:54 monsieurp Exp $
+
+# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
+#       be built as it needs forrest which we do not have
+# TODO: package and use optional dependency jeuclid
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
+HOMEPAGE="http://xmlgraphics.apache.org/fop/"
+SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
+
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+# Tests are broken even in 2.0
+RESTRICT="test"
+
+CDEPEND="dev-java/batik:1.8
+	dev-java/ant-core:0
+	dev-java/fontbox:1.7
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:3.0
+	dev-java/avalon-framework:4.2
+	dev-java/xmlgraphics-commons:2
+	dev-java/xml-commons-external:1.3
+	dev-java/qdox:1.12"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+#	test? (
+#		dev-java/ant-junit:0
+#		dev-java/junit:4
+#		dev-java/xmlunit:1
+#		dev-java/mockito:0
+#	)"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	ant-core
+	batik-1.8
+	fontbox-1.7
+	commons-io-1
+	commons-logging
+	servlet-api-3.0
+	avalon-framework-4.2
+	xmlgraphics-commons-2
+	xml-commons-external-1.3
+"
+
+TARGETS=(
+	resourcegen
+	jar-hyphenation
+	jar-sandbox
+	jar-main
+)
+
+java_prepare() {
+	find "${S}"/lib -type f | xargs rm -v
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=554386
+	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
+	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
+	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
+	java-pkg_jar-from --into lib commons-logging commons-logging.jar
+	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
+	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
+	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
+	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
+
+	for target in ${TARGETS[@]}; do
+		EANT_BUILD_TARGET="${target}" \
+			java-pkg-2_src_compile
+	done
+
+	if use doc; then
+		sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml
+		EANT_BUILD_TARGET="javadocs" \
+			java-pkg-2_src_compile
+	fi
+}
+
+src_install() {
+	java-pkg_dojar \
+		build/${PN}.jar \
+		build/${PN}-sandbox.jar \
+		build/${PN}-hyph.jar
+
+	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
+
+	dodoc NOTICE README
+
+	if use doc; then
+		java-pkg_dojavadoc \
+			build/javadocs
+	fi
+
+	if use examples; then
+		java-pkg_doexamples \
+			examples/* conf
+	fi
+
+	if use source; then
+		java-pkg_dosrc \
+			src/java/org \
+			src/sandbox/org
+	fi
+}
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@ -1,3 +1,2 @@
-DIST struts-1.2.9-src.tar.gz 5754377 SHA256 7354437d04b666fc6d302b0fd14a3bb971a6389085d9f7a5ea4b25eed289400e SHA512 a3d4ea1a0aef70d73bdc156d525b155a09b6ab22c367f6d0fe76ae16bde404bb33f78a7927fcea967105401915adff9a94b3ddbb81ac5ee10d5eb3430d97a93e WHIRLPOOL bb4a89f09177ef726d0c1bc4a250f152e7b63063791423d541d24d7e415a46bc74b9002d5e984e47c76b8a75acd44ecfbac762a70462bdda33facb0a9aa0b9d5
 DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
 DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897
--- a/dev-java/struts/files/struts-CVE-2008-2025.patch
+++ b/dev-java/struts/files/struts-CVE-2008-2025.patch
@ -1,328 +0,0 @@
-diff --git a/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java b/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
-index 403ff97..386ccf3 100644
--- a/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
-+++ b/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
-@@ -35,6 +35,7 @@ import org.apache.struts.taglib.TagUtils;
- import org.apache.struts.taglib.logic.IterateTag;
- import org.apache.struts.util.MessageResources;
- import org.apache.struts.util.RequestUtils;
-+import org.apache.struts.util.ResponseUtils;
- 
- /**
-  * Base class for tags that render form elements capable of including JavaScript
-@@ -898,10 +899,12 @@ public abstract class BaseHandlerTag extends BodyTagSupport {
-      */
-     protected void prepareAttribute(StringBuffer handlers, String name, Object value) {
-         if (value != null) {
-+            if (name.indexOf('"') >= 0)
-+                throw new IllegalArgumentException("quote character in attribute name");
-             handlers.append(" ");
-             handlers.append(name);
-             handlers.append("=\"");
-            handlers.append(value);
-+            handlers.append(ResponseUtils.filterIfQuote(value.toString()));
-             handlers.append("\"");
-         }
-     }
-diff --git a/src/share/org/apache/struts/taglib/html/FormTag.java b/src/share/org/apache/struts/taglib/html/FormTag.java
-index e8eb9b4..ba2d782 100644
--- a/src/share/org/apache/struts/taglib/html/FormTag.java
-+++ b/src/share/org/apache/struts/taglib/html/FormTag.java
-@@ -37,6 +37,7 @@ import org.apache.struts.config.ModuleConfig;
- import org.apache.struts.taglib.TagUtils;
- import org.apache.struts.util.MessageResources;
- import org.apache.struts.util.RequestUtils;
-+import org.apache.struts.util.ResponseUtils;
- 
- /**
-  * Custom tag that represents an input form, associated with a bean whose
-@@ -547,10 +548,10 @@ public class FormTag extends TagSupport {
- 
-         results.append(" action=\"");
-         results.append(
-            response.encodeURL(
-+            ResponseUtils.filterIfQuote(response.encodeURL(
-                 TagUtils.getInstance().getActionMappingURL(
-                     this.action,
-                    this.pageContext)));
-+                    this.pageContext))));
-                 
-         results.append("\"");
-     }
-@@ -580,7 +581,7 @@ public class FormTag extends TagSupport {
-                 results.append("<div><input type=\"hidden\" name=\"");
-                 results.append(Constants.TOKEN_KEY);
-                 results.append("\" value=\"");
-                results.append(token);
-+                results.append(ResponseUtils.filterIfQuote(token));
-                 if (this.isXhtml()) {
-                     results.append("\" />");
-                 } else {
-@@ -598,10 +599,12 @@ public class FormTag extends TagSupport {
-      */
-     protected void renderAttribute(StringBuffer results, String attribute, String value) {
-         if (value != null) {
-+            if (attribute.indexOf('"') >= 0)
-+                throw new IllegalArgumentException("quote character in attribute name");
-             results.append(" ");
-             results.append(attribute);
-             results.append("=\"");
-            results.append(value);
-+            results.append(ResponseUtils.filterIfQuote(value));
-             results.append("\"");
-         }
-     }
-diff --git a/src/share/org/apache/struts/taglib/html/HtmlTag.java b/src/share/org/apache/struts/taglib/html/HtmlTag.java
-index fb64875..d4da38d 100644
--- a/src/share/org/apache/struts/taglib/html/HtmlTag.java
-+++ b/src/share/org/apache/struts/taglib/html/HtmlTag.java
-@@ -29,6 +29,7 @@ import javax.servlet.jsp.tagext.TagSupport;
- import org.apache.struts.Globals;
- import org.apache.struts.taglib.TagUtils;
- import org.apache.struts.util.MessageResources;
-+import org.apache.struts.util.ResponseUtils;
- 
- /**
-  * Renders an HTML <html> element with appropriate language attributes if
-@@ -151,20 +152,20 @@ public class HtmlTag extends TagSupport {
- 
-         if ((this.lang || this.locale || this.xhtml) && validLanguage) {
-             sb.append(" lang=\"");
-            sb.append(language);
-+            sb.append(ResponseUtils.filterIfQuote(language));
-             if (validCountry) {
-                 sb.append("-");
-                sb.append(country);
-+                sb.append(ResponseUtils.filterIfQuote(country));
-             }
-             sb.append("\"");
-         }
- 
-         if (this.xhtml && validLanguage) {
-             sb.append(" xml:lang=\"");
-            sb.append(language);
-+            sb.append(ResponseUtils.filterIfQuote(language));
-             if (validCountry) {
-                 sb.append("-");
-                sb.append(country);
-+                sb.append(ResponseUtils.filterIfQuote(country));
-             }
-             sb.append("\"");
-         }
-diff --git a/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java b/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
-index 77d7dba..5da8317 100644
--- a/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
-+++ b/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
-@@ -45,6 +45,7 @@ import org.apache.struts.Globals;
- import org.apache.struts.action.ActionMapping;
- import org.apache.struts.config.ModuleConfig;
- import org.apache.struts.taglib.TagUtils;
-+import org.apache.struts.util.ResponseUtils;
- import org.apache.struts.util.MessageResources;
- import org.apache.struts.validator.Resources;
- import org.apache.struts.validator.ValidatorPlugIn;
-@@ -850,7 +851,7 @@ public class JavascriptValidatorTag extends BodyTagSupport {
-         }
- 
-         if (this.src != null) {
-            start.append(" src=\"" + src + "\"");
-+            start.append(" src=\"" + ResponseUtils.filterIfQuote(src) + "\"");
-         }
- 
-         start.append("> \n");
-diff --git a/src/share/org/apache/struts/taglib/html/OptionTag.java b/src/share/org/apache/struts/taglib/html/OptionTag.java
-index 4df5c95..e9e4b2e 100644
--- a/src/share/org/apache/struts/taglib/html/OptionTag.java
-+++ b/src/share/org/apache/struts/taglib/html/OptionTag.java
-@@ -26,6 +26,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport;
- import org.apache.struts.Globals;
- import org.apache.struts.taglib.TagUtils;
- import org.apache.struts.util.MessageResources;
-+import org.apache.struts.util.ResponseUtils;
- 
- /**
-  * Tag for select options.  The body of this tag is presented to the user
-@@ -235,7 +236,7 @@ public class OptionTag extends BodyTagSupport {
-     protected String renderOptionElement() throws JspException {
-         StringBuffer results = new StringBuffer("<option value=\"");
-         
-        results.append(this.value);
-+        results.append(ResponseUtils.filterIfQuote(this.value));
-         results.append("\"");
-         if (disabled) {
-             results.append(" disabled=\"disabled\"");
-@@ -245,17 +246,17 @@ public class OptionTag extends BodyTagSupport {
-         }
-         if (style != null) {
-             results.append(" style=\"");
-            results.append(style);
-+            results.append(ResponseUtils.filterIfQuote(style));
-             results.append("\"");
-         }
-         if (styleId != null) {
-             results.append(" id=\"");
-            results.append(styleId);
-+            results.append(ResponseUtils.filterIfQuote(styleId));
-             results.append("\"");
-         }
-         if (styleClass != null) {
-             results.append(" class=\"");
-            results.append(styleClass);
-+            results.append(ResponseUtils.filterIfQuote(styleClass));
-             results.append("\"");
-         }
-         results.append(">");
-diff --git a/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java b/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
-index 9999259..e5ecb66 100644
--- a/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
-+++ b/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
-@@ -30,6 +30,7 @@ import javax.servlet.jsp.tagext.TagSupport;
- 
- import org.apache.commons.beanutils.PropertyUtils;
- import org.apache.struts.util.IteratorAdapter;
-+import org.apache.struts.util.ResponseUtils;
- import org.apache.struts.taglib.TagUtils;
- import org.apache.struts.util.MessageResources;
- 
-@@ -291,7 +292,7 @@ public class OptionsCollectionTag extends TagSupport {
-         if (filter) {
-             sb.append(TagUtils.getInstance().filter(value));
-         } else {
-            sb.append(value);
-+            sb.append(ResponseUtils.filterIfQuote(value));
-         }
-         sb.append("\"");
-         if (matched) {
-@@ -299,12 +300,12 @@ public class OptionsCollectionTag extends TagSupport {
-         }
-         if (style != null) {
-             sb.append(" style=\"");
-            sb.append(style);
-+            sb.append(ResponseUtils.filterIfQuote(style));
-             sb.append("\"");
-         }
-         if (styleClass != null) {
-             sb.append(" class=\"");
-            sb.append(styleClass);
-+            sb.append(ResponseUtils.filterIfQuote(styleClass));
-             sb.append("\"");
-         }
-         
-@@ -313,7 +314,7 @@ public class OptionsCollectionTag extends TagSupport {
-         if (filter) {
-             sb.append(TagUtils.getInstance().filter(label));
-         } else {
-            sb.append(label);
-+            sb.append(ResponseUtils.filterIfQuote(label));
-         }
-         
-         sb.append("</option>\r\n");
-diff --git a/src/share/org/apache/struts/taglib/html/OptionsTag.java b/src/share/org/apache/struts/taglib/html/OptionsTag.java
-index 90d716a..dbc14cf 100644
--- a/src/share/org/apache/struts/taglib/html/OptionsTag.java
-+++ b/src/share/org/apache/struts/taglib/html/OptionsTag.java
-@@ -32,6 +32,7 @@ import org.apache.commons.beanutils.PropertyUtils;
- import org.apache.struts.util.IteratorAdapter;
- import org.apache.struts.taglib.TagUtils;
- import org.apache.struts.util.MessageResources;
-+import org.apache.struts.util.ResponseUtils;
- 
- /**
-  * Tag for creating multiple &lt;select&gt; options from a collection.  The
-@@ -313,7 +314,7 @@ public class OptionsTag extends TagSupport {
-         if (filter) {
-             sb.append(TagUtils.getInstance().filter(value));
-         } else {
-            sb.append(value);
-+            sb.append(ResponseUtils.filterIfQuote(value));
-         }
-         sb.append("\"");
-         if (matched) {
-@@ -321,12 +322,12 @@ public class OptionsTag extends TagSupport {
-         }
-         if (style != null) {
-             sb.append(" style=\"");
-            sb.append(style);
-+            sb.append(ResponseUtils.filterIfQuote(style));
-             sb.append("\"");
-         }
-         if (styleClass != null) {
-             sb.append(" class=\"");
-            sb.append(styleClass);
-+            sb.append(ResponseUtils.filterIfQuote(styleClass));
-             sb.append("\"");
-         }
-         
-@@ -335,7 +336,7 @@ public class OptionsTag extends TagSupport {
-         if (filter) {
-             sb.append(TagUtils.getInstance().filter(label));
-         } else {
-            sb.append(label);
-+            sb.append(ResponseUtils.filterIfQuote(label));
-         }
-         
-         sb.append("</option>\r\n");
-diff --git a/src/share/org/apache/struts/taglib/html/RewriteTag.java b/src/share/org/apache/struts/taglib/html/RewriteTag.java
-index 804e50c..63a2f03 100644
--- a/src/share/org/apache/struts/taglib/html/RewriteTag.java
-+++ b/src/share/org/apache/struts/taglib/html/RewriteTag.java
-@@ -24,6 +24,7 @@ import java.util.Map;
- import javax.servlet.jsp.JspException;
- 
- import org.apache.struts.taglib.TagUtils;
-+import org.apache.struts.util.ResponseUtils;
- 
- /**
-  * Generate a URL-encoded URI as a string.
-@@ -72,7 +73,8 @@ public class RewriteTag extends LinkTag {
-                 (messages.getMessage("rewrite.url", e.toString()));
-         }
- 
-        TagUtils.getInstance().write(pageContext, url);
-+        TagUtils.getInstance().write(pageContext,
-+                ResponseUtils.filterIfQuote(url));
- 
-         return (SKIP_BODY);
- 
-diff --git a/src/share/org/apache/struts/util/ResponseUtils.java b/src/share/org/apache/struts/util/ResponseUtils.java
-index 4588bb2..fe7e517 100644
--- a/src/share/org/apache/struts/util/ResponseUtils.java
-+++ b/src/share/org/apache/struts/util/ResponseUtils.java
-@@ -137,6 +137,37 @@ public class ResponseUtils {
-     }
- 
- 
-+    /**
-+     * Replace double-quote characters in the input string with
-+     * proper HTML encoding.
-+     * 
-+     * No other HTML-encoding is performed.  As a result, the return value
-+     * can only be safely used in (X)HTML attributes surrounded by
-+     * double-quote characters (<code>"</code>).
-+     * 
-+     * <p>Note that you should not use this function in new code.
-+     * It is only intended for old code which needs to be
-+     * backwards-compatible with incompletely-quoted attributes.
-+     * 
-+     * @return a fresh string object if quoting is needed,
-+     *   otherwise the input string
-+     */
-+    public static String filterIfQuote(String value) {
-+    	if (value == null)
-+    		return null;
-+    	if (value.indexOf('"') >= 0) {
-+    		StringBuffer sb = new StringBuffer(value.length() + 2);
-+    		for (int i = 0; i < value.length(); ++i) {
-+    			final char ch = value.charAt(i);
-+    			if (ch == '"')
-+    				sb.append("&quot;");
-+    			else
-+    				sb.append(ch);
-+    		}
-+    		return sb.toString();
-+    	}
-+    	return value;
-+    }
- 
-     
-     /**
--- a/dev-java/struts/struts-1.2.9-r3.ebuild
+++ b/dev-java/struts/struts-1.2.9-r3.ebuild
@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r3.ebuild,v 1.5 2011/12/19 11:01:26 sera Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-trax"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${P}-src"
-DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
-SRC_URI="mirror://apache/struts/source/${MY_P}.tar.gz"
-HOMEPAGE="http://struts.apache.org/index.html"
-LICENSE="Apache-2.0"
-SLOT="1.2"
-COMMON_DEPS="
-	>=dev-java/antlr-2.7.7:0[java]
-	dev-java/commons-beanutils:1.7
-	>=dev-java/commons-collections-2.1:0
-	>=dev-java/commons-digester-1.5:0
-	>=dev-java/commons-fileupload-1.0:0
-	>=dev-java/commons-logging-1.0.4:0
-	>=dev-java/commons-validator-1.1.4:0
-	dev-java/jakarta-oro:2.0
-	java-virtuals/servlet-api:2.3"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPS}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPS}"
-IUSE=""
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-CVE-2008-2025.patch"
-
-	java_prepare
-}
-
-java_prepare() {
-	# the build.xml expects this directory to exist
-	mkdir "${S}/lib"
-	cd "${S}/lib"
-
-	# No property exists for this
-	java-pkg_jar-from commons-collections
-}
-
-src_compile() {
-	local antflags="compile.library"
-
-	# In the order the build process asks for these
-	# They are copied in the build.xml to ${S}/target/library/
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
-	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
-	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
-	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
-	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)"
-	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)"
-
-	# Needed to compile
-	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
-	antflags="${antflags} -Dantlr.jar=$(java-pkg_getjars antlr)"
-
-	# only needed for contrib stuff which we don't currently build
-#	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
-
-	eant ${antflags} $(use_doc compile.javadoc)
-}
-
-src_install() {
-	java-pkg_dojar target/library/${PN}.jar
-
-	#install the tld files
-	insinto /usr/share/${PN}-${SLOT}/lib
-	doins target/library/*.tld
-
-	dodoc README STATUS.txt || die
-	use doc && java-pkg_dohtml -r target/documentation/
-	use examples && java-pkg_doexamples src/example*
-	use source && java-pkg_dosrc src/share/*
-}
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@ -1,9 +1,5 @@
-DIST parrot-6.10.0.tar.gz 4643304 SHA256 e90e83b69ec2f6c54bb0c6dc5645159c044bb3a48618e88e858dd18234ed1e84 SHA512 67de2521dd2f00351c2ab23d3ff47be77a1031b24276fb46cf2035a05c37cfc14f1160988880db8e64ec4ff369ccbc53ce7989fab114a823852b90f6b2e819df WHIRLPOOL 3cabd2a9ac1f46f9cb156797ee36a643c44197a91565646aa29ab2a99194bd727cb0b53aac205cab4442df69f9a485f93308dbb7de9bb373984b5e227a120972
-DIST parrot-6.11.0.tar.gz 4678513 SHA256 e92829ff3796f834ac98f100ca5625850590574822ca479c13c00f622f1c322f SHA512 f969db2def3aeea9e9267f0757e8c37f30a838372d9adf2aa413df50f9d26f0a376ce162040f36a4ad2367d5caeec43781f1180ebc4bbe3cf79ed68c357dd284 WHIRLPOOL f3eefc49ca675bf00f50466fa9621f1f0f99003f177a957dd60472bd3ab1a20363846c1c6db89c9b858bfc95c92b636c1a19921f6e028e3f435784e11bb2972a
-DIST parrot-6.7.0.tar.gz 4613520 SHA256 04b0ee976c61100af993f8830863ccfee9eada6bf2b9c224850653d470dc9da2 SHA512 dd80ba10468fea5ddc3ce34cccf633a7d717901580f04792ec3f5414c6a45b83b7862b81801a24c77d1f9054be1a9a3303c19adf1393454234b4ea352ca07935 WHIRLPOOL e5ad834ca0f4743cb1bbe03af018f7abdef86ecc82e56330b86bf8d264a89eff23fd6dc582d5048a03675bcfdd6f7becf0bbc9553f2ba1d700a74eb046da1b51
-DIST parrot-6.8.0.tar.gz 4625363 SHA256 986a0e543e660e83595a3c477b7b7f065099edb559d74c56f61d88e216042f4e SHA512 f6bbb1576b2ea24379e4ec5778456754be41b01edf39c7b965124c195b16a7ac636f6000e168003310ded5eb420e16bb3881201a82a7d327fd0ff849ae7ca816 WHIRLPOOL 91bd7d1273a2ec8519ef63ee0d5b074e73d566c4f79f75dc4d13eb86574bf02b357ca364495441453c22463de930dcdcd78cdcf229b2281a5ea3ba8d02af39c3
-DIST parrot-6.9.0.tar.gz 4629472 SHA256 91ca66be5747b826374a91bb509c03c192e7a90f7742a279146a0a70639d5f9c SHA512 0308f98faafbd3cc0bfc50fdef004a169220da288a6180ba394a68b2c552e9a45f24d783ca45be1faebcad93466810e7abe16a95d81dec33c844c5ea9bb51c17 WHIRLPOOL 686020406e5c31234948320bcfbafa963423d80bcc0fde1fd893cd5dc622748f9923549c172c8ac780bcdb2f5a5fd30a2f1fb3010093164ea685e772158341f9
 DIST parrot-7.0.2.tar.gz 4697530 SHA256 1a8e9e203ad8ac92c89422603d1603fa821e957aa3a9ae57420c737d93c55213 SHA512 9fcd3d27c71a37841c81353aea3e393822358521e18f02644caa360de8d0f90b04c040839539769f0565c76fecc345a8c803c8e1b2cb0ec14675077a84cb4714 WHIRLPOOL e3f42c54c2c1dc422a7307e1f45689a81e27ffece6178e96067ae5a1ced168cf27849765249759d4fbc0b355151dc1d274dc97a8fb6a17cf9eece831415f2a71
 DIST parrot-7.1.0.tar.gz 4688341 SHA256 fe2cac1f5b811f36d6de7454ef1ff394ad66474f203813e5369b4dc68305964b SHA512 b7d261e82934aa84b3d93b2e68b3eb0f13dea684665ca2448a0e2139aa6676c1ff2da1a8056332a7f2538bee6158953be5bceed0ac8a9b277827ec7bcba46cb8 WHIRLPOOL 8083787f8779664e4ec7b3426b3e103dff9a22dfb18051e7617b6738b44156e1084f1691ce02e5869abba4d6455628c30631a9b5c86bc90779e6d2051e85d87b
 DIST parrot-7.2.0.tar.gz 4700915 SHA256 f4792fc1a82040dd855f73890de6fa26759aa62f4b4ad1aa468597592b7bf3bf SHA512 9b29394e753a88ecc5f581e73cb2c01cbf65442f754dacda1e7b4ff68ce527248d831de56a597512418918660ec12829259fd4ad3a235d1e22012c88a933242b WHIRLPOOL abef905a53830d7e352f5d64bb26c8861f10b2188fea36f3d1a426cf6e0fd5b0383345d1f6b7ba32dc47b8f7666566a6ac987f7b8e1b5b198192c30e5fcb815e
 DIST parrot-7.3.0.tar.gz 4687210 SHA256 23d2f59a0399a63a835087a192bede02a25f21fbcf5e42ed113b4c6dcdbea6b1 SHA512 e0aa408733af7939bdd4149952765fada0dcd6ce08b6a95f19ceab974f202fa3e440ffcb604f28fe9fd1b3b860a3400890b81e24984efdd88595f985041f3112 WHIRLPOOL fa2f32eb04d0a2be18fef4d420fa88808859d42474869d46ae6f44f3caa8611297de19b35dd337993de7e6e33df139b79e228c19a4fd7386b611643d557361e9
+DIST parrot-7.5.0.tar.gz 4693149 SHA256 71c25d2eb0798f1fc1c0890f6e4aed9d5f2a6e4e248456b3502f7721758267fe SHA512 6c009dec6bdb9f419b20f3bb6c103b16018b27b2ed0094f13c957f66d9735cfc126c15f787d4ce577cd0c6492d61264c35c23d50ab29517b65f00df7c4b4d619 WHIRLPOOL 7c0da3ad36d92cdae3d89de5f0938a4744c87301d8d0e76fec9bf7421dda7459ab083e112867702cfb6cfee3f308c856e5d7dcb547b35d27754d23e98dff8c3c
--- a/dev-lang/parrot/parrot-6.10.0.ebuild
+++ b/dev-lang/parrot/parrot-6.10.0.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-6.10.0.ebuild,v 1.1 2014/11/23 23:58:15 patrick Exp $
-
-EAPI=5
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
--- a/dev-lang/parrot/parrot-6.7.0-r1.ebuild
+++ b/dev-lang/parrot/parrot-6.7.0-r1.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-6.7.0-r1.ebuild,v 1.1 2014/10/10 08:24:14 patrick Exp $
-
-EAPI=5
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
--- a/dev-lang/parrot/parrot-6.8.0-r1.ebuild
+++ b/dev-lang/parrot/parrot-6.8.0-r1.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-6.8.0-r1.ebuild,v 1.1 2014/10/10 08:24:14 patrick Exp $
-
-EAPI=5
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
--- a/dev-lang/parrot/parrot-6.9.0.ebuild
+++ b/dev-lang/parrot/parrot-6.9.0.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-6.9.0.ebuild,v 1.1 2014/10/25 03:14:36 patrick Exp $
-
-EAPI=5
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
--- a/dev-lang/parrot/parrot-6.11.0.ebuild
+++ b/dev-lang/parrot/parrot-6.11.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-lang/parrot/parrot-6.11.0.ebuild,v 1.2 2015/01/26 04:15:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-7.5.0.ebuild,v 1.1 2015/07/17 07:29:22 patrick Exp $

 EAPI=5

@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
 LICENSE="Artistic-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
+IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"

 RDEPEND="sys-libs/readline
 	dev-libs/libffi
--- a/dev-lang/vala/vala-0.26.2.ebuild
+++ b/dev-lang/vala/vala-0.26.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-lang/vala/vala-0.26.2.ebuild,v 1.7 2015/06/07 10:24:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.26.2.ebuild,v 1.8 2015/07/17 15:32:35 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Vala"

 LICENSE="LGPL-2.1"
 SLOT="0.26"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"

 RDEPEND="
--- a/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.4.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-libs/appstream-glib/appstream-glib-0.4.0.ebuild,v 1.2 2015/07/15 05:23:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild,v 1.3 2015/07/17 06:11:03 jer Exp $

 EAPI=5
 GCONF_DEBUG="no"
@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 IUSE="+introspection nls"

 # FIXME: yaml is optional with --enable-dep11 but not
--- a/dev-libs/atk/atk-2.14.0.ebuild
+++ b/dev-libs/atk/atk-2.14.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-libs/atk/atk-2.14.0.ebuild,v 1.8 2015/06/07 10:26:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.14.0.ebuild,v 1.9 2015/07/17 15:32:37 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -12,7 +12,7 @@ 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"
+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="
--- a/dev-libs/boost/boost-1.56.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.56.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/dev-libs/boost/boost-1.56.0-r1.ebuild,v 1.8 2015/07/15 16:21:54 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.56.0-r1.ebuild,v 1.11 2015/07/17 16:04:48 zlogene Exp $

 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"

 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"

 IUSE="context debug doc icu +nls mpi python static-libs +threads tools"

--- a/dev-libs/botan/botan-1.10.5.ebuild
+++ b/dev-libs/botan/botan-1.10.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-libs/botan/botan-1.10.5.ebuild,v 1.9 2015/04/19 06:52:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.5.ebuild,v 1.11 2015/07/18 11:48:57 jer Exp $

 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@ -13,7 +13,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz"

-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib"
--- a/dev-libs/botan/botan-1.11.4.ebuild
+++ b/dev-libs/botan/botan-1.11.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/botan/botan-1.11.4.ebuild,v 1.4 2015/04/08 17:51:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.11.4.ebuild,v 1.5 2015/07/18 11:48:57 jer Exp $

 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@ -13,7 +13,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz"

-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bindist doc python bzip2 gmp lzma sqlite ssl static-libs threads zlib"
--- a/dev-libs/botan/botan-1.11.8.ebuild
+++ b/dev-libs/botan/botan-1.11.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/dev-libs/botan/botan-1.11.8.ebuild,v 1.4 2015/04/08 17:51:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.11.8.ebuild,v 1.5 2015/07/18 11:48:57 jer Exp $

 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@ -13,7 +13,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz"

-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 SLOT="0"
 LICENSE="BSD"
 IUSE="bindist doc python bzip2 gmp lzma sqlite ssl static-libs threads zlib"
--- a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-2.0.1.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-libs/double-conversion/double-conversion-2.0.1.ebuild,v 1.1 2014/04/02 22:54:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/double-conversion/double-conversion-2.0.1.ebuild,v 1.2 2015/07/18 05:52:06 patrick Exp $

 EAPI=5

@ -27,7 +27,7 @@ src_prepare() {
 }

 src_compile() {
-	escons ${LIBNAME}.so
+	escons ${LIBNAME}.so.1
 	use static-libs && escons ${LIBNAME}.a
 }

--- a/dev-libs/gjs/gjs-1.42.0.ebuild
+++ b/dev-libs/gjs/gjs-1.42.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-libs/gjs/gjs-1.42.0.ebuild,v 1.6 2015/06/07 10:29:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.42.0.ebuild,v 1.7 2015/07/17 15:32:42 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sparc x86"

 RDEPEND="
 	>=dev-libs/glib-2.36:2
--- a/dev-libs/glib/glib-1.2.10-r6.ebuild
+++ b/dev-libs/glib/glib-1.2.10-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/dev-libs/glib/glib-1.2.10-r6.ebuild,v 1.7 2015/07/13 04:10:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r6.ebuild,v 1.8 2015/07/17 15:32:53 ago Exp $

 EAPI=5
 GNOME_TARBALL_SUFFIX="gz"
@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}

 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="hardened static-libs"

 DEPEND=""
--- a/dev-libs/glib/glib-2.42.2.ebuild
+++ b/dev-libs/glib/glib-2.42.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/glib/glib-2.42.2.ebuild,v 1.7 2015/06/07 10:16:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.42.2.ebuild,v 1.8 2015/07/17 15:32:53 ago 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
@ -32,7 +32,7 @@ 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"
+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="
 	!<dev-util/gdbus-codegen-${PV}
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.42.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.42.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-libs/gobject-introspection-common/gobject-introspection-common-1.42.0.ebuild,v 1.7 2015/06/07 10:28:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/gobject-introspection-common-1.42.0.ebuild,v 1.8 2015/07/17 15:33:00 ago Exp $

 EAPI="5"
 GNOME_ORG_MODULE="gobject-introspection"
@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"

 LICENSE="HPND"
 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"
+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"
 IUSE=""

 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
--- a/dev-libs/gobject-introspection/gobject-introspection-1.42.0-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.42.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/dev-libs/gobject-introspection/gobject-introspection-1.42.0-r1.ebuild,v 1.8 2015/06/07 10:28:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.42.0-r1.ebuild,v 1.9 2015/07/17 15:32:57 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -19,7 +19,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-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"
+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"

 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and goi to be in sync by this way as explained in bug #518424
--- a/dev-libs/json-glib/json-glib-1.0.4.ebuild
+++ b/dev-libs/json-glib/json-glib-1.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/dev-libs/json-glib/json-glib-1.0.4.ebuild,v 1.6 2015/07/13 04:12:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-1.0.4.ebuild,v 1.7 2015/07/17 15:33:02 ago Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug +introspection"

 RDEPEND="
--- a/dev-libs/liberasurecode/liberasurecode-1.0.7.ebuild
+++ b/dev-libs/liberasurecode/liberasurecode-1.0.7.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/liberasurecode/liberasurecode-1.0.7.ebuild,v 1.1 2015/04/30 19:34:46 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liberasurecode/liberasurecode-1.0.7.ebuild,v 1.2 2015/07/18 12:06:46 zlogene Exp $

 EAPI=5
 inherit toolchain-funcs
@ -13,7 +13,7 @@ S="${WORKDIR}/tsg--${PN}-${CUSTOM_VERSION}"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""

 RDEPEND=""
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST puppetdb-3.0.1.tar.gz 24693952 SHA256 b5e86d36845c62d75c078816cffd5d38d97f014da8886506819b21a6c2719366 SHA512 00960de13270a8063de1845f7f0c42a3fa4bdec10ab2b8f66ce0dba27acda1b78974c57c0f3c6e2c09187f63e85d799b94f95de563bcbc179e9d692470a1e902 WHIRLPOOL ec136a91b2712b9249defaff6ea24b6f1ed917e519850515d8c0b995c5dcbc049550b2ac9efbe585c197a5747edcdb10e490a016de2067b593c833e02d8a7426`
				`@ -0,0 +1 @@`
				`DIST time-locale-compat-0.1.1.0.tar.gz 1933 SHA256 25a04d0099482c2f367fb80e557ab59ba09c99aec6061c2b52733178420cb455 SHA512 1192841b9065f052cd03672f587e4dad04fb6ee983159014c582c31da6b2d09dec6ea0c728554ee3aa04478de686d155075dbed9cc5cc258927df2d9d896e5b6 WHIRLPOOL efa6fb209519c05c5fc6767bcb628479a6948426c3d3f043a41b6f49d09b6f9621f27245759aba83ae2e31b72d4850d7c3c6b844f1cb036842e547ccebef2bc0`