Sync with portage [Thu Jun 25 09:17:47 MSK 2015].

9 years ago · 8111275c55
parent 8dc64feed6
commit 8111275c55
407 changed files with 4000 additions and 1911 deletions
--- a/app-antivirus/clamav/clamav-0.98.7.ebuild
+++ b/app-antivirus/clamav/clamav-0.98.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-antivirus/clamav/clamav-0.98.7.ebuild,v 1.3 2015/06/05 09:00:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.98.7.ebuild,v 1.4 2015/06/24 07:58:50 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 milter metadata-analysis-api selinux static-libs uclibc"

 CDEPEND="bzip2? ( app-arch/bzip2 )
--- a/app-arch/ncompress/ncompress-4.2.4.3.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.3.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/ncompress/ncompress-4.2.4.3.ebuild,v 1.6 2010/02/11 19:27:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ncompress/ncompress-4.2.4.3.ebuild,v 1.7 2015/06/24 15:04:26 vapier Exp $

 inherit toolchain-funcs

 DESCRIPTION="Another uncompressor for compatibility"
-HOMEPAGE="http://ncompress.sourceforge.net/"
+HOMEPAGE="https://github.com/vapier/ncompress"
 SRC_URI="mirror://sourceforge/ncompress/${P}.tar.gz"

 LICENSE="public-domain"
--- a/app-arch/ncompress/ncompress-4.2.4.4.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.4.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/ncompress/ncompress-4.2.4.4.ebuild,v 1.9 2014/01/18 01:43:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/ncompress/ncompress-4.2.4.4.ebuild,v 1.10 2015/06/24 15:04:26 vapier Exp $

 EAPI=4

 inherit toolchain-funcs

 DESCRIPTION="Another uncompressor for compatibility"
-HOMEPAGE="http://ncompress.sourceforge.net/"
+HOMEPAGE="https://github.com/vapier/ncompress"
 SRC_URI="mirror://sourceforge/ncompress/${P}.tar.gz"

 LICENSE="public-domain"
--- a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1-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-arch/p7zip/p7zip-9.20.1-r5.ebuild,v 1.13 2015/06/21 18:21:30 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild,v 1.14 2015/06/24 07:54:16 ago Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"

 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc kde rar +pch static wxwidgets"

 REQUIRED_USE="kde? ( wxwidgets )"
--- a/app-crypt/mit-krb5/mit-krb5-1.13.2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.13.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13.2.ebuild,v 1.2 2015/06/23 15:18:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13.2.ebuild,v 1.3 2015/06/24 07:58:12 ago Exp $

 EAPI=5

@ -16,7 +16,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"

 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd"

 CDEPEND="
--- a/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+++ b/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch
@ -0,0 +1,19 @@
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
+index 7f74b85..ea58119 100644
+--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
+@@ -41,11 +41,11 @@ CONNECT_RETRIES=10
+ RETRIES_SLEEP=1
+ SYNC_TIME=0
+ 
+-test -f "$sysconfdir"/sysconfig/libvirt-guests &&
+-    . "$sysconfdir"/sysconfig/libvirt-guests
+test -f "$sysconfdir"/libvirt/libvirt-guests.conf &&
+    . "$sysconfdir"/libvirt/libvirt-guests.conf
+ 
+ LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
+-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
+VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
+ 
+ RETVAL=0
+ 
--- a/app-emulation/libvirt/files/libvirtd.confd-r5
+++ b/app-emulation/libvirt/files/libvirtd.confd-r5
@ -0,0 +1,71 @@
+# /etc/conf.d/libvirtd
+
+# Startup dependency
+# libvirtd typically requires all networks to be up and settled which
+# is what rc_need="net" provides. However if you only use specific networks
+# for libvirtd, you may override this. Or if you only use libvirtd locally.
+rc_need="net"
+
+# LIBVIRTD_OPTS
+#   You may want to add '--listen' to have libvirtd listen for tcp/ip
+#   connections if you want to use libvirt for remote control. Please
+#   consult 'libvirtd --help' for more options.
+#LIBVIRTD_OPTS="--listen"
+
+# LIBVIRTD_KVM_SHUTDOWN
+#   controls the behavior for kvm guests on daemon shutdown
+#
+# Valid options:
+# * shutdown
+#   - Sends an ACPI shutdown (think when you tap the power button on your
+#     machine and it begins a graceful shutdown). If your VM ignores this,
+#     it will have the power yanked out from under it in
+#     LIBVIRTD_KVM_SHUTDOWN_MAXWAIT seconds.
+# * managedsave
+#   - Performs a state save external to the VM. qemu-kvm will stop stop the
+#     CPU and save off all state to a separate file. When the machine is
+#     started again, it will resume like nothing ever happened. This is
+#     guarenteed to always successfully stop your machine and restart it.
+#     However it may take some time to finish.
+# * none
+#   - No attempts will be made to stop any VMs. If you are restarting your
+#     machine the qemu-kvm process will be simply killed, which may result
+#     in your VMs having disk corruption.
+LIBVIRTD_KVM_SHUTDOWN="managedsave"
+
+# LIBVIRTD_KVM_SHUTDOWN_MAXWAIT
+#   timeout in seconds until stopping libvirtd and "pulling the plug" on
+#   the remaining VM's still in a running state
+LIBVIRTD_KVM_SHUTDOWN_MAXWAIT="500"
+
+# LIBVIRTD_KVM_RESTART
+#   controls the behavior for kvm guests on daemon restart
+#
+# Valid options:
+# * <empty>
+#   - apply the same policy on daemon restart as defined by
+#     LIBVIRTD_KVM_SHUTDOWN for the shutdown
+# * shutdown
+# * managedsave
+# * none
+#   - as defined for LIBVIRTD_KVM_SHUTDOWN
+LIBVIRTD_KVM_RESTART=""
+
+# LIBVIRTD_KVM_NET_SHUTDOWN
+#   If libvirtd created networks for you (e.g. NATed networks) then this
+#   init script will shut them down for you if this is set to 'yes'.
+#   Otherwise, the networks will be left running once libvirt is shutdown.
+#   For this option to be useful you must have enabled the 'virt-network'
+#   USE flag and have had libvirt create a NATed network for you. Valid
+#   values: 'yes' or 'no'
+LIBVIRTD_KVM_NET_SHUTDOWN="yes"
+
+# LIBVIRTD_KVM_NET_RESTART
+# Valid options:
+# * <empty>
+#   - apply the same policy on daemon restart as defined by
+#     LIBVIRTD_KVM_NET_SHUTDOWN for the shutdown
+# * yes
+# * no
+#   - as defined for LIBVIRTD_KVM_NET_SHUTDOWN
+LIBVIRTD_KVM_NET_RESTART=""
--- a/app-emulation/libvirt/files/libvirtd.init-r15
+++ b/app-emulation/libvirt/files/libvirtd.init-r15
@ -0,0 +1,163 @@
+#!/sbin/runscript
+
+description="Virtual Machine Management daemon (libvirt)"
+extra_started_commands="reload halt"
+description_halt="Stops the libvirt daemon without stopping your VMs"
+description_reload="Restarts the libvirt daemon without stopping your VMs"
+
+depend() {
+    USE_FLAG_FIREWALLD
+    use USE_FLAG_AVAHI USE_FLAG_ISCSI USE_FLAG_RBD dbus virtlockd
+    after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
+}
+
+libvirtd_virsh() {
+    local mode=$1
+    shift
+
+    # Silence errors because virsh always throws an error about
+    # not finding the hypervisor version when connecting to libvirtd
+    LC_ALL=C virsh -c ${mode}:///system "$@" 2>/dev/null
+}
+
+libvirtd_dom_list() {
+    # Make sure that it wouldn't be confused if the domain name
+    # contains the word running.
+    libvirtd_virsh $1 list | awk '$3 == "running" { print $1 }'
+}
+
+libvirtd_dom_count() {
+    # Make sure that it wouldn't be confused if the domain name
+    # contains the word running.
+    libvirtd_virsh $1 list | awk 'BEGIN { count = 0 } \
+        $3 == "running" { count++ } \
+        END { print count }'
+}
+
+libvirtd_net_list() {
+    # The purpose of the awk is to avoid networks with 'active' in the name
+    libvirtd_virsh $1 net-list | awk '$2 == "active" { print $1 }'
+}
+
+libvirtd_net_count() {
+    # The purpose of the awk is to avoid networks with 'active' in the name
+    libvirtd_virsh $1 net-list | awk 'BEGIN { count = 0 } \
+        $2 == "active" { count++ } \
+        END { print count }'
+}
+
+
+start() {
+    # Test configuration directories in /etc/libvirt/ to be either not
+    # present or a directory, i.e. not a regular file, bug #532892
+    for dir in lxc nwfilter qemu storage; do
+      if [ -f /etc/libvirt/$dir ]; then
+        eerror "/etc/libvirt/$dir was created as a regular file. It must be either"
+        eerror "a directory or not present for libvirtd to start up successfully."
+        return 1
+      fi
+    done
+
+    ebegin "Starting libvirtd"
+    start-stop-daemon --start \
+        --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
+        --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
+    eend $?
+}
+
+stop() {
+    local policy=
+    local counter=
+    local net_policy=
+    local vm_name=
+    local net_name=
+    local dom_id=
+
+    ebegin "Stopping libvirtd"
+
+    if [ "${RC_CMD}" = "restart" -a -n "${LIBVIRTD_KVM_RESTART}" ] ; then
+        policy="${LIBVIRTD_KVM_RESTART}"
+    else
+        policy="${LIBVIRTD_KVM_SHUTDOWN}"
+    fi
+
+    # sanitize policy:
+    if [ "${policy}" != "none" -a "${policy}" != "managedsave" -a "${policy}" != "shutdown" ] ; then
+        if [ -n "${policy}" ] ; then
+            eerror " !!! Invalid policy \"${policy}\" specified in LIBVIRTD_KVM_SHUTDOWN/RESTART"
+        fi
+        einfo "  Using default policy \"managedsave\" for domains"
+        policy="managedsave"
+    fi
+
+    if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
+        counter="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
+    else
+        counter=500
+    fi
+
+    if [ "${RC_CMD}" = "restart" -a -n "${LIBVIRTD_KVM_NET_RESTART}" ] ; then
+        net_policy="${LIBVIRTD_KVM_NET_RESTART}"
+    else
+        net_policy="${LIBVIRTD_KVM_NET_SHUTDOWN}"
+    fi
+
+    # try to shutdown all (KVM/Qemu) domains
+    if [ "${policy}" != "none" ] \
+        && [ "$(libvirtd_dom_count qemu)" != "0" ] ; then
+
+        einfo " Shutting down domain(s):"
+        for dom_id in $(libvirtd_dom_list qemu) ; do
+            vm_name="$(libvirtd_virsh qemu domname ${dom_id} | head -n 1)"
+            einfo "   ${vm_name}"
+            libvirtd_virsh qemu ${policy} ${dom_id} > /dev/null
+        done
+
+        if [ "${policy}" = "shutdown" ]; then
+            einfo " Waiting ${counter} seconds while domains shutdown ..."
+            DOM_COUNT="$(libvirtd_dom_count qemu)"
+            while [ ${DOM_COUNT} -gt 0 ] && [ ${counter} -gt 0 ] ; do
+                DOM_COUNT="$(libvirtd_dom_count qemu)"
+                sleep 1
+                counter=$((${counter} - 1))
+                echo -n "."
+            done
+        fi
+
+        if [ "$(libvirtd_dom_count qemu)" != "0" ] ; then
+            eerror " !!! Some guests are still running, stopping anyway"
+        fi
+    fi
+
+    # try to shutdown all networks
+    if [ "${net_policy}" != "no" ] \
+        && [ "$(libvirtd_net_count qemu)" != "0" ]; then
+
+        einfo " Shutting down network(s):"
+        for net_name in $(libvirtd_net_list qemu); do
+            einfo "   ${net_name}"
+            libvirtd_virsh qemu net-destroy ${net_name} > /dev/null
+        done
+
+        if [ "$(libvirtd_net_count qemu)" != "0" ]; then
+            eerror " !!! Some networks are still active, stopping anyway"
+        fi
+    fi
+
+    # Now actually stop the daemon
+    start-stop-daemon --stop --quiet --exec \
+        /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
+    eend $?
+}
+
+halt() {
+    ebegin "Stopping libvirtd without shutting down your VMs"
+    start-stop-daemon --stop --quiet --exec \
+        /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
+    eend $?
+}
+
+reload() {
+    halt
+    start
+}
--- a/app-emulation/libvirt/libvirt-1.2.16-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.16-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-emulation/libvirt/libvirt-1.2.16.ebuild,v 1.1 2015/06/14 15:39:58 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.16-r2.ebuild,v 1.1 2015/06/24 11:07:37 tamiko Exp $

 EAPI=5

@ -227,7 +227,9 @@ src_prepare() {
 		) >.git-module-status
 	fi

-	epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
+		"${FILESDIR}"/${P}-fix_paths_in_libvirt-guests_sh.patch

 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
@ -242,7 +244,7 @@ src_prepare() {
 	local iscsi_init=
 	local rbd_init=
 	local firewalld_init=
-	cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init"
+	cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init"
 	use avahi && avahi_init='avahi-daemon'
 	use iscsi && iscsi_init='iscsid'
 	use rbd && rbd_init='ceph'
@ -407,7 +409,7 @@ src_install() {
 	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf

 	newinitd "${S}/libvirtd.init" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
 	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die

 	readme.gentoo_create_doc
--- a/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
+++ b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
@ -0,0 +1,16 @@
+ src/git.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/git.c b/src/git.c
+index c6040b2..595912d 100644
+--- a/src/git.c
+++ b/src/git.c
+@@ -1917,7 +1917,7 @@ main(argc, argv)
+     printf("%s %s (%s)\n", PRODUCT, VERSION, HOST);
+ #endif /* !HAVE_GCC */
+ 
+-    printf(copyright);
+    printf("%s", copyright);
+ 
+ #ifdef DEBIAN
+     add_to_environment("GIT_EDITOR",    "EDITOR",     "sensible-editor");
--- a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
+++ b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/gnuit-4.9.5-r2.ebuild,v 1.1 2015/06/24 10:03:51 jlec Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="GNU Interactive Tools - increase speed and efficiency of most daily tasks"
+HOMEPAGE="http://www.gnu.org/software/gnuit/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format-security.patch
+}
+
+src_configure() {
+	# The transition option controls whether a "git" wrapper is installed, it is
+	# disabled explicitly so we don't need to block on dev-vcs/git.
+	econf --disable-transition
+}
+
+src_install() {
+	default
+	#emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install
+	mv "${D}/usr/bin/gitview" "${D}/usr/bin/gnuitview" || die
+}
+
+pkg_postinst() {
+	elog "The 'git' tool this package previously installed is now called 'gitfm'"
+	elog "The 'gitview' tool this package previously installed is now called 'gnuitview'"
+	elog "If you want the 'gitaction' tool to use your preferred desktop"
+	elog "application settings install the 'x11-misc/xdg-utils' package."
+}
--- a/app-misc/pfm/pfm-2.12.3.ebuild
+++ b/app-misc/pfm/pfm-2.12.3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pfm/pfm-2.12.3.ebuild,v 1.1 2014/04/11 02:15:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pfm/pfm-2.12.3.ebuild,v 1.2 2015/06/24 14:25:54 monsieurp Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/p-f-m/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 RDEPEND=">=dev-lang/perl-5.8
 	>=dev-perl/File-Stat-Bits-1.10.0
--- a/app-misc/tracker/tracker-1.4.0.ebuild
+++ b/app-misc/tracker/tracker-1.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/app-misc/tracker/tracker-1.4.0.ebuild,v 1.1 2015/06/09 10:41:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.4.0.ebuild,v 1.2 2015/06/24 20:21:44 pacho Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/100"
 IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
-gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager
+gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager
 pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"

 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@ -53,7 +53,10 @@ RDEPEND="
 		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
 	exif? ( >=media-libs/libexif-0.6 )
-	ffmpeg? ( >=virtual/ffmpeg-9 )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 	firefox-bookmarks? ( || (
 		>=www-client/firefox-4.0
 		>=www-client/firefox-bin-4.0 ) )
--- a/app-office/texmaker/files/texmaker-4.4.1-modern-styles.patch
+++ b/app-office/texmaker/files/texmaker-4.4.1-modern-styles.patch
@ -0,0 +1,16 @@
+--- a/texmaker.cpp	2014-11-26 09:06:56.000000000 -0300
+++ b/texmaker.cpp	2015-06-19 20:49:58.801377000 -0300
+@@ -4451,7 +4451,12 @@
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+ if (modern_style)
+     {
+-qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
+		if(desktop_env == 1){
+			if (styles.contains("GTK+")) qApp->setStyle(new ManhattanStyle(QLatin1String("gtkstyle")));
+			else if (styles.contains("Windows")) qApp->setStyle(new ManhattanStyle(QLatin1String("windows")));
+			else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
+		}
+		else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
+     }
+ // else
+ // {
--- a/app-office/texmaker/texmaker-4.4.1-r1.ebuild
+++ b/app-office/texmaker/texmaker-4.4.1-r1.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1-r1.ebuild,v 1.1 2015/06/24 06:28:53 jlec Exp $
+
+EAPI=5
+
+inherit eutils qmake-utils readme.gentoo
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler:=[qt4?,qt5?]
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	dev-qt/qtsingleapplication[X,qt4?,qt5?]
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+		dev-qt/qtscript:4
+		dev-qt/qtwebkit:4
+		)
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtscript:5
+		dev-qt/qtwebkit:5[printsupport]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		)
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm
+	qt4? ( app-i18n/ibus-qt )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1-unbundle.patch
+	"${FILESDIR}"/${P}-modern-styles.patch
+	)
+
+DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	find singleapp hunspell -delete || die
+
+	epatch "${PATCHES[@]}"
+
+	cat >> ${PN}.pro <<- EOF
+	exists(texmakerx_my.pri):include(texmakerx_my.pri)
+	EOF
+
+	cp "${FILESDIR}"/texmakerx_my.pri . || die
+
+	sed \
+		-e '/^#include/s:hunspell/::g' \
+		-e '/^#include/s:singleapp/::g' \
+		-i *.cpp *.h || die
+
+	DOC_CONTENTS="A user manual with many screenshots is available at:
+	${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
+
+src_configure() {
+	local myeqmakeargs=(
+		${PN}.pro
+		PREFIX="${EPREFIX}/usr"
+		DESKTOPDIR="${EPREFIX}/usr/share/applications"
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+		)
+	if use qt4; then
+		eqmake4 ${myeqmakeargs[@]}
+	else
+		eqmake5 ${myeqmakeargs[@]}
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+	readme.gentoo_create_doc
+}
--- a/app-portage/layman/layman-2.3.0.ebuild
+++ b/app-portage/layman/layman-2.3.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-portage/layman/layman-2.3.0.ebuild,v 1.7 2015/05/07 16:02:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.3.0.ebuild,v 1.8 2015/06/25 00:24:51 floppym Exp $

 EAPI="5"

@ -57,6 +57,7 @@ pkg_setup() {
 }

 python_prepare_all()  {
+	python_setup
 	esetup.py setup_plugins
 	distutils-r1_python_prepare_all
 	#rm "${S}"/"${PN}"/tests/dtest.py
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.42 2015/04/25 13:57:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.43 2015/06/25 00:24:51 floppym Exp $

 EAPI="5"

@ -57,6 +57,7 @@ pkg_setup() {
 }

 python_prepare_all()  {
+	python_setup
 	esetup.py setup_plugins
 	distutils-r1_python_prepare_all
 	eprefixify etc/layman.cfg layman/config.py
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@ -1 +1 @@
-DIST tatt-0.2.tar.gz 22339 SHA256 33c2afd57a115fc6d7993c0fe0162e87d259e34c71bef42685c16f47abd1a775 SHA512 6784a94a70677b55352debb769e24f763c74ae0bc5acfeb64f703e492d1d288fa09f21e9962ddfb47b4be861f902f5f303512142b181134747ccf315a5c481e8 WHIRLPOOL f460d083bdeac33254a378b8105d4dda939d462277a14f1066140f83351347598e1ce46729e31529c1c99207b91499c4f7b24a814a218cfdab2ff864c402a9a0
+DIST tatt-0.3.tar.gz 22527 SHA256 bad1f0f33889aaa5887bab8c80bcbdaa620c379de5ff381ab983ae23d24ac9ed SHA512 822ec8904e452afd2373ca7ff01a05b8020b261acfc02864523a22e91d83dea51a1d2a8c79ec75db38e6de00cb3c06b3799dee261f376ec91d261a9f468aaa19 WHIRLPOOL f9be83b45c3d79e004600fa3e1ecd2d1ab6e6720035f13ab5f0b4a46555c280663e6371fb9ed88ab0de6bbfb4a853a0f07963dbc25f668a3cd8482c369343b90
--- a/app-portage/tatt/tatt-0.3.ebuild
+++ b/app-portage/tatt/tatt-0.3.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-portage/tatt/tatt-0.2.ebuild,v 1.3 2015/06/06 15:46:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/tatt/tatt-0.3.ebuild,v 1.1 2015/06/24 11:15:22 tomka Exp $

 EAPI=5

-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )

 inherit distutils-r1

--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.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-portage/tatt/tatt-9999.ebuild,v 1.10 2015/06/06 15:46:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/tatt/tatt-9999.ebuild,v 1.11 2015/06/24 11:15:22 tomka Exp $

 EAPI=5

-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )

 inherit distutils-r1 git-r3

--- a/app-vim/scala-syntax/scala-syntax-1.0.ebuild
+++ b/app-vim/scala-syntax/scala-syntax-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-vim/scala-syntax/scala-syntax-1.0.ebuild,v 1.1 2015/03/09 17:37:23 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/scala-syntax/scala-syntax-1.0.ebuild,v 1.2 2015/06/24 14:26:59 monsieurp Exp $

 EAPI=5

@ -12,5 +12,5 @@ SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"

 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
--- a/dev-java/cssparser/Manifest
+++ b/dev-java/cssparser/Manifest
@ -1,2 +1 @@
-DIST cssparser-0.9.14-sources.jar 234339 SHA256 0a41f330da911f31d4911d2745d83ecc37a131c41e99a052f131fdaf585addce SHA512 e7f9ec1bfff774d75c367c1dfcaf2b10550755900071cd6a5a64d9453b789779e0bfa6bcbdba48a679604621ee1ffb32eece774dc219d614a52e5c484256feae WHIRLPOOL 3d23c0d1873725699f2c5031aa13c30b1954c3079bd18826f0f868bc3ca78ff9be4203168778a9fd7dba0b005b29c03311404175617c621e0d0c787bbef827bd
-DIST cssparser-0.9.15-sources.jar 239976 SHA256 8b018e92228ea16ea1c52bee73bec9fe224c608c628af30d20951f571f1e493f SHA512 86c6f30542b6be967ee4099b59858531f1e333bfdf2fe4a1ef13e252cd836911da2d7d9258f8aef5fa8987d14f35905af5a82929810bc0550f4b58bc7b993e64 WHIRLPOOL fa1974a5e4d47e0037af7fe6ab2c4fa80e2379310c92604e48f289e81cbbf1812a3352289bf1389552fa4bfdc3a509556f2b3e0aa2cf1dc0cdec87053e10519d
+DIST cssparser-0.9.16-sources.jar 243889 SHA256 e21b075401a7a17fd3316a392631b77c245f8217d9da90e89fd926436098f151 SHA512 dac0f322d21c6f2ae65128ab83a6de9eb93f5c152e9e6f42de3e18b9be23d73083f42af50eeaa415da400c297fad34381ddd0f626b7aafa89c97a8b46a0d61b4 WHIRLPOOL 0c73080c9bf916eddc694de40da8a8b8ae543cf7863179f33649f3a38c95a7304d6ad98a79d78621225767c430ca1409063209b5012870557027554611648562
--- a/dev-java/cssparser/cssparser-0.9.14.ebuild
+++ b/dev-java/cssparser/cssparser-0.9.14.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cssparser/cssparser-0.9.14.ebuild,v 1.5 2015/05/27 08:31:32 monsieurp Exp $
-EAPI="5"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="API for parsing CSS 2 in Java"
-HOMEPAGE="http://cssparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/sac:0"
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="sac"
--- a/dev-java/cssparser/cssparser-0.9.16.ebuild
+++ b/dev-java/cssparser/cssparser-0.9.16.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cssparser/cssparser-0.9.15.ebuild,v 1.1 2015/05/27 08:29:33 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cssparser/cssparser-0.9.16.ebuild,v 1.2 2015/06/24 14:16:57 monsieurp Exp $
 EAPI="5"

 inherit java-pkg-2 java-pkg-simple
@ -10,7 +10,7 @@ HOMEPAGE="http://cssparser.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 CDEPEND="dev-java/sac:0"
 DEPEND=">=virtual/jdk-1.6
--- a/dev-java/httpcomponents-client/Manifest
+++ b/dev-java/httpcomponents-client/Manifest
@ -1,2 +1,3 @@
 DIST httpcomponents-client-4.3.1-build.tar.bz2 3372 SHA256 77838bce12d52943db110a37de73e8803e0adf4136be182a649674fe1c723d7e SHA512 c4b5278cb19c5ed21665bcdb8885854d3ef0a87c3e61c462e52bd74da22e17a2a8ba6e9c86c08db3e7aea071c4364df9ff605991a37ba315d47a81770d96bde0 WHIRLPOOL eca01701d90a07cfd664fe5ef5f1a44d63821a8602a6d2377afad9241ba04247b7efe117a051db60c0ac07e44ce114fd061bf2e56274bd9640233ec37ec3efbf
 DIST httpcomponents-client-4.3.1-src.tar.gz 738783 SHA256 43b3f14eff5785369492c00a5712760377177c03f8eb23ccf911a3e4f0c91cd9 SHA512 601e3c8043786ac9e2633cddc76e30aae31fa254e698e6abdce24e803c45516e116bb41fa8af40178abfa68c36805a108b132958ba0d91f14d3dac2efd4e62d0 WHIRLPOOL 764c89feaf191ed8ff49ae0759d542f7c6a9e348b7c86ada547cc854d0e8dc616bca6705c31f58636a93d620c8d90b70f2623af1da37cf6feee62a17a6d9014a
+DIST httpcomponents-client-4.5-src.tar.gz 782815 SHA256 1af3471f99f667eb4fb5d0eae08f1dbf0b14fdfe612c1527821d3b24fa437420 SHA512 a4c3da887a2933ddec0876a3c08903153e34d3dd555dad1be8d9d48ab5dc04f56b3f22eb6f96b407d1ac85c455e33561c7e8625c0a38705bd1e810fd9b6c8517 WHIRLPOOL 774d179ab6a8dceff787223502300836df5140dda6126f021b95f4ca341dd550f72b039b67033000c14efeb680731b3a2e4b964455712a7c8a9f0a37b78af90d
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-fluent-hc-4.5-build.xml
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-fluent-hc-4.5-build.xml
@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 6/24/15 9:38 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="fluent-hc-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="fluent-hc-4.5"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5-tests.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+      <link href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class" value="Main"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-4.5-build.xml
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-4.5-build.xml
@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 6/23/15 11:41 PM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpclient-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="httpclient-4.5"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="**/*.properties"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class" value="Main"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-cache-4.5-build.xml
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-cache-4.5-build.xml
@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 6/24/15 9:48 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpclient-cache-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="httpclient-cache-4.5"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/net/sf/ehcache/ehcache-core/2.6.9/ehcache-core-2.6.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7.7.jar"/>
+    <pathelement location="${maven.repo.local}/net/spy/spymemcached/2.11.4/spymemcached-2.11.4.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/net/sf/ehcache/ehcache-core/2.6.9/ehcache-core-2.6.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7.7.jar"/>
+    <pathelement location="${maven.repo.local}/net/spy/spymemcached/2.11.4/spymemcached-2.11.4.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymock/2.5.2/easymock-2.5.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymockclassextension/2.5.2/easymockclassextension-2.5.2.jar"/>
+    <pathelement location="${maven.repo.local}/cglib/cglib-nodep/2.2/cglib-nodep-2.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5-tests.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+      <link href="http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class" value="Main"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-osgi-4.5-build.xml
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-httpclient-osgi-4.5-build.xml
@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 6/24/15 6:17 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpclient-osgi-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="httpclient-osgi-4.5"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient-cache/4.5/httpclient-cache-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/fluent-hc/4.5/fluent-hc-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpmime/4.5/httpmime-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient-cache/4.5/httpclient-cache-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/fluent-hc/4.5/fluent-hc-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class" value="Main"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
--- a/dev-java/httpcomponents-client/files/httpcomponents-client-httpmime-4.5-build.xml
+++ b/dev-java/httpcomponents-client/files/httpcomponents-client-httpmime-4.5-build.xml
@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 6/24/15 5:01 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpmime-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="maven.build.finalName" value="httpmime-4.5"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpclient/4.5/httpclient-4.5.jar"/>
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar"/>
+    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
+    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}">
+        <include name="**/*.properties"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="false" 
+           source="1.6">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             source="1.6" 
+             linksource="false" 
+             breakiterator="false">
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Main-Class" value="Main"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
--- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild,v 1.1 2015/06/24 19:04:38 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source examples doc test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols"
+HOMEPAGE="http://hc.apache.org/index.html"
+SRC_URI="mirror://apache/${PN/-//http}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.5"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/ant-junit:0
+	dev-java/easymock:3.2
+	dev-java/spymemcached:0
+	dev-java/osgi-core-api:0
+	dev-java/osgi-enterprise-api:0
+	dev-java/commons-codec:0
+	dev-java/commons-logging:0
+	dev-java/httpcomponents-core:4.4
+	dev-java/easymock-classextension:3.2
+"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/mockito:0
+	)
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	commons-codec
+	commons-logging
+	spymemcached
+	osgi-core-api
+	osgi-enterprise-api
+	httpcomponents-core-4.4
+"
+
+# List of modules to compile and test.
+MODULES=(
+	httpclient
+	httpclient-cache
+	httpmime
+	fluent-hc
+	httpclient-osgi
+)
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/${MODULES[0]}/target/${MODULES[0]}-${PV}.jar"
+
+java_prepare() {
+	# copy build.xml files to their location.
+	for module in ${MODULES[@]}; do
+		cd "${S}"/"${module}" || die
+		cp "${FILESDIR}"/"${PN}-${module}-${PV}"-build.xml build.xml
+	done
+
+	cd "${S}" || die
+
+	# httpclient:
+	# - copy deprecated sources for compilation
+	cp -r "${S}"/${MODULES[0]}/src/main/java-deprecated/* \
+		"${S}"/${MODULES[0]}/src/main/java/* || die
+
+	# - remove broken tests
+	rm -v ${MODULES[0]}/src/test/java/org/apache/http/client/config/TestRequestConfig.java
+
+	# httpclient-cache:
+	# - copy deprecated sources into main repository
+	cp -r "${S}"/${MODULES[1]}/src/main/java-deprecated/* \
+		"${S}"/${MODULES[1]}/src/main/java || die
+
+	# - remove broken tests
+	rm -v \
+		${MODULES[1]}/src/test/java/org/apache/http/impl/client/cache/TestCachingExec*
+
+	# - disable ehcache support altogether
+	# the version in Portage is very old and compilation chokes on missing imports
+	rm -rf \
+		"${S}"/${MODULES[1]}/src/main/java/org/apache/http/impl/client/cache/ehcache \
+		"${S}"/${MODULES[1]}/src/test/java/org/apache/http/impl/client/cache/ehcache
+
+	# httpmime:
+	# - copy deprecated sources into main repository
+	cp -r "${S}"/${MODULES[2]}/src/main/java-deprecated/* \
+		"${S}"/${MODULES[2]}/src/main/java
+
+	# fluent-hc:
+	# remove broken tests.
+	rm -v ${MODULES[3]}/src/test/java/org/apache/http/client/fluent/TestFluent.java
+}
+
+EANT_TEST_GENTOO_CLASSPATH="
+	${EANT_GENTOO_CLASSPATH}
+	junit-4
+	mockito
+	easymock-3.2
+	easymock-classextension-3.2
+"
+
+src_compile() {
+	for module in ${MODULES[@]}; do
+		EANT_BUILD_XML="${module}/build.xml" \
+			java-pkg-2_src_compile
+	done
+}
+
+src_test() {
+	for module in ${MODULES[@]}; do
+		ANT_TASKS= \
+			EANT_BUILD_XML="${module}/build.xml" \
+			java-pkg-2_src_test
+	done
+}
+
+src_install() {
+	for module in ${MODULES[@]}; do
+		java-pkg_newjar ${module}/target/${module}-${PV}.jar ${module}.jar
+	done
+
+	if use source; then
+
+		java-pkg_dosrc {httpclient,httpclient-cache,httpmime,fluent-hc}/src/main/java/org
+	fi
+
+	if use examples; then
+		for dir in $(find "${S}" -mindepth 3 -maxdepth 4 -name "examples" -type d -print); do
+			java-pkg_doexamples ${dir}/*
+		done
+	fi
+
+	if use doc; then
+		java-pkg_dojavadoc {httpclient,httpclient-cache,httpmime,fluent-hc}/target/site/apidocs/
+	fi
+}
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.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-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild,v 1.4 2015/06/13 11:43:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild,v 1.5 2015/06/24 10:55:27 ago Exp $

 EAPI="5"

@ -24,7 +24,7 @@ done

 LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
-KEYWORDS="-* amd64 ~ppc x86"
+KEYWORDS="-* amd64 ppc x86"

 IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
 REQUIRED_USE="nsplugin? ( X )"
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild,v 1.5 2015/06/13 11:43:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild,v 1.6 2015/06/24 10:55:27 ago Exp $

 EAPI="5"

@ -24,7 +24,7 @@ done

 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="-* amd64 ~arm ~ppc x86"
+KEYWORDS="-* amd64 ~arm ppc x86"

 IUSE="+X +alsa cjk +cups doc examples nsplugin pulseaudio selinux source webstart"
 REQUIRED_USE="nsplugin? ( X )"
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild,v 1.5 2015/06/13 11:43:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild,v 1.6 2015/06/24 10:55:31 ago Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)

 EAPI="5"
@ -13,7 +13,7 @@ SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.xz"

 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"

 IUSE="+doc test"

--- a/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.5.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/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild,v 1.6 2015/05/23 23:08:15 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild,v 1.7 2015/06/24 10:55:37 ago Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)

 EAPI="5"
@ -13,7 +13,7 @@ SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"

 LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"

 IUSE="doc +icedtea7 javascript +nsplugin tagsoup test"

--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild,v 1.2 2013/07/16 12:06:33 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild,v 1.3 2015/06/24 17:53:14 monsieurp Exp $

 EAPI="5"

@ -14,7 +14,7 @@ HOMEPAGE="http://www.osgi.org/Main/HomePage"

 LICENSE="Apache-2.0 OSGi-Specification-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 RESTRICT="bindist fetch"

--- a/dev-lang/execline/execline-2.1.1.0.ebuild
+++ b/dev-lang/execline/execline-2.1.1.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 2013-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/execline/execline-2.1.1.0.ebuild,v 1.1 2015/03/16 23:22:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/execline/execline-2.1.1.0.ebuild,v 1.2 2015/06/24 16:15:03 williamh Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static static-libs"

 DEPEND=">=sys-devel/make-4.0
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@ -20,3 +20,4 @@ DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7
 DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
 DIST parallel_studio_xe_2015_update1.tgz 4044230603 SHA256 84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b SHA512 894c911dce9d261fbe67d65c91c3b6c7117b183102fe7673a5e106d14994a082fdf03fdb573bbb1a9f0a01cf1539082b72ec75c39db7590bb2f63222f9a5b832 WHIRLPOOL f43b219ba82aa3f94c6818c54b971302f3693cb1c0266924f7ee79c67d6008699388afedaf4b2f72e969a73c8fd7d276309d80ff4dc8dfb1ba766cbe19b33872
 DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
+DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
--- a/dev-lang/icc/icc-15.0.3.187.ebuild
+++ b/dev-lang/icc/icc-15.0.3.187.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-15.0.3.187.ebuild,v 1.1 2015/06/24 09:39:49 jlec Exp $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=7538
+INTEL_DPV=2015_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel C/C++ Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="eclipse linguas_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	!dev-lang/ifc[linguas_ja]
+	eclipse? ( dev-util/eclipse-sdk )"
+RDEPEND="${DEPEND}
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerproc compilerproc-devel"
+INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
+
+CHECKREQS_DISK_BUILD=325M
+
+src_install() {
+	if ! use linguas_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+	intel-sdp_src_install
+}
--- a/dev-lang/ifc/Manifest
+++ b/dev-lang/ifc/Manifest
@ -20,3 +20,4 @@ DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7
 DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
 DIST parallel_studio_xe_2015_update1.tgz 4044230603 SHA256 84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b SHA512 894c911dce9d261fbe67d65c91c3b6c7117b183102fe7673a5e106d14994a082fdf03fdb573bbb1a9f0a01cf1539082b72ec75c39db7590bb2f63222f9a5b832 WHIRLPOOL f43b219ba82aa3f94c6818c54b971302f3693cb1c0266924f7ee79c67d6008699388afedaf4b2f72e969a73c8fd7d276309d80ff4dc8dfb1ba766cbe19b33872
 DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
+DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
--- a/dev-lang/ifc/ifc-15.0.3.187.ebuild
+++ b/dev-lang/ifc/ifc-15.0.3.187.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-15.0.3.187.ebuild,v 1.1 2015/06/24 09:45:54 jlec Exp $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=7538
+INTEL_DPV=2015_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel FORTRAN Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="linguas_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="!dev-lang/ifc[linguas_jp]"
+RDEPEND="${DEPEND}
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerprof compilerprof-devel"
+INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
+
+CHECKREQS_DISK_BUILD=375M
+
+src_install() {
+	if ! use linguas_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+
+	intel-sdp_src_install
+}
--- a/dev-lang/php/php-5.4.41.ebuild
+++ b/dev-lang/php/php-5.4.41.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.41.ebuild,v 1.8 2015/06/02 05:05:01 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.41.ebuild,v 1.9 2015/06/24 09:00:08 ago Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

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

 function php_get_uri ()
 {
--- a/dev-lang/php/php-5.5.25-r1.ebuild
+++ b/dev-lang/php/php-5.5.25-r1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.25-r1.ebuild,v 1.8 2015/06/11 19:07:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.25-r1.ebuild,v 1.9 2015/06/24 09:00:08 ago Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

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

 function php_get_uri ()
 {
--- a/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild
+++ b/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2012 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/d0_blind_id/d0_blind_id-0.5.ebuild,v 1.5 2012/05/04 18:35:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild,v 1.6 2015/06/25 03:25:18 mr_bones_ Exp $

-EAPI=4
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
 inherit autotools-utils

 DESCRIPTION="Blind-ID library for user identification using RSA blind signatures"
@ -14,24 +15,26 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="static-libs"

-RDEPEND="dev-libs/gmp"
+RDEPEND="dev-libs/gmp:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 DOCS=( d0_blind_id.txt )

-AUTOTOOLS_IN_SOURCE_BUILD=1
+src_prepare() {
+	# fix out-of-source build
+	sed -i \
+		-e 's, d0_rijndael.c, "$srcdir/d0_rijndael.c",' \
+		configure.ac || die
+
+	autotools-utils_src_prepare
+}

 src_configure() {
 	local myeconfargs=(
 		--enable-rijndael
 		--without-openssl
 		--without-tommath
-		$(use_enable static-libs static)
 	)
 	autotools-utils_src_configure
 }
-
-src_install() {
-	autotools-utils_src_install
-}
--- a/dev-libs/icu/icu-55.1.ebuild
+++ b/dev-libs/icu/icu-55.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-libs/icu/icu-55.1.ebuild,v 1.10 2015/06/02 05:04:32 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-55.1.ebuild,v 1.11 2015/06/24 07:55:22 ago Exp $

 EAPI=5

@ -14,7 +14,7 @@ LICENSE="BSD"

 SLOT="0/55"

-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"

 DEPEND="
--- a/dev-libs/intel-common/Manifest
+++ b/dev-libs/intel-common/Manifest
@ -20,3 +20,4 @@ DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7
 DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
 DIST parallel_studio_xe_2015_update1.tgz 4044230603 SHA256 84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b SHA512 894c911dce9d261fbe67d65c91c3b6c7117b183102fe7673a5e106d14994a082fdf03fdb573bbb1a9f0a01cf1539082b72ec75c39db7590bb2f63222f9a5b832 WHIRLPOOL f43b219ba82aa3f94c6818c54b971302f3693cb1c0266924f7ee79c67d6008699388afedaf4b2f72e969a73c8fd7d276309d80ff4dc8dfb1ba766cbe19b33872
 DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
+DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
--- a/dev-libs/intel-common/intel-common-15.0.3.187.ebuild
+++ b/dev-libs/intel-common/intel-common-15.0.3.187.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/intel-common/intel-common-15.0.3.187.ebuild,v 1.1 2015/06/24 09:35:19 jlec Exp $
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=7538
+INTEL_DPV=2015_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
+
+IUSE="+compiler"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+CHECKREQS_DISK_BUILD=375M
+
+pkg_setup() {
+	einfo ${INTEL_SDP_EDIR}
+	INTEL_BIN_RPMS="openmp openmp-devel"
+	INTEL_DAT_RPMS="compilerpro-common compilerpro-common-pset"
+	if use compiler; then
+		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
+		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common ccompxe compxe fcompxe"
+	fi
+	intel-sdp_pkg_setup
+}
+
+src_install() {
+	intel-sdp_src_install
+	local path rootpath ldpath arch fenv=35intelsdp
+	cat > ${fenv} <<-EOF
+		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
+		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
+	EOF
+	for arch in ${INTEL_ARCH}; do
+			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
+			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
+			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
+	done
+	cat >> ${fenv} <<-EOF
+		PATH=${path#:}
+		ROOTPATH=${rootpath#:}
+		LDPATH=${ldpath#:}
+	EOF
+
+	doenvd ${fenv}
+
+	cat >> "${T}"/40-${PN} <<- EOF
+	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
+	EOF
+	insinto /etc/revdep-rebuild/
+	doins "${T}"/40-${PN}
+}
--- a/dev-libs/libsodium/libsodium-1.0.2.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsodium/libsodium-1.0.2.ebuild,v 1.8 2015/06/20 05:34:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsodium/libsodium-1.0.2.ebuild,v 1.9 2015/06/24 09:01:01 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0/13"
-KEYWORDS="amd64 arm hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom"

 src_configure() {
--- a/dev-libs/libzip/libzip-1.0.1.ebuild
+++ b/dev-libs/libzip/libzip-1.0.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-1.0.1.ebuild,v 1.4 2015/06/04 09:05:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-1.0.1.ebuild,v 1.5 2015/06/24 07:59:58 ago Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"

 RDEPEND="sys-libs/zlib"
--- a/dev-libs/skalibs/skalibs-2.3.2.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.3.2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/skalibs/skalibs-2.3.2.0.ebuild,v 1.1 2015/03/16 23:21:13 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/skalibs/skalibs-2.3.2.0.ebuild,v 1.2 2015/06/24 16:15:26 williamh Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc ipv6 static-libs"

 DEPEND=">=sys-devel/make-3.81"
--- a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild
+++ b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild,v 1.1 2014/08/26 15:15:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild,v 1.2 2015/06/24 14:23:13 monsieurp Exp $

 EAPI=5

@ -12,7 +12,7 @@ DESCRIPTION="File stat bit mask constants"

 LICENSE="|| ( GPL-2 GPL-3 )" # GPL-2+
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 SRC_TEST="do"
--- a/dev-perl/HTML-FillInForm/HTML-FillInForm-2.210.0.ebuild
+++ b/dev-perl/HTML-FillInForm/HTML-FillInForm-2.210.0.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-perl/HTML-FillInForm/HTML-FillInForm-2.210.0.ebuild,v 1.1 2015/06/24 23:08:32 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MARKSTOS
+MODULE_VERSION=2.21
+inherit perl-module
+
+DESCRIPTION="Populates HTML Forms with data"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/HTML-Parser
+	virtual/perl-Carp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( dev-perl/CGI )
+"
+# the dep specs are rather incomplete
+
+SRC_TEST="do parallel"
--- a/dev-perl/HTML-FillInForm/Manifest
+++ b/dev-perl/HTML-FillInForm/Manifest
@ -1 +1,2 @@
 DIST HTML-FillInForm-2.20.tar.gz 17309 SHA256 75e1125e32fb218d5aceddb7f6ffdd49edf16ff438571ab0fd4866a52fc7ec5b SHA512 d00955fae1d9602ccda79e42e4a2863cb04b7070d72bdfe383b3b68ac56cf0a629bf2cbea35aaa042a379fe1c9679d7905407454d0e6c19433f6821dfbd27ebd WHIRLPOOL d60f5118b2e16115e5e1316c72b41a9583334261e18fa1299ba78b9d5fa641fa775283ae734e11f099e43a850fba403d817f679b183332dbc48a47f04e4d82b3
+DIST HTML-FillInForm-2.21.tar.gz 17823 SHA256 d3af183cc8327614f1192929f4f0919b6e9725fc19c6f3730ce556a8daea6cf6 SHA512 05a755635478a797c4711e812a7fbd0428e61b4a4dbb3f8b62ed929122bb4b138aa3d86f2d99ace01d9e7f9486663e64b2c50490d0084c861cbdf8c25645be96 WHIRLPOOL 2f89df5e337e11ea9c327de5afaeca18b845b77d437f1fa139681ccb3be1495fe58852728a94debedee3f36483a2b30f3f5a14733b7f3c90b391a021a416ec0e
--- a/dev-perl/Hash-MultiValue/Hash-MultiValue-0.130.0.ebuild
+++ b/dev-perl/Hash-MultiValue/Hash-MultiValue-0.130.0.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Hash-MultiValue/Hash-MultiValue-0.130.0.ebuild,v 1.2 2014/07/07 18:52:09 dilfridge Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Store multiple values per key"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Filter"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
--- a/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild
+++ b/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild,v 1.1 2015/06/24 22:58:24 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=ARISTOTLE
+MODULE_VERSION=0.16
+inherit perl-module
+
+DESCRIPTION="Store multiple values per key"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/Hash-MultiValue/Manifest
+++ b/dev-perl/Hash-MultiValue/Manifest
@ -1,2 +1,2 @@
-DIST Hash-MultiValue-0.13.tar.gz 55781 SHA256 4dcabe74108fb755159122a4c9e08a2fbe16e92125e40eabd409f72966a58e3a SHA512 92e0b4de249f70f0ca42498465ce322ceb89dd5cd3338a2ea3d326e4c3934b4f0913cc3a0e5e30f6723d0d8aa5377376c82d2f7020f74d518c28efdb7f90209e WHIRLPOOL 63cd67cf61c9a96cc013d34187a9b9835d58ae52298097424568eadcadf39a241c55c08aa4bb28d750b5f2557f190dc325c61e9af3790a7b18c2c1fe3ca68c0b
 DIST Hash-MultiValue-0.15.tar.gz 19827 SHA256 805d0eba514f18d9af60f7d8baf50b5b6e004bbaa12da43642d40575f93c83c9 SHA512 fd97db887590c8c9ecbd0e58434df01fae8e3d2aa2335245ea1217d454e50c3bf1177921dd340f4cca3685808bebc573d13c892da7ccd685d3658c1db9d96465 WHIRLPOOL 6e53b5f51d85eb5adf09dd5648321b1a62838345d052bf28c934fcffc3aac0e0d7bd689089cc96659db3252530a495ecf106c3f3024b90419402730e11e8cab3
+DIST Hash-MultiValue-0.16.tar.gz 19841 SHA256 66181df7aa68e2786faf6895c88b18b95c800a8e4e6fb4c07fd176410a3c73f4 SHA512 a6e1cab00ff24492bc84343b83a1282ad0eaded6633e7c511389dfb1d21cd8987dc2f1ad9ab69df69f36b651d68c70df3160666ff9ee584dbb1b6ab7095b78ac WHIRLPOOL 57e563f204b16e46c6052655a37cc09e72c82203d6a85f07b5d171aec5be4287b4c1935bab5702f6c13412e862e21868f5ccaa5d9e49e01d64e7179acb1ca30a
--- a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild
+++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild,v 1.1 2015/06/24 23:03:45 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=0.25
+inherit perl-module
+
+DESCRIPTION="Lexically scoped subroutine wrappers"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/Module-Build-Tiny-0.39.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+		dev-perl/Test-Pod
+	)
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/Hook-LexWrap/Manifest
+++ b/dev-perl/Hook-LexWrap/Manifest
@ -1 +1,2 @@
 DIST Hook-LexWrap-0.24.tar.gz 9338 SHA256 44c2b8b184e166461494c7bf90b6ed0997d691bb216317ed6442bfdc568ece5b SHA512 113641b89cce644ca739eab371786971bbb966dcb0e9eb7612379063ad71318af594f351771cafc8fc0c50c8a325ed76fb257ef7f0511a6fac0a80d52039ad31 WHIRLPOOL 1a3b291518989b85135b7bd89035d19c29ff3acb997f46bde9b8fb0af013f077ff2d670692bad01234ecad650460cea98bcc0d07196a77d23ac8edee0e6cef65
+DIST Hook-LexWrap-0.25.tar.gz 29304 SHA256 08ab9af6bd9b4560702d9d994ad9d905af0c2fd24090d1480ff640f137c1430d SHA512 63623164ac67a33bd12ef771725a09647bdfe19d2f8eb84a0049ca0bdf4adc325143889a5751b1aefaca23eedb1a503ee42071b2fe3e7e3f033c148c0716eca9 WHIRLPOOL cccf1e39f207dc005417f7056acafdb905a6cdc1c8f880a91565b03b00fc3d8017f877505d3ebca73359353d842888fde5e411336ea7ebbd110e661a3382e39f
--- a/dev-perl/Term-Screen/Term-Screen-1.30.0-r1.ebuild
+++ b/dev-perl/Term-Screen/Term-Screen-1.30.0-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-Screen/Term-Screen-1.30.0-r1.ebuild,v 1.1 2014/08/26 14:54:14 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-Screen/Term-Screen-1.30.0-r1.ebuild,v 1.2 2015/06/24 14:24:11 monsieurp Exp $

 EAPI=5

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple Term::Cap based screen positioning module"

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

 # Tests are interactive
--- a/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild
+++ b/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild,v 1.1 2014/08/26 17:10:18 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild,v 1.2 2015/06/24 14:25:30 monsieurp Exp $

 EAPI=5

@ -12,7 +12,7 @@ DESCRIPTION="A Term::Screen based screen positioning and coloring module"

 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 RDEPEND=">=dev-perl/Term-Screen-1.30.0"
--- a/dev-python/eyeD3/eyeD3-0.7.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.7.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.7.5.ebuild,v 1.7 2015/06/19 17:11:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.7.5.ebuild,v 1.8 2015/06/24 08:09:25 ago Exp $

 EAPI=5

@ -16,7 +16,7 @@ SRC_URI="http://eyed3.nicfit.net/releases/${P}.tgz"

 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""

 RDEPEND="!<${CATEGORY}/${PN}-0.6.18-r1:0"
--- a/dev-python/into/into-0.1.3.ebuild
+++ b/dev-python/into/into-0.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/dev-python/into/into-0.1.3.ebuild,v 1.3 2015/03/08 23:50:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/into/into-0.1.3.ebuild,v 1.4 2015/06/24 08:39:20 idella4 Exp $

 EAPI=5

@ -16,5 +16,4 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"

-RDEPEND=""
-DEPEND="${RDEPEND}"
+DEPEND="!media-libs/urt" # Bug #552448
--- a/dev-python/into/into-0.2.1.ebuild
+++ b/dev-python/into/into-0.2.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/into/into-0.2.1.ebuild,v 1.1 2015/03/01 14:24:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/into/into-0.2.1.ebuild,v 1.2 2015/06/24 08:39:20 idella4 Exp $

 EAPI=5

@ -21,5 +21,6 @@ RDEPEND="dev-python/datashape[${PYTHON_USEDEP}]
 		>=dev-python/pandas-0.15[${PYTHON_USEDEP}]
 		dev-python/toolz[${PYTHON_USEDEP}]
 		dev-python/multipledispatch[${PYTHON_USEDEP}]
-		dev-python/networkx[${PYTHON_USEDEP}]"
+		dev-python/networkx[${PYTHON_USEDEP}]
+		!media-libs/urt" # Bug #552448
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/into/into-0.2.2.ebuild
+++ b/dev-python/into/into-0.2.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/into/into-0.2.2.ebuild,v 1.1 2015/06/18 02:22:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/into/into-0.2.2.ebuild,v 1.2 2015/06/24 08:39:20 idella4 Exp $

 EAPI=5

@ -21,5 +21,6 @@ RDEPEND="dev-python/datashape[${PYTHON_USEDEP}]
 		>=dev-python/pandas-0.15[${PYTHON_USEDEP}]
 		dev-python/toolz[${PYTHON_USEDEP}]
 		dev-python/multipledispatch[${PYTHON_USEDEP}]
-		dev-python/networkx[${PYTHON_USEDEP}]"
+		dev-python/networkx[${PYTHON_USEDEP}]
+		!media-libs/urt" # Bug #552448
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/ipython/ipython-2.2.0-r1.ebuild
+++ b/dev-python/ipython/ipython-2.2.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-python/ipython/ipython-2.2.0-r1.ebuild,v 1.2 2015/06/23 15:18:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.2.0-r1.ebuild,v 1.3 2015/06/24 08:04:59 ago Exp $

 EAPI=5

@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"

--- a/dev-python/pillow/pillow-2.8.1.ebuild
+++ b/dev-python/pillow/pillow-2.8.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-python/pillow/pillow-2.8.1.ebuild,v 1.9 2015/06/17 08:51:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.8.1.ebuild,v 1.10 2015/06/24 07:53:46 ago Exp $

 EAPI=5

@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"

 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"

 REQUIRED_USE="test? ( jpeg )"
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@ -1 +1,2 @@
 DIST pyproj-1.9.3.tar.gz 2687498 SHA256 912ed86c5e407f091d0f3d076594af4fb569e27c68199b7d71651edd522aaa0c SHA512 a365da012bf7b9adc8069896bdeabf88ff3d260b643e49b8a74edccc3b65aab10ec96116353fbb45c73ce1027c9b4e80aae566c6b28e149110b16cd8405cda30 WHIRLPOOL b6008b4879722e6e6ce82fbda22a5d8f57e6484f74d2607c19087130f833188ee76d1bc40ffd205babb25b9e7ea983c80bc1bd7555dd83f2473f2950421e7c62
+DIST pyproj-1.9.4.tar.gz 7838454 SHA256 71b4d8c52d781e2b4afe2d3609e9d700cb631ddbf51060bc702644733cc70869 SHA512 96b118e75ba8360ca56176631c44567c7b6596f98189a99bfbdc2d0f8bff1bba814a86d66ac1c54964951a3534c2a5cfb54a0fc4d8eda52c77069a8b64f8db3a WHIRLPOOL 750f466566aab3d2edb155407f37efc7f514901bd782b5be589f1c788059c81c8e17e519d53410be169cec971aa3524268bd86e08f9f90a1e2b742343f6b0ae2
--- a/dev-python/pyproj/pyproj-1.9.4.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.4.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-python/pyproj/pyproj-1.9.4.ebuild,v 1.1 2015/06/24 07:44:40 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to PROJ.4 library"
+HOMEPAGE="http://github.com/jswhit/pyproj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="doc"
+
+CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+python_test() {
+	einfo "Testruns do not have regular unittest type tests, instead for test.py,"
+	einfo "the output need be compared with a separate file, sample.out."
+	"${PYTHON}" test/test.py || die
+
+	einfo ""; einfo "Now the file test2.py is run to test pickling"; einfo ""
+	"${PYTHON}" test/test2.py || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@ -1,2 +1,3 @@
 DIST gherkin-2.11.6-git.tgz 603165 SHA256 a52b0f1909aea52ea5644e0bf91008538d20d46e41a5a940b56b7e8066824a1e SHA512 92409f948d39fe4038016706fb5b8580ed9aeffac2b4b03dceb2759923010c33f4bc51b3dbb31a5108e2892c52276ceb0c3e14b3e6826193d4624c8b72c0845f WHIRLPOOL d1c7d13e4601fe345e13a04dc10eb2b7679f65eb99ed022cbeaa2479d9cbd8b91e1344f15c9c34ada3dcd4777870435663e433906175ef9654ea26d08522e0b1
 DIST gherkin-2.12.0-git.tgz 605964 SHA256 09206d66e437bfa2cb917a251899e3e95479c47d713a2b8de3e7dcbdd9982bfa SHA512 e86c2299bb3b41845bf8a3119b65ff855023510173b04c1e08e1105c03523e0e89ec45db4c7034e85fc20b7a9e1ce5a791aaf3f4793d44c0aa782ffd9fcee83a WHIRLPOOL dcfc5b5a0dcad7e401c2e0afb41e53593d095a44e97df8eadffa634b155ccb5a979f3e719e57c32d18afac0be49d31021276abc20010a6a9259ca041c155a390
+DIST gherkin-2.12.2-git.tgz 1764938 SHA256 139739eae42c7da925c816c859a41dcf539a361040ffb64c174e90e3fd9425b9 SHA512 1030bcaf31791c7031f22b8e4c5d94ddbddf012b8686d06a7598fde99a28f8a1fda45dc66dbdefdb825a045730b077a10ca1134835630710551e20364886ce51 WHIRLPOOL b5bdcff4a1e8e8ff32c202cac4e33ba9f07dac09ad723b9b6ef202dfa6a86413aff4e5fe24c69962edccf24158c9c85e8d32fc75a92ee0243943dff04327fe7c
--- a/dev-ruby/gherkin/files/gherkin-2.12.2-ruby21.patch
+++ b/dev-ruby/gherkin/files/gherkin-2.12.2-ruby21.patch
@ -0,0 +1,44 @@
+commit 021309d273960bb5625f8072b8366eab7d077d25
+Author: Cédric Boutillier <boutil@debian.org>
+Date:   Fri Apr 25 13:34:41 2014 +0200
+
+    change regexp matchin Ruby versions to support Ruby2.1
+
+diff --git a/lib/gherkin/formatter/pretty_formatter.rb b/lib/gherkin/formatter/pretty_formatter.rb
+index 28c8b54..ff13c70 100644
+--- a/lib/gherkin/formatter/pretty_formatter.rb
+++ b/lib/gherkin/formatter/pretty_formatter.rb
+@@ -199,7 +199,7 @@ module Gherkin
+         end
+       end
+ 
+-      if(RUBY_VERSION =~ /^1\.9|2\.0/)
+      if(RUBY_VERSION =~ /^(1\.9|2\.)/)
+         START = /#{'^'.encode('UTF-8')}/
+         TRIPLE_QUOTES = /#{'"""'.encode('UTF-8')}/
+       else
+diff --git a/ragel/lexer.rb.rl.erb b/ragel/lexer.rb.rl.erb
+index 7fd85b4..4be053e 100644
+--- a/ragel/lexer.rb.rl.erb
+++ b/ragel/lexer.rb.rl.erb
+@@ -165,7 +165,7 @@ module Gherkin
+         utf8_pack(rest[0..rest.index(10)||-1]).strip # 10 is \n
+       end
+ 
+-      if (RUBY_VERSION =~ /^1\.9|2\.0/)
+      if (RUBY_VERSION =~ /^(1\.9|2\.)/)
+         def utf8_pack(array)
+           array.pack("c*").force_encoding("UTF-8")
+         end
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 72333a7..0f6e3ae 100644
+--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
+@@ -6,6 +6,6 @@ def silence_warnings(&block)
+-if RUBY_VERSION =~ /1\.9|2\.0/
+if RUBY_VERSION =~ /^(1\.9|2\.)/
+   silence_warnings do
+     Encoding.default_external = Encoding::UTF_8
+     Encoding.default_internal = Encoding::UTF_8
+   end
+ end
--- a/dev-ruby/gherkin/gherkin-2.12.2.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.2.ebuild,v 1.1 2015/06/24 05:37:27 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast Gherkin lexer and parser based on Ragel"
+HOMEPAGE="https://github.com/cucumber/gherkin"
+LICENSE="MIT"
+SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="doc test"
+
+DEPEND="${DEPEND} dev-util/ragel"
+RDEPEND="${RDEPEND}"
+
+ruby_add_bdepend "
+	dev-ruby/rake-compiler
+	test? (
+		>=dev-ruby/builder-2.1.2
+		>=dev-util/cucumber-1.1.3
+		>=dev-ruby/rspec-2.6.0
+		>=dev-ruby/term-ansicolor-1.0.5
+	)
+	doc? ( >=dev-ruby/yard-0.8.3 )"
+
+ruby_add_rdepend ">=dev-ruby/multi_json-1.3"
+
+RUBY_PATCHES=( ${P}-ruby21.patch )
+
+all_ruby_prepare() {
+	# Remove Bundler-related things.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb features/support/env.rb || die
+	rm Gemfile || die
+
+	# Don't use compile dependencies to avoid building again for specs.
+	sed -i -e '/:compile/d' Rakefile
+
+	# Keep this hardcoded -O0 optimization level since
+	# https://github.com/cucumber/gherkin/issues/182#issuecomment-6945009
+	# hints at the fact that removing it might cause the mysterious
+	# Lexer errors that hapen intermittently.
+	# sed -ie -e 's/-O0//' tasks/compile.rake || die
+
+	# Remove feature that depends on direct access to the cucumber
+	# source. We could probably set this up by downloading the source
+	# and unpacking it, but skipping this now in the interest of time.
+	rm features/pretty_formatter.feature || die
+
+	# We need to remove these tasks during bootstrapping since it tries
+	# to load cucumber already but we can be sure it isn't installed
+	# yet. Also remove other rake tasks for which we may not yet have
+	# dependencies.
+	if ! use test ; then
+		rm tasks/cucumber.rake tasks/rspec.rake || die "Unable to remove rake tasks."
+	fi
+
+	# Avoid dependency on yard if USE=-doc
+	if ! use doc ; then
+		rm tasks/apidoc.rake || die
+	fi
+
+	# Avoid implicit dependency on git
+	sed -i -e 's/git ls-files/echo/' gherkin.gemspec || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		yard || die
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} -I lib -S rake -rrake/clean -f tasks/compile.rake compile || die
+}
+
+each_ruby_test() {
+	${RUBY} -I lib -S rspec-2 spec || die "Specs failed"
+	CUCUMBER_HOME="${HOME}" RUBYLIB=lib ${RUBY} -S cucumber features || die "Cucumber features failed"
+}
--- a/dev-ruby/rack/rack-1.4.6.ebuild
+++ b/dev-ruby/rack/rack-1.4.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/dev-ruby/rack/rack-1.4.6.ebuild,v 1.4 2015/06/19 05:23:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.6.ebuild,v 1.5 2015/06/24 09:00:43 ago Exp $

 EAPI=5
 USE_RUBY="ruby19 ruby20"
@ -17,7 +17,7 @@ HOMEPAGE="http://rack.github.com/"

 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.4.5-fix-test-ruby20.patch )
--- a/dev-ruby/rack/rack-1.5.4.ebuild
+++ b/dev-ruby/rack/rack-1.5.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.5.4.ebuild,v 1.4 2015/06/19 05:23:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.5.4.ebuild,v 1.5 2015/06/24 09:00:43 ago Exp $

 EAPI=5
 USE_RUBY="ruby19 ruby20"
@ -17,7 +17,7 @@ HOMEPAGE="http://rack.github.com/"

 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch )
--- a/dev-util/aruba/aruba-0.6.2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.6.2.ebuild,v 1.1 2015/01/18 21:36:17 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.6.2.ebuild,v 1.2 2015/06/24 05:37:37 graaff Exp $

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
--- a/dev-util/cucumber/cucumber-1.3.20.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.20.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.3.20.ebuild,v 1.1 2015/06/24 04:57:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.3.20.ebuild,v 1.2 2015/06/24 05:37:48 graaff Exp $

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"

 # Documentation task depends on sdoc which we currently don't have.
 RUBY_FAKEGEM_TASK_DOC=""
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@ -1,2 +1,3 @@
 DIST dwdiff-2.0.10.tar.bz2 76285 SHA256 67c4b9fbbbf8ea25335a07c7f4107028649dcd04136a3904778c7a767b843f6f SHA512 670ab12560e3aa98f44a9cd53e87ba8c553807f7864190f9da6db59cc3b152fdb486429b7316e9d0a58d61afc478353924330e984218da52d5017cb6932a6ee7 WHIRLPOOL cad6313439bb885987d593eb6058022937f6370e5ef3151bbdcd341179a033184a16e62f8ad9d606f812d02da90718c513017bba1688d8cb57cbb1bae6c989c3
 DIST dwdiff-2.0.9.tgz 86521 SHA256 c1c9217825ad3fac9936129cc26b73fa5479fb079e5c34522fc7066e74e31ef8 SHA512 73fe43dcc7ba6d3a4e773c7a8b117c359c0470b7b00d7f5bd53781dd046e06b5e02c5adfc7f877bc4ded289a767de3849bacea7cf03883f72046c2d0e7877f1b WHIRLPOOL 9054ef46bfa1f767a2fa64e195afaa7150d2895e99c7bb63cb9380463ce72d5d2e0e9bac336fb677d1a7dfd4c97f98f3e3541a267e1c4ea7096e6f61c4e09b0c
+DIST dwdiff-2.1.0.tar.bz2 79224 SHA256 45308f2f07c08c75c6ebd1eae3e3dcf7f836e5af1467cefc1b4829777c07743a SHA512 63e5ea3ae510c84fa2353da55bbc3cfac3a3753e1cebfb42c387218289a5e19d8e68af663181720a55eca05e49ef075db7d5dafda9dc4d57b9af503553ae9021 WHIRLPOOL 74ceba5cc7c20e0ab6ee09b62f7e8b07a1b8321bbe60ca7c3791c35176ba7137ddf17b1c471ff5ac0586ad0455e67968c71bf00f2de7cb137720b88a85c8f181
--- a/dev-util/dwdiff/dwdiff-2.1.0.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwdiff/dwdiff-2.1.0.ebuild,v 1.1 2015/06/24 14:13:01 monsieurp Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
+HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
+SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="dev-libs/icu:="
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e '/INSTALL/s:COPYING::' \
+		Makefile.in || die
+}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		$(use_with nls gettext) || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
+}
--- a/dev-util/patchelf/patchelf-0.8.ebuild
+++ b/dev-util/patchelf/patchelf-0.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-util/patchelf/patchelf-0.8.ebuild,v 1.4 2015/05/22 23:26:22 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/patchelf/patchelf-0.8.ebuild,v 1.5 2015/06/24 10:55:41 ago Exp $

 EAPI=5

@ -13,7 +13,7 @@ HOMEPAGE="http://nixos.org/patchelf.html"
 SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2"

 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 IUSE=""

--- a/dev-vcs/subversion/subversion-1.7.20.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.20.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.20.ebuild,v 1.7 2015/06/04 19:02:30 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.20.ebuild,v 1.8 2015/06/24 09:00:17 ago Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"

 COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]
--- a/dev-vcs/subversion/subversion-1.8.13-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.13-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-vcs/subversion/subversion-1.8.13-r1.ebuild,v 1.8 2015/06/11 19:14:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13-r1.ebuild,v 1.9 2015/06/24 09:00:17 ago Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"

 COMMON_DEPEND=">=dev-db/sqlite-3.7.12
--- a/eclass/depend.php.eclass
+++ b/eclass/depend.php.eclass
@ -1,7 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.35 2015/06/18 14:22:59 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.36 2015/06/24 13:36:03 grknight Exp $

+# @DEAD
 # @ECLASS: depend.php.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
@ -14,6 +15,7 @@
 # This eclass provides functions that allow ebuilds to depend on php5 and check
 # for specific PHP features, SAPIs etc. Also provides dodoc-php wrapper to install
 # documentation for PHP packages to php-specific location.
+# This eclass is deprecated and is set to be removed 30 days after bug 552836 is resolved

 inherit eutils multilib

--- a/eclass/golang-build.eclass
+++ b/eclass/golang-build.eclass
@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v 1.2 2015/06/24 17:04:53 williamh Exp $
+
+# @ECLASS: golang-build.eclass
+# @MAINTAINER:
+# William Hubbs <williamh@gentoo.org>
+# @BLURB: Eclass for compiling go packages.
+# @DESCRIPTION:
+# This eclass provides default  src_compile, src_test and src_install
+# functions for software written in the Go programming language.
+
+case "${EAPI:-0}" in
+	5)
+		;;
+	*)
+		die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
+		;;
+esac
+
+EXPORT_FUNCTIONS src_compile src_install src_test
+
+if [[ -z ${_GOLANG_BUILD} ]]; then
+
+_GOLANG_BUILD=1
+
+DEPEND=">=dev-lang/go-1.4.2:="
+STRIP_MASK="*.a"
+
+# @ECLASS-VARIABLE: EGO_PN
+# @REQUIRED
+# @DESCRIPTION:
+# This is the import path for the go package(s) to build. Please emerge
+# dev-lang/go and read "go help importpath" for syntax.
+#
+# Example:
+# @CODE
+# EGO_PN=github.com/user/package
+# @CODE
+
+# @FUNCTION: _golang-build_setup
+# @INTERNAL
+# @DESCRIPTION:
+# Make sure EGO_PN has a value.
+_golang-build_setup() {
+	[[ -z "${EGO_PN}" ]] &&
+		die "${ECLASS}.eclass: EGO_PN is not set"
+	return 0
+}
+
+golang-build_src_compile() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_golang-build_setup
+	set -- env GOPATH="${WORKDIR}/${P}:${EPREFIX}/usr/lib/go-gentoo" \
+		go build -v -work -x "${EGO_PN}"
+	echo "$@"
+	"$@" || die
+}
+
+golang-build_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_golang-build_setup
+	set -- env GOPATH="${WORKDIR}/${P}:${EPREFIX}/usr/lib/go-gentoo" \
+		go install -v -work -x "${EGO_PN}"
+	echo "$@"
+	"$@" || die
+	insinto /usr/lib/go-gentoo
+	insopts -m0644 -p # preserve timestamps for bug 551486
+	doins -r pkg src
+}
+
+golang-build_src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_golang-build_setup
+	set -- env GOPATH="${WORKDIR}/${P}:${EPREFIX}/usr/lib/go-gentoo" \
+		go test -v -work -x "${EGO_PN}"
+	echo "$@"
+	"$@" || die
+}
+
+fi
--- a/eclass/php-lib-r1.eclass
+++ b/eclass/php-lib-r1.eclass
@ -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/eclass/php-lib-r1.eclass,v 1.12 2015/04/14 18:32:51 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.13 2015/06/24 13:22:02 grknight Exp $

 # @ECLASS: php-lib-r1.eclass
 # @MAINTAINER:
@ -13,8 +13,6 @@
 # This eclass provides a unified interface for adding new PHP libraries.
 # PHP libraries are PHP scripts designed for reuse inside other PHP scripts.

-inherit depend.php
-
 EXPORT_FUNCTIONS src_install
 # Silence repoman warnings
 case "${EAPI:-0}" in
@ -58,6 +56,6 @@ php-lib-r1_src_install() {
 	done

 	for doc in ${DOCS} ; do
-		[[ -s ${doc} ]] && dodoc-php ${doc}
+		[[ -s ${doc} ]] && dodoc ${doc}
 	done
 }
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@ -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/eclass/waf-utils.eclass,v 1.22 2015/01/03 14:50:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.23 2015/06/24 06:32:12 jlec Exp $

 # @ECLASS: waf-utils.eclass
 # @MAINTAINER:
@ -15,10 +15,10 @@
 # waf-based packages much easier.
 # Its main features are support of common portage default settings.

-inherit base eutils multilib toolchain-funcs multiprocessing
+inherit eutils multilib toolchain-funcs multiprocessing

 case ${EAPI:-0} in
-	3|4|5) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
+	4|5) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac

@ -125,5 +125,5 @@ waf-utils_src_install() {
 	"${WAF_BINARY}" --destdir="${D}" install  || die "Make install failed"

 	# Manual document installation
-	base_src_install_docs
+	einstalldocs
 }
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.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/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild,v 1.3 2015/03/15 13:22:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild,v 1.4 2015/06/25 02:44:53 tetromino Exp $

 EAPI="5"
 GCONF_DEBUG="yes"
@ -88,7 +88,8 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
 	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
+		|| ( >=app-admin/system-config-printer-gnome-1.3.5
+			app-admin/system-config-printer )
 		net-print/cups-pk-helper )
 	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
 	i18n? ( >=gnome-base/libgnomekbd-3 )
--- a/mail-client/thunderbird/thunderbird-31.7.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-31.7.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/mail-client/thunderbird/thunderbird-31.7.0.ebuild,v 1.4 2015/05/23 19:05:26 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-31.7.0.ebuild,v 1.5 2015/06/24 09:00:34 ago Exp $

 EAPI=5
 WANT_AUTOCONF="2.1"
@ -36,7 +36,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-v5.31 makeedit multilib autotools
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"

-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt hardened ldap +lightning +minimal mozdom selinux"
--- a/media-fonts/lklug/lklug-0.6.ebuild
+++ b/media-fonts/lklug/lklug-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/media-fonts/lklug/lklug-0.6.ebuild,v 1.7 2015/06/20 13:00:30 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/lklug/lklug-0.6.ebuild,v 1.8 2015/06/24 10:55:46 ago Exp $

 EAPI="4"

@ -13,7 +13,7 @@ SRC_URI="http://sinhala.sourceforge.net/files/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 x86"
 IUSE=""

 S="${WORKDIR}/${MY_P}"
--- a/media-gfx/potrace/potrace-1.12.ebuild
+++ b/media-gfx/potrace/potrace-1.12.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.12.ebuild,v 1.5 2015/06/22 11:48:46 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.12.ebuild,v 1.6 2015/06/24 07:54:49 ago Exp $

 EAPI="5"

@ -12,7 +12,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"

 RDEPEND="sys-libs/zlib"
--- a/media-video/motion/motion-3.2.12-r3.ebuild
+++ b/media-video/motion/motion-3.2.12-r3.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.12-r3.ebuild,v 1.1 2015/06/24 20:08:42 pacho Exp $
+
+EAPI=5
+inherit autotools eutils readme.gentoo user
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE="ffmpeg libav mysql postgres +v4l"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/jpeg
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+# note: libv4l is only in dependencies for the libv4l1-videodev.h header file
+# used by the -workaround-v4l1_deprecation.patch.
+DEPEND="${RDEPEND}
+	v4l? ( virtual/os-headers media-libs/libv4l )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You need to setup /etc/motion.conf before running
+motion for the first time.
+You can install motion detection as a service, use:
+rc-update add motion default
+"
+
+pkg_setup() {
+	enewuser motion -1 -1 -1 video
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/ffmpeg-1.patch \
+		"${FILESDIR}"/ffmpeg-2.patch \
+		"${FILESDIR}"/ffmpeg-3.patch \
+		"${FILESDIR}"/ffmpeg-4.patch \
+		"${FILESDIR}"/ffmpeg-5.patch \
+		"${FILESDIR}"/libav-9.patch \
+		"${FILESDIR}"/${P}-workaround-v4l1_deprecation.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with v4l) \
+		$(use_with ffmpeg) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		--without-optimizecpu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DOC='CHANGELOG CODE_STANDARD CREDITS FAQ README' \
+		docdir=/usr/share/doc/${PF} \
+		EXAMPLES='thread*.conf' \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	dohtml *.html
+
+	newinitd "${FILESDIR}"/motion.initd-r2 motion
+	newconfd "${FILESDIR}"/motion.confd motion
+
+	mv -vf "${D}"/etc/motion{-dist,}.conf || die
+
+	readme.gentoo_create_doc
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 24 Jun 2015 05:36:53 +0000
+Thu, 25 Jun 2015 05:36:53 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 24 Jun 2015 05:36:53 +0000
+Thu, 25 Jun 2015 05:36:53 +0000
--- a/metadata/md5-cache/app-antivirus/clamav-0.98.7
+++ b/metadata/md5-cache/app-antivirus/clamav-0.98.7
@ -4,10 +4,10 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=5
 HOMEPAGE=http://www.clamav.net/
 IUSE=bzip2 clamdtop iconv ipv6 milter metadata-analysis-api selinux static-libs uclibc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2 dev-libs/openssl:0 sys-devel/libtool selinux? ( sec-policy/selinux-clamav )
 SLOT=0
 SRC_URI=mirror://sourceforge/clamav/clamav-0.98.7.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=7bf211f1bc37fed34d8340948def7cca
+_md5_=af8488f7d76af604b9e377a4c8525d0c
--- a/metadata/md5-cache/app-arch/ncompress-4.2.4.3
+++ b/metadata/md5-cache/app-arch/ncompress-4.2.4.3
@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Another uncompressor for compatibility
-HOMEPAGE=http://ncompress.sourceforge.net/
+HOMEPAGE=https://github.com/vapier/ncompress
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/ncompress/ncompress-4.2.4.3.tar.gz
 _eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=fc3f1029b29f5e0e5209cad3e1dfad78
+_md5_=042c5ae22a847a920ad87099ba704f23
--- a/metadata/md5-cache/app-arch/ncompress-4.2.4.4
+++ b/metadata/md5-cache/app-arch/ncompress-4.2.4.4
@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Another uncompressor for compatibility
 EAPI=4
-HOMEPAGE=http://ncompress.sourceforge.net/
+HOMEPAGE=https://github.com/vapier/ncompress
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/ncompress/ncompress-4.2.4.4.tar.gz
 _eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=da0443f5c2aca72eb65d12e1e3a01d15
+_md5_=8cf45716de0776488cb93df5a9a4a448
--- a/metadata/md5-cache/app-arch/p7zip-9.20.1-r5
+++ b/metadata/md5-cache/app-arch/p7zip-9.20.1-r5
@ -4,11 +4,11 @@ DESCRIPTION=Port of 7-Zip archiver for Unix
 EAPI=4
 HOMEPAGE=http://p7zip.sourceforge.net/
 IUSE=doc kde rar +pch static wxwidgets
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=LGPL-2.1 rar? ( unRAR )
 RDEPEND=kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )
 REQUIRED_USE=kde? ( wxwidgets )
 SLOT=0
 SRC_URI=mirror://sourceforge/p7zip/p7zip_9.20.1_src_all.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=556a6da43adff77a74a1dbd2d1921214
+_md5_=7206061af44e597b201d1a17d1543335
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.13.2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.13.2
@ -4,10 +4,10 @@ DESCRIPTION=MIT Kerberos V
 EAPI=5
 HOMEPAGE=http://web.mit.edu/kerberos/www/
 IUSE=doc +keyutils openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=23f980efa64fcc03c0cca2b501a6d67f
+_md5_=aa394473db83807536a9eb4ea5c2484c
--- a/metadata/md5-cache/app-emulation/libvirt-1.2.16-r2
+++ b/metadata/md5-cache/app-emulation/libvirt-1.2.16-r2
@ -11,4 +11,4 @@ REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps
 SLOT=0/1.2.16
 SRC_URI=http://libvirt.org/sources/libvirt-1.2.16.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d630c5a190a303c112c67499abf1c1a9
+_md5_=99043622a961568a28bdd82057947764
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.11
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.11
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.1.11
 SRC_URI=http://phpvirtualbox.googlecode.com/files/phpvirtualbox-4.1-11.zip
-_eclasses_=depend.php	a84c9fbf69f61b8a371bea1a0fcd1da0	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4400a239a11e94cd350b6b6f27d203e8	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=88a3ceaf9facc2b813e79dd880bc9977
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.7-r2
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.7-r2
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.1.7-r2
 SRC_URI=http://phpvirtualbox.googlecode.com/files/phpvirtualbox-4.1-7.zip
-_eclasses_=depend.php	a84c9fbf69f61b8a371bea1a0fcd1da0	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4400a239a11e94cd350b6b6f27d203e8	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=3fb1225b3c19084fd3a2edc3a976d8da
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.3b
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.3b
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.2.3b
 SRC_URI=http://phpvirtualbox.googlecode.com/files/phpvirtualbox-4.2-3b.zip
-_eclasses_=depend.php	a84c9fbf69f61b8a371bea1a0fcd1da0	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4400a239a11e94cd350b6b6f27d203e8	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=86f93c2c0cecc0f31b4c11818a6343de
--- a/Show More
+++ b/Show More