diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index 88c4df01afff..fbe94d1bf987 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,3 +1,3 @@
DIST lzip-1.16.tar.gz 86035 SHA256 128cc25baf92c8b69700831e6f984d954016318cc78edca87870d0c033112751 SHA512 8a1c0b254fd10428ddee8b26a2e426b57c4799bdc690e08211c3bc8fdef0d86e3ed69c48a3f6b7be1fe6c65f1e09f44cd3481b233632b60b58f4b8a806175b63 WHIRLPOOL fdb9462a4f7c3efc05b00785f1124e491d316ca44eb0d280542675593861cdca993654b5e6fcbbbabf7a1aa96c552b8ebc3307493af87ee4e154790e448ff8e5
DIST lzip-1.17.tar.gz 91299 SHA256 9443855e0a33131233b22cdb6c62c9313a483f16cc7415efe88d4a494cea0352 SHA512 cd4a1a7d3778f22e3a6f2d2a20491919e662771e79d1738f74c63de857913e28186d53b2af7997e1b164f8ab792561c7dde8781bb025a1859271ddd72f5ed519 WHIRLPOOL 6ac2c7811bccb91db290df0c446f6fccf77918903f6a5eb430163973ded98b33d09505afbd2c9c1a585029d554f3a5683816778c23c0ee696eb49f25496d2828
-DIST lzip-1.18-pre1.tar.gz 93526 SHA256 a74b11edc04a9c39a38a7265b33a94fc3b99bb465c22b1996444b3a8c29ab31a SHA512 20aea2bdf98168551895d8137dd619ae3b6ec6eb5b6d138985e32236d38d909c03c899f45aabbc51d8d315d82aaf03c4bc45ff648206fd2dcfd1fec6e437e2f1 WHIRLPOOL d277832c0cc354fd033495547ce8ea3bf7573eb9d46bee7281d805246fa65e306c514db67cdd30488dda2357ad901b859ad0164cf2794c9ae453c57e1997ab95
+DIST lzip-1.18.tar.gz 95569 SHA256 47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd SHA512 cf24756bd657ef48f48304be94bf5c6c18baf7dc4fce276e79c3abeab4c4f801e901ccfb12841fa4b2402e687aeb95f2e537695442f53c45f7cb9081c3062674 WHIRLPOOL 61a76a55afdbd685aa8b16c0cb2f1ae1629d488ea087df589cd96441db9ab6d64caf08b8ba116daaabadf62a37858dc82a03b18b61595c08e0924f51860eef56
diff --git a/app-arch/lzip/lzip-1.18_pre1.ebuild b/app-arch/lzip/lzip-1.18.ebuild
similarity index 93%
rename from app-arch/lzip/lzip-1.18_pre1.ebuild
rename to app-arch/lzip/lzip-1.18.ebuild
index a0f348f1df38..efd7b66f521b 100644
--- a/app-arch/lzip/lzip-1.18_pre1.ebuild
+++ b/app-arch/lzip/lzip-1.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI=5
inherit toolchain-funcs
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 2d735f15a2ea..c416f0f85813 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -2,3 +2,4 @@ DIST libvirt-1.2.21-20151222.tar.xz 1684 SHA256 6c97f288470ec58bcbe98507563c6a19
DIST libvirt-1.2.21.tar.gz 29848954 SHA256 8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b SHA512 5c15d0ba5d75c13f735c6a60dfdbad007426f77e113f95894d520f7fc358fa4361d5cce7bb9a548a436f323b845f13b8940abbad568b8b146418430068bb970e WHIRLPOOL d53bbb07c85b3aa2d9b0f38ff2edd3cd0a2a5300627f3e2f0a82bc057303617cab9d6f1d8a9a771bd968b0496d38d3a39a0154f88bdca44dda359a65fdc2c650
DIST libvirt-1.3.1.tar.gz 29900143 SHA256 a5d43fbed34d31eeffc641d2ac9b6026a57bf1a4fa74d0fa19a9891d9ec2c21a SHA512 a109c09d947f7c5e924fdbc9c9b6c0a9d6ff64d9411aedd9a3e710d20f749b088ff9895e882dd888b88bfea7724a8933534be4078f16cb9d2047da761515e804 WHIRLPOOL 62fb8486bfa53d55b397d9a90750d32a83f0a73cf2e6685f296489390abf9c62efc69fecd6d011fc51e9f562f75f5b8ce03208c350e98d20de0a5560721c675e
DIST libvirt-1.3.4.tar.gz 30493908 SHA256 e2396ebebb3f3fdb50429ce8faa99559f6e8e3cc0493d5fa0c1999db189c25bd SHA512 6f85e4cd8a696da729bb88368c608694119258c6ab7f9b99f41c34a6cc4492d9ad90b8ff1574fd4ee6c78c674a3a501db60d1d3ba898f7013321ecc996612919 WHIRLPOOL af4a8a0e3d746f50e0f9d95e3920c023c5bbec0d7c641f43aea580db9b95a793027f7579ecd94625a68b7e3662c328d94b7b2d243afea60a8d2f31cab1cc9319
+DIST libvirt-1.3.5.tar.gz 35109092 SHA256 93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8 SHA512 6c6a09623d3d4d426311bfa7039f5e39584d5f891b8e761bbdb3022601ea066b8e1c3f8d609326e8ba4081ae40b7b03086fbc8ba5759d218b8616ec98200a89d WHIRLPOOL 88ac308cc461efff842c27e40263a3b25ce0bc0ca310fb6e9def9126ab893fe43aed01bda9fc3615439ee797c36e2800f741b346e0b3d96aac64e7909c269879
diff --git a/app-emulation/libvirt/libvirt-1.3.4.ebuild b/app-emulation/libvirt/libvirt-1.3.4.ebuild
index 086cacc03147..c4d2e5d6305f 100644
--- a/app-emulation/libvirt/libvirt-1.3.4.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.4.ebuild
@@ -24,7 +24,7 @@ else
SRC_URI+=" ${BACKPORTS:+
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
SLOT="0/${PV}"
fi
diff --git a/app-emulation/libvirt/libvirt-1.3.5.ebuild b/app-emulation/libvirt/libvirt-1.3.5.ebuild
new file mode 100644
index 000000000000..dc601a4b3265
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.3.5.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
+
+BACKPORTS=""
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+ SRC_URI=""
+ KEYWORDS=""
+ SLOT="0"
+else
+ # Versions with 4 numbers are stable updates:
+ if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+ SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
+ else
+ SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+ fi
+ SRC_URI+=" ${BACKPORTS:+
+ https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+ https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+ KEYWORDS="~amd64 ~x86"
+ SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
+ lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+ selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+ xen"
+
+REQUIRED_USE="
+ firewalld? ( virt-network )
+ libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+ lxc? ( caps libvirtd )
+ openvz? ( libvirtd )
+ qemu? ( libvirtd )
+ uml? ( libvirtd )
+ vepa? ( macvtap )
+ virt-network? ( libvirtd )
+ virtualbox? ( libvirtd )
+ xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+ app-misc/scrub
+ dev-libs/libgcrypt:0
+ dev-libs/libnl:3
+ >=dev-libs/libxml2-2.7.6
+ || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
+ >=net-libs/gnutls-1.0.25:0=
+ net-libs/libssh2
+ >=net-misc/curl-7.18.0
+ sys-apps/dmidecode
+ >=sys-apps/util-linux-2.17
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:=
+ apparmor? ( sys-libs/libapparmor )
+ audit? ( sys-process/audit )
+ avahi? ( >=net-dns/avahi-0.6[dbus] )
+ caps? ( sys-libs/libcap-ng )
+ firewalld? ( net-firewall/firewalld )
+ fuse? ( >=sys-fs/fuse-2.8.6 )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+ iscsi? ( sys-block/open-iscsi )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+ lxc? ( !systemd? ( sys-power/pm-utils ) )
+ nfs? ( net-fs/nfs-utils )
+ numa? (
+ >sys-process/numactl-2.0.2
+ sys-process/numad
+ )
+ openvz? ( sys-kernel/openvz-sources:* )
+ parted? (
+ >=sys-block/parted-1.8[device-mapper]
+ sys-fs/lvm2
+ )
+ pcap? ( >=net-libs/libpcap-1.0.0 )
+ policykit? ( >=sys-auth/polkit-0.9 )
+ qemu? (
+ >=app-emulation/qemu-0.13.0
+ dev-libs/yajl
+ !systemd? ( sys-power/pm-utils )
+ )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl )
+ selinux? ( >=sys-libs/libselinux-2.0.85 )
+ systemd? ( sys-apps/systemd )
+ virt-network? (
+ net-dns/dnsmasq[script]
+ net-firewall/ebtables
+ >=net-firewall/iptables-1.4.10[ipv6]
+ net-misc/radvd
+ sys-apps/iproute2[-minimal]
+ )
+ virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+ wireshark-plugins? ( net-analyzer/wireshark:= )
+ xen? (
+ app-emulation/xen
+ app-emulation/xen-tools:=
+ )
+ udev? (
+ virtual/udev
+ >=x11-libs/libpciaccess-0.10.9
+ )"
+
+DEPEND="${RDEPEND}
+ app-text/xhtml1
+ dev-lang/perl
+ dev-libs/libxslt
+ dev-perl/XML-XPath
+ virtual/pkgconfig"
+
+pkg_setup() {
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 qemu kvm
+
+ # Some people used the masked ebuild which was not adding the qemu
+ # user to the kvm group originally. This results in VMs failing to
+ # start for some users. bug #430808
+ egetent group kvm | grep -q qemu
+ if [[ $? -ne 0 ]]; then
+ gpasswd -a qemu kvm
+ fi
+
+ # Check kernel configuration:
+ CONFIG_CHECK=""
+ use fuse && CONFIG_CHECK+="
+ ~FUSE_FS"
+
+ use lvm && CONFIG_CHECK+="
+ ~BLK_DEV_DM
+ ~DM_MULTIPATH
+ ~DM_SNAPSHOT"
+
+ use lxc && CONFIG_CHECK+="
+ ~BLK_CGROUP
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~CGROUP_NET_PRIO
+ ~CGROUP_PERF
+ ~CGROUPS
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~DEVPTS_MULTIPLE_INSTANCES
+ ~IPC_NS
+ ~MACVLAN
+ ~NAMESPACES
+ ~NET_CLS_CGROUP
+ ~NET_NS
+ ~PID_NS
+ ~POSIX_MQUEUE
+ ~SECURITYFS
+ ~USER_NS
+ ~UTS_NS
+ ~VETH
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS"
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+ use macvtap && CONFIG_CHECK+="
+ ~MACVTAP"
+
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_MARK_T
+ ~BRIDGE_NF_EBTABLES
+ ~NETFILTER_ADVANCED
+ ~NETFILTER_XT_CONNMARK
+ ~NETFILTER_XT_MARK
+ ~NETFILTER_XT_TARGET_CHECKSUM"
+ # Bandwidth Limiting Support
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_T_NAT
+ ~NET_ACT_POLICE
+ ~NET_CLS_FW
+ ~NET_CLS_U32
+ ~NET_SCH_HTB
+ ~NET_SCH_INGRESS
+ ~NET_SCH_SFQ"
+
+ ERROR_USER_NS="Optional depending on LXC configuration."
+
+ if [[ -n ${CONFIG_CHECK} ]]; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ touch "${S}/.mailmap"
+
+ if [[ ${PV} = *9999* ]]; then
+ # git checkouts require bootstrapping to create the configure script.
+ # Additionally the submodules must be cloned to the right locations
+ # bug #377279
+ ./bootstrap || die "bootstrap failed"
+ (
+ git submodule status | sed 's/^[ +-]//;s/ .*//'
+ git hash-object bootstrap.conf
+ ) >.git-module-status
+ fi
+
+ epatch \
+ "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \
+ "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
+ "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch \
+ "${FILESDIR}"/${PN}-1.2.21-avoid_deprecated_pc_file.patch \
+ "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
+
+ [[ -n ${BACKPORTS} ]] &&
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+ epatch_user
+
+ # Tweak the init script:
+ cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
+ sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+ -e "s/USE_FLAG_AVAHI/$(usex avahi 'use avahi-daemon' '')/" \
+ -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
+ -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
+ -i "${S}/libvirtd.init" || die "sed failed"
+
+ AUTOTOOLS_AUTORECONF=true
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with apparmor)
+ $(use_with apparmor apparmor-profiles)
+ $(use_with audit)
+ $(use_with avahi)
+ $(use_with caps capng)
+ $(use_with firewalld)
+ $(use_with fuse)
+ $(use_with glusterfs)
+ $(use_with glusterfs storage-gluster)
+ $(use_with iscsi storage-iscsi)
+ $(use_with libvirtd)
+ $(use_with lvm storage-lvm)
+ $(use_with lvm storage-mpath)
+ $(use_with lxc)
+ $(use_with macvtap)
+ $(use_enable nls)
+ $(use_with numa numactl)
+ $(use_with numa numad)
+ $(use_with openvz)
+ $(use_with parted storage-disk)
+ $(use_with pcap libpcap)
+ $(use_with phyp)
+ $(use_with policykit polkit)
+ $(use_with qemu)
+ $(use_with qemu yajl)
+ $(use_with rbd storage-rbd)
+ $(use_with sasl)
+ $(use_with selinux)
+ $(use_with systemd systemd-daemon)
+ $(usex systemd --with-init-script=systemd '')
+ $(use_with udev)
+ $(use_with uml)
+ $(use_with vepa virtualport)
+ $(use_with virt-network network)
+ $(use_with wireshark-plugins wireshark-dissector)
+ $(use_with xen)
+ $(use_with xen xen-inotify)
+ $(usex xen --with-libxl '')
+
+ --without-hal
+ --without-netcf
+ --without-sanlock
+ --without-xenapi
+ --with-esx
+ --with-qemu-group=$(usex caps qemu root)
+ --with-qemu-user=$(usex caps qemu root)
+ --with-remote
+ --with-storage-fs
+ --with-vmware
+
+ --disable-static
+ --disable-werror
+
+ --with-html-subdir=${PF}/html
+ --localstatedir=/var
+ )
+
+ if use virtualbox && has_version app-emulation/virtualbox-ose; then
+ myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+ else
+ myeconfargs+=( $(use_with virtualbox vbox) )
+ fi
+
+ autotools-utils_src_configure
+
+ if [[ ${PV} = *9999* ]]; then
+ # Restore gnulib's config.sub and config.guess
+ # bug #377279
+ (cd .gnulib && git reset --hard > /dev/null)
+ fi
+
+ # Workaround: Sometimes this subdirectory is missing and leads to a
+ # build failure.
+ mkdir -p "${BUILD_DIR}"/docs/internals
+}
+
+src_test() {
+ # Explicitly allow parallel build of tests
+ export VIR_TEST_DEBUG=1
+ HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+ autotools-utils_src_compile install \
+ DESTDIR="${D}" \
+ SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
+
+ find "${D}" -name '*.la' -delete || die
+
+ # Remove bogus, empty directories. They are either not used, or
+ # libvirtd is able to create them on demand
+ rm -rf "${D}"/etc/sysconfig
+ rm -rf "${D}"/var/cache
+ rm -rf "${D}"/var/run
+ rm -rf "${D}"/var/log
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ use systemd && systemd_install_serviced \
+ "${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+ newinitd "${S}/libvirtd.init" libvirtd || die
+ newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # we only ever want to generate this once
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+ fi
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+ fi
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
+ FORCE_PRINT_ELOG=true
+ fi
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 01b3adf354ef..d36271c83f15 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -4,7 +4,6 @@
tamiko@gentoo.org
Matthias Maier
- Please assign bugs to me
virtualization@gentoo.org
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.11.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.11.ebuild
index ffba0016f938..bcf1b03e6713 100644
--- a/app-emulation/spice-protocol/spice-protocol-0.12.11.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/app-emulation/spice/spice-0.12.7-r1.ebuild b/app-emulation/spice/spice-0.12.7-r1.ebuild
index c5b93f6bc451..e1f2587008fd 100644
--- a/app-emulation/spice/spice-0.12.7-r1.ebuild
+++ b/app-emulation/spice/spice-0.12.7-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="libressl sasl smartcard static-libs"
# the libspice-server only uses the headers of libcacard
diff --git a/app-text/jabref-bin/jabref-bin-3.4.ebuild b/app-text/jabref-bin/jabref-bin-3.4.ebuild
index 86add2dd9749..a52e3987c897 100644
--- a/app-text/jabref-bin/jabref-bin-3.4.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.4.ebuild
@@ -19,7 +19,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
+RDEPEND="
+ >=virtual/jre-1.8
+"
S="${WORKDIR}"
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
index 74329b5b96e9..f910bc58fa31 100644
--- a/app-text/pelican/metadata.xml
+++ b/app-text/pelican/metadata.xml
@@ -5,6 +5,10 @@
djc@gentoo.org
Dirkjan Ochtman
+
+ zlg@gentoo.org
+ Daniel Campbell
+
pelican
getpelican/pelican
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
new file mode 100644
index 000000000000..d89aee9b53dc
--- /dev/null
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.python.org/pypi/pelican"
+EGIT_REPO_URI="https://github.com/getpelican/pelican.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples markdown test"
+# Tests fail for this release but are fixed upstream
+RESTRICT="test"
+
+DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/unidecode[${PYTHON_USEDEP}]
+ dev-python/blinker[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ )"
+RDEPEND=""
+
+DOCS=( README.rst )
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ if use examples; then
+ insinto "/usr/share/doc/${PF}"
+ docompress -x "/usr/share/doc/${PF}/samples"
+ doins -r samples
+ fi
+ distutils-r1_python_install_all
+}
+
+python_test() {
+ nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index d9d17676402c..36748f9efcd0 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -5,3 +5,4 @@ DIST redis-3.0.4.tar.gz 1364993 SHA256 a35e90ad581925134aa0fc92e969cc825f5cdee8e
DIST redis-3.0.5.tar.gz 1366160 SHA256 4c176826eee909fbdc63db1c15adc22aab42d758043829e556f4331e6a5bd480 SHA512 f44e2bcf2f4910da9f9d9e31ec542d5816ec0ba4329efe3e5053cc0176a5a8557d905f23bd3fd37e8a6e674eaf12804613718f63cb2ca1eac2b4f9c6082acab6 WHIRLPOOL 5b58ca02af6be7768c89e9307d668081cc161f9a200a1db40f0216b6c564cb67c8230d420024c12fb5f2397cedb8979a62ad01a61d526030018171a69a22e19d
DIST redis-3.0.6.tar.gz 1372648 SHA256 6f1e1523194558480c3782d84d88c2decf08a8e4b930c56d4df038e565b75624 SHA512 cb29b2ed6db4a77ffafc27a94deb71b73332f4e05b63957ac870532a634d7aaf1df4225aec8bc3011322b6df35a7f0e7c3f3bb070e29aabd3dabdb5cfbb681d4 WHIRLPOOL ce0de5aa188d8c631456ea5bf6346357676eb8c5f0f6bc69a704f7d35559ec6a4f5c0e583e321f546fc91c6c51d0331065d64be601864e033ce7d47da002d71b
DIST redis-3.0.7.tar.gz 1375200 SHA256 b2a791c4ea3bb7268795c45c6321ea5abcc24457178373e6a6e3be6372737f23 SHA512 6c8f4c88d911e1433fd28efff2f6d62763e08be89814ebf4aa4e68e2c8bd605eba24ca3410548b2f480ae094437ce96c0bafa7a5762b3b405d5d850886297ba3 WHIRLPOOL 53c2c967b999bbcb5b45117bbad74b46457158ad94e8c43566311dd3d58c63c2d0cc2dac5dc9e8806821c2532ee4beded17e039da4ddeae958e5a0092429ee3a
+DIST redis-3.2.0.tar.gz 1525900 SHA256 989f1af3dc0ac1828fdac48cd6c608f5a32a235046dddf823226f760c0fd8762 SHA512 02a046080d070a81d38f4e8868ae85ace2db26718fc292388a94fd8f0ac45fe071f1536b3197e22451f99848dcd110469005f84456b8455836b2779eeb554d49 WHIRLPOOL d12e1f1b5ffc4170844f007ee7e25ef893fd59872bff45f95d9702cc54e0847fc66816bfa22b67f89b0570c9da167a7311a2b27f959fcf8348bb129d647498ed
diff --git a/dev-db/redis/files/redis-3.2.0-config.patch b/dev-db/redis/files/redis-3.2.0-config.patch
new file mode 100644
index 000000000000..8d93a0e7b62a
--- /dev/null
+++ b/dev-db/redis/files/redis-3.2.0-config.patch
@@ -0,0 +1,37 @@
+--- a/redis.conf 2016-05-06 09:11:36.000000000 +0200
++++ b/redis.conf 2016-06-14 09:20:05.980855432 +0200
+@@ -146,7 +146,7 @@
+ #
+ # Creating a pid file is best effort: if Redis is not able to create it
+ # nothing bad happens, the server will start and run normally.
+-pidfile /var/run/redis.pid
++pidfile /run/redis/redis.pid
+
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -159,7 +159,7 @@
+ # Specify the log file name. Also the empty string can be used to force
+ # Redis to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile /var/log/redis/redis.log
+
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -243,7 +243,7 @@
+ # The Append Only File will also be created inside this directory.
+ #
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir /var/lib/redis/
+
+ ################################# REPLICATION #################################
+
+@@ -505,6 +505,7 @@
+ # output buffers (but this is not needed if the policy is 'noeviction').
+ #
+ # maxmemory
++maxmemory 67108864
+
+ # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+ # is reached. You can select among five behaviors:
diff --git a/dev-db/redis/files/redis-3.2.0-sharedlua.patch b/dev-db/redis/files/redis-3.2.0-sharedlua.patch
new file mode 100644
index 000000000000..248e990cf59c
--- /dev/null
+++ b/dev-db/redis/files/redis-3.2.0-sharedlua.patch
@@ -0,0 +1,36 @@
+--- a/src/Makefile 2016-06-14 09:21:51.613721601 +0200
++++ b/src/Makefile 2016-06-14 09:25:21.262442026 +0200
+@@ -15,7 +15,7 @@
+ release_hdr := $(shell sh -c './mkreleasehdr.sh')
+ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ OPTIMIZATION?=-O2
+-DEPENDENCY_TARGETS=hiredis linenoise lua geohash-int
++DEPENDENCY_TARGETS=hiredis linenoise geohash-int
+
+ # Default settings
+ STD=-std=c99 -pedantic -DREDIS_STATIC=''
+@@ -51,6 +51,7 @@
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int
+ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
++FINAL_LIBS+=$(shell pkg-config --libs lua)
+ DEBUG=-g -ggdb
+
+ ifeq ($(uname_S),SunOS)
+@@ -112,6 +113,7 @@
+ REDIS_SERVER_NAME=redis-server
+ REDIS_SENTINEL_NAME=redis-sentinel
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o geo.o
++REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o
+ REDIS_GEOHASH_OBJ=../deps/geohash-int/geohash.o ../deps/geohash-int/geohash_helper.o
+ REDIS_CLI_NAME=redis-cli
+ REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
+@@ -166,7 +168,7 @@
+
+ # redis-server
+ $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
+- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS)
++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS)
+
+ # redis-sentinel
+ $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/dev-db/redis/redis-3.2.0.ebuild b/dev-db/redis/redis-3.2.0.ebuild
new file mode 100644
index 000000000000..e615716b46bf
--- /dev/null
+++ b/dev-db/redis/redis-3.2.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc test"
+SLOT="0"
+
+RDEPEND=">=dev-lang/lua-5.1:*
+ tcmalloc? ( dev-util/google-perftools )
+ jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+DEPEND="virtual/pkgconfig
+ >=sys-devel/autoconf-2.63
+ test? ( dev-lang/tcl:0= )
+ ${RDEPEND}"
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+ enewgroup redis 75
+ enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch
+ epatch "${FILESDIR}"/${PN}-3.2.0-config.patch
+ epatch "${FILESDIR}"/${PN}-3.2.0-sharedlua.patch
+ eapply_user
+
+ # Copy lua modules into build dir
+ cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+ cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+ # Append cflag for lua_cjson
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+ append-cflags "-DENABLE_CJSON_GLOBAL"
+
+ # now we will rewrite present Makefiles
+ local makefiles=""
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do
+ mv "${MKF}" "${MKF}.in"
+ sed -i -e 's:$(CC):@CC@:g' \
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+ -e 's: $(DEBUG)::g' \
+ -e 's:$(OBJARCH)::g' \
+ -e 's:ARCH:TARCH:g' \
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+ "${MKF}.in" \
+ || die "Sed failed for ${MKF}"
+ makefiles+=" ${MKF}"
+ done
+ # autodetection of compiler and settings; generates the modified Makefiles
+ cp "${FILESDIR}"/configure.ac-2.2 configure.ac
+ sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+ configure.ac || die "Sed failed for configure.ac"
+ eautoconf
+}
+
+src_configure() {
+ econf
+
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+ # geohash-int can't be built with -std=c99 either
+ # also, don't define ANSI/c99 for lua twice
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/geohash-int/Makefile deps/Makefile || die
+}
+
+src_compile() {
+ tc-export CC AR RANLIB
+
+ local myconf=""
+
+ if use tcmalloc ; then
+ myconf="${myconf} USE_TCMALLOC=yes"
+ elif use jemalloc ; then
+ myconf="${myconf} JEMALLOC_SHARED=yes"
+ else
+ myconf="${myconf} MALLOC=yes"
+ fi
+
+ emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+ insinto /etc/
+ doins redis.conf sentinel.conf
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+ fperms 0644 /etc/{redis,sentinel}.conf
+
+ newconfd "${FILESDIR}/redis.confd" redis
+ newinitd "${FILESDIR}/redis.initd-4" redis
+
+ systemd_newunit "${FILESDIR}/redis.service-2" redis.service
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
+
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+ dobin src/redis-cli
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+ fperms 0750 /usr/sbin/redis-benchmark
+ dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
+
+ if use prefix; then
+ diropts -m0750
+ else
+ diropts -m0750 -o redis -g redis
+ fi
+ keepdir /var/{log,lib}/redis
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 9f0e80e37419..1e9dea26d5c4 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -9,5 +9,7 @@ DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568e
DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966
-DIST apache-tomcat-9.0.0.M6-src.tar.gz 5023823 SHA256 7217416b1c6470f3653d978bbfdb153693aef74929da21c5823117a168992b2a SHA512 712a93d71bef2f6dbdd35d32cbf200045bacc1a27426cb9f92e3a645a7f59f3611adebebdc24168de569cea2c64500ea893acfba05670947f53d72abec0988f1 WHIRLPOOL fb98d23ac462cef450d1ed8c88eb8be88a0aad32b24cf1b5c8437e51966bfb3d5222a3368ea54a2f19b0be38118b3148bf7549d2d59f1c8267aaa29246ef1d62
+DIST apache-tomcat-8.0.36-src.tar.gz 4988679 SHA256 36db67592adda575fc08dd5f0cd3532934d2edb117028e29bdd9f702bf31ab10 SHA512 192a31eb42afdc345fa5ea5f05b03766e70a67841fca9bd9c76bcd47ae1d505fd3cd1fde6bc64e145add2b6a9e88ecc50ab1a0954942704c139ec3c7a6bf7286 WHIRLPOOL da1bb6570d62caedfe83948f2e850ec7e8bdba36925d1f000067864c98b1bd780aabf2f1cbcb66cb544db292156a98819e9cc6dfa42a345064f09dcc4471a7c3
+DIST apache-tomcat-8.5.3-src.tar.gz 5001008 SHA256 d0d1ecfd88d733cf3666cc39483ea092627840cd2cfab8fae09f93b7bf05d21d SHA512 7c4da46725c6e34669f538f406e699c235b99b4ec47a289f4fcbf93b49a35082cea3e041bee8a2772a29c240521d8720b2b50b5cda7afe0ec0f2b4f5cb29bda5 WHIRLPOOL 2ad999e8ee068d66164e2a256ee58f47799251fab60cf9af3a67128b131a07116a2faf2da6eef132e13f5df6ed78f1c44ac69bf5615178b63452fbffc62a4852
+DIST apache-tomcat-9.0.0.M8-src.tar.gz 5024499 SHA256 bef36f9ead80188a8859fc1fa9846e77e570c54c99c05388857dc6dd29f526f8 SHA512 b1778709bddf6b0d1263115a57c743fcb58286b58dda384b06079ddcab8188a63de48efd3f47b6314c92154dd01c7bd1c8858ac2ea82d20a3d90c80899edcf87 WHIRLPOOL 8083b108a49ac0e066104a5849fcc6ef6c1355c09d9854d50a4108df769384664d0b37aa0cc85f59361a080e73fb585de36916855e1fcef1a441c4225653aca6
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.36.ebuild
new file mode 100644
index 000000000000..7f90a4396711
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.36.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.3.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.3.ebuild
new file mode 100644
index 000000000000..7f90a4396711
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha6.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha8.ebuild
similarity index 92%
rename from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha6.ebuild
rename to dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha8.ebuild
index 0d70304393b1..225ec0e26558 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha6.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha8.ebuild
@@ -10,7 +10,7 @@ inherit eutils java-pkg-2 java-ant-2
MY_PV="${PV/_alpha/.M}"
MY_A="apache-${PN}-${MY_PV}-src"
MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3 implementation"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
HOMEPAGE="http://tomcat.apache.org/"
SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
diff --git a/dev-python/hiredis/hiredis-0.2.0.ebuild b/dev-python/hiredis/hiredis-0.2.0.ebuild
index 0354d86ef3fa..8892ff77594e 100644
--- a/dev-python/hiredis/hiredis-0.2.0.ebuild
+++ b/dev-python/hiredis/hiredis-0.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 3532b8984a9b..e5718e0fc18b 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,3 +1,4 @@
DIST libvirt-python-1.2.21.tar.gz 171250 SHA256 7ffb49fcb64ac06188fc626c853c99361e5965766ab020f8ea66f8fbcfc29684 SHA512 7e2481ffa26105ddde703bd6eafe74240b69990b2f2ce0042f20f7fceb1d326fb8a66bf26042bfe63a12cf3202d7c19b14b6d766dd42fb66af212393d7aaf332 WHIRLPOOL 18dd5bc0d565b6846c40960cf258d7fb3714054be15fe54507e2846c5a7c2cd81e9b209c8e70cbfd5319d5a06f00c2c5322995058637af87d1676276f8675b2e
DIST libvirt-python-1.3.1.tar.gz 171221 SHA256 7143b922a9bd66a5e199b13316fa4266cbffc23db01c99bce37216a1eb9118f7 SHA512 f980d6aec1c83422d01c8ff02915357f4903f8c2a8ea9538da35e7313f6d491ebb4646e642097269a6be2996da879e7594c5e166cf2cc0bd96745eace7ce7567 WHIRLPOOL 3fe0ecba5f618eab1059c5e4ac4ef8789ed6684f36aee336f2e366198805560706c41d67ddceb328a0ad66867145a103aa15665b646b7bc5a5b058b02755ce11
DIST libvirt-python-1.3.4.tar.gz 172808 SHA256 badd2f51b07d5b03be7c01c45d8f52fea181ba9386ced5b12241ffdcf7e4f7a7 SHA512 18063021edf28b6c7b6b407590ec94eda45272c6b976ef560b4e81a8b212a5c7d2c1ce844e066855cda0a1bca4e98028936314c58e12261952783bd606501f59 WHIRLPOOL 73e2a9a1327efad4e448bb08814ddbe5c8958bcdbe596ea539be39e3a34ff9ffed141aac40bd90d4c0b841e1ddd42f6d7905245499efa774dca6f99c16305814
+DIST libvirt-python-1.3.5.tar.gz 168780 SHA256 a0508a57637fd18a3584fb9d2322fb172f65708c9db16e0438a70eb0f36fa5c2 SHA512 e1241e71dc0c574b14c6ecb101ec611f0c8caab6a5f82268882febb7b1382752d350ee0f6c2d648c30c6af3f19ef5b91bb518d8a0bd6ab967807b82dd4cf893f WHIRLPOOL 83a861fd425320214c43b80053444cc273c761e88b2530a10d2e8bfe898b19e1563d9f3b182deabe7fc8a7f445c303fa495123bb28d41caa88954cceff40c453
diff --git a/dev-python/libvirt-python/libvirt-python-1.3.4.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.4.ebuild
index cc59d1ba63b0..7e00c010c3be 100644
--- a/dev-python/libvirt-python/libvirt-python-1.3.4.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-1.3.4.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then
RDEPEND="app-emulation/libvirt:=[-python(-)]"
else
SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
RDEPEND="app-emulation/libvirt:0/${PV}"
fi
S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-1.3.5.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.5.ebuild
new file mode 100644
index 000000000000..cc59d1ba63b0
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-1.3.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+ SRC_URI=""
+ KEYWORDS=""
+ RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+ SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="http://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}] )"
+
+# testsuite is currently not included in upstream tarball
+RESTRICT="test"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest
index a16147d3356d..da1c61421843 100644
--- a/dev-tcltk/tls/Manifest
+++ b/dev-tcltk/tls/Manifest
@@ -1 +1,2 @@
DIST tls1.6-src.tar.gz 168043 SHA256 adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3 SHA512 beaca2653a11924f022e28254cef5071ecb8ab2e2355496d278fcab1bdcc46424aa58d2fe176aea26ec4fbe4416a912b5af8e8e69571c8a5301b7921ecf48383 WHIRLPOOL 5769eccd4df94558d7b5cdaa7234f4b248e3d8108686c3104bfa53a709a444088cdbf51b9660ecaa1f213c9391afbf81108ed330fe41bed3409d3c9364ac9790
+DIST tls1.6.7-src.tar.gz 173654 SHA256 5119de3e5470359b97a8a00d861c9c48433571ee0167af0a952de66c99d3a3b8 SHA512 f8dbb7fc9890bcb3e3930cad66209ca67cd68c0aa2288caa6a3bb1fd1ad21444f1eb056b4b4585ec86da64079cd9df72cdd6ff201102820d45e6397d6148d21c WHIRLPOOL 3aa6f39995c89569d9365a118d096b628f11c9163be8b90cdd5dbf4f59502c78906da311ba5e47ef97f01e2980992d3a5fa4bfbb6c56dbc804a6d24e1f99439b
diff --git a/dev-tcltk/tls/tls-1.6.7.ebuild b/dev-tcltk/tls/tls-1.6.7.ebuild
new file mode 100644
index 000000000000..065cbe9b6ba8
--- /dev/null
+++ b/dev-tcltk/tls/tls-1.6.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="TLS OpenSSL extension to Tcl"
+HOMEPAGE="http://tls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tls/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="tk"
+
+DEPEND="
+ dev-lang/tcl:0=
+ dev-libs/openssl:0=
+ tk? ( dev-lang/tk:0= )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ econf \
+ --with-ssl-dir="${EPREFIX}/usr" \
+ --with-tcl="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+ default
+ dohtml tls.htm
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # this is ugly, but fixing the makefile mess is even worse
+ local loc=usr/$(get_libdir)/tls1.6/libtls1.6.dylib
+ install_name_tool -id "${EPREFIX}"/${loc} "${ED}"/${loc} || die
+ fi
+}
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 740d198b1666..b18abc93c05e 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,3 +1,3 @@
DIST devscripts_2.15.10.tar.xz 679536 SHA256 8659779f03563aea6187f744b083cea2dfe637da2bb12ff52e38dd2e6f3762f9 SHA512 700e7734876325af6d8ae1d9b833b3f5cd8fee00cd1de63cab8da5eb643357c204e9a5f626cc1923d80a376850adbc931f51c46aebd1a2ad95ce4a13c7323657 WHIRLPOOL 0f62462308b7741ad7459eff12867988667b7a43e9a35b8845c5e8d0c741c623c2a6ff0c22509b7319399cb7d91bb3c4023c143678e0f7cb11d7c4380f9cf59c
-DIST devscripts_2.16.2.tar.xz 686080 SHA256 847507a2636c4e2eb0bea50b77be70b52e149496a603c78b0c0143e763649f62 SHA512 cbb76bf2b04349e905d895c31df30c3c72b3563f378559d0df4117dbbe20867c76f9aa4826dea6820bd72b4c3c73ed0e0fa952d8bfe1257585eaea502bc77b44 WHIRLPOOL badb15197e284fb00da3390c35a4565fa3cc4a1067422547aa30d24122a3f9f7c07ee1059c02ff4713219fc5619473446ddfb7e7bf7e7bf03f8a11429aadb41d
DIST devscripts_2.16.4.tar.xz 686656 SHA256 628fd8153de351cc6d479656d5a8987dc91e3a8f34d1535caed41ce690ebbb43 SHA512 14f05a75a8b8553cc50f076b51a9a12e9b48404ca3e4520166142b6a047701b5b8c67fee7c1b7a550a6080d44af5f29a1a5ca5c0856f7859b9bd8c43d9aa5a1f WHIRLPOOL 287a2e52bfd5898cbdaa5dc00b106c4f6dafd33d8372e149878b2ea52e308cb38627aeb945a7a8b2e17a3de7fe39eb202e0c5768557373183afa721bfd1181dd
+DIST devscripts_2.16.5.tar.xz 688204 SHA256 02b813f3565683f1ba6d1381b247a2342030279ae4ff56ff609964e5963acf4b SHA512 e0f645e3680da32b4216e81a0d7f2701501a0c0d7f1b107f02260ce39311a331825053cfb1ee2445b5fda27d0722d659f46f82125402d7b8a053ce294406a503 WHIRLPOOL 41fd777e2992b68e78db87d5794720eff91f895a96b9b969689e528df647afa22496cc2d856adcd3a6cf9e519471ca6662afa7827a0e5bdd47b820dd5a1861d4
diff --git a/dev-util/checkbashisms/checkbashisms-2.16.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.16.5.ebuild
similarity index 90%
rename from dev-util/checkbashisms/checkbashisms-2.16.2.ebuild
rename to dev-util/checkbashisms/checkbashisms-2.16.5.ebuild
index 9d584f4637bb..4b11f8d42e0f 100644
--- a/dev-util/checkbashisms/checkbashisms-2.16.2.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.16.5.ebuild
@@ -27,8 +27,12 @@ RDEPEND="dev-lang/perl
S="${WORKDIR}/${MY_P}/scripts"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+ epatch "${PATCHES[@]}"
}
src_compile() { :; }
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index a17e4be03381..73f18e584aa1 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -31,7 +31,8 @@ IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
!dev-util/pkgconf[pkg-config]
!dev-util/pkg-config-lite
- !dev-util/pkgconfig-openbsd[pkg-config]"
+ !dev-util/pkgconfig-openbsd[pkg-config]
+ virtual/libintl"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
@@ -67,6 +68,12 @@ multilib_src_configure() {
# not good, esp. since Carbon should be deprecated
[[ ${CHOST} == *-darwin* ]] && \
append-ldflags -framework CoreFoundation -framework Carbon
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # required due to __EXTENSIONS__
+ append-cppflags -DENABLE_NLS
+ # similar to Darwin
+ append-ldflags -lintl
+ fi
fi
else
if ! has_version dev-util/pkgconfig; then
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f3840c8dab95..efc98810792d 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -4,19 +4,19 @@ DIST git-2.6.6.tar.xz 3822260 SHA256 8d53410d60f9c36b0f34c125076634d068c8d812f41
DIST git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch 28198 SHA256 b6bf7d67b9cc4d34550a10933af63b665b136b869dbbe23ad3ece0d463f027f9 SHA512 3fd64b0d6b53d5b08b791195e6edc162db682fc8a1bafc04aab7a7a4e61e2db4b3b84d9f769e0d7756da2739bdd900e30a233c228706c39817e42e309c36684c WHIRLPOOL 7e1d9337d46222ea4ae2164429a6a220adb0f763bdde6722c0f2adf79789e092f5cfb74b932597b8d3971af4fc27dede1fea51b9cb72b44ec8e30bd78bdaaa8d
DIST git-2.7.3.tar.xz 3909636 SHA256 89c467912d4740da2b40288f956251f0a1e276e28eecd28a6d776067103629b6 SHA512 f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72 WHIRLPOOL 5cc261749f91c2e0b0509d2fac1bc7426b3ddcc37e859d4f524838e1dd471071ad430886751933bae57aafc20bdcf3f9a43f4c018cc9c89610134a5203b22447
DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3
-DIST git-2.8.3.tar.xz 3979536 SHA256 7d8e6c274a88b4a73b3c98c70d3438ec12871300ce8bb4ca179ea19fcf74aa91 SHA512 747b6927700ab47648746f61984588a040ec0bda6db218e1c0a86cb443846fc3efd4875758bab9b1004d6239f285ce546f7df0b9d189177d77b0f8ba62776ad2 WHIRLPOOL fe4c6eb3fc038ed1a7c0b21f1accdf954240abc72760b54d36c472730153ea0cf5da2694929c973e19a2edd654ad6cc0d62ccff5a48d2877bc001b802fef58a4
DIST git-2.8.4.tar.xz 3982836 SHA256 120e9a32a1858871dea34165622ec7a63f27887b93093c8d72a18bcf89fe1657 SHA512 92c3b4437d1160cc23612b4df62646b80a1245d4ed482c3543ba19511f754a34d0185d5dd5d16f2a42bc3097bebc47ece0670c45a1c53ca38cbfbff7d43de87b WHIRLPOOL 8be86b1cba51ef549d56014c090dd5844019c2c5ccf15865dce86ed7f28f5628621450d784f23ba03f79282bc87e5a8ee0fad161a157785cf6c5716f8aa1e767
+DIST git-2.9.0.tar.xz 4014000 SHA256 f41fa97949948fbf49af94a43d779e072a5452c6b5039d86ffa41ebab747b409 SHA512 9433b4642482634d4c76884307d987155568c08a741285cff0eb3699de04d7ff970892f23587bdf6f9ea0083dd5aee652c3265842ba6cf789955e0040a3e5b6a WHIRLPOOL 314fc79cb5b480da7ad6abc4ba467cc9e806f95c45dc527cd31d481547d446612936f1601ac31c9296a371a57f1403f8452cc7487816fd1c8e85c7bd242ca2a1
DIST git-htmldocs-2.4.11.tar.xz 997132 SHA256 2764af41b319f4d11b29832de4bd05392f2887d9a1d3c56c864fb081920eac97 SHA512 d5d2abae9cc303fe8ebeb72ae7078d44db94610d549ca03afffcbbef8b611efda662677423d9ff97a0c7a2384bbd4c3468b01a2ecd7b68f4fdc89e62ad688eb4 WHIRLPOOL 66cd4fc754be7c103ca58a030d4799ba988792419a426e85a39805172e6329ec617b3561696dc74be36801cca0b17a26102a194a1a58d6c7b9ee1ab17752c4a6
DIST git-htmldocs-2.5.5.tar.xz 1010216 SHA256 15de2f234cf419496399f7ad396709544d62537488a8e5200e6e34b0f1a685e7 SHA512 265ddf3835352f85eb2e2ee983eb8aaf37bc7b151968866bdb8b9bb6782cdb72dbd1fefe5d7f694a6825954d49bcf4c799e8bcb4e3b25e3f228f6f97f041fd9b WHIRLPOOL 90da44c0bdb6f9ff428d1673289e612936ed5f26110cd13d155c8cbef8433b13bd8b15cea88f967224a699e4c3a6ac41d70b67be1b25c4d35989879626eb10ad
DIST git-htmldocs-2.6.6.tar.xz 1021856 SHA256 897fb0bc7e2eb67a4b582c963f337fda3a6ad2b23bca55e27f23f7d15bad7c5d SHA512 85dcd8514e1ba2cb591512a0003aedf25eafbf185ba1eed01f8adfd9eb467d29b17108e6b087183004004ab17301316d403cd6762619ac2a030a565ea5c776b3 WHIRLPOOL 3cd964f1d0164db98e97e0097813a620911adadd9c50837e23a5ca79eb0f2d988aa68317b5b79fa7b052900564657c36d050e75841a1018d5ff12e1299c01dc6
DIST git-htmldocs-2.7.3.tar.xz 1031848 SHA256 f71f5e8e1a6103e83ea794f367bc419a1d14ba0f79ebacdc81b3b9430714adea SHA512 50de5d9d3c0f6d874a6a4bc3b247a1795b1bcf154a276b546f88c3b5f5fb2eb27212d207a4bb50c04cba36d8537853afd25816addfb87c9a50e18528d93586fe WHIRLPOOL 057d9bebfe51c29a0a7f689baa9873cb6a54feb1d2869c541396902b160379c9220c5de79a4cb59c6e804e5c7557c0fd141b89621b97d3b495dc6e0a77c67a9f
DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682 WHIRLPOOL 87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869
-DIST git-htmldocs-2.8.3.tar.xz 1041036 SHA256 df9aa1f374ca49dd65f47a8bb1498c11567d963e30cf00e097aa89c495d3ccde SHA512 5df5b991091d2c04f96a6236905fea7cc2ec9ddb7b86a4b298f65f69219101273121e4585fc36cd86a595d3b3b29de3afc7d2815e643b88040e5c7406fa440bb WHIRLPOOL 84b45804240e3aa5e427fc03983ef22e911021b2dc7303ba7326d64290d38f54111992c02b978c29c338154dd29d70b0ae62d1ab8e90eb542ba9ea9100235cec
DIST git-htmldocs-2.8.4.tar.xz 1042260 SHA256 78135be591e3a68d1030a76e343d59622e5e40f6990667f4385a01d9dafe9bbd SHA512 5da40db4421f94a969b83bfa0ea6e5ccf3fce8c2085ea2271a2eb3e1b4fc496c36ae8790207cd1814ff747b7633bb27fd53bb9c012f866ea1e7f1cc8065379dd WHIRLPOOL 4f80041ad4ef8b178a6b91313680433a7e07b0ecb15354304436d70880063b2f9cdd875fcd95684a817272d05a57485e1863e9e06c3788eddf0e5f031279ea9a
+DIST git-htmldocs-2.9.0.tar.xz 1049236 SHA256 664dc1aa20966a91cf6b90d282bb5f93b4e4c831a32a0791f43218389ce3b955 SHA512 16dbbb1d3179932f9e383faa8383b948fb5d18761c8b5d9530e00a363e739c3a03cdaf1c96e303a6e98af5c81caaaa116fdd4ea8b867e5317dc0531bff33c843 WHIRLPOOL a2e98fc454fb1758675aaf2b9e198e4d5ce2883ebd6534264142131939fdd9a3597e1f39f7e63857f5b64c40f4f15042a30f1dc62d58e281f72191221babd09c
DIST git-manpages-2.4.11.tar.xz 373956 SHA256 0a1fff7650e635339f92985a47198f5f6664eda1c233c3cf48e92f22c3735db2 SHA512 78226baf1c8be28c456a84b06f403af9b918cd3e46218917cce18b3b9ce494600bf00014b818ca0dff9f675aca8b17cd9f7893c7063e218d719a9567e81d9040 WHIRLPOOL f8883ca7d327c378937f62287cbb515b5271cb8aeda18d32135f1c7ea71c9f39282fe55b191476f046de4815a994e4f6f98696d9353f0bfcca7994101398786c
DIST git-manpages-2.5.5.tar.xz 378304 SHA256 41b66002436add0781618764c3f0c8222bac7d8a636f1d7e2994480b22369930 SHA512 bebcc04fa54080316d01f1bd1ba7b91a1712e6c6a6f95306d9f079cf5858cf0fb2ccea24c606153e9adb99e956c5dbae5a5c7a7a0ed8c643efdf5a5db599cda1 WHIRLPOOL e72873d3f1a404a311e643d89cf65996d884e794e468417272cdda494ef621f0ebf875faa17433e443fcece54608c59a3c094372101bf4342fadcf8395dabce8
DIST git-manpages-2.6.6.tar.xz 381588 SHA256 0f64c1db015e3c74e56eef646a9fdd456cf043cae54714f404ad9b35ddb537a0 SHA512 bd8573f58bd988f78978041b88643e6d0af99ae0df4be6ec80db7de6e042970a23d9a153e84ddb8ffc538724b1482ff6dac7594462e28073067f54d040fdddfd WHIRLPOOL 3e8af6df1b96e3211c5799ace846dab331f30c1133c1d093e344b4576d8f588631e29187909b600112a9f7b42a0de63f56cec953e0d162cc49c2b6efeef0db53
DIST git-manpages-2.7.3.tar.xz 384544 SHA256 9f088427c61a9e0a840007c7f50fc6f7caba36ac8c403460c49210983090496d SHA512 883441df049bfaf0f22cf9d17041125dc9c8f0e7d94efa7a4188a68c2242d1b4c3d34fd3bd3ecdd2af905ee2f8fb5fefd0ce6328dd76c665f7ec20e3b9c87d1b WHIRLPOOL 7ee013444665366ecb8f3df507a3c5af8a9f48d3185783a94db827b192c32ac6998157eb42bcbfe397f96d452451b2416c32e2dffbabc71062422e7c5e25c184
DIST git-manpages-2.7.4.tar.xz 384460 SHA256 d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd WHIRLPOOL 38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5
-DIST git-manpages-2.8.3.tar.xz 386856 SHA256 9d25e10c2bc327fdc59820bb00075799487095059d652fb32fea1cdb3a898bc6 SHA512 539f7ac635bccf89c95ce3b7e79b72ad90bde4c48e6945b786d6a8d58485eb197d3505a4da574501768d98cce4d7d5bdf00f98baaf9e0658ed54dc49b032b43b WHIRLPOOL 24e16311a558019bce3007ad0cf3d42ea10762b8355e431216c59284a845d7d064ad51b94971d964ff0db84c6c766393d3feb81e14a07f10a97c4cbfe7f19b92
DIST git-manpages-2.8.4.tar.xz 387168 SHA256 d2ddfc302e5b3c0ad182916b27c28d95bc667ea8b9db8dc099bf3d8d62b8b7f5 SHA512 d4ffca6ad8ff0b6bfab984eb06ad5c6c0cf73cfb4beaff4e924b2bd117a4a369e928faa2ca09f11903ebc52249ad24e2b68e7b571965a2ef48f5731ad94b9bef WHIRLPOOL a22d7ad38ccfb399325e321cecc7255fdf4ca05f14e92acfe94e74b816199d2e057a559f6e3eede2df768d762457eb2a43f1e9c76e8b6e76c7498dc9547dcf25
+DIST git-manpages-2.9.0.tar.xz 392440 SHA256 dc85c1afa923fd709d651a49d0a720d50a3c248cb16c6c09517cceae88fe8445 SHA512 ad3fbf7ed716d31d0e1006168a9c49477279961e8c4b2d0d249f57d07ed3fdfef7c42bd2df4d3a9b06d54df45e2e2a43b9959aee951566c02e21a4ff3df23483 WHIRLPOOL 0da980cf24bea0e8a6582e9a2f9f19ea6628beb76eb43fd438cabb0a0f1c0686db8806e109716cee39a6a6b9cf6d3bba7c74c81e49558d0aa1424284525c2ac7
diff --git a/dev-vcs/git/git-2.8.3.ebuild b/dev-vcs/git/git-2.9.0.ebuild
similarity index 99%
rename from dev-vcs/git/git-2.8.3.ebuild
rename to dev-vcs/git/git-2.9.0.ebuild
index 30ae9d02053f..95d95e7d4619 100644
--- a/dev-vcs/git/git-2.8.3.ebuild
+++ b/dev-vcs/git/git-2.9.0.ebuild
@@ -120,7 +120,7 @@ REQUIRED_USE="
PATCHES=(
# bug #350330 - automagic CVS when we don't want it is bad.
- "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+ "${FILESDIR}"/git-2.8.4-optional-cvs.patch
# install mediawiki perl modules also in vendor_dir
# hack, needs better upstream solution
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 23f9d72c009e..94908b5bb828 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,5 +5,5 @@ DIST postfix-3.0.4.tar.gz 4240805 SHA256 b81ce81176b9df7183ad99b9c98000135f5e88e
DIST postfix-3.0.5.tar.gz 4241656 SHA256 dbe20d011a6fe79d28b5f7e6e86681dafd30f7ed8ad663bec244fc4694c87d1c SHA512 73ae64d5d5a21a773934b1b334bb7c407a1e8f9652a2de7d4c0563d8b399fbd25b9fcc28d1d5ee724fc13c775ee9af2d5d56cb06d4947cd5a18bcf487c71c24e WHIRLPOOL 022110186e5c2e9a11bfe19bd2712d39f751a47a273f75a3aa61f99f34ce76e4f20552c3df87c3878d0c1b7a1bf5bff893191d94a4951e14ce3d6ff7bcfbf905
DIST postfix-3.1.0.tar.gz 4336709 SHA256 88ac3e92755629077d9363319b1fa0db406efb10c2f22cdbb941bd8ab36fd733 SHA512 06cf4c827de8d613cab6a57a8e76198d293660a263f60d17dd189f511da4b1e12eb98bbcf75695697a62959e26ca204bf2a53eb6657e8bd756a816977e717783 WHIRLPOOL 5fe4350d47051cfda00505012493f5c6f70598be901cd94a598a7e3332bc022b41050935c5263f140f0df573e3a3e00f6b97dd1d90c01a4e3d78a039f47a16a8
DIST postfix-3.1.1.tar.gz 4337295 SHA256 3deda4c34631970490b1b5fbb559905f93531bf1c7eb00e38b0d0deb1dba9982 SHA512 e094dae3c3aaf6be23edefb7863d2f9fb57cd4e705464f17799fa4f71f9877efdf3f59ceb1970457a0dc6e6f3237ee06131f4ce1b21a5db9a61fe0c5f95a219d WHIRLPOOL 4dbf26e498cb48ebf5d5721aa69447deed4db25dd2a9159514826eb7d4986dd7fef40980281f0872f565750ed5d316f831856b87eaaabfed3df8b23f982592cd
-DIST postfix-3.2-20160611.tar.gz 4366425 SHA256 c3574c38aaa17da891e9672567fcde19c4ba358d7f6b9d3aaf652aac6656e739 SHA512 2e9e4f8363641f88cb4b666a23a3f8623c63660ffb3a4b8d0b3b55d0ffd6179df2b5ec5481da4d08e13b22207341c122da0001b44a36a2bc86a928359b4671fa WHIRLPOOL e01b4378e3024103b52e40b125fa8b2998fdc196bc5a4457a2fa895d258f5ceca30c09a8325aa008c09edd2d9679713a34fb1dc2aef5e7c307af6b029dbe8155
+DIST postfix-3.2-20160612.tar.gz 4366596 SHA256 d7a64b6166befe9a0a705144283eec9ea055bb4cba67a5704bfb1a4048b3860c SHA512 230789ddf9d8cf54325fa00d1643e284aa0284f2e06deb0120c92136d81bfe373c8bcb47fceb7ad934716f8728c1c6117fc4135e5c1a92639d3d8eeb0df4e495 WHIRLPOOL 8bf4136d1c24e1b411d6f9116dfd7da0ac442343d0220690fe83cad6d0b19f5499e2f15a611ccfd283828717eaf25187985b3f009e7ac68d2a45839559129065
DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-3.1.1-r1.ebuild b/mail-mta/postfix/postfix-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..b624d76b6571
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.1.1-r1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic pam systemd toolchain-funcs user
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+ dev-lang/perl
+ berkdb? ( >=sys-libs/db-3.2:* )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+ eai? ( dev-libs/icu:= )
+ ldap? ( net-nds/openldap )
+ ldap-bind? ( net-nds/openldap[sasl] )
+ lmdb? ( >=dev-db/lmdb-0.9.11 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+
+RDEPEND="${DEPEND}
+ dovecot-sasl? ( net-mail/dovecot )
+ memcached? ( net-misc/memcached )
+ net-mail/mailbase
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !=mail-mta/ssmtp-2.64-r2[mta]
+ !net-mail/fastforward
+ selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+ # Add postfix, postdrop user/group (bug #77565)
+ enewgroup postfix 207
+ enewgroup postdrop 208
+ enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+ default
+ sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+ src/util/sys_defs.h || die "sed failed"
+ # change default paths to better comply with portage standard paths
+ sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+ eapply -p0 "${FILESDIR}/${PN}-libressl.patch"
+}
+
+src_configure() {
+ for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+ do
+ local AUXLIBS_${name}=""
+ done
+
+ # Make sure LDFLAGS get passed down to the executables.
+ local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+ AUXLIBS_PCRE="$(pcre-config --libs)"
+
+ use pam && mylibs="${mylibs} -lpam"
+
+ if use ldap; then
+ mycc="${mycc} -DHAS_LDAP"
+ AUXLIBS_LDAP="-lldap -llber"
+ fi
+
+ if use mysql; then
+ mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+ AUXLIBS_MYSQL="$(mysql_config --libs)"
+ fi
+
+ if use postgres; then
+ mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+ AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+ fi
+
+ if use sqlite; then
+ mycc="${mycc} -DHAS_SQLITE"
+ AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+ fi
+
+ if use ssl; then
+ mycc="${mycc} -DUSE_TLS"
+ mylibs="${mylibs} -lssl -lcrypto"
+ fi
+
+ if use lmdb; then
+ mycc="${mycc} -DHAS_LMDB"
+ AUXLIBS_LMDB="-llmdb -lpthread"
+ fi
+
+ if ! use eai; then
+ mycc="${mycc} -DNO_EAI"
+ fi
+
+ # broken. and "in other words, not supported" by upstream.
+ # Use inet_protocols setting in main.cf
+ #if ! use ipv6; then
+ # mycc="${mycc} -DNO_IPV6"
+ #fi
+
+ if use sasl; then
+ if use dovecot-sasl; then
+ # Set dovecot as default.
+ mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+ fi
+ if use ldap-bind; then
+ mycc="${mycc} -DUSE_LDAP_SASL"
+ fi
+ mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+ mylibs="${mylibs} -lsasl2"
+ elif use dovecot-sasl; then
+ mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+ fi
+
+ if ! use nis; then
+ mycc="${mycc} -DNO_NIS"
+ fi
+
+ if ! use berkdb; then
+ mycc="${mycc} -DNO_DB"
+ if use cdb; then
+ # change default hash format from Berkeley DB to cdb
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+ fi
+ fi
+
+ if use cdb; then
+ mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+ # Tinycdb is preferred.
+ if has_version dev-db/tinycdb ; then
+ einfo "Building with dev-db/tinycdb"
+ AUXLIBS_CDB="-lcdb"
+ else
+ einfo "Building with dev-db/cdb"
+ CDB_PATH="/usr/$(get_libdir)"
+ for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+ AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+ done
+ fi
+ fi
+
+ # Robin H. Johnson 17/Nov/2006
+ # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+ mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ filter-lfs-flags
+
+ # Workaround for bug #76512
+ if use hardened; then
+ [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+ fi
+
+ # Remove annoying C++ comment style warnings - bug #378099
+ append-flags -Wno-comment
+
+ sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+ sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+ emake makefiles shared=yes dynamicmaps=no pie=yes \
+ shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+ DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+ AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+ AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+ AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+ AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+ local myconf
+ use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+ html_directory=\"/usr/share/doc/${PF}/html\""
+
+ LD_LIBRARY_PATH="${S}/lib" \
+ /bin/sh postfix-install \
+ -non-interactive \
+ install_root="${D}" \
+ config_directory="/etc/postfix" \
+ manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" \
+ mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ ${myconf} \
+ || die "postfix-install failed"
+
+ # Fix spool removal on upgrade
+ rm -Rf "${D}"/var
+ keepdir /var/spool/postfix
+
+ # Install rmail for UUCP, closes bug #19127
+ dobin auxiliary/rmail/rmail
+
+ # Provide another link for legacy FSH
+ dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+ # Install qshape and posttls-finger
+ dobin auxiliary/qshape/qshape.pl
+ doman man/man1/qshape.1
+ dobin bin/posttls-finger
+ doman man/man1/posttls-finger.1
+
+ # Performance tuning tools and their manuals
+ dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+ doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+ # Set proper permissions on required files/directories
+ dodir /var/lib/postfix
+ keepdir /var/lib/postfix
+ fowners -R postfix:postfix /var/lib/postfix
+ fperms 0750 /var/lib/postfix
+ fowners root:postdrop /usr/sbin/post{drop,queue}
+ fperms 02711 /usr/sbin/post{drop,queue}
+
+ keepdir /etc/postfix
+ if use mbox; then
+ mypostconf="mail_spool_directory=/var/spool/mail"
+ else
+ mypostconf="home_mailbox=.maildir/"
+ fi
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+ -e ${mypostconf} || die "postconf failed"
+
+ insinto /etc/postfix
+ newins "${FILESDIR}"/smtp.pass saslpass
+ fperms 600 /etc/postfix/saslpass
+
+ newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+ # do not start mysql/postgres unnecessarily - bug #359913
+ use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+ use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+ dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+ use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+ pamd_mimic_system smtp auth account
+
+ if use sasl; then
+ insinto /etc/sasl2
+ newins "${FILESDIR}"/smtp.sasl smtpd.conf
+ fi
+
+ # header files
+ insinto /usr/include/postfix
+ doins include/*.h
+
+ # Keep config_dir clean
+ rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+ rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+ if has_version mail-mta/postfix; then
+ # let the sysadmin decide when to change the compatibility_level
+ sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+ fi
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ [ "${EROOT}" == "/" ] && pkg_config
+
+ if [[ ! -e /etc/mail/aliases.db ]] ; then
+ ewarn
+ ewarn "You must edit /etc/mail/aliases to suit your needs"
+ ewarn "and then run /usr/bin/newaliases. Postfix will not"
+ ewarn "work correctly without it."
+ ewarn
+ fi
+}
+
+pkg_config() {
+ # configure tls
+ if use ssl ; then
+ if "${EROOT}"usr/sbin/postfix tls all-default-client ; then
+ elog "Configuring client side TLS settings"
+ "${EROOT}"usr/sbin/postfix tls enable-client
+ fi
+ if "${EROOT}"usr/sbin/postfix tls all-default-server ; then
+ elog "Configuring server side TLS settings"
+ "${EROOT}"usr/sbin/postfix tls enable-server
+ fi
+ fi
+}
diff --git a/mail-mta/postfix/postfix-3.2_pre20160611.ebuild b/mail-mta/postfix/postfix-3.2_pre20160612.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.2_pre20160611.ebuild
rename to mail-mta/postfix/postfix-3.2_pre20160612.ebuild
diff --git a/media-gfx/wings/wings-1.1.1.ebuild b/media-gfx/wings/wings-1.1.1.ebuild
index 2e0636af6fbc..c20aff9bdb02 100644
--- a/media-gfx/wings/wings-1.1.1.ebuild
+++ b/media-gfx/wings/wings-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
RDEPEND=">=dev-lang/erlang-13.0
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index c5ef8ccdc7ea..9137c0d77f61 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,2 +1,3 @@
DIST libjpeg-turbo-1.4.2.tar.gz 1569306 SHA256 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e SHA512 9bd27c917c29125c425469eb0fdf99b802f25095f187fb416bd7c05e4af95a32404bbb0d06b77343d35d3461029500decf3481337b2eade9e57b58dea69719ee WHIRLPOOL 4a6dfefee5d50b19474a5b0a8b2e3c06a403538985b9cf369a51d3cb2a9e2a0bbb6ac314e1e85d4432a44a8a381472c4e8be1286de909f3f47407692a583a01b
+DIST libjpeg-turbo-1.5.0.tar.gz 1654276 SHA256 9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f SHA512 3b7249a5f5c7b1f1fa99924ac6bc9bff3bf811815ef38505af5359d1f0edb0bfb771f0fa54308743a2d9305cb19a997453fdb00d0aade3f2f17ea917a45fde22 WHIRLPOOL 5aee1cda739fb70fe15efd0cdb2cdecd7d99e4bea3d0b05d757420dd781749bc9c4a91ba4f5c1ad68584113323acc0d2784ac18c9daed678d4057a410a289610
DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 WHIRLPOOL bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
index d85a4d7908f3..523eed7557d5 100644
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
@@ -2,8 +2,8 @@ https://bugs.gentoo.org/420239
https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160
---- configure
-+++ configure
+--- a/configure
++++ b/configure
@@ -33,7 +33,11 @@ case "$host_os" in
linux*)
case "$host_cpu" in
@@ -25,8 +25,8 @@ https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=12
ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';;
RDF) NAFLAGS='-frdf -DRDF';;
Mach-O) NAFLAGS='-fmacho -DMACHO';;
---- simd/nasm_lt.sh
-+++ simd/nasm_lt.sh
+--- a/simd/nasm_lt.sh
++++ b/simd/nasm_lt.sh
@@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do
pic=yes
fi
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild
new file mode 100644
index 000000000000..633def79e790
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit libtool eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+ !media-libs/jpeg:62"
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+ amd64? ( ${ASM_DEPEND} )
+ x86? ( ${ASM_DEPEND} )
+ amd64-fbsd? ( ${ASM_DEPEND} )
+ x86-fbsd? ( ${ASM_DEPEND} )
+ amd64-linux? ( ${ASM_DEPEND} )
+ x86-linux? ( ${ASM_DEPEND} )
+ x64-macos? ( ${ASM_DEPEND} )
+ java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
+)
+
+src_prepare() {
+ default
+
+ elibtoolize
+
+ java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=()
+ if multilib_is_native_abi; then
+ myconf+=( $(use_with java) )
+ if use java; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+ fi
+ else
+ myconf+=( --without-java )
+ fi
+ [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+ # Force /bin/bash until upstream generates a new version. #533902
+ CONFIG_SHELL=/bin/bash \
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ --with-mem-srcdst \
+ "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ local _java_makeopts
+ use java && _java_makeopts="-j1"
+ emake ${_java_makeopts}
+
+ if multilib_is_native_abi; then
+ pushd ../debian/extra >/dev/null
+ emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+ popd >/dev/null
+ fi
+}
+
+multilib_src_test() {
+ emake test
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${D}" \
+ docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+ install
+
+ if multilib_is_native_abi; then
+ pushd "${WORKDIR}"/debian/extra >/dev/null
+ emake \
+ DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+ INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+ install
+ popd >/dev/null
+
+ if use java; then
+ rm -rf "${ED}"/usr/classes
+ java-pkg_dojar java/turbojpeg.jar
+ fi
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files
+
+ insinto /usr/share/doc/${PF}/html
+ doins -r "${S}"/doc/html/*
+ newdoc "${WORKDIR}"/debian/changelog changelog.debian
+ if use java; then
+ insinto /usr/share/doc/${PF}/html/java
+ doins -r "${S}"/java/doc/*
+ newdoc "${S}"/java/README README.java
+ fi
+}
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index c6b395d1d7ab..02ad7737820e 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,9 +1,9 @@
DIST LibRaw-0.16.2.tar.gz 1476575 SHA256 6344e355f7c23f13e266844b36265d5f624237ba5a62dc901c7b91b510a84187 SHA512 c8fa974b72c1e2d255254527ca241a059b9a2e0943044c1b3c85257f987d451305fe94b4b901e9efd90ebab71ff602d442686a710c205d51862e88b2dfd13855 WHIRLPOOL 94f5fa4eb100a478d965516dd3c9048ca47bc0253bfd0482ebe3f410269e863a0f484c18bd2e07d44c324dbdbd84c1fd1768466b2b23e6909bc7d534f2a1f9fe
-DIST LibRaw-0.17.0.tar.gz 1468635 SHA256 e643c20945d548aac1eaa1f5573bf74050e0f49ec6a53a6843dc2a2cfb647310 SHA512 a9a92879fecd484b09f31f92da8a7e1aaa6ac48cd6f42f42502fbd8e41f99a644415f21532e4934471d2a109e9eb4fdac50d431c0db72ede9736a53e12ad505e WHIRLPOOL 92aee1c9e52b76398ffa22e5a7702e31bd089281f2cd16aab7ba545aafc3416cb4fdee0cb44b6ce3970b6cce862da22ec33b52e2ade33cb09dde61e9a51ce018
DIST LibRaw-0.17.1.tar.gz 1472341 SHA256 e599651a4cc37e00cfc2d2b56be87c3a4e4dae2c360b680fe9ab3f93d07cdea1 SHA512 661204175faca8d2ebb44d90c1c7a823c18fd5453a64db2e99961e697f25c522f2314f0ad758e6d33dd65eb09034b542f936c2a892d06f64663e7ed3d1e349b9 WHIRLPOOL c0d7e251abf4c9cf13738c583185074ff4b93e3e95a8545526a632e0b2904142daf8503cec4a2210fa0dcd3a3d6f8f76432f4bc94f42b15b4616954790808aa8
+DIST LibRaw-0.17.2.tar.gz 1472714 SHA256 92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c SHA512 e27227850b09e291802c089c826778579420a4af3f4b94dddf488bfc7eb84335d7a944445287d5993c5a574c192df5117c022d1b3d0372b3539a4553612988f4 WHIRLPOOL 55ab9980dc789a0f8c08043a93c1004e268ac3e0902f789a808a47f50e9294eb2f3755f71ecc0310e80cdf440aa60d9ed0e389b27d184e81db6f90f144257436
DIST LibRaw-demosaic-pack-GPL2-0.16.2.tar.gz 32652 SHA256 2218f08d59866e7852938356c197b96a6f47d0b9221a261280e010540477e77b SHA512 e41574f48bd3cda5755503b2693859de47b98064611771b9d950a198ad8f197c929c959de18599033c91fc7200d883074900e74ab154a4354d198af98a460903 WHIRLPOOL 56db7577a9a77347ea1f14a52e02925ef6191de1b1a98d7b870bf9e2fb49ffa460255ae5c662f01ef138346d23720333976d5029ddf91ccd99c13ba8cda260c3
-DIST LibRaw-demosaic-pack-GPL2-0.17.0.tar.gz 31281 SHA256 3c5982772f55f0b70c3c7604bc73e8b55f1de7b040e8f144cb220ee88e8bc346 SHA512 eb64ae5f356e276824522a400fd9763e4ef0afc7e3fed648715e52175fb9a17a611110ee90f2465d260c06b92a899ddf2e649e6ed3c9441b8e2fb0b1a4a9b5d4 WHIRLPOOL cab107fbe6adcbda5b4c3806a13d9306a14a6bb2dc11008c6004f1d05f3e16aa4359db43c4c651dd5761858b97d0eb410f17d9f115bee276bfbee26701e892b9
DIST LibRaw-demosaic-pack-GPL2-0.17.1.tar.gz 30989 SHA256 2e9f72873a6db319aca5be5bc4d426e3063e2c33f66438e89720c3b48bef0678 SHA512 7f6d5dbae653c2b5adfa4af50b9c92e4d3f45f7869d7870732a19f76ec87c6feaca7fcaa56418f7dc81e9b963e3de01cff024587502e1fd3affa99321c3b1490 WHIRLPOOL e347ae3bf64f2229971138fbb0e9d83bd7a4b5e7bd094d7190647b537f8f2ebe720ae245223f5b759cca74410665633358417c65b6812674611d49eabff48bc4
+DIST LibRaw-demosaic-pack-GPL2-0.17.2.tar.gz 31190 SHA256 a2e5e9cc04fa8f3e94070110dce8a06aa3b0b2f573ed99c5fc3e327d15f014b7 SHA512 634fcd62433bc9a9aebccd113ef95a070609edee2520b7a609bab1b9612cc472b77295deb84e43ffcf002a2cdb57bb92a39d1e4b1bb8fed77a221b370074edea WHIRLPOOL a10d7921a9f20b088e2e0d773315bd00b2c4105c1a9e6890386fe53a08af2e698441e6abf9ab445099962e500502618fb687974126a4345422a759fb174e591c
DIST LibRaw-demosaic-pack-GPL3-0.16.2.tar.gz 39457 SHA256 749b5baa3a4f1f5c4ea4169b9293b02b0d2a0714aa01729327f23f82621c9735 SHA512 1cc1ea98f544ac485a797718448e138d3aeab7d4bfce77706161b42ec1edf265e177437ecff2a58c452048102359088a326b0bb4aa63b3d79e76c6156c9374d2 WHIRLPOOL 470a3a673671af6057e4baf268e63742192c3cce88a7dd1cdf7b793d51da2dcf641a6c9b11059b13d82507ab726355c84635eb926a634822b344454ba40e5e65
-DIST LibRaw-demosaic-pack-GPL3-0.17.0.tar.gz 39153 SHA256 deca57ed524ab4f9915060360d74c5748e6fe8065fd60ca5e969fe9f578a8a0a SHA512 71a11cccd681978f89e9df6dd0346da45cb448994f82be73f92fe47acb810dd31dde2e20b4e47c6527ae0b8dfccc685c3b68ab67f9a183f8a44b7df8f80aad4b WHIRLPOOL 79c82fd2beb378e56209310a7e1c8061738b37ff582dbcf7850b4f7c176f36c0e410ecc3bac8ac7f20c68a2614d66ed0c4c98268478a6d62d77c7391bd6fcbc9
DIST LibRaw-demosaic-pack-GPL3-0.17.1.tar.gz 38230 SHA256 442b3e8de4664e539cbcdd437a7b6cd167e07c0fcf76f07b50d16657f18ff962 SHA512 3464d330848113007b4e762bceb068b6f4f82ef6892146b8263f7912c0cc711ec8308611fa6d083331c28644ab5d48d5e920a68705e6d9ea763a743df94b0df3 WHIRLPOOL c2bb2fbcca2bd542aa58ea2de6db287b1b07b3f5c78fce50acf458d243d1163f256b49b99163fe1cde01881108d29633dd7faa1c214038c3682dca019b7eba58
+DIST LibRaw-demosaic-pack-GPL3-0.17.2.tar.gz 38908 SHA256 b00cd0f54851bd3c8a66be4cacbf049e4508f1bac8ff85cb4528d8979739ed36 SHA512 fda6e22a8e4eb5614c6878ed77990f8f558ea54b9ec63ca77fb279543efa334c60d0fc48c1c5029c17216a1f7ed0e84db73675bd9d7308f869d11218184e19ad WHIRLPOOL 545d5fc29ccc01f862868675b12ea5dab8fad5bd59781e744344fee62d446697529cc9ac169f2167d81feea8dbbb56f57cb4883d02e4e472fa81e992f3a7f73f
diff --git a/media-libs/libraw/libraw-0.17.0.ebuild b/media-libs/libraw/libraw-0.17.2.ebuild
similarity index 89%
rename from media-libs/libraw/libraw-0.17.0.ebuild
rename to media-libs/libraw/libraw-0.17.2.ebuild
index 5d96b53222fb..8a855bc405e6 100644
--- a/media-libs/libraw/libraw-0.17.0.ebuild
+++ b/media-libs/libraw/libraw-0.17.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-inherit autotools-multilib toolchain-funcs
+inherit multilib-minimal toolchain-funcs
MY_PN=LibRaw
MY_PV=${PV/_b/-B}
@@ -42,7 +42,7 @@ pkg_pretend() {
fi
}
-src_configure() {
+multilib_src_configure() {
local myeconfargs=(
$(use_enable demosaic demosaic-pack-gpl2)
$(use_enable demosaic demosaic-pack-gpl3)
@@ -52,5 +52,6 @@ src_configure() {
$(use_enable lcms)
$(use_enable openmp)
)
- autotools-multilib_src_configure
+ ECONF_SOURCE="${S}" \
+ econf "${myeconfargs[@]}"
}
diff --git a/media-libs/webrtc-audio-processing/Manifest b/media-libs/webrtc-audio-processing/Manifest
index 44cb8cc03f27..2225bf314597 100644
--- a/media-libs/webrtc-audio-processing/Manifest
+++ b/media-libs/webrtc-audio-processing/Manifest
@@ -1 +1,2 @@
DIST webrtc-audio-processing-0.1.tar.xz 392540 SHA256 ed4b52f9c2688b97628035a5565377d74704d7c04de4254a768df3342c7afedc SHA512 7626897a1f3d21e78896ed45074fbfbf0752918f7240ad9651390a39eabcb41b8aa2e31624a9cb62dc2e78debdafc0400159c0c2f3e7fc0838ff08004054bcd0 WHIRLPOOL fd3a07d5d4937fd0c37247fe9e428ab2b5623d8dc68ce0339131e7d18527ffaf6e4307f13a5f1a3e0204116f564ba166813bbd07e8e6fc5a80ceecd2ca939b64
+DIST webrtc-audio-processing-0.2.tar.xz 687484 SHA256 4b46a7f91a5d255c2451f9862c86e2a5de904902724b4bba1fd23e2854f21df5 SHA512 d93a988b1fcf7ca399258a22f84048f0fa13819faf01854b3548012a58e706fd6fbd8675ac8e8bf87bfedb6c81658812c523a42bb11a4dd40066ccdb63443a38 WHIRLPOOL bba4b4b339ee4d043d430c3544b84983966d5526dd8e469a8ea1c5def98cba5e1ba3b3663e24b9d13826155c0493a996d385ac2582a52952e8b835664095e668
diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.2.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.2.ebuild
new file mode 100644
index 000000000000..d3af43a7afef
--- /dev/null
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="AudioProcessing library from the webrtc.org code base"
+HOMEPAGE="https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="static-libs"
+
+DOCS=( AUTHORS NEWS README.md )
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf
+}
+
+multilib_src_install_all() {
+ find "${D}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index c94447c5602a..c6ea10c4b9d5 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,5 +1,7 @@
DIST qmmp-plugin-pack-0.9.2.tar.bz2 76314 SHA256 730c4ac568a86969234e1faf2f18a7593a7d89c8c56fb58ab317aa7f3edb6317 SHA512 cc740cc28b55abe2d410c75433e49041a7602d80e932f97f22926bbff63b391e46f9772f8d7cd2fb5e7b109a73ef674894e151007ce99b1e26ef3234aaa22d42 WHIRLPOOL 6e5c213e54003e47c1b8226050f1d0c2628d159649fb9de3b8e3abe5b11e1cdef12f7dd4749c96454347c29715e941b32dbcee414c10ef01a116958aabfbf364
DIST qmmp-plugin-pack-0.9.3.tar.bz2 76668 SHA256 4c65cf6b917574858248b81f7c357b128af21908e7a437f1e1cb89f1501020ec SHA512 b4be0f74ebee7306d9a6f51f462f201896f0287cd9bcf3db4cd12d4cd41313795c3a8e904f9173ce49159188f341eb81b37f3bab316ca824afb9877c1bb40a26 WHIRLPOOL 63fb1332e76a6d487c5208309c4cc04137818309865431eb6ca67b17fb17533e25f3db5cf09b0bae040338855838bd7844d2cca6db674b59c136a5454c7db267
DIST qmmp-plugin-pack-0.9.4.tar.bz2 78007 SHA256 b817b766854d6ac641d875b8f8f901356f942e7b5d982c16a31a3d4771d43527 SHA512 869b90f006c165352e413c501d8a581cab27f4e9cc931c2213887dc5c3f9d65be1b263f83a1e5bbb96bfe9be76f002a70fb76dbcfb6d96eb1391d24a61229e34 WHIRLPOOL f20cfbf667b7f07a69709d089c2555294408a76c5c3c6c802f1b8202dfe5a75b58b0f842b67b8ebb4a3f472b57ab8deb86da4718d475b4c50267d445ec15df5c
+DIST qmmp-plugin-pack-0.9.5.tar.bz2 78097 SHA256 3bf2451545833871c01b75b79215ff52c5583876a7c8122005c55fc9053a61bb SHA512 34155e25ee381d9e61d88fe3871a4b8198611fbe99ab811e173c74f39e0105d232ea8945db9a3dafbea38bcb380a8b5b95bfcfd6c399ba8ed8dbd027b823d269 WHIRLPOOL 647cec884e1d725be7545aa2fdd0bdafedf699fe388b407b5a3b028dcf051ab6b483dd36114c7049affc31b82d210ecd9535a975864870249601a31d91d3e85a
DIST qmmp-plugin-pack-1.0.2.tar.bz2 76533 SHA256 a3a309342fd5077c80bcba214a3d5df6f96135e9fae37d5d122e608557080767 SHA512 268e7cdb5e88f7f15f407df4b2d353c20d8477acc67607485500e0f3eee6bff259a2aac180d3e591dfd15750e495c5f1e0f645704fbe59fa398bfdd7d3f38f5f WHIRLPOOL 296de7571d6d61ec0ca58c4d970455aec092f5b0a9a50f8d960422649a8d7ecb6bc46b48b600f9a1a953aec64b165640b2cea91fee2b5ba11332c35385bd472d
DIST qmmp-plugin-pack-1.0.3.tar.bz2 77610 SHA256 bb77cfdf3225413ad763bb4a47cf4cee030afbf41207879d78e0fe5575ee8892 SHA512 4bb06704fc9c5fb57fda1e31285ecb59e566f7966f01834adb23759ddb3e114471db11c5db0b3b4f3abf4c066859ccfc8513d4b5e2dd15ed9e4026511cf0019a WHIRLPOOL 8f381644872e60c20e1a05245dd15d6fedf2258624245b1770bd2809b561ce32e308fb734672f115a771876027ea0a8f596ee739ddd741106d361ebcedac3342
+DIST qmmp-plugin-pack-1.0.4.tar.bz2 77490 SHA256 59073ced518c4dfb4b281b950997fdfe0c90461598d8ccfda3458a819bc10f67 SHA512 5bd601da78b8ae3e3fbaf0d2f5aac4e79bf1f9511f4712d346ea648b98d7d37ffdc8632c8fec160e2bf78fe27e00fb043da295d290653bee1d3781ba7b0b9407 WHIRLPOOL 63ad7085df56e874649be6a7402fb14c677e5fcd7b6a44c22839724952da24f101be82ae68484bac3dfa880b1841c63c9f57f433351a0721a94d21a18ad6c494
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.5.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.5.ebuild
new file mode 100644
index 000000000000..35dde3a1d8f5
--- /dev/null
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_MIN_VERSION=2.8
+
+inherit cmake-utils
+
+DESCRIPTION="A set of extra plugins for Qmmp"
+HOMEPAGE="http://qmmp.ylsoftware.com/"
+SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/taglib
+ media-sound/mpg123
+ media-sound/qmmp
+ dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+ dev-lang/yasm"
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.0.4.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.0.4.ebuild
new file mode 100644
index 000000000000..97ef00c2b793
--- /dev/null
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_MIN_VERSION=2.8
+
+inherit cmake-utils
+
+DESCRIPTION="A set of extra plugins for Qmmp"
+HOMEPAGE="http://qmmp.ylsoftware.com/"
+SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/taglib-1.10
+ media-sound/mpg123
+ >=media-sound/qmmp-1.0.0
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5"
+DEPEND="${RDEPEND}
+ dev-lang/yasm
+ dev-qt/linguist-tools:5"
+
+#PATCHES=( )
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 5080b163eae1..963a880bd59b 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,5 +1,7 @@
+DIST qmmp-0.9.10.tar.bz2 1126355 SHA256 a93ca43b2407b917602a47b5728cd4d72d694069a3ea329572c01ff66845f7e1 SHA512 2326ac6ca91b68c0b68888a98bd4f6f6596b50aa7442edca3686bf7516a9947954ad95a6107f74f8ea6e3013325eeb2e59d53d034410e27845208e2486916556 WHIRLPOOL 4716e4f40915a37049195450b005e387069a02171dcfe331d2898f8059c956f4d1e48ea14a8e9258103f21b7728ec4546c6666259b43bbb809d39aa322890464
DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
DIST qmmp-0.9.8.tar.bz2 1125404 SHA256 83ca64e222b8b02a0515511d8187667f1d44a71281cf36eb0fe05560c88b1911 SHA512 1a86cd1c3552f64005d49e2a9baa2fd65bdc8fefad4e72e265cd3afdb45fd22d57c712a9c6e693e0308cd5607f8fe5905bb3a5e51747b11273f3e4eb60c4fd81 WHIRLPOOL 3d036fb3d7dd8ce7282f97d6e89a04e10c71c3bc615d0529ab0ef262f5b0d3d7b2bc9e2ed3f9e29e06be8a6b3b764ba52345b9100ead371985c00ae99c597f6e
DIST qmmp-0.9.9.tar.bz2 1125419 SHA256 8159f877d3a0329d49e54d9c367b4a85e73c2a0c4eca4033a4ae8382e59a64f3 SHA512 994c49f7a1f5708a4dc65f5e0b01b4d0e1d225abbda062bb9f6970785d3601eceee2bef248873aa85907f351c2c7222f18e886e65f9e9e3564be35f96c28c3b7 WHIRLPOOL a5959b35b8d4befb8101b590b294b68bbbb044423e49659a55896e6b220a44b5a439fd41252a530fcfab4a312bcd9251bdb3795b6599234152cf61dd2af7135e
+DIST qmmp-1.0.10.tar.bz2 1107784 SHA256 02bcd01b1d8f6ca8b805a5deaeaa059ee44a38fafd20bec7ee3560a021250ee3 SHA512 45231ef8b1f0a0825336752fe9314cc0df1b937ebcf85b18c89c66e52f38cf69583eccd8ffcf92d89add11643e1f40ccf0fe720fd6279f3cf4f73db336d4d59b WHIRLPOOL 0bb7d873e58b8cdbbb71576af3080031fc0e03cc3fc3153812e2a105bad40f02ac4a3838454aef5551890e278d050bbe04caf0e77ddb1cd3b43f7fd2c77cd5e7
DIST qmmp-1.0.7.tar.bz2 1107565 SHA256 adb8c4338a22bc80e75aa667e866789b970eb3c7662fdb374f03388f45e5e09b SHA512 d9c5be464ba2c4e2eb4b0ffbb938cb277e8c483fcb1ec97100dc862acfc2f1c6c1110a3d45c5c5713c7e30bd508a7c0828ff48587ea875ac7befe5b23544cabd WHIRLPOOL d766bd45c9bb18a5cec37d23a4ca123021e79dc1ffc275e38c99a9ee88b03120534aa845a0df007b1c93e44d4867e883fd6720079333b85420e4ca4b1364e992
DIST qmmp-1.0.9.tar.bz2 1107577 SHA256 419913e6becc91061a361afaf59b3471cfb6d28dcca1fb6201f4155632b4ad02 SHA512 062ecf62fd8e980c91edb19b5fd4f8f21ae3d38d2708488726978fae18a70f2f799b2a400ab2afc25558a0bc77ae489ac9bcffbe297a53a359f5be8ec97b55ba WHIRLPOOL d848c07f2b9c298f369028a740f91dfdc5ee9ab0997302eb4bcdaee60e4d584da04cb93489fcb03b2e43f5c91a1b3c8e44fbdf6ccab6b10a7f3b4a581d7e0c13
diff --git a/media-sound/qmmp/qmmp-0.9.10.ebuild b/media-sound/qmmp/qmmp-0.9.10.ebuild
new file mode 100644
index 000000000000..f5cf1ca1129b
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.9.10.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( media-video/mplayer )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:4 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DUSE_alsa="$(usex alsa)"
+ -DUSE_aac="$(usex aac)"
+ -DUSE_analyzer="$(usex analyzer)"
+ -DUSE_bs2b="$(usex bs2b)"
+ -DUSE_CDA="$(usex cdda)"
+ -DUSE_crossfade="$(usex crossfade)"
+ -DUSE_cover="$(usex cover)"
+ -DUSE_cue="$(usex cue)"
+ -DUSE_curl="$(usex curl)"
+ -DUSE_dbus="$(usex dbus)"
+ -DUSE_enca="$(usex enca)"
+ -DUSE_ffmpeg="$(usex ffmpeg)"
+ -DUSE_FFMPEG_LEGACY=OFF
+ -DUSE_flac="$(usex flac)"
+ -DUSE_GME="$(usex game)"
+ -DUSE_HAL=OFF
+ -DUSE_jack="$(usex jack)"
+ -DUSE_KDENOTIFY="$(usex kde)"
+ -DUSE_ladspa="$(usex ladspa)"
+ -DUSE_lyrics="$(usex lyrics)"
+ -DUSE_mad="$(usex mad)"
+ -DUSE_MIDI_WILDMIDI="$(usex midi)"
+ -DUSE_mplayer="$(usex mplayer)"
+ -DUSE_mms="$(usex mms)"
+ -DUSE_modplug="$(usex modplug)"
+ -DUSE_mpris="$(usex mpris)"
+ -DUSE_MPC="$(usex musepack)"
+ -DUSE_notifier="$(usex notifier)"
+ -DUSE_opus="$(usex opus)"
+ -DUSE_oss="$(usex oss)"
+ -DUSE_projectm="$(usex projectm)"
+ -DUSE_PULSE="$(usex pulseaudio)"
+ -DUSE_qsui="$(usex qsui)"
+ -DUSE_scrobbler="$(usex scrobbler)"
+ -DUSE_sndfile="$(usex sndfile)"
+ -DUSE_stereo="$(usex stereo)"
+ -DUSE_STATICON="$(usex tray)"
+ -DUSE_UDISKS2="$(usex udisks)"
+ -DUSE_UDISKS=OFF
+ -DUSE_SRC="$(usex libsamplerate)"
+ -DUSE_vorbis="$(usex vorbis)"
+ -DUSE_wavpack="$(usex wavpack)"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.0.10.ebuild b/media-sound/qmmp/qmmp-1.0.10.ebuild
new file mode 100644
index 000000000000..0713ab90828c
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.0.10.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ QMMP_DEV_BRANCH="1.1"
+ SRC_URI=""
+ ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( media-video/mplayer )
+ mpris? ( dev-qt/qtdbus:5 )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:5
+ dev-qt/qtgui:5[-gles2] )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DUSE_alsa="$(usex alsa)"
+ -DUSE_aac="$(usex aac)"
+ -DUSE_analyzer="$(usex analyzer)"
+ -DUSE_bs2b="$(usex bs2b)"
+ -DUSE_CDA="$(usex cdda)"
+ -DUSE_crossfade="$(usex crossfade)"
+ -DUSE_cover="$(usex cover)"
+ -DUSE_cue="$(usex cue)"
+ -DUSE_curl="$(usex curl)"
+ -DUSE_dbus="$(usex dbus)"
+ -DUSE_enca="$(usex enca)"
+ -DUSE_ffmpeg="$(usex ffmpeg)"
+ -DUSE_flac="$(usex flac)"
+ -DUSE_GME="$(usex game)"
+ -DUSE_HAL=OFF
+ -DUSE_jack="$(usex jack)"
+ -DUSE_KDENOTIFY="$(usex kde)"
+ -DUSE_ladspa="$(usex ladspa)"
+ -DUSE_lyrics="$(usex lyrics)"
+ -DUSE_mad="$(usex mad)"
+ -DUSE_MIDI_WILDMIDI="$(usex midi)"
+ -DUSE_mplayer="$(usex mplayer)"
+ -DUSE_mms="$(usex mms)"
+ -DUSE_modplug="$(usex modplug)"
+ -DUSE_mpris="$(usex mpris)"
+ -DUSE_MPC="$(usex musepack)"
+ -DUSE_notifier="$(usex notifier)"
+ -DUSE_opus="$(usex opus)"
+ -DUSE_oss="$(usex oss)"
+ -DUSE_projectm="$(usex projectm)"
+ -DUSE_PULSE="$(usex pulseaudio)"
+ -DUSE_qsui="$(usex qsui)"
+ -DUSE_scrobbler="$(usex scrobbler)"
+ -DUSE_sndfile="$(usex sndfile)"
+ -DUSE_stereo="$(usex stereo)"
+ -DUSE_STATICON="$(usex tray)"
+ -DUSE_UDISKS2="$(usex udisks)"
+ -DUSE_SRC="$(usex libsamplerate)"
+ -DUSE_vorbis="$(usex vorbis)"
+ -DUSE_wavpack="$(usex wavpack)"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/xmms2/xmms2-0.8-r4.ebuild b/media-sound/xmms2/xmms2-0.8-r4.ebuild
index be25c41f8900..894796be5be4 100644
--- a/media-sound/xmms2/xmms2-0.8-r4.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r4.ebuild
@@ -83,6 +83,8 @@ DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind ) )
"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
S="${WORKDIR}/${MY_P}"
pkg_setup() {
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
index 198a6ecf6c47..8584ad120598 100644
--- a/media-video/smtube/Manifest
+++ b/media-video/smtube/Manifest
@@ -1,3 +1,4 @@
DIST smtube-15.11.0.tar.bz2 670236 SHA256 dedef3dc634624e8252c5806e2cb09b1c2b8a363c29bea2b6dfa79610868f38e SHA512 b66026b69c36f2ade0797ab50c7df458b9508509574563079ca22af63bc842b317f9b8853220860527f100aa97f1c35a39b00ee588957e1939cffd54b244e9b2 WHIRLPOOL 17409b7ac1058ad9ba5919db5fd7e161e8e677eda7bf794ad101791c7131e611515da9340ccf367d2b55cade58918fbdacd6b807eb32240145ab851bc7157e6d
DIST smtube-16.1.0.tar.bz2 670383 SHA256 9948596342b94b152cc5ab62e9600bd06d066b12f32bf7ca4088bb5be43b56fa SHA512 dd844d181864b62a872f65fb1aad96e9cc1edb2d91a5ce5c1b2cc67ba99fa052f5e0e9439d61bfb9f4a8438fe745ad408763b2bd5020f10e3efc559119cf13f1 WHIRLPOOL 7b5fa5663ff0117a4dcebae813fd7ac16d2abd5cdaf95bd2551c75f4a94c770a132e47961dc7e19d0cd5ce0b6b4e2a4aa0ef430fe8f0224d14cbe764daeabba0
DIST smtube-16.3.0.tar.bz2 675962 SHA256 6ac038645eb03f7d8069713312c99f5ff7d8d0d6b4550b206b87ac6e1a941570 SHA512 75e456306e6baba4e8954b967a993102017901bc48ec5cd1a8b0ec50c10333fd04c73ae1d1dd1c6829f72df91441bbd78c756e06a0f200519d4b1a4933c1c197 WHIRLPOOL 818f76d3b503a361f19653afe6fe2f8267ce6ea6ab53aa7182727a163a9724f525a2c607ce1ecb042b1b9906b740a004b5c0ab231604a1a4155eabecda3c1e39
+DIST smtube-16.6.0.tar.bz2 735813 SHA256 a23f760d348b8d2d519b4a57cfb622d11cadd766f380bd8e4b410db0caed0e30 SHA512 4509722a83eb1c3449a8c2c99bd9233091462b351124e3061dba377279cad5bf7803fc553cd75566eb4e4313f9c04961d60088d64685c9973fe91741007709dc WHIRLPOOL bf5110efcbce6ed2f56c68401f7d574bfdfbb18d46eb8bee72a645e24663c6ac8b4c9bebedd8d0e7a6deae5c8cf07f5ac6220c96fc7d8145c42ea402c4589cfa
diff --git a/media-video/smtube/smtube-16.6.0.ebuild b/media-video/smtube/smtube-16.6.0.ebuild
new file mode 100644
index 000000000000..93ba1bf387b1
--- /dev/null
+++ b/media-video/smtube/smtube-16.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="YouTube Browser for SMPlayer"
+HOMEPAGE="http://smplayer.sourceforge.net/smtube"
+SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="qt5"
+
+# Deps in makefile seemed to be -core, -network, -script, -gui, -webkit, but the
+# given packages seem to be deprecated...
+DEPEND="qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebkit:5 dev-qt/qtscript:5 )
+ !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtscript:4 )"
+RDEPEND="${DEPEND}
+ || ( media-video/smplayer[streaming] media-video/mpv media-video/mplayer media-video/vlc media-video/totem media-video/gnome-mplayer )"
+
+gen_translation() {
+ lrelease ${PN}_${1}.ts
+ eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+ if use qt5; then
+ eqmake5 src/${PN}.pro
+ else
+ eqmake4 src/${PN}.pro
+ fi
+ emake
+
+ cd "${S}"/src/translations
+ l10n_for_each_locale_do gen_translation
+}
+
+install_locale() {
+ insinto /usr/share/${PN}/translations
+ doins "${S}"/src/translations/${PN}_${1}.qm
+ eend $? || die "failed to install $1 translation"
+}
+
+src_install() {
+ dobin ${PN}
+ domenu ${PN}.desktop
+ newicon icons/${PN}_64.png ${PN}.png
+ dodoc Changelog
+
+ l10n_for_each_locale_do install_locale
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a7f9b1808569..67bc5f42cce0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 14 Jun 2016 06:12:34 +0000
+Tue, 14 Jun 2016 14:40:49 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a7f9b1808569..67bc5f42cce0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 14 Jun 2016 06:12:34 +0000
+Tue, 14 Jun 2016 14:40:49 +0000
diff --git a/metadata/md5-cache/app-arch/lzip-1.18_pre1 b/metadata/md5-cache/app-arch/lzip-1.18
similarity index 88%
rename from metadata/md5-cache/app-arch/lzip-1.18_pre1
rename to metadata/md5-cache/app-arch/lzip-1.18
index 4ed165cf3157..8d9520219236 100644
--- a/metadata/md5-cache/app-arch/lzip-1.18_pre1
+++ b/metadata/md5-cache/app-arch/lzip-1.18
@@ -1,10 +1,10 @@
DEFINED_PHASES=configure
DESCRIPTION=lossless data compressor based on the LZMA algorithm
-EAPI=4
+EAPI=5
HOMEPAGE=http://www.nongnu.org/lzip/lzip.html
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2+
SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.18-pre1.tar.gz
+SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.18.tar.gz
_eclasses_=multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=127b6374023552ff16304014a97ddd74
+_md5_=86628d9d93cd77b6f82e8b7356d85a6b
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.3.4 b/metadata/md5-cache/app-emulation/libvirt-1.3.4
index c44b5b64b046..7dde94c555b2 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.3.4
+++ b/metadata/md5-cache/app-emulation/libvirt-1.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=C toolkit to manipulate virtual machines
EAPI=5
HOMEPAGE=http://www.libvirt.org/
IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
SLOT=0/1.3.4
SRC_URI=http://libvirt.org/sources/libvirt-1.3.4.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib d062ae4ba2fc40a19c11de2ad89b6616 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cab5009ea554bfb56c00cd4ac3f8fdb0
+_md5_=aa5f1757a8760e9ebd30484eac63e9ee
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.3.5 b/metadata/md5-cache/app-emulation/libvirt-1.3.5
new file mode 100644
index 000000000000..b7137c657237
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-1.3.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=5
+HOMEPAGE=http://www.libvirt.org/
+IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+SLOT=0/1.3.5
+SRC_URI=http://libvirt.org/sources/libvirt-1.3.5.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib d062ae4ba2fc40a19c11de2ad89b6616 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4fc3b7205a8097fd3b57b855d073e6f5
diff --git a/metadata/md5-cache/app-emulation/spice-0.12.7-r1 b/metadata/md5-cache/app-emulation/spice-0.12.7-r1
index 9472c22c51db..65c9af0be035 100644
--- a/metadata/md5-cache/app-emulation/spice-0.12.7-r1
+++ b/metadata/md5-cache/app-emulation/spice-0.12.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SPICE server
EAPI=5
HOMEPAGE=http://spice-space.org/
IUSE=libressl sasl smartcard static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
SLOT=0
SRC_URI=http://spice-space.org/download/releases/spice-0.12.7.tar.bz2
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=1fe203374df51312682fe1e0e7d1295d
+_md5_=1445998778404fc33c873d6521335809
diff --git a/metadata/md5-cache/app-emulation/spice-protocol-0.12.11 b/metadata/md5-cache/app-emulation/spice-protocol-0.12.11
index dd6c4b7484b1..8a68dd40a134 100644
--- a/metadata/md5-cache/app-emulation/spice-protocol-0.12.11
+++ b/metadata/md5-cache/app-emulation/spice-protocol-0.12.11
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
DESCRIPTION=Headers defining the SPICE protocol
EAPI=5
HOMEPAGE=http://spice-space.org/
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=BSD
SLOT=0
SRC_URI=http://spice-space.org/download/releases/spice-protocol-0.12.11.tar.bz2
-_md5_=5266ea2614c6888367ee5deb77444519
+_md5_=7fc1cf84b3f488ad8751b517a77fc47c
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.4 b/metadata/md5-cache/app-text/jabref-bin-3.4
index dd32c9fd6fcc..a7e5ee14096a 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.4
+++ b/metadata/md5-cache/app-text/jabref-bin-3.4
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.jabref.org/
IUSE=elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 ) >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=mirror://sourceforge/jabref/JabRef-3.4.jar
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5dc18878cab3199e122351107c1fc633
+_md5_=d8fed89079391a993c1132ad8b21d4dc
diff --git a/metadata/md5-cache/app-text/pelican-9999 b/metadata/md5-cache/app-text/pelican-9999
new file mode 100644
index 000000000000..fbef1e6f5109
--- /dev/null
+++ b/metadata/md5-cache/app-text/pelican-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/feedgenerator-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
+EAPI=6
+HOMEPAGE=http://blog.getpelican.com/ https://pypi.python.org/pypi/pelican
+IUSE=doc examples markdown test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+LICENSE=AGPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d eutils 792f83d5ec9536cb5ccef375469d8bde git-r3 00f60a84fc7b499c99edfe99caea9f95 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=5a0db4c63391d79b602d439695c73ddb
diff --git a/metadata/md5-cache/dev-db/redis-3.2.0 b/metadata/md5-cache/dev-db/redis-3.2.0
new file mode 100644
index 000000000000..d4abd613c184
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-3.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=virtual/pkgconfig >=sys-devel/autoconf-2.63 test? ( dev-lang/tcl:0= ) >=dev-lang/lua-5.1:* tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=A persistent caching system, key-value and data structures database
+EAPI=6
+HOMEPAGE=http://redis.io/
+IUSE=+jemalloc tcmalloc test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-lang/lua-5.1:* tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
+REQUIRED_USE=?? ( tcmalloc jemalloc )
+SLOT=0
+SRC_URI=http://download.redis.io/releases/redis-3.2.0.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=fa46bf53a43b7f83fd0c857944a5abe7
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.36
new file mode 100644
index 000000000000..abbced7db612
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=5
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.36/src/apache-tomcat-8.0.36-src.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1e45441633b6acb083a7b8357b3f586c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.3 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.3
new file mode 100644
index 000000000000..6f1c9745b80f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=5
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.3/src/apache-tomcat-8.5.3-src.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1e45441633b6acb083a7b8357b3f586c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha6 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha8
similarity index 80%
rename from metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha6
rename to metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha8
index 0b306600e742..94d234cc0239 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha6
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha8
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile configure install preinst prepare setup
DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3 implementation
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
EAPI=5
HOMEPAGE=http://tomcat.apache.org/
IUSE=elibc_FreeBSD source elibc_FreeBSD
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.0.M6/src/apache-tomcat-9.0.0.M6-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.0.M8/src/apache-tomcat-9.0.0.M8-src.tar.gz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d7f0b3581c4db88690149014bcdf5c0c
+_md5_=d6bdd88c84e4c1a06b8622b599528c3c
diff --git a/metadata/md5-cache/dev-python/hiredis-0.2.0 b/metadata/md5-cache/dev-python/hiredis-0.2.0
index 37254a948d24..5dad7cf51844 100644
--- a/metadata/md5-cache/dev-python/hiredis-0.2.0
+++ b/metadata/md5-cache/dev-python/hiredis-0.2.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/hiredis-0.13.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-libs/hiredis-0.13.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=Python extension that wraps hiredis
EAPI=5
HOMEPAGE=https://github.com/pietern/hiredis-py
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64 ~x86
LICENSE=BSD
-RDEPEND=>=dev-libs/hiredis-0.13.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RDEPEND=>=dev-libs/hiredis-0.13.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/h/hiredis/hiredis-0.2.0.tar.gz
_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=34e05da21649f9ead1c9febab8c98fa1
+_md5_=3bf0188dbb853ff1cdf95c8f173ad7d6
diff --git a/metadata/md5-cache/dev-python/libvirt-python-1.3.4 b/metadata/md5-cache/dev-python/libvirt-python-1.3.4
index 600a0d3b184a..6a4175b05f9f 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-1.3.4
+++ b/metadata/md5-cache/dev-python/libvirt-python-1.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=libvirt Python bindings
EAPI=5
HOMEPAGE=http://www.libvirt.org
IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=LGPL-2
RDEPEND=app-emulation/libvirt:0/1.3.4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://libvirt.org/sources/python/libvirt-python-1.3.4.tar.gz
_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=42bb13a23da097efe3ec195427c005f5
+_md5_=45d68074709f98dd836a5559843f1911
diff --git a/metadata/md5-cache/dev-python/libvirt-python-1.3.5 b/metadata/md5-cache/dev-python/libvirt-python-1.3.5
new file mode 100644
index 000000000000..1c33f3a52b94
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libvirt-python-1.3.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-emulation/libvirt:0/1.3.5 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=libvirt Python bindings
+EAPI=5
+HOMEPAGE=http://www.libvirt.org
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=app-emulation/libvirt:0/1.3.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://libvirt.org/sources/python/libvirt-python-1.3.5.tar.gz
+_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=42bb13a23da097efe3ec195427c005f5
diff --git a/metadata/md5-cache/dev-tcltk/tls-1.6.7 b/metadata/md5-cache/dev-tcltk/tls-1.6.7
new file mode 100644
index 000000000000..113d8cf6edc7
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/tls-1.6.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
+DESCRIPTION=TLS OpenSSL extension to Tcl
+EAPI=5
+HOMEPAGE=http://tls.sourceforge.net/
+IUSE=tk
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/tls/tls1.6.7-src.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=3302cf30d19f0e3e09d956ab98e85bea
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.16.2 b/metadata/md5-cache/dev-util/checkbashisms-2.16.5
similarity index 83%
rename from metadata/md5-cache/dev-util/checkbashisms-2.16.2
rename to metadata/md5-cache/dev-util/checkbashisms-2.16.5
index 06b6cc2752d2..7bd5472e16da 100644
--- a/metadata/md5-cache/dev-util/checkbashisms-2.16.2
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.16.5
@@ -7,6 +7,6 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
+DEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
DESCRIPTION=Package config system that manages compile/link flags
EAPI=6
HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
-RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
+RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
SLOT=0
SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.1.tar.gz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=1d9ed495dd6584738327f5a90fbec9be
+_md5_=79fce1d76a2bd5f957a155223f504189
diff --git a/metadata/md5-cache/dev-vcs/git-2.8.3 b/metadata/md5-cache/dev-vcs/git-2.9.0
similarity index 90%
rename from metadata/md5-cache/dev-vcs/git-2.8.3
rename to metadata/md5-cache/dev-vcs/git-2.9.0
index 5aca29e48d86..c5badd33b391 100644
--- a/metadata/md5-cache/dev-vcs/git-2.8.3
+++ b/metadata/md5-cache/dev-vcs/git-2.9.0
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
SLOT=0
-SRC_URI=https://git-core.googlecode.com/files/git-2.8.3.tar.xz mirror://kernel/software/scm/git/git-2.8.3.tar.xz https://git-core.googlecode.com/files/git-manpages-2.8.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.8.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.8.3.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.8.3.tar.xz )
+SRC_URI=https://git-core.googlecode.com/files/git-2.9.0.tar.xz mirror://kernel/software/scm/git/git-2.9.0.tar.xz https://git-core.googlecode.com/files/git-manpages-2.9.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.9.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.9.0.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.9.0.tar.xz )
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 792f83d5ec9536cb5ccef375469d8bde l10n e26ea0642846685782f1813642e7ff0f multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=60c4a69371e5fac0e46acaaa41c98d33
+_md5_=b58cdb37bd78d2cdc2da86bd92f95fba
diff --git a/metadata/md5-cache/mail-mta/postfix-3.1.1-r1 b/metadata/md5-cache/mail-mta/postfix-3.1.1-r1
new file mode 100644
index 000000000000..b07c265ff2b3
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure install postinst prepare setup
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=6
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=IBM
+RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.1.1.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=78edd69b157a26738e162d5fb6a0fe97
diff --git a/metadata/md5-cache/mail-mta/postfix-3.2_pre20160611 b/metadata/md5-cache/mail-mta/postfix-3.2_pre20160612
similarity index 98%
rename from metadata/md5-cache/mail-mta/postfix-3.2_pre20160611
rename to metadata/md5-cache/mail-mta/postfix-3.2_pre20160612
index 5bc7e90604cb..961f9e870037 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.2_pre20160611
+++ b/metadata/md5-cache/mail-mta/postfix-3.2_pre20160612
@@ -9,6 +9,6 @@ LICENSE=IBM
RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
REQUIRED_USE=ldap-bind? ( ldap sasl )
SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.2-20160611.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.2-20160612.tar.gz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 user 906f3c8eb3a2350a4f1191a89baa3e46
_md5_=6e8a699dbe4be6d0f45982c8cbe027b0
diff --git a/metadata/md5-cache/media-gfx/wings-1.1.1 b/metadata/md5-cache/media-gfx/wings-1.1.1
index d2398d3a0a6d..f8f21a807a48 100644
--- a/metadata/md5-cache/media-gfx/wings-1.1.1
+++ b/metadata/md5-cache/media-gfx/wings-1.1.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-13.0 >=media-libs/esdl-1.0.1 media-libs/libsdl[opengl]
DESCRIPTION=excellent 3D polygon mesh modeler
EAPI=2
HOMEPAGE=http://www.wings3d.com/
-KEYWORDS=~alpha amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
LICENSE=BSD
RDEPEND=>=dev-lang/erlang-13.0 >=media-libs/esdl-1.0.1 media-libs/libsdl[opengl]
SLOT=0
SRC_URI=mirror://sourceforge/wings/wings-1.1.1.tar.bz2
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=4236e934fb9cb15bbdc4333485f639cf
+_md5_=5c1d592652c13b6ccf02d697615d30f3
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.0 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.0
new file mode 100644
index 000000000000..d568e5d307f1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
+EAPI=6
+HOMEPAGE=http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/
+IUSE=java static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD IJG
+RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.5.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c54fd2b45cb121fb5b99bbc516fd1498
diff --git a/metadata/md5-cache/media-libs/libraw-0.17.0 b/metadata/md5-cache/media-libs/libraw-0.17.2
similarity index 70%
rename from metadata/md5-cache/media-libs/libraw-0.17.0
rename to metadata/md5-cache/media-libs/libraw-0.17.2
index 6dfb8609c26c..e6fe3dc4babb 100644
--- a/metadata/md5-cache/media-libs/libraw-0.17.0
+++ b/metadata/md5-cache/media-libs/libraw-0.17.2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare pretend test
+DEFINED_PHASES=compile configure install pretend test
DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
-EAPI=5
+EAPI=6
HOMEPAGE=http://www.libraw.org/
IUSE=demosaic examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1 CDDL GPL-2 GPL-3
RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0/15
-SRC_URI=http://www.libraw.org/data/LibRaw-0.17.0.tar.gz demosaic? ( http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.17.0.tar.gz http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.17.0.tar.gz )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-multilib 77afca16a6cb82823eed6366a10e7f75 autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=49ab56420316f55e9891c3db135535fd
+SRC_URI=http://www.libraw.org/data/LibRaw-0.17.2.tar.gz demosaic? ( http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.17.2.tar.gz http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.17.2.tar.gz )
+_eclasses_=multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=de4ddd3c02d4283a6afe6f95639e8c14
diff --git a/metadata/md5-cache/media-libs/webrtc-audio-processing-0.2 b/metadata/md5-cache/media-libs/webrtc-audio-processing-0.2
new file mode 100644
index 000000000000..53094858a708
--- /dev/null
+++ b/metadata/md5-cache/media-libs/webrtc-audio-processing-0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=AudioProcessing library from the webrtc.org code base
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/
+IUSE=static-libs abi_x86_32 abi_x86_64 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=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-0.2.tar.xz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=e90e3a3aa7e245f6b2ce0de8a58e06f3
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.9.5 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.9.5
new file mode 100644
index 000000000000..cb496dd05682
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.9.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/taglib media-sound/mpg123 media-sound/qmmp dev-qt/qtgui:4 dev-lang/yasm sys-devel/make >=dev-util/cmake-2.8
+DESCRIPTION=A set of extra plugins for Qmmp
+EAPI=6
+HOMEPAGE=http://qmmp.ylsoftware.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/taglib media-sound/mpg123 media-sound/qmmp dev-qt/qtgui:4
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-0.9.5.tar.bz2
+_eclasses_=cmake-utils 9e0d156beee613940cde06d0bc00791b eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=068637828149dc7cbc73dc76241b299e
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.0.4 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.0.4
new file mode 100644
index 000000000000..e6836aa674e3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/taglib-1.10 media-sound/mpg123 >=media-sound/qmmp-1.0.0 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 dev-lang/yasm dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-2.8
+DESCRIPTION=A set of extra plugins for Qmmp
+EAPI=6
+HOMEPAGE=http://qmmp.ylsoftware.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/taglib-1.10 media-sound/mpg123 >=media-sound/qmmp-1.0.0 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.0.4.tar.bz2
+_eclasses_=cmake-utils 9e0d156beee613940cde06d0bc00791b eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ed9ac260815947c2856d4c4ea99f56d9
diff --git a/metadata/md5-cache/media-sound/qmmp-0.9.10 b/metadata/md5-cache/media-sound/qmmp-0.9.10
new file mode 100644
index 000000000000..48d91f657eff
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qmmp-0.9.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/taglib dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) opus? ( media-libs/opusfile ) projectm? ( media-libs/libprojectm dev-qt/qtopengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udisks? ( sys-fs/udisks:2 ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Qt4-based audio player with winamp/xmms skins support
+EAPI=6
+HOMEPAGE=http://qmmp.ylsoftware.com
+IUSE=analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/taglib dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) opus? ( media-libs/opusfile ) projectm? ( media-libs/libprojectm dev-qt/qtopengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=kde? ( dbus )
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.9.10.tar.bz2
+_eclasses_=cmake-utils 9e0d156beee613940cde06d0bc00791b eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d08c5513188415358d29328d413b00c5
diff --git a/metadata/md5-cache/media-sound/qmmp-1.0.10 b/metadata/md5-cache/media-sound/qmmp-1.0.10
new file mode 100644
index 000000000000..b08f2d34d0b3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qmmp-1.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/taglib dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( media-video/mplayer ) mpris? ( dev-qt/qtdbus:5 ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) opus? ( media-libs/opusfile ) projectm? ( media-libs/libprojectm dev-qt/qtopengl:5 dev-qt/qtgui:5[-gles2] ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udisks? ( sys-fs/udisks:2 ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
+EAPI=6
+HOMEPAGE=http://qmmp.ylsoftware.com
+IUSE=analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/taglib dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( media-video/mplayer ) mpris? ( dev-qt/qtdbus:5 ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) opus? ( media-libs/opusfile ) projectm? ( media-libs/libprojectm dev-qt/qtopengl:5 dev-qt/qtgui:5[-gles2] ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=kde? ( dbus )
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.0.10.tar.bz2
+_eclasses_=cmake-utils 9e0d156beee613940cde06d0bc00791b eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a0bd3a8245ab07597a69648162304d2f
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8-r4 b/metadata/md5-cache/media-sound/xmms2-0.8-r4
index 0d2295adc0aa..0a435d007779 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8-r4
+++ b/metadata/md5-cache/media-sound/xmms2-0.8-r4
@@ -7,7 +7,8 @@ IUSE=aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices jack mac
KEYWORDS=~alpha ~amd64 ~ppc ~x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) gvfs? ( gnome-base/gnome-vfs ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba[smbclient(+)] ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://sourceforge/xmms2/xmms2-0.8DrO_o.tar.bz2
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb ruby-single a5e86595177a8998cbb9f794f2bf9700 ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=34f64b2310f937b6545d4fa9d3c6df38
+_md5_=c6da7ba7d639125538310a2bffccad73
diff --git a/metadata/md5-cache/media-video/smtube-16.6.0 b/metadata/md5-cache/media-video/smtube-16.6.0
new file mode 100644
index 000000000000..c538d4eb7928
--- /dev/null
+++ b/metadata/md5-cache/media-video/smtube-16.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebkit:5 dev-qt/qtscript:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtscript:4 )
+DESCRIPTION=YouTube Browser for SMPlayer
+EAPI=5
+HOMEPAGE=http://smplayer.sourceforge.net/smtube
+IUSE=qt5 linguas_bg linguas_cs linguas_da linguas_de linguas_en_GB linguas_en linguas_es linguas_eu linguas_fr linguas_gl linguas_he_IL linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_ms linguas_nn_NO linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_sq linguas_sr linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebkit:5 dev-qt/qtscript:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtscript:4 ) || ( media-video/smplayer[streaming] media-video/mpv media-video/mplayer media-video/vlc media-video/totem media-video/gnome-mplayer )
+SLOT=0
+SRC_URI=mirror://sourceforge/smplayer/smtube-16.6.0.tar.bz2
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde l10n e26ea0642846685782f1813642e7ff0f multilib d062ae4ba2fc40a19c11de2ad89b6616 qmake-utils 0a242e7177789b0028b4045f336dd4db toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=95541d119ca970bf9513d61c80c11c53
diff --git a/metadata/md5-cache/net-firewall/ferm-2.3 b/metadata/md5-cache/net-firewall/ferm-2.3
new file mode 100644
index 000000000000..a91418cb9e75
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/ferm-2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Command line util for managing firewall rules
+EAPI=6
+HOMEPAGE=http://ferm.foo-projects.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl:* net-firewall/iptables virtual/perl-File-Spec
+SLOT=0
+SRC_URI=http://ferm.foo-projects.org/download/2.3/ferm-2.3.tar.gz
+_eclasses_=multilib d062ae4ba2fc40a19c11de2ad89b6616 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=6908f005d9a6cddbec382b33a56226f5
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.14 b/metadata/md5-cache/net-libs/gloox-1.0.14
deleted file mode 100644
index e7bcce2ae4b5..000000000000
--- a/metadata/md5-cache/net-libs/gloox-1.0.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) zlib? ( sys-libs/zlib )
-DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-EAPI=5
-HOMEPAGE=http://camaya.net/gloox
-IUSE=debug gnutls idn ssl static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) zlib? ( sys-libs/zlib )
-SLOT=0/13
-SRC_URI=http://camaya.net/download/gloox-1.0.14.tar.bz2
-_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=7a51993afffb43de79be75d4aa2634f1
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.13 b/metadata/md5-cache/net-libs/gloox-1.0.15
similarity index 53%
rename from metadata/md5-cache/net-libs/gloox-1.0.13
rename to metadata/md5-cache/net-libs/gloox-1.0.15
index 5a85f57b4535..f2df0b127083 100644
--- a/metadata/md5-cache/net-libs/gloox-1.0.13
+++ b/metadata/md5-cache/net-libs/gloox-1.0.15
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
+DEFINED_PHASES=configure install
+DEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-EAPI=5
+EAPI=6
HOMEPAGE=http://camaya.net/gloox
-IUSE=debug gnutls idn ssl static-libs test zlib
+IUSE=debug gnutls idn libressl ssl static-libs test zlib
KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86
LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
+RDEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
SLOT=0/13
-SRC_URI=http://camaya.net/download/gloox-1.0.13.tar.bz2
+SRC_URI=http://camaya.net/download/gloox-1.0.15.tar.bz2
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=b5895bf3836cce8eb182239bf990420e
+_md5_=b99ef4a5f499615b8f7e5bed8b3f0abc
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-0.9.7 b/metadata/md5-cache/net-libs/telepathy-qt-0.9.7
new file mode 100644
index 000000000000..f3ca9d6a4fc0
--- /dev/null
+++ b/metadata/md5-cache/net-libs/telepathy-qt-0.9.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=farstream? ( >=net-libs/telepathy-farstream-0.2.2 >=net-libs/telepathy-glib-0.18.0 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 ) !net-libs/telepathy-qt4 || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig test? ( dev-libs/dbus-glib dev-libs/glib:2 dev-python/dbus-python qt4? ( dev-qt/qttest:4 ) qt5? ( dev-qt/qttest:5 ) ) sys-devel/make >=dev-util/cmake-2.8.12 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Qt bindings for the Telepathy D-Bus protocol
+EAPI=6
+HOMEPAGE=https://telepathy.freedesktop.org/
+IUSE=debug farstream +qt4 qt5 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=farstream? ( >=net-libs/telepathy-farstream-0.2.2 >=net-libs/telepathy-glib-0.18.0 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 ) !net-libs/telepathy-qt4
+REQUIRED_USE=|| ( qt4 qt5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.7.tar.gz
+_eclasses_=cmake-utils 9e0d156beee613940cde06d0bc00791b eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96
+_md5_=38e6392663a48fdffa07b7fd71850eb3
diff --git a/metadata/md5-cache/net-misc/chrony-2.4_pre1-r3 b/metadata/md5-cache/net-misc/chrony-2.4_pre1-r3
index e0610cb1ce06..6bb2ef1778a9 100644
--- a/metadata/md5-cache/net-misc/chrony-2.4_pre1-r3
+++ b/metadata/md5-cache/net-misc/chrony-2.4_pre1-r3
@@ -4,7 +4,7 @@ DESCRIPTION=NTP client and server programs
EAPI=5
HOMEPAGE=http://chrony.tuxfamily.org/
IUSE=caps +cmdmon html ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns
-KEYWORDS=~amd64 ~hppa ~ppc64
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc64
LICENSE=GPL-2
RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
REQUIRED_USE=?? ( libedit readline )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://download.tuxfamily.org/chrony/chrony-2.4-pre1.tar.gz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=6189dadb39f000d80bd98baaa6f04e37
+_md5_=690c230e454d09b37d0168743535a16d
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-1.0.3 b/metadata/md5-cache/net-nntp/sabnzbd-1.0.3
new file mode 100644
index 000000000000..b71114dbc35e
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND==dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite] virtual/pkgconfig
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=4
+HOMEPAGE=http://www.sabnzbd.org/
+IUSE=+rar +ssl unzip +yenc
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=>=app-arch/par2cmdline-0.4 >=dev-python/cheetah-2.0.1 dev-python/configobj dev-python/feedparser dev-python/gntp dev-python/pythonutils dev-python/rarfile net-misc/wget rar? ( || ( app-arch/unrar app-arch/rar ) ) ssl? ( dev-python/pyopenssl ) unzip? ( >=app-arch/unzip-5.5.2 ) yenc? ( dev-python/yenc ) =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
+SLOT=0
+SRC_URI=mirror://sourceforge/sabnzbdplus/SABnzbd-1.0.3-src.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 python efc1c55fc44c5b7272fc2ffba73c3e6f systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6579995fdd035bcb03906429eb9c57e3
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1
index 61d5296d66a9..d113191e9895 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line driven interactive plotting program
EAPI=5
HOMEPAGE=http://www.gnuplot.info/
IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=gnuplot bitmap? ( free-noncomm )
RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline:0 ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
SLOT=0
SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.0.1.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 wxwidgets 9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=774b3a39eb3dd45dca666509698ef51c
+_md5_=5c9513cb26d20a1fa586db61f755531e
diff --git a/metadata/md5-cache/sys-apps/file-5.28 b/metadata/md5-cache/sys-apps/file-5.28
index 225037e68d66..112ce132872c 100644
--- a/metadata/md5-cache/sys-apps/file-5.28
+++ b/metadata/md5-cache/sys-apps/file-5.28
@@ -10,4 +10,4 @@ RDEPEND=python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python
SLOT=0
SRC_URI=ftp://ftp.astron.com/pub/file/file-5.28.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.28.tar.gz
_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=22ef54f9ff78f22e86e0ccf65749d560
+_md5_=22d5855dcd6e049e78c95a3a370361e2
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.2.21 b/metadata/md5-cache/sys-cluster/keepalived-1.2.21
new file mode 100644
index 000000000000..e14fd578c4f0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.2.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:= dev-libs/openssl:= snmp? ( net-analyzer/net-snmp ) net-libs/libnfnetlink >=sys-kernel/linux-headers-2.6.30 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
+EAPI=6
+HOMEPAGE=http://www.keepalived.org/
+IUSE=debug ipv6 snmp
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:= dev-libs/openssl:= snmp? ( net-analyzer/net-snmp ) net-libs/libnfnetlink
+SLOT=0
+SRC_URI=http://www.keepalived.org/software/keepalived-1.2.21.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=e94fdd0e64cde850d431ee41ddb43968
diff --git a/metadata/md5-cache/sys-fs/exfat-utils-1.2.2 b/metadata/md5-cache/sys-fs/exfat-utils-1.2.4
similarity index 64%
rename from metadata/md5-cache/sys-fs/exfat-utils-1.2.2
rename to metadata/md5-cache/sys-fs/exfat-utils-1.2.4
index 44154c539591..31bcf93ad47b 100644
--- a/metadata/md5-cache/sys-fs/exfat-utils-1.2.2
+++ b/metadata/md5-cache/sys-fs/exfat-utils-1.2.4
@@ -5,5 +5,5 @@ HOMEPAGE=https://github.com/relan/exfat
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux
LICENSE=GPL-2+
SLOT=0
-SRC_URI=https://github.com/relan/exfat/releases/download/v1.2.2/exfat-utils-1.2.2.tar.gz
-_md5_=eaeb9e48199ea9decae910e11c7aafcf
+SRC_URI=https://github.com/relan/exfat/releases/download/v1.2.4/exfat-utils-1.2.4.tar.gz
+_md5_=fc8f63b6f802e6a65538b1158689573c
diff --git a/metadata/md5-cache/sys-fs/fuse-exfat-1.2.2 b/metadata/md5-cache/sys-fs/fuse-exfat-1.2.4
similarity index 69%
rename from metadata/md5-cache/sys-fs/fuse-exfat-1.2.2
rename to metadata/md5-cache/sys-fs/fuse-exfat-1.2.4
index 06d760afa31e..0834320f3a31 100644
--- a/metadata/md5-cache/sys-fs/fuse-exfat-1.2.2
+++ b/metadata/md5-cache/sys-fs/fuse-exfat-1.2.4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2+
RDEPEND=sys-fs/fuse
SLOT=0
-SRC_URI=https://github.com/relan/exfat/releases/download/v1.2.2/fuse-exfat-1.2.2.tar.gz
-_md5_=8ba05bc4f4de5c9d1389954444d9a0d4
+SRC_URI=https://github.com/relan/exfat/releases/download/v1.2.4/fuse-exfat-1.2.4.tar.gz
+_md5_=2655ee5ff9cf2d24e24f157a1285557e
diff --git a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.21-r1 b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.21-r1
deleted file mode 100644
index 096da5220ac8..000000000000
--- a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.21-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Reiserfs Utilities
-EAPI=4
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/reiserfs/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/fs/reiserfs/reiserfsprogs-3.6.21.tar.gz mirror://kernel/linux/kernel/people/jeffm/reiserfsprogs/v3.6.21/reiserfsprogs-3.6.21.tar.gz
-_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=60b3797114c0cbc08b80028d4e702aeb
diff --git a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.23 b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.25
similarity index 70%
rename from metadata/md5-cache/sys-fs/reiserfsprogs-3.6.23
rename to metadata/md5-cache/sys-fs/reiserfsprogs-3.6.25
index 8a3eec245226..17c886473f81 100644
--- a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.23
+++ b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.25
@@ -1,10 +1,11 @@
-DEFINED_PHASES=configure
+DEFINED_PHASES=configure install
DESCRIPTION=Reiserfs Utilities
EAPI=5
HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/reiserfs/
+IUSE=static-libs
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
SLOT=0
-SRC_URI=mirror://kernel/linux/utils/fs/reiserfs/reiserfsprogs-3.6.23.tar.xz mirror://kernel/linux/kernel/people/jeffm/reiserfsprogs/v3.6.23/reiserfsprogs-3.6.23.tar.xz
+SRC_URI=mirror://kernel/linux/utils/fs/reiserfs/reiserfsprogs-3.6.25.tar.xz mirror://kernel/linux/kernel/people/jeffm/reiserfsprogs/v3.6.25/reiserfsprogs-3.6.25.tar.xz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=611f43c19eac759e57c3d9e553bf4711
+_md5_=5849204774e70ec322f04afcaad558f1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.101 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.102
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.10.101
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.10.102
index 47058b0de76f..7d51b133cdf8 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.101
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.102
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2 freedist
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=3.10.101
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.101.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
+SLOT=3.10.102
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.102.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde kernel-2 f745fe70cd0e35af07412905687b9a7f multilib d062ae4ba2fc40a19c11de2ad89b6616 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=0dc8fcb8286cc84f96e1568a488616d6
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.1-r1 b/metadata/md5-cache/sys-libs/libunwind-1.1-r1
index 416fb2e7bf87..7f551c9cbf75 100644
--- a/metadata/md5-cache/sys-libs/libunwind-1.1-r1
+++ b/metadata/md5-cache/sys-libs/libunwind-1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Portable and efficient API to determine the call-chain of a program
EAPI=5
HOMEPAGE=https://savannah.nongnu.org/projects/libunwind
IUSE=debug debug-frame libatomic lzma static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=lzma? ( app-arch/xz-utils )
RESTRICT=test
SLOT=7
SRC_URI=http://download.savannah.nongnu.org/releases/libunwind/libunwind-1.1.tar.gz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=87bab9ef74d5c92fd2773987d9a0914a
+_md5_=2ea16662813caf92da9b6459a5df3117
diff --git a/metadata/md5-cache/sys-process/criu-2.2 b/metadata/md5-cache/sys-process/criu-2.2
index 1331ec1d8d0e..ecc12f157b04 100644
--- a/metadata/md5-cache/sys-process/criu-2.2
+++ b/metadata/md5-cache/sys-process/criu-2.2
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://download.openvz.org/criu/criu-2.2.tar.bz2
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e linux-info fd1e29abbb02cbc49f1a14299846e9c4 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=84e1abec38eda8183ba458bd8103dae0
+_md5_=b097245249a12cbdc0ab15bd6aae0e4a
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.36 b/metadata/md5-cache/www-servers/tomcat-8.0.36
new file mode 100644
index 000000000000..62c6065a2e81
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.36
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 app-admin/pwgen >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container
+EAPI=5
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 !=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=8
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.36/src/apache-tomcat-8.0.36-src.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib d062ae4ba2fc40a19c11de2ad89b6616 prefix e7f2b9c6e57342e5d25eac22fce23062 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9065494899add67ed4d67c994f85021c
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.3 b/metadata/md5-cache/www-servers/tomcat-8.5.3
new file mode 100644
index 000000000000..9b48b61bd490
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 app-admin/pwgen >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=5
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.3/src/apache-tomcat-8.5.3-src.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib d062ae4ba2fc40a19c11de2ad89b6616 prefix e7f2b9c6e57342e5d25eac22fce23062 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ff04757fea8a17572af5fbf2ee8ea019
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.0_alpha6-r1 b/metadata/md5-cache/www-servers/tomcat-9.0.0_alpha8
similarity index 75%
rename from metadata/md5-cache/www-servers/tomcat-9.0.0_alpha6-r1
rename to metadata/md5-cache/www-servers/tomcat-9.0.0_alpha8
index dcc7729fd8f6..741ca48be482 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.0_alpha6-r1
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.0_alpha8
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.0_alpha6:4.0 app-admin/pwgen >=virtual/jdk-1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3 Container
+DEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.0_alpha8:4.0 app-admin/pwgen >=virtual/jdk-1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container
EAPI=5
HOMEPAGE=http://tomcat.apache.org/
IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.0_alpha6:4.0 !=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.0_alpha8:4.0 !=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.0.M6/src/apache-tomcat-9.0.0.M6-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.0.M8/src/apache-tomcat-9.0.0.M8-src.tar.gz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib d062ae4ba2fc40a19c11de2ad89b6616 prefix e7f2b9c6e57342e5d25eac22fce23062 toolchain-funcs c9d9187f4caa4026a0ceddd8dfceb3c1 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1c41d3685a6c254f8bbeff5251ca0219
+_md5_=71276df758da6e1d573479a14f8522bd
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a7f9b1808569..67bc5f42cce0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 14 Jun 2016 06:12:34 +0000
+Tue, 14 Jun 2016 14:40:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a5808518881b..09f9d3f2ed69 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jun 14 06:11:39 UTC 2016
+Tue Jun 14 14:39:53 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 325346417542..0e06cc8d4a67 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 14 Jun 2016 06:30:01 +0000
+Tue, 14 Jun 2016 15:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c4c45e1e04dc..852ba34b6f3e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1465884601 Tue 14 Jun 2016 06:10:01 AM UTC
+1465915201 Tue 14 Jun 2016 02:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a7f9b1808569..67bc5f42cce0 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 14 Jun 2016 06:12:34 +0000
+Tue, 14 Jun 2016 14:40:49 +0000
diff --git a/net-firewall/ferm/Manifest b/net-firewall/ferm/Manifest
index 5f8e916d72e0..b0638c12e709 100644
--- a/net-firewall/ferm/Manifest
+++ b/net-firewall/ferm/Manifest
@@ -1 +1,2 @@
DIST ferm-2.2.tar.gz 118828 SHA256 6d5447a2560495f34da78b4189b5d04d5cc1fca6733496de94ba900aec8b7a63 SHA512 af703c8a77f41c08b59c88cad523427dd5ab2a9209b51c2396d4eb7d5922e1821beeded9b4d0cdc33d7c757cdbf4c825332c7493522f548bfd9294f3657b807b WHIRLPOOL 3f86002b4b7a1ec2f9986ec74579a5ad300dd01601e66c6b5ccaee04eb0befe9955e8df8372bded2a7d03d80a9ce8cb2493f2d9e7a51d4a57483dba80a986ddb
+DIST ferm-2.3.tar.gz 125706 SHA256 9de83d3e5f6e459f27140ae50610ed9419ac4f7b90d8d51e54c1172ea11ba64b SHA512 0df172fcae0d862df1d2840c401ebf5a20a609f447301c398c0d5f9992d07af23b09530f4214d3debd231f35b1d7c76324f57d134225cf884008daec1c3c76f8 WHIRLPOOL 327b870c191cb25839bd2a08cf5ab1e9d2b87ccffdd81cc4f004c68492fb2914d712332553fbd5b1d189e9beedf64b6f4622073a76e931da9f20f9cf418f77fe
diff --git a/net-firewall/ferm/ferm-2.3.ebuild b/net-firewall/ferm/ferm-2.3.ebuild
new file mode 100644
index 000000000000..de30150e00d1
--- /dev/null
+++ b/net-firewall/ferm/ferm-2.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Command line util for managing firewall rules"
+HOMEPAGE="http://ferm.foo-projects.org/"
+SRC_URI="http://ferm.foo-projects.org/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# does not install any perl libs
+RDEPEND="dev-lang/perl:*
+ net-firewall/iptables
+ virtual/perl-File-Spec"
+
+DOCS=( AUTHORS NEWS README TODO doc/ferm.txt examples/ )
+HTML_DOCS=( doc/ferm.html )
+
+src_compile() { :; }
+
+src_install() {
+ dosbin src/{,import-}ferm
+ systemd_dounit ferm.service
+
+ einstalldocs
+ doman doc/*.1
+}
+
+pkg_postinst() {
+ elog "See ${EROOT}usr/share/doc/${PF}/examples for sample configs"
+}
diff --git a/net-firewall/ferm/metadata.xml b/net-firewall/ferm/metadata.xml
index 6f49eba8f496..6833312144dc 100644
--- a/net-firewall/ferm/metadata.xml
+++ b/net-firewall/ferm/metadata.xml
@@ -1,5 +1,16 @@
-
+
+ hydrapolic@gmail.com
+ Tomas Mozes
+ Proxy maintainer
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ MaxKellermann/ferm
+
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index a1329e3c4ac8..d644a1109b63 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,3 +1,3 @@
-DIST gloox-1.0.13.tar.bz2 675842 SHA256 4d9f1eeac97c6563dde11d4bdba346a025ef27908b088b47b5c8d3d03df6ea8a SHA512 9f9773a5c3d2ae8a4eec6e8365c8578c089004d0f5101c2e8a8bf96ac8e8b6a08cf4e92f93afb8d07af0e8cc2c238c12f4f8df75a81c2a06dfb039c1d4ae850a WHIRLPOOL 772b18a22acff536abb378a4307c6dcb3b9b35b231d061f05b22d5cb260d8da3c0356bdbca0a8cac9feab0fbc9124bc41472b91a335215291e1e66a9184ccc78
DIST gloox-1.0.14.tar.bz2 696719 SHA256 520b72a66fa9fea917a0336872101539f0bea30d1f871e12c31b6c2cd0203941 SHA512 0c3242bbb9713e944b9b4926ea7588434c52ae78a1fadc0b2a6da9677303550e805d1f570188a464806a9d56242efb50d268f65b3f661ed3a4df1b7055046b77 WHIRLPOOL 2ed53195b8658112167195749c3e58b451c587c7530bdf2197eb77a750344e92d0e4c13843997e3098c51512ecd45943d6849ec60a7953a55a2420b072ca622d
+DIST gloox-1.0.15.tar.bz2 697835 SHA256 31e1fe7c0aedc74bf9566c4de68244825df9fbc20eabee5214536b4e3beea311 SHA512 2f640612bce27750e159f435b9f10849acec1917dc5e858ee8f128d19c259d283dec76a857cbecc34b22cc9aa23da4a4387e9f60c0bd1b7c6dab21de1bd83768 WHIRLPOOL 5aaae1b38cb3ae6b39206095b4a53f6682e10372990949646c3320dc5f7be079fa8077ed2e729179ac0e2e420de8ae8ba0836b2d976b6e914436603dcba2fda9
DIST gloox-1.0.9.tar.bz2 670206 SHA256 143dd50e1edc4eb1d304fa28bdd6ab9e53b60c37c1726dd0e34c06c51f9a453e SHA512 a3fa7acc76fdca0421030e71b6a13ca0b04589946df2a781609f1bddae5329299d68ce99a4a94a0760206b112759636379ce67d220422b99302fc799964bfa22 WHIRLPOOL 414eb34fa3ec11ae929f84198d95ed0da9de0739655ae1188ac3eb03998de5cecb9c165ad284496b405b49126236b628dc5b4579e855b10377add145fabb63b1
diff --git a/net-libs/gloox/gloox-1.0.13.ebuild b/net-libs/gloox/gloox-1.0.13.ebuild
deleted file mode 100644
index 5bc18fc75472..000000000000
--- a/net-libs/gloox/gloox-1.0.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_P="${P/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86"
-IUSE="debug gnutls idn ssl static-libs test zlib"
-
-DEPEND="idn? ( net-dns/libidn )
- gnutls? ( net-libs/gnutls )
- ssl? ( dev-libs/openssl )
- zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- # Examples are not installed anyway, so - why should we build them?
- econf \
- --without-examples \
- $(use debug && echo "--enable-debug") \
- $(use_enable static-libs static) \
- $(use_with idn libidn) \
- $(use_with gnutls) \
- $(use_with ssl openssl) \
- $(use_with test tests) \
- $(use_with zlib)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/net-libs/gloox/gloox-1.0.14.ebuild b/net-libs/gloox/gloox-1.0.15.ebuild
similarity index 82%
rename from net-libs/gloox/gloox-1.0.14.ebuild
rename to net-libs/gloox/gloox-1.0.15.ebuild
index f3cefc940158..b66bb2b81ced 100644
--- a/net-libs/gloox/gloox-1.0.14.ebuild
+++ b/net-libs/gloox/gloox-1.0.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils
@@ -14,21 +14,20 @@ SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0/13"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86"
-IUSE="debug gnutls idn ssl static-libs test zlib"
+IUSE="debug gnutls idn libressl ssl static-libs test zlib"
DEPEND="idn? ( net-dns/libidn )
gnutls? ( net-libs/gnutls )
- ssl? ( dev-libs/openssl:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
-src_prepare() {
- epatch_user
-}
-
src_configure() {
# Examples are not installed anyway, so - why should we build them?
econf \
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 30ff988e80e6..dd266171b51c 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1 +1,2 @@
DIST telepathy-qt-0.9.6.1.tar.gz 6067468 SHA256 496eb4951ea9b181d7d68a2122a885474c4f73b519319496aa1b97d9b361a1f8 SHA512 d15bdf94ef2b546270130012e8636fb2801b0c4fb50513ac0dbc0e1f6255d84da6df12195b3d26dc6df5a9466929a1073e87d2a9e600c7bf26c3e1aa112113b7 WHIRLPOOL 621137fc10ce3db1d834711aaf876adf98056a5ca8bab22c011e881e71522060cd6110733880db4f6646872501b870305d3590428ea3d809b4b512bbc21e653b
+DIST telepathy-qt-0.9.7.tar.gz 6213405 SHA256 21bad30be7ebc4ba667d53d92cd1cec1be23114103f2149404d9740721693d4f SHA512 081daecb2509ea690079014bcc88eacbf2b3e4f4ac42aaf1b0cb264c01b801bc499a041482571d383f258cb3d3e2c6ffa5682fbe417fe807fcc25a06d2ead877 WHIRLPOOL 81569b648ae51ba932d1a212d69cd51a727201f5c36f7b91fe2da52ec0ed3a3fc01165a260f262e182474a383ff614ea6e4ee7dd6691add04052b1f4d14cd63d
diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
index d62898aa0240..0bfa4d0b48ae 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -1,6 +1,15 @@
+
+ akulichalexander@gmail.com
+ Alexandr Akulich
+ Proxy maintainer
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
qt@gentoo.org
Gentoo Qt Project
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.7.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.7.ebuild
new file mode 100644
index 000000000000..be29795652ff
--- /dev/null
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 cmake-utils virtualx multibuild
+
+DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug farstream +qt4 qt5 test"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ farstream? (
+ >=net-libs/telepathy-farstream-0.2.2
+ >=net-libs/telepathy-glib-0.18.0
+ )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtxml:5
+ )
+ !net-libs/telepathy-qt4
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? (
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ dev-python/dbus-python
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.6.1-yes-release.patch"
+ "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch"
+)
+
+# bug 549448 - last checked with 0.9.7
+RESTRICT="test"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ -DENABLE_DEBUG_OUTPUT=$(usex debug)
+ -DENABLE_FARSTREAM=$(usex farstream)
+ -DENABLE_TESTS=$(usex test)
+ -DENABLE_EXAMPLES=OFF
+ )
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+ mycmakeargs+=( -DDESIRED_QT_VERSION=4 )
+ fi
+ if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+ mycmakeargs+=( -DDESIRED_QT_VERSION=5 )
+ fi
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ _test_runner() {
+ ctest -E '(CallChannel)'
+ }
+
+ mytest() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ virtx _test_runner
+ popd > /dev/null || die
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+}
diff --git a/net-misc/chrony/chrony-2.4_pre1-r3.ebuild b/net-misc/chrony/chrony-2.4_pre1-r3.ebuild
index 4f9b613e1c1e..118fd06d41b7 100644
--- a/net-misc/chrony/chrony-2.4_pre1-r3.ebuild
+++ b/net-misc/chrony/chrony-2.4_pre1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc64"
IUSE="caps +cmdmon html ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
REQUIRED_USE="
?? ( libedit readline )
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 4bfb2182cfb6..62744e62342d 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -3,3 +3,4 @@ DIST SABnzbd-0.7.17-src.tar.gz 2310300 SHA256 a501517dbaf161deab2153118ff3b44512
DIST SABnzbd-0.7.18-src.tar.gz 2317137 SHA256 aa05697d901b3e334e92f274b2e8788973059840be656a1545e8f2a4b070b014 SHA512 db7606be913fc89cdea0c037594b614c16f3887b32d1133c5f7a6c92f3dac5bec2250972e35941cd462e65bb29e91db2a43ff1e6624d827223afb957ec7922fe WHIRLPOOL 313e74425555af3dc86e111440974fefef42531018faad14a2a39649cef21a2b2d1d5a917c4ec13089ef9a46a2c31fe56b544ae0fa72628497782be756e8014f
DIST SABnzbd-0.7.19-src.tar.gz 2386744 SHA256 31ad0ae24db3873011db816e1b100f4429734b2260f4c669b7261d2f85717487 SHA512 383788d87a3ee4e69ba818f6614f6929aa328d1153b746e04736868de598ee35e556a07cced7c74bc89c54fe77c1e52c4cdde8ed37d536a09bd1c605c551b9e7 WHIRLPOOL fbf1ab129a403011bd6957272d348fd745621e9c13f46f3988362bb8bb7a6ceb26b57253978ec5f5ae97c2ea942ba80ff1cab0ca1d1f99d33a1c55fc03b0dad9
DIST SABnzbd-0.7.20-src.tar.gz 2389762 SHA256 20b3a4613a0ecdede4fdfeb628ae806e458ac1a6fb684306328dd4ed1faf8742 SHA512 51ea888fcb7b49156cb719cb4fe75725d69acd726097d8b2526d6af87d0404bf08d0ab4b82f25dae7ac9a52d6c639e57a145bf5af6005fa435ad31f239a716d5 WHIRLPOOL 2686160be649c051ac1186481dae1e876650fbc91fe3ea1ab2d1569baea51f0ab7d0be6c7942b9facd6e5f856ab24ab36d1dc2f55dc645f06be275b2e43abb4b
+DIST SABnzbd-1.0.3-src.tar.gz 2975111 SHA256 cf87d3f17fc03e8b3a4b3010261115c2ad7e2f773b5ede95a80025b340dbbd35 SHA512 6213cb73f6d2127133c5ab292e5ac2bcf6f4c780b5345b54b91459271c1acad6c6c95c4ba1ebc1e34341d5dc09d14e4806b84b977fc90f5ff0a49725b08a77e9 WHIRLPOOL 021a864f8d2b90481da5f4d1b3b1a5a5478230c3a61af2c30ba2be65594224863a48d58d475fc2e79986274e48e5ad83b5d13a6bc0a7829e99552062fdf185a7
diff --git a/net-nntp/sabnzbd/files/1.x/0001-use-system-configobj-and-feedparser.patch b/net-nntp/sabnzbd/files/1.x/0001-use-system-configobj-and-feedparser.patch
new file mode 100644
index 000000000000..3cc1c7c65db1
--- /dev/null
+++ b/net-nntp/sabnzbd/files/1.x/0001-use-system-configobj-and-feedparser.patch
@@ -0,0 +1,52 @@
+From 75608455ab239c8dd05280e858f10026a31a5eac Mon Sep 17 00:00:00 2001
+From: Justin Bronder
+Date: Thu, 3 Jan 2013 04:10:37 -0500
+Subject: [PATCH 1/4] use system configobj and feedparser
+
+---
+ sabnzbd/config.py | 4 +++-
+ sabnzbd/rss.py | 3 ++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/sabnzbd/config.py b/sabnzbd/config.py
+index 3bf777a..3e6551a 100644
+--- a/sabnzbd/config.py
++++ b/sabnzbd/config.py
+@@ -24,10 +24,12 @@ import re
+ import logging
+ import threading
+ import shutil
++
++import configobj
++
+ import sabnzbd.misc
+ from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER
+ from sabnzbd.utils import listquote
+-from sabnzbd.utils import configobj
+ from sabnzbd.decorators import synchronized
+
+ CONFIG_LOCK = threading.Lock()
+diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py
+index 67ff94b..8b7d8c1 100644
+--- a/sabnzbd/rss.py
++++ b/sabnzbd/rss.py
+@@ -26,6 +26,8 @@ import threading
+ import urllib
+ import os
+
++import feedparser
++
+ import sabnzbd
+ from sabnzbd.constants import *
+ from sabnzbd.decorators import synchronized
+@@ -36,7 +38,6 @@ from sabnzbd.misc import cat_convert, sanitize_foldername, wildcard_to_re, cat_t
+ import sabnzbd.emailer as emailer
+ from sabnzbd.encoding import unicoder, xml_name
+
+-import sabnzbd.utils.feedparser as feedparser
+
+ __RSS = None # Global pointer to RSS-scanner instance
+
+--
+2.4.10
+
diff --git a/net-nntp/sabnzbd/files/1.x/0002-growler-support-gntp-1.0.patch b/net-nntp/sabnzbd/files/1.x/0002-growler-support-gntp-1.0.patch
new file mode 100644
index 000000000000..845ab15e8e63
--- /dev/null
+++ b/net-nntp/sabnzbd/files/1.x/0002-growler-support-gntp-1.0.patch
@@ -0,0 +1,31 @@
+From 14eabdcd495be61bb14ecc8152058f92bd71a2db Mon Sep 17 00:00:00 2001
+From: Justin Bronder
+Date: Mon, 24 Jun 2013 19:03:17 -0400
+Subject: [PATCH 2/4] growler: support >=gntp-1.0
+
+Fixes Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=474540
+---
+ sabnzbd/growler.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/sabnzbd/growler.py b/sabnzbd/growler.py
+index 34d73c4..cd1ce91 100644
+--- a/sabnzbd/growler.py
++++ b/sabnzbd/growler.py
+@@ -37,7 +37,12 @@ import sabnzbd.cfg
+ from sabnzbd.encoding import unicoder
+ from sabnzbd.constants import NOTIFY_KEYS
+
+-from gntp import GNTPRegister
++try:
++ # <= version 0.6
++ from gntp import GNTPRegister
++except ImportError:
++ # >= version 1.0
++ from gntp.core import GNTPRegister
+ from gntp.notifier import GrowlNotifier
+ try:
+ import Growl
+--
+2.4.10
+
diff --git a/net-nntp/sabnzbd/files/1.x/0003-cfg-disable-growl-by-default.patch b/net-nntp/sabnzbd/files/1.x/0003-cfg-disable-growl-by-default.patch
new file mode 100644
index 000000000000..ab03fcf05df7
--- /dev/null
+++ b/net-nntp/sabnzbd/files/1.x/0003-cfg-disable-growl-by-default.patch
@@ -0,0 +1,34 @@
+From 93f2759ce13c3e93e4fe64bf632249d96eddb41b Mon Sep 17 00:00:00 2001
+From: Justin Bronder
+Date: Tue, 14 Jun 2016 08:38:54 -0400
+Subject: [PATCH 3/4] cfg: disable growl by default
+
+---
+ sabnzbd/cfg.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
+index 9d362df..a90cc03 100644
+--- a/sabnzbd/cfg.py
++++ b/sabnzbd/cfg.py
+@@ -286,7 +286,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True)
+ acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False)
+
+ # [ntfosd]
+-ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN)
++ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False)
+ ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True)
+ ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False)
+ ntfosd_prio_pp = OptionBool('ntfosd', 'ntfosd_prio_pp', False)
+@@ -299,7 +299,7 @@ ntfosd_prio_queue_done = OptionBool('ntfosd', 'ntfosd_prio_queue_done', True)
+ ntfosd_prio_other = OptionBool('ntfosd', 'ntfosd_prio_other', False)
+
+ # [growl]
+-growl_enable = OptionBool('growl', 'growl_enable', sabnzbd.DARWIN and sabnzbd.DARWIN_VERSION < 8)
++growl_enable = OptionBool('growl', 'growl_enable', False)
+ growl_server = OptionStr('growl', 'growl_server')
+ growl_password = OptionPassword('growl', 'growl_password')
+ growl_prio_startup = OptionBool('growl', 'growl_prio_startup', True)
+--
+2.4.10
+
diff --git a/net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch b/net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch
new file mode 100644
index 000000000000..7d5f374e6e03
--- /dev/null
+++ b/net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch
@@ -0,0 +1,68 @@
+From 33ce1a3e3cce21feedc88cddf708173f826c57cb Mon Sep 17 00:00:00 2001
+From: Justin Bronder
+Date: Tue, 14 Jun 2016 08:43:37 -0400
+Subject: [PATCH 4/4] use system rarfile
+
+---
+ sabnzbd/assembler.py | 3 ++-
+ sabnzbd/dirscanner.py | 3 ++-
+ sabnzbd/newsunpack.py | 3 ++-
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/sabnzbd/assembler.py b/sabnzbd/assembler.py
+index 7c4beb8..142678d 100644
+--- a/sabnzbd/assembler.py
++++ b/sabnzbd/assembler.py
+@@ -34,6 +34,8 @@ except:
+ import md5
+ new_md5 = md5.new
+
++from rarfile import RarFile, is_rarfile
++
+ import sabnzbd
+ from sabnzbd.misc import get_filepath, sanitize_filename, get_unique_filename, renamer, \
+ set_permissions, flag_file, long_path, clip_path
+@@ -42,7 +44,6 @@ import sabnzbd.cfg as cfg
+ from sabnzbd.articlecache import ArticleCache
+ from sabnzbd.postproc import PostProcessor
+ import sabnzbd.downloader
+-from sabnzbd.utils.rarfile import RarFile, is_rarfile
+ from sabnzbd.encoding import unicoder, is_utf8
+ from sabnzbd.rating import Rating
+
+diff --git a/sabnzbd/dirscanner.py b/sabnzbd/dirscanner.py
+index 6ada4bf..7a31920 100644
+--- a/sabnzbd/dirscanner.py
++++ b/sabnzbd/dirscanner.py
+@@ -27,9 +27,10 @@ import gzip
+ import bz2
+ import threading
+
++from rarfile import RarFile, is_rarfile
++
+ import sabnzbd
+ from sabnzbd.constants import *
+-from sabnzbd.utils.rarfile import is_rarfile, RarFile
+ from sabnzbd.newsunpack import is_sevenfile, SevenZip
+ import sabnzbd.nzbstuff as nzbstuff
+ import sabnzbd.misc as misc
+diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py
+index 6906aed..940879f 100644
+--- a/sabnzbd/newsunpack.py
++++ b/sabnzbd/newsunpack.py
+@@ -28,10 +28,11 @@ from time import time
+ import binascii
+ import shutil
+
++from rarfile import RarFile, is_rarfile
++
+ import sabnzbd
+ from sabnzbd.encoding import TRANS, UNTRANS, unicode2local, name_fixer, \
+ reliable_unpack_names, unicoder, platform_encode, deunicode
+-from sabnzbd.utils.rarfile import RarFile, is_rarfile
+ from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \
+ flag_file, real_path, globber, globber_full, short_path
+ from sabnzbd.tvsort import SeriesSorter
+--
+2.4.10
+
diff --git a/net-nntp/sabnzbd/sabnzbd-1.0.3.ebuild b/net-nntp/sabnzbd/sabnzbd-1.0.3.ebuild
new file mode 100644
index 000000000000..2df677f032c6
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-1.0.3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+# Require python-2 with sqlite USE flag
+PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="sqlite"
+
+inherit eutils python user systemd versionator
+
+MY_P="${P/sab/SAB}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="http://www.sabnzbd.org/"
+SRC_URI="mirror://sourceforge/sabnzbdplus/${MY_P}-src.tar.gz"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+rar +ssl unzip +yenc"
+
+# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
+# be in python's sitedir. See: http://wiki.sabnzbd.org/unix-packaging
+
+# TODO: still bundled but not in protage:
+# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt
+# pynewsleecher
+#
+# Also note that cherrypy is still bundled. It's near impossible to find
+# out where the bundled and heavily patched version came from (pulled from
+# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
+# further. Upstream is planning on making this easier with 0.8.0.
+# https://github.com/sabnzbd/sabnzbd/issues/47
+
+RDEPEND="
+ >=app-arch/par2cmdline-0.4
+ >=dev-python/cheetah-2.0.1
+ dev-python/configobj
+ dev-python/feedparser
+ dev-python/gntp
+ dev-python/pythonutils
+ dev-python/rarfile
+ net-misc/wget
+ rar? ( || ( app-arch/unrar app-arch/rar ) )
+ ssl? ( dev-python/pyopenssl )
+ unzip? ( >=app-arch/unzip-5.5.2 )
+ yenc? ( dev-python/yenc )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ HOMEDIR="/var/lib/${PN}"
+ python_set_active_version 2
+ python_pkg_setup
+
+ # Create sabnzbd group
+ enewgroup ${PN}
+ # Create sabnzbd user, put in sabnzbd group
+ enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/1.x/0001-use-system-configobj-and-feedparser.patch
+ epatch "${FILESDIR}"/1.x/0002-growler-support-gntp-1.0.patch
+ epatch "${FILESDIR}"/1.x/0003-cfg-disable-growl-by-default.patch
+ epatch "${FILESDIR}"/1.x/0004-use-system-rarfile.patch
+
+ # remove bundled modules
+ rm -r sabnzbd/utils/{feedparser,configobj,rarfile}.py || die
+ rm -r gntp || die
+ rm licenses/License-{feedparser,configobj,gntp,rarfile}.txt || die
+}
+
+src_install() {
+ local d
+
+ dodir /usr/share/${PN}/sabnzbd
+ insinto /usr/share/${PN}/
+ doins SABnzbd.py
+ fperms +x /usr/share/${PN}/SABnzbd.py
+ dobin "${FILESDIR}"/sabnzbd
+
+ for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
+ insinto /usr/share/${PN}/${d}
+ doins -r ${d}/*
+ done
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+ diropts -o ${PN} -g ${PN}
+ dodir /etc/${PN}
+ dodir /var/log/${PN}
+
+ insinto "/etc/${PN}"
+ insopts -m 0600 -o ${PN} -g ${PN}
+ doins "${FILESDIR}/${PN}.ini"
+
+ dodoc {ABOUT,ISSUES,README}.txt licenses/*
+
+ systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+ python_mod_optimize /usr/share/${PN}
+
+ einfo "Default directory: ${HOMEDIR}"
+ einfo ""
+ einfo "Run: gpasswd -a sabnzbd"
+ einfo "to add a user to the sabnzbd group so it can edit sabnzbd files"
+ einfo ""
+ einfo "By default sabnzbd will listen on 127.0.0.1:8080"
+ einfo "As growl isn't default notification system on gentoo we disable it."
+ einfo "By default notifications are forwarded to the 23053 port(gntp)."
+
+ if [ "$(get_major_version ${REPLACING_VERSIONS})" == "0" ]; then
+ echo
+ ewarn "Upgrading from ${PN}-0.x.y to ${PN}-1.x.y introduces incompatible changes"
+ ewarn "See http://wiki.sabnzbd.org/introducing-1-0-0."
+ ewarn "In particular, you need to let your queue complete before restarting ${PN}"
+ fi
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/share/${PN}
+}
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index ddec9a2b8bac..438a3bb48077 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Tobias Klausmann (14 Jun 2016)
+# asciidoctor pulls in a lot of Ruby deps
+>=net-misc/chrony-2.4_pre1 html
+
# Tobias Klausmann (07 Jun 2016)
# cmus is one amongst many. When-if a user wants it, we'll reconsider it.
# Same goes for libircclient
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index c912aeed2ea6..641346c0f755 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,8 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Fabian Groffen (14 Jun 2016)
+# Fails to link due to missing libiconv.so, bug #585924
+=net-misc/wget-1.18
+
# Fabian Groffen (13 Jun 2015)
# Needs patching to compile (d_type and DT_REG), bug #551696
=app-portage/portage-utils-0.56
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
index 8e1080b5a91d..4a986be8b858 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
@@ -18,11 +18,11 @@ if [[ -z ${PV%%*9999} ]]; then
ECVS_CVS_OPTIONS="-dP"
MY_P="${PN}"
SRC_URI=""
- KEYWORDS="arm"
+ KEYWORDS="alpha arm"
else
MY_P="${P/_/.}"
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
inherit autotools
fi
diff --git a/sys-apps/file/file-5.28.ebuild b/sys-apps/file/file-5.28.ebuild
index 658a92fa32a2..6ebccd647f22 100644
--- a/sys-apps/file/file-5.28.ebuild
+++ b/sys-apps/file/file-5.28.ebuild
@@ -96,7 +96,7 @@ multilib_src_install() {
if multilib_is_native_abi ; then
default
else
- emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+ emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
fi
}
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index bed1895745dc..9ef95ebe3c49 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,4 +1,5 @@
DIST keepalived-1.2.15.tar.gz 345471 SHA256 47db44d78549da704e0794198bfc874be65ca570d15429a6a5c23b8d91109aa9 SHA512 f640e3f2694d359ebb24addb55c48c9ca877fa64daac5e73b4a251bf2a531705a8e02a34d7ee95cd96ad70a282c96f5102d3ce4baa2be90e6df2c8d910551b78 WHIRLPOOL 3273e2d1cdaf8c5ca468e536472c6c781ed4cf78035b559f68693b935eeae04b28204f51e983d9066f294f63dbb05b9d8d77f8c7cb647c77abbd99c6a8f65561
DIST keepalived-1.2.19.tar.gz 330164 SHA256 32fbae732c1cd854cacd7a930d4a26f5bad6372cdecb5e3139f0c17e87493853 SHA512 d2848726aa97bbd5a3be3e667314a453d26572ef6d14f5f606395a203ceab7bce8a6c63e3b5ebb05c83d75a5491b77f1fa4e3042cd919d7d673c3595ec829974 WHIRLPOOL d99f2ec52b952d8f5d79486e01c58fe6b15e22fe8279a56384958c5597ed031d217495518388efb33ece3170c56220836bcda7c998777deb81d348d0e9fd146a
DIST keepalived-1.2.2.tar.gz 249557 SHA256 4c05dbd149af120506b4f3a66b4016e30d9ad112e4c26a602e28c366705de8c0 SHA512 1ac581c94be846822ef0ea7f3d2084b4a64ebc2cf77f9e41248169daa3319adcdeb8bd2bef2b3ce6630ae620f4b2ab7e9e949881d7efcc3d359004f0ff316ae8 WHIRLPOOL 13ad7a3f97619951f40dd3a7e43253d218b8bb9515c4b9c551125df2d6d6fe1cbf2761e88b54733498adf782aeae10f55ee267c58c297f1765fa86939edc1a00
+DIST keepalived-1.2.21.tar.gz 470774 SHA256 c2fe1bf13a2e073133b800093464525a364bcabc1fa21c067d80cf12b82ec8f8 SHA512 df1e0386f88159e00be5954c70ab261371034437ada138129fe36d3acb5d66e60871d290865802c8254acfd51d780933caf8cce38910537655f3c323755794a4 WHIRLPOOL 5fc82d8b111c5c67b7834871a53e952a159d544424b186173a1b71efc191913469896b8c4c4fa3adabd21a92e9ccf1ba3720ae9fe9f19be5b43913061e14056d
DIST keepalived_1.2.2-3.diff.gz 9856 SHA256 104213b98e80c5de7c04ff0a409b88c6aad30f727516f26871fa77dcbdc74aa6 SHA512 d42dc7c591e4134e155e4e8db3cb7ccbf5098f02f09cb9ecfc5b18c43f8c497360018e4584b7f77169b15ca0b28ec84f340dd5c336fc53e3338c62bce0fe1478 WHIRLPOOL 4eefb8765fc78365472687af6d2742c1cdb3eb2ee0e3d0570e5c82e478054547797aaa823786bae73a31bc4b752c334ab6e4784f86f457b140b01ef9a72336aa
diff --git a/sys-cluster/keepalived/keepalived-1.2.21.ebuild b/sys-cluster/keepalived/keepalived-1.2.21.ebuild
new file mode 100644
index 000000000000..4450afaa0fe7
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-1.2.21.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="debug ipv6 snmp"
+
+RDEPEND="dev-libs/popt
+ sys-apps/iproute2
+ dev-libs/libnl:=
+ dev-libs/openssl:=
+ snmp? ( net-analyzer/net-snmp )
+ net-libs/libnfnetlink"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-2.6.30"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.2-libipvs-fix-backup-daemon.patch
+)
+
+DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
+ doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
+
+src_prepare() {
+ eautoreconf
+ default
+}
+
+src_configure() {
+ STRIP=/bin/true \
+ econf \
+ --with-kernel-dir=/usr \
+ --enable-vrrp \
+ $(use_enable debug) \
+ $(use_enable snmp)
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/keepalived.init keepalived
+ newconfd "${FILESDIR}"/keepalived.confd keepalived
+
+ use snmp && dodoc doc/KEEPALIVED-MIB
+
+ docinto genhash
+ dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION
+ # This was badly named by upstream, it's more HOWTO than anything else.
+ newdoc INSTALL INSTALL+HOWTO
+
+ # Security risk to bundle SSL certs
+ rm -f "${ED}"/etc/keepalived/samples/*.pem
+ # Clean up sysvinit files
+ rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
+}
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index afb87dcd8316..5101bd5c7b56 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,5 +1,5 @@
DIST exfat-utils-1.0.1.tar.gz 51905 SHA256 eeacedca1878065dc3886674ae39cd51149c37bd7d6d7e9325c971a1d1acdab3 SHA512 e2716e902110858e33e21395c45881315cbe469cf5192de130031ce989bdcb388944ad22d8588ae1a29d682615809be886086d313d5ab46b3aafa6d356a0e8ac WHIRLPOOL 7d78afd9a37fed433704d8b6873d8ab19bd3d4e5c0e5951961f743768483c9843d51aa7342ec67e36466bb3141085a44c2d6ac6140f23361a4efd0d4ebcc6de1
DIST exfat-utils-1.1.1.tar.gz 48754 SHA256 c64454083961fbad164fa7daef03d7e9247aa978c11395d62a265d48a1d56232 SHA512 d2ebf216a826734937402ff62c020d16c425e092cee5065a48bc7dca9d1e47e5906fc7bf3665ae553d819b0e2e066b1a882ad0bd2a6ab6caed50565f431ee253 WHIRLPOOL be4beda5a8dfa173553f9d03f019814195aa07506a0d6e31c7682b2f994e88e6673566f46dab77ad28784fd9551e0fe8d8f5e24922388f2fbdd181010c05fa7a
DIST exfat-utils-1.2.1.tar.gz 166102 SHA256 a91bd60c1a05e5421da46a1f7cdca19d6db85f2de0afedf8f0f5ff77f8edbcb4 SHA512 b441add3f8f0c663bcf048cd899a5b0aa32a9fcb452e6e8f80fe3ea305a4792be949ffd7d1e390755e7880fd6bb4050d230062c1562d361677ed7bce33545ba3 WHIRLPOOL 6a9548da7dd990759798197de5a027a47c8e431766cf3361cdd1196f757fc52057fb679caa60aca2761924bd166bf7431bcc455683be86fed2ab34d2ecde8389
-DIST exfat-utils-1.2.2.tar.gz 166316 SHA256 60e33b51db5a8f79b035031bc61b120cdac3075dd27fad156ece4feeb82871f7 SHA512 bd3c4d57b05aee7064e05a8af7ff8d7a1bf7b9a891d804c45fb6c5fcc19d877b75a25c32cfee462133f203a1bead3a65c40d5e32061b5dc4943f36c2a961c2b8 WHIRLPOOL 34fa9cefdfc1f1ed15e11410a43138ade7f2b5a3551ad04279c6c22e9b11198cbf55ba60b84621ded7f834f3086c76223042bd47ca2a77d7158040ca283e457b
DIST exfat-utils-1.2.3.tar.gz 166911 SHA256 80d3b3f21242d60d36a38a4ddb05cb7cc3a7d4eef5793e8314814937b938fcea SHA512 1dd6af4bd20174a0e32a68fa66bd3d8f64820e580fd136e145efc6dfa68afc2496c9e640dcad4551e1efeffffcfdc2183440fcd05f21c52d5412a8514bdc5d81 WHIRLPOOL 10be5659e65df9fe42b72f115621d62b1d8d7fa28354d420e30c7f340eae3ddca2738f27005abad877845e9844cb47227c86e382d5c9945d36431837401a4769
+DIST exfat-utils-1.2.4.tar.gz 167004 SHA256 6aa51926416b9d0977b456902f4c4cd10bcce4b2d160859a7a2fc9ca6bcbbb11 SHA512 88c012b535a761493b7c417fad6d1cdafdfb71a5a7e29279e73c7220111edc51bf2e9857f9f3b786b7324227db5ea7b919b599c5b44b6e121fae004a7bdc15e5 WHIRLPOOL 2a14db7589816ee5e183a763b2f0c25ec20bf8f453e46d45d023302a9715b8a9a0de03803a5ea4df36dc732503d935f8d46edd1288ecd323fda88d6545be2a57
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.2.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.4.ebuild
similarity index 73%
rename from sys-fs/exfat-utils/exfat-utils-1.2.2.ebuild
rename to sys-fs/exfat-utils/exfat-utils-1.2.4.ebuild
index 6db7bfda3d39..329f401f7c15 100644
--- a/sys-fs/exfat-utils/exfat-utils-1.2.2.ebuild
+++ b/sys-fs/exfat-utils/exfat-utils-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,8 +13,10 @@ LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+DOCS=( ChangeLog )
+
src_install() {
- emake DESTDIR="${D}" install
- dodoc ChangeLog
- doman dump/dumpexfat.8 fsck/exfatfsck.8 label/exfatlabel.8 mkfs/mkexfatfs.8
+ default
+ dosym exfatfsck.8 /usr/share/man/man8/fsck.exfat.8
+ dosym mkexfatfs.8 /usr/share/man/man8/mkfs.exfat.8
}
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index aadf09dbcf1d..b56f564aef69 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -1,4 +1,4 @@
DIST fuse-exfat-1.0.1.tar.gz 39627 SHA256 12ac1ba1b7d4343bef64e7898176705a41cfe3b5a7a179e28549d242e2854758 SHA512 e444031e7a6b999b3014ced255447bdfe4586b16970f36393706433262ca0cbd17911d6ca7af3465871f3136bdd9c8be2ec85f0dd124d670b240829093d341f6 WHIRLPOOL 521e1bc9356e2fcef7afc7720f5a4b017aa908f58af1537bc243ebfdfb6ba41dcba3cdb8d9e5b526e2333d93fffe4d0ffc5b29b9025387088f5b486393e5bf7c
DIST fuse-exfat-1.1.0.tar.gz 36677 SHA256 198c520e417e955dc5c08687c278e63eefa56719da4452aa4a605be0327f953e SHA512 60280687c9adea3955fd85f003482e9d40163924837e5dcac4205c2bd02318c8ea280103a509213e83a04d390507f15dfe3cd3ecc03e9b90abcf4cef7e830398 WHIRLPOOL 86c029c13287b9b7b0b4d7798f7eef9dfad37bc05b5cbb836cd71539f78b0bcfeeffd7d2d35c3b4c55ca259b8ed1f0d6ea68bad23b3304c36775c20717b38a35
-DIST fuse-exfat-1.2.2.tar.gz 135181 SHA256 c93b4d10bd548db205b7c491c43cabf510e4817716460322f5f645739c54cdca SHA512 26f73017a36b072d2c7905358cb2236cdfbd55ddb94c554a0bfd8520ffc6c0366f3c40497d18eefb2a27a55c3531f7d6fabec1882802ad6961603ada89229c4a WHIRLPOOL db4ae9a3ce10cd5650d4a9f649c50717f1b08fe4d69d921b5479b93d666abeea03a7af0e9bd19e4bf0e1799e1cbeec7ec5b669b4dccc981ac363961ab762ae48
DIST fuse-exfat-1.2.3.tar.gz 135715 SHA256 f2e06eba5a21c621aac1d6da21b12a5a324fdd1e20f9c8acd357dd463c2355d9 SHA512 960f24325af3604a6c3643462e53c989e0b06cafd8cfc1ac8872a37fe149d106d0155fe578f2d8f15f330c51f1bc653d296f01b1adf7aa7028a9d8a73215f692 WHIRLPOOL 3c7b77d9760265dacf16499f0ec0cbf96cc2086d7f3d6d0f4cc68955acd6e2e26ef7475e642471bf717fd9ef8babc5419487e14d1cb8672ee430e667fba7e368
+DIST fuse-exfat-1.2.4.tar.gz 136048 SHA256 9312d23a5d82543ad2e9ab7f0a0b471aea53eeb8eae664451c881b46d849756e SHA512 e425df39b205de017250ae29231a1d485649710fa08d6c46f2c831e3ff6a696f20e5bf2086d7803b992edc7e9296ee28df5cf1321cc21183f96e373aa3b5fcd9 WHIRLPOOL 1168756eee2698a6bd14412a618d33b2769dad0d6aedef46317efb1c50b2f546c0fab25ab9faa39914e7b4111416cd854b0639de07928356d8418bf3df4401c3
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.2.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.4.ebuild
similarity index 80%
rename from sys-fs/fuse-exfat/fuse-exfat-1.2.2.ebuild
rename to sys-fs/fuse-exfat/fuse-exfat-1.2.4.ebuild
index 3be1dfcff933..c09926b47693 100644
--- a/sys-fs/fuse-exfat/fuse-exfat-1.2.2.ebuild
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,8 +17,9 @@ RDEPEND="sys-fs/fuse"
DEPEND="${RDEPEND}
virtual/pkgconfig"
+DOCS=( ChangeLog )
+
src_install() {
- emake DESTDIR="${D}" install
- dodoc ChangeLog
- doman fuse/mount.exfat-fuse.8
+ default
+ dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8
}
diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index 1ee220bf953a..6384d9133289 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -1,3 +1,2 @@
-DIST reiserfsprogs-3.6.21.tar.gz 423521 SHA256 cc87cecd5c259665aae46a7760525486767e1ace6da833a4f1a616a58b5ad092 SHA512 fd7e96a75aec9f8db205aaa81f5508c3bd11d550dd54a158e3c5e15ecc39cd013ff4628d622f66bc15a3597c2f763c12696fda87a350ff4dfcbc3566979edc23 WHIRLPOOL b4ed0944cca82ae964412f62f1024688e8c83552c10c61f6bb27e936dde6e55fd856847ebd0450114d675c994213a5a7c96421c6506434c5c60accf86faf054e
-DIST reiserfsprogs-3.6.23.tar.xz 311524 SHA256 022350675117a8b07d736240b16f01c8ffcc07a0bdf997a4c16818902fc6bb75 SHA512 31039a0758148680a1f4e34b4c030f4c947732d6a0701f3df466b76509d72df5d2c8ac3e760d4ddc1edba9a229297d02ae0e4549ff9875217e75fecade76f2d6 WHIRLPOOL 4dd601d7aea8f5a57295c8704f0d4200c1716b32c5a4ea2de91a9406db097b54add1fe34b721d4dfce05d88329f20722547f23b73acc909416ef306ab690b7b8
DIST reiserfsprogs-3.6.24.tar.xz 316444 SHA256 7e44fefe557d68a642191428210f3d64d80283b9ad0e45c24130f6ce936b0760 SHA512 183cda8c1bef375a9e90b6bfcbbbe7cc901f12890be29551e74950c723b0ae565786be86f69cba2a5d8b2f9014d22f6f3bdf277d666d4b6bea15406cb2803a42 WHIRLPOOL 1046b9ca94e733a1b90c220a122d41cb933522e39244b6c6de987de1eefe9a2712a3a7dbaf5de64f2c76de1eb9b43c3fe0650fc3ac11929951956a91ea92e571
+DIST reiserfsprogs-3.6.25.tar.xz 448984 SHA256 fb1199405af8b8af609e9e97054de8f0d05b6cc2b6727713db92ed5e2919d20d SHA512 247ca392d227680fb24e94cd490319e77e82d00d7d357516690d2cab6f0bbe8b35879f8a25ed5046bd3a7a3e1f2b140a8a82404043aa0e7f6f60f57d069857ae WHIRLPOOL d467ae27729a2777fd04578ae62327d71cf34404f9e70c717b07ef385c6d7f830546e3a07b34e9a8ca70cfd0cbdecedec2dd3720129e0c4d9131ad2d9ead3f32
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-fsck-n.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-fsck-n.patch
deleted file mode 100644
index 2146c94d4f36..000000000000
--- a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-fsck-n.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur reiserfsprogs-3.6.19.orig/fsck/main.c reiserfsprogs-3.6.19/fsck/main.c
---- reiserfsprogs-3.6.19.orig/fsck/main.c 2004-10-07 15:04:08.000000000 +0100
-+++ reiserfsprogs-3.6.19/fsck/main.c 2007-05-02 16:05:08.000000000 +0100
-@@ -416,7 +416,7 @@
- (data->log == stdout) ? "stdout" :
- (data->log_file_name ? data->log_file_name : "fsck.run"));
-
-- if (!(data->options & OPT_YES) && !user_confirmed (warn_to, "\nDo you want to "
-+ if (!(data->options & OPT_YES) && !(data->options & OPT_SILENT) && !user_confirmed (warn_to, "\nDo you want to "
- "run this program?[N/Yes] (note need to type Yes if you do):", "Yes\n"))
- exit (EXIT_USER);
- }
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch
deleted file mode 100644
index 5883ce85f827..000000000000
--- a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-backported from 3.6.20
-
-http://bugs.gentoo.org/153494
-
---- include/reiserfs_fs.h
-+++ include/reiserfs_fs.h
-@@ -38,14 +38,22 @@
- # define extern_inline
- #endif
-
--#include
--
- #ifndef get_unaligned
--#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
-- defined(__PPC) || defined(powerpc) || defined(__powerpc__)
--# define get_unaligned(ptr) (*(ptr))
--# define put_unaligned(val,ptr) ((void)(*(ptr) = (val)))
-+#define get_unaligned(ptr) \
-+({ \
-+ __typeof__(*(ptr)) __tmp; \
-+ memcpy(&__tmp, (ptr), sizeof(*(ptr))); \
-+ __tmp; \
-+})
- #endif
-+
-+#ifndef put_unaligned
-+#define put_unaligned(val, ptr) \
-+({ \
-+ __typeof__(*(ptr)) __tmp = (val); \
-+ memcpy((ptr), &__tmp, sizeof(*(ptr))); \
-+ (void)0; \
-+})
- #endif
-
- #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field))
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.20-fsck-n.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.20-fsck-n.patch
deleted file mode 100644
index b29133ee65b4..000000000000
--- a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.20-fsck-n.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/utils/fsck/main.c b/utils/fsck/main.c
---- a/utils/fsck/main.c 2006-03-28 13:40:23.000000000 +0100
-+++ b/utils/fsck/main.c 2007-08-02 10:13:53.000000000 +0100
-@@ -421,7 +421,7 @@
- (data->log == stdout) ? "stdout" :
- (data->log_file_name ? data->log_file_name : "fsck.run"));
-
-- if (!(data->options & OPT_YES)) {
-+ if (!(data->options & OPT_YES) && !(data->options & OPT_SILENT)) {
- if (!util_user_confirmed(warn_to, "\nDo you want to run this "
- "program?[N/Yes] (note need to type "
- "Yes if you do):", "Yes\n"))
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.21-fix_large_fs.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.21-fix_large_fs.patch
deleted file mode 100644
index a214440a5393..000000000000
--- a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.21-fix_large_fs.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-From: Jeff Mahoney
-Subject: [PATCH] reiserfs: Fix signedness issues for large file systems
-References: bnc#701602
-
-
-Signed-by: Jeff Mahoney
----
- debugreiserfs/debugreiserfs.c | 22 +++++++++++-----------
- debugreiserfs/pack.c | 18 +++++++++---------
- debugreiserfs/scan.c | 2 +-
- debugreiserfs/stat.c | 2 +-
- fsck/check_tree.c | 6 +++---
- fsck/pass0.c | 10 +++++-----
- fsck/pass1.c | 4 ++--
- include/reiserfs_fs.h | 2 ++
- lib/io.c | 2 +-
- reiserfscore/journal.c | 2 +-
- reiserfscore/prints.c | 14 +++++++-------
- reiserfscore/reiserfslib.c | 5 +++--
- reiserfscore/stree.c | 2 +-
- 13 files changed, 47 insertions(+), 44 deletions(-)
-
---- a/debugreiserfs/debugreiserfs.c
-+++ b/debugreiserfs/debugreiserfs.c
-@@ -59,11 +59,11 @@ Options:\n\
-
- #if 1
- struct reiserfs_fsstat {
-- int nr_internals;
-- int nr_leaves;
-- int nr_files;
-- int nr_directories;
-- int nr_unformatted;
-+ unsigned int nr_internals;
-+ unsigned int nr_leaves;
-+ unsigned int nr_files;
-+ unsigned int nr_directories;
-+ unsigned int nr_unformatted;
- } g_stat_info;
- #endif
-
-@@ -465,14 +465,14 @@ static void init_bitmap (reiserfs_filsys
- case ALL_BLOCKS:
- input_bitmap (fs) = reiserfs_create_bitmap (block_count);
- reiserfs_bitmap_fill (input_bitmap (fs));
-- reiserfs_warning (stderr, "Whole device (%d blocks) is to be scanned\n",
-+ reiserfs_warning (stderr, "Whole device (%u blocks) is to be scanned\n",
- reiserfs_bitmap_ones (input_bitmap (fs)));
- break;
- case USED_BLOCKS:
- reiserfs_warning (stderr, "Loading on-disk bitmap .. ");
- input_bitmap (fs) = reiserfs_create_bitmap (block_count);
- reiserfs_bitmap_copy (input_bitmap (fs), fs->fs_bitmap2);
-- reiserfs_warning (stderr, "%d bits set - done\n",
-+ reiserfs_warning (stderr, "%lu bits set - done\n",
- reiserfs_bitmap_ones (input_bitmap (fs)));
- break;
- case UNUSED_BLOCKS:
-@@ -480,7 +480,7 @@ static void init_bitmap (reiserfs_filsys
- input_bitmap (fs) = reiserfs_create_bitmap (block_count);
- reiserfs_bitmap_copy (input_bitmap (fs), fs->fs_bitmap2);
- reiserfs_bitmap_invert (input_bitmap (fs));
-- reiserfs_warning (stderr, "%d bits set - done\n",
-+ reiserfs_warning (stderr, "%lu bits set - done\n",
- reiserfs_bitmap_ones (input_bitmap (fs)));
- break;
- case EXTERN_BITMAP:
-@@ -494,7 +494,7 @@ static void init_bitmap (reiserfs_filsys
- reiserfs_exit (1, "could not load fitmap from \"%s\"",
- input_bitmap_file_name(fs));
- }
-- reiserfs_warning (stderr, "%d blocks marked in the given bitmap\n",
-+ reiserfs_warning (stderr, "%u blocks marked in the given bitmap\n",
- reiserfs_bitmap_ones (input_bitmap (fs)));
- fclose (fp);
- break;
-@@ -554,8 +554,8 @@ static void do_dump_tree (reiserfs_filsy
- }
-
- /* print the statistic */
-- printf ("\t%d internal + %d leaves + %d "
-- "unformatted nodes = %d blocks\n",
-+ printf ("\t%u internal + %u leaves + %u "
-+ "unformatted nodes = %u blocks\n",
- g_stat_info.nr_internals, g_stat_info.nr_leaves,
- g_stat_info.nr_unformatted, g_stat_info.nr_internals +
- g_stat_info.nr_leaves + g_stat_info.nr_unformatted);
---- a/debugreiserfs/pack.c
-+++ b/debugreiserfs/pack.c
-@@ -8,7 +8,7 @@
-
-
- /* counters for each kind of blocks */
--int packed,
-+unsigned int packed,
- packed_leaves,
- full_blocks,
- having_ih_array, /* blocks with broken block head */
-@@ -638,7 +638,7 @@ static void pack_frozen_data (reiserfs_f
- }
- reiserfs_warning (stderr, "ok\n");fflush (stderr);
- reiserfs_warning (stderr,
-- "Super block, bitmaps, journal - %d blocks - done, %d blocks left\n",
-+ "Super block, bitmaps, journal - %u blocks - done, %u blocks left\n",
- packed, reiserfs_bitmap_ones (what_to_pack));
- }
-
-@@ -693,13 +693,13 @@ void pack_partition (reiserfs_filsys_t *
- magic16 = END_MAGIC;
- fwrite_le16 (&magic16);
-
-- fprintf (stderr, "\nPacked %d blocks:\n"
-- "\tcompessed %d\n"
-- "\tfull blocks %d\n"
-- "\t\tleaves with broken block head %d\n"
-- "\t\tcorrupted leaves %d\n"
-- "\t\tinternals %d\n"
-- "\t\tdescriptors %d\n",
-+ fprintf (stderr, "\nPacked %u blocks:\n"
-+ "\tcompessed %u\n"
-+ "\tfull blocks %u\n"
-+ "\t\tleaves with broken block head %u\n"
-+ "\t\tcorrupted leaves %u\n"
-+ "\t\tinternals %u\n"
-+ "\t\tdescriptors %u\n",
- packed,
- packed_leaves, full_blocks, having_ih_array,
- bad_leaves, internals, descs);
---- a/debugreiserfs/scan.c
-+++ b/debugreiserfs/scan.c
-@@ -1032,7 +1032,7 @@ void do_scan (reiserfs_filsys_t * fs)
- /* step 2: */
- done = 0;
- total = reiserfs_bitmap_ones (input_bitmap (fs));
-- printf ("%ld bits set in bitmap\n", total);
-+ printf ("%lu bits set in bitmap\n", total);
- for (i = 0; i < get_sb_block_count (fs->fs_ondisk_sb); i ++) {
- int type;
-
---- a/debugreiserfs/stat.c
-+++ b/debugreiserfs/stat.c
-@@ -245,7 +245,7 @@ void do_stat (reiserfs_filsys_t * fs)
- reiserfs_exit (1, "could not open %s to save bitmap: %m\n",
- input_bitmap_file_name(fs));
- }
-- reiserfs_warning (stderr, "Updated bitmap contains %d blocks marked\n",
-+ reiserfs_warning (stderr, "Updated bitmap contains %u blocks marked\n",
- reiserfs_bitmap_ones (input_bitmap (fs)));
-
- reiserfs_bitmap_save (fp, input_bitmap (fs));
---- a/fsck/check_tree.c
-+++ b/fsck/check_tree.c
-@@ -119,7 +119,7 @@ static int is_block_free (reiserfs_filsy
- }
-
-
--/*static int hits = 0;*/
-+/*static unsigned int hits = 0;*/
-
- /* we have seen this block in the tree, mark corresponding bit in the
- control bitmap */
-@@ -156,7 +156,7 @@ static void init_control_bitmap (reiserf
- for (i = 0; i <= fs->fs_super_bh->b_blocknr; i ++)
- we_met_it (i);
-
-- /*printf ("SKIPPED: %d blocks marked used (%d)\n", hits,
-+ /*printf ("SKIPPED: %u blocks marked used (%d)\n", hits,
- reiserfs_bitmap_zeros (control_bitmap));
- hits = 0;*/
-
-@@ -172,7 +172,7 @@ static void init_control_bitmap (reiserf
- block ++;
- }
-
-- /*printf ("BITMAPS: %d blocks marked used (%d)\n", hits,
-+ /*printf ("BITMAPS: %u blocks marked used (%d)\n", hits,
- reiserfs_bitmap_zeros (control_bitmap));
-
- hits = 0;*/
---- a/fsck/pass0.c
-+++ b/fsck/pass0.c
-@@ -1759,7 +1759,7 @@ static void init_source_bitmap (reiserfs
- case ALL_BLOCKS:
- fsck_source_bitmap (fs) = reiserfs_create_bitmap (block_count);
- reiserfs_bitmap_fill (fsck_source_bitmap (fs));
-- fsck_progress ("The whole partition (%d blocks) is to be scanned\n",
-+ fsck_progress ("The whole partition (%u blocks) is to be scanned\n",
- reiserfs_bitmap_ones (fsck_source_bitmap (fs)));
- break;
-
-@@ -1768,7 +1768,7 @@ static void init_source_bitmap (reiserfs
- fsck_source_bitmap (fs) = reiserfs_create_bitmap (block_count);
- reiserfs_bitmap_copy (fsck_source_bitmap (fs), fs->fs_bitmap2);
-
-- fsck_progress ("ok, %d blocks marked used\n",
-+ fsck_progress ("ok, %u blocks marked used\n",
- reiserfs_bitmap_ones (fsck_source_bitmap (fs)));
- break;
-
-@@ -1787,7 +1787,7 @@ static void init_source_bitmap (reiserfs
- fsck_data (fs)->rebuild.bitmap_file_name);
- }
-
-- fsck_progress ("%d blocks marked used in extern bitmap\n",
-+ fsck_progress ("%u blocks marked used in extern bitmap\n",
- reiserfs_bitmap_ones (fsck_source_bitmap (fs)));
- fclose (fp);
- break;
-@@ -1863,8 +1863,8 @@ static void init_source_bitmap (reiserfs
-
- fsck_source_bitmap (fs)->bm_set_bits = reiserfs_bitmap_ones (fsck_source_bitmap (fs));
-
-- fsck_progress ("Skipping %d blocks (super block, journal, "
-- "bitmaps) %d blocks will be read\n", tmp, fsck_source_bitmap (fs)->bm_set_bits);
-+ fsck_progress ("Skipping %u blocks (super block, journal, "
-+ "bitmaps) %u blocks will be read\n", tmp, fsck_source_bitmap (fs)->bm_set_bits);
-
- }
-
---- a/fsck/pass1.c
-+++ b/fsck/pass1.c
-@@ -646,8 +646,8 @@ void load_pass_1_result (FILE * fp, reis
- fetch_objectid_map (proper_id_map (fs), fs);
- */
-
-- fsck_progress ("Pass 1 result loaded. %d blocks used, %d allocable, "
-- "still to be inserted %d\n",
-+ fsck_progress ("Pass 1 result loaded. %u blocks used, %u allocable, "
-+ "still to be inserted %u\n",
- reiserfs_bitmap_ones (fsck_new_bitmap (fs)),
- reiserfs_bitmap_zeros (fsck_allocable_bitmap (fs)),
- reiserfs_bitmap_zeros (fsck_uninsertables (fs)));
---- a/include/reiserfs_fs.h
-+++ b/include/reiserfs_fs.h
-@@ -32,6 +32,8 @@
- #ifndef REISERFSPROGS_FS_H
- #define REISERFSPRIGS_FS_H
-
-+typedef unsigned int blocknr_t;
-+
- #ifndef NO_EXTERN_INLINE
- # define extern_inline extern inline
- #else
---- a/lib/io.c
-+++ b/lib/io.c
-@@ -628,7 +628,7 @@ void close_rollback_file () {
- return;
- fwrite (&rollback_blocks_number, sizeof (rollback_blocksize), 1, s_rollback_file);
- if (log_file != 0)
-- fprintf (log_file, "rollback: %d blocks backed up\n", rollback_blocks_number);
-+ fprintf (log_file, "rollback: %u blocks backed up\n", rollback_blocks_number);
- }
-
- fclose (s_rollback_file);
---- a/reiserfscore/journal.c
-+++ b/reiserfscore/journal.c
-@@ -577,7 +577,7 @@ int reiserfs_create_journal(
- {
- /* host device does not contain enough blocks */
- reiserfs_warning (stderr, "reiserfs_create_journal: cannot create "
-- "a journal of %lu blocks with %lu offset on %d blocks\n",
-+ "a journal of %lu blocks with %lu offset on %u blocks\n",
- len, offset, get_sb_block_count(sb));
- return 0;
- }
---- a/reiserfscore/prints.c
-+++ b/reiserfscore/prints.c
-@@ -148,7 +148,7 @@ static int print_disk_child (FILE * stre
- int len;
-
- dc = *((const struct disk_child **)(args[0]));
-- len = asprintf (&buffer, "[dc_number=%u, dc_size=%u]", get_dc_child_blocknr (dc),
-+ len = asprintf (&buffer, "[dc_number=%lu, dc_size=%u]", get_dc_child_blocknr (dc),
- get_dc_child_size (dc));
- FPRINTF;
- }
-@@ -373,9 +373,9 @@ static void print_sequence (FILE * fp, _
- return;
-
- if (len == 1)
-- reiserfs_warning (fp, " %d", le32_to_cpu (start));
-+ reiserfs_warning (fp, " %u", le32_to_cpu (start));
- else
-- reiserfs_warning (fp, " %d(%d)", le32_to_cpu (start), len);
-+ reiserfs_warning (fp, " %u(%d)", le32_to_cpu (start), len);
- }
-
-
-@@ -491,7 +491,7 @@ static int print_internal (FILE * fp, st
- to = last < B_NR_ITEMS (bh) ? last : B_NR_ITEMS (bh);
- }
-
-- reiserfs_warning (fp, "INTERNAL NODE (%ld) contains %b\n", bh->b_blocknr, bh);
-+ reiserfs_warning (fp, "INTERNAL NODE (%lu) contains %b\n", bh->b_blocknr, bh);
-
- dc = B_N_CHILD (bh, from);
- reiserfs_warning (fp, "PTR %d: %y ", from, dc);
-@@ -527,7 +527,7 @@ static int print_leaf (FILE * fp, reiser
-
- reiserfs_warning (fp,
- "\n===================================================================\n");
-- reiserfs_warning (fp, "LEAF NODE (%ld) contains %b (real items %d)\n",
-+ reiserfs_warning (fp, "LEAF NODE (%lu) contains %b (real items %d)\n",
- bh->b_blocknr, bh, real_nr);
-
- if (!(print_mode & PRINT_TREE_DETAILS)) {
-@@ -761,7 +761,7 @@ void print_block (FILE * fp, reiserfs_fi
- if (print_super_block (fp, fs, file_name, bh, 0))
- if (print_leaf (fp, fs, bh, mode, first, last))
- if (print_internal (fp, bh, first, last))
-- reiserfs_warning (fp, "Block %ld contains unformatted data\n", bh->b_blocknr);
-+ reiserfs_warning (fp, "Block %lu contains unformatted data\n", bh->b_blocknr);
- }
-
-
-@@ -797,7 +797,7 @@ void print_tb (int mode, int item_pos, i
- tbSh = 0;
- tbFh = 0;
- }
-- printf ("* %u * %3lu(%2lu) * %3lu(%2lu) * %3lu(%2lu) * %5ld * %5ld * %5ld * %5ld * %5ld *\n",
-+ printf ("* %u * %3lu(%2lu) * %3lu(%2lu) * %3lu(%2lu) * %5lu * %5lu * %5lu * %5lu * %5lu *\n",
- h,
- tbSh ? tbSh->b_blocknr : ~0ul,
- tbSh ? tbSh->b_count : ~0ul,
---- a/reiserfscore/reiserfslib.c
-+++ b/reiserfscore/reiserfslib.c
-@@ -59,7 +59,8 @@ reiserfs_filsys_t * reiserfs_open (char
- reiserfs_filsys_t * fs;
- struct buffer_head * bh;
- struct reiserfs_super_block * sb;
-- int fd, i;
-+ int fd;
-+ unsigned int i;
-
- /* convert root dir key and parent root dir key to little endian format */
- make_const_keys ();
-@@ -200,7 +201,7 @@ reiserfs_filsys_t * reiserfs_create (cha
- block_size, block_count, 0))
- {
- reiserfs_warning (stderr, "reiserfs_create: can not create that small "
-- "(%d blocks) filesystem\n", block_count);
-+ "(%u blocks) filesystem\n", block_count);
- return 0;
- }
-
---- a/reiserfscore/stree.c
-+++ b/reiserfscore/stree.c
-@@ -313,7 +313,7 @@ int search_by_key (reiserfs_filsys_t * f
- int n_stop_level) /* How far down the tree to search.*/
- {
- struct reiserfs_super_block * sb;
-- int n_block_number,
-+ unsigned int n_block_number,
- expected_level,
- n_block_size = fs->fs_blocksize;
- struct buffer_head * p_s_bh;
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.21-fsck-n.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.21-fsck-n.patch
deleted file mode 100644
index 0eacd22f66d3..000000000000
--- a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.21-fsck-n.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- fsck/main.c
-+++ fsck/main.c
-@@ -421,8 +421,9 @@
- (data->log == stdout) ? "stdout" :
- (data->log_file_name ? data->log_file_name : "fsck.run"));
-
-- if (!(data->options & OPT_YES) && !user_confirmed (warn_to, "\nDo you want to "
-- "run this program?[N/Yes] (note need to type Yes if you do):", "Yes\n"))
-+ if (!(data->options & OPT_YES) && !(data->options & OPT_SILENT) &&
-+ !user_confirmed (warn_to, "\nDo you want to run this program?[N/Yes] "
-+ "(note need to type Yes if you do):", "Yes\n"))
- exit (EXIT_USER);
- }
-
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.21-r1.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.21-r1.ebuild
deleted file mode 100644
index fa5a10109d1a..000000000000
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.21-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Reiserfs Utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiserfs/"
-SRC_URI="mirror://kernel/linux/utils/fs/reiserfs/${P}.tar.gz
- mirror://kernel/linux/kernel/people/jeffm/${PN}/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fsck-n.patch
- epatch "${FILESDIR}"/${P}-fix_large_fs.patch
-}
-
-src_configure() {
- econf --prefix="${EPREFIX}/"
-}
-
-src_install() {
- default
- dosym reiserfsck /sbin/fsck.reiserfs
- dosym mkreiserfs /sbin/mkfs.reiserfs
-}
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.23.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.23.ebuild
deleted file mode 100644
index 61934fc3a165..000000000000
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.23.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic
-
-DESCRIPTION="Reiserfs Utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiserfs/"
-SRC_URI="mirror://kernel/linux/utils/fs/reiserfs/${P}.tar.xz
- mirror://kernel/linux/kernel/people/jeffm/${PN}/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_configure() {
- append-flags -std=gnu89 #427300
- econf --prefix="${EPREFIX}/"
-}
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
new file mode 100644
index 000000000000..b0a9ab759740
--- /dev/null
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Reiserfs Utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiserfs/"
+SRC_URI="mirror://kernel/linux/utils/fs/reiserfs/${P}.tar.xz
+ mirror://kernel/linux/kernel/people/jeffm/${PN}/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+src_configure() {
+ append-flags -std=gnu89 #427300
+ econf \
+ --bindir="${EPREFIX}/bin" \
+ --libdir="${EPREFIX}/$(get_libdir)" \
+ --sbindir="${EPREFIX}/sbin" \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ dodir /usr/$(get_libdir)
+ mv "${D}"/$(get_libdir)/pkgconfig "${D}"/usr/$(get_libdir) || die
+
+ if use static-libs ; then
+ mv "${D}"/$(get_libdir)/*a "${D}"/usr/$(get_libdir) || die
+ gen_usr_ldscript libreiserfscore.so
+ else
+ find "${D}" -type f \( -name "*.a" -o -name "*.la" \) -delete
+ fi
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index e38646d0bf18..81ab38618aa4 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,7 +9,7 @@ DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc0
DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
DIST linux-4.5.tar.xz 88375040 SHA256 a40defb401e01b37d6b8c8ad5c1bbab665be6ac6310cdeed59950c96b31a519c SHA512 cb0d5f30baff37dfea40fbc1119a1482182f95858c883e019ee3f81055c8efbdb9dba7dfc02ebcc4216db38f03ece58688e69efc0fce1dade359af30bd5426de WHIRLPOOL 8faa0b02c5733fc45dbe61f82a7022e9246b9b1665f27541d4afa5d14c310b9dce7a8532dfac8273898edf8c6923654ee2fbcf2cec1ec2a220f4c9f926f2b333
DIST linux-4.6.tar.xz 89461728 SHA256 a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866 SHA512 df5ee40b0ebd89914a900f63c32a481cb4f405d8f792b2d03ea167ce9c5bdf75154c7bd8ecd7ebac77a8dbf2b077c972cbfe6b95163e27c38c1fefc6ddbdfa0b WHIRLPOOL 50ee28a06930ffb29ade1aa5fb4e3bf165ead92cb660dc6771a265cdbc2240713ebf14fe235fa153d8b6e3ab853852ea06c2525209cd7989aa3d6f6fad5b7edf
-DIST patch-3.10.101.xz 1269636 SHA256 6a23fe951e7c4f50b4b0ca54bc31a3190406327dfb44be91b351ad13cad39e4b SHA512 90dc8a22653fbfda1214d382ae59408cd37479fe6e466d0ff66d13a2a44fd1c6a72e5c8658d0df39bb18d4306e58303d843fafdf527bd6d9b54386202059e80e WHIRLPOOL 21364bf10c635cc941f8eedd726c267a0273ccc75c9cdc98f8a99d1a02f7cdebaf21dee46e8e133c6f45e8f0fc62b9a149a8cb99924a268e0c7d5ba8c2df44b3
+DIST patch-3.10.102.xz 1295268 SHA256 148be5b90ce84a86bf23f8984808680696db19c08e97dcbb2a76bea2c9568c5d SHA512 bbe6d9c416ec34e34f6fc695b066c6b4b1be1737a5f263e7e3a3d41044f0c4b702008a75c0da00148b9550e4a3e927025d3463f5cb2229b4e19413f3aa1c2b6d WHIRLPOOL f0dda5840d0927d68731695eb80bab0531f5a7d1570bd916b8b884801c410e0e603e82f0220f78f65e4abd96a24ae072c394231fa3f39c52594cb3cc701f9ff1
DIST patch-3.12.60.xz 1561240 SHA256 281de62e6d3c5908285b14dfb8385c62b4ca3405fb79f50ce8225a853e417e8a SHA512 ffb15e5d7e9cc3005cce6e68a32f399f01f1ac6f3c1c70cd6962fe02ba4ff2acb270ae0ade1e5d2ae8f85a8417e7c182cede1976e0f040df0de6c19b5cd9d19f WHIRLPOOL 724a4702b033db3720014c83ebbaabcec0141a34f8c6c31dd4b27a653b1ace04c176ff92c0e7283481c327e01bc447f8d55d253b01cd6355399ea16af2c6fa82
DIST patch-3.14.72.xz 1173464 SHA256 8069809c0b47f62d789676f660d2049314f5d4d8a8ad24e2567dd7a541d3174c SHA512 3b491a9aa9102d442429eb49eb97a6f2460ea9142b17f40a929c58f1604cead87b6e484deae60d6c9ee8770b6c3a8f37d12a0146901345d096077d998c3904b6 WHIRLPOOL 719de3fbeeba4cb014c79940fd0c9cf49856d99d85934d694ddc79e0cf05ec4b8199f41bafbbfdb72420c1d2b59ccdbb12fb1ba6810c8c2b7aea561cdd55bf5c
DIST patch-3.16.35.xz 1203316 SHA256 721c550daf6caf0d6910787097fee9b4f5ed74daeee913bb3a0ad33bb45acf58 SHA512 c23591049f4fe8b5d4e5b473a0209c779ac32d9eb365477bf75fbe68ccb9dcc5e2958b2df22111d8cdd7b5a982bbc04232e0d18f6999432560432a5ac4354ffd WHIRLPOOL ebed71eb081d80d50318a858ba6b5ef78d5ae9b664638ec0fc58c02ba94b2b3202e9c1493013c3c3527975eca8f9596cd879a6084eb63606c17d994b65112b6f
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.10.101.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.102.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.10.101.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.10.102.ebuild
diff --git a/sys-libs/libunwind/libunwind-1.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.1-r1.ebuild
index 03557aca160a..6275ae2dda3d 100644
--- a/sys-libs/libunwind/libunwind-1.1-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.nongnu.org/releases/libunwind/${P}.tar.gz"
LICENSE="MIT"
SLOT="7"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="debug debug-frame libatomic lzma static-libs"
RESTRICT="test" #461958 -- re-enable tests with >1.1 again for retesting, this is here for #461394
diff --git a/sys-process/criu/criu-2.2.ebuild b/sys-process/criu/criu-2.2.ebuild
index c18ed46f68aa..a2bb1740da98 100644
--- a/sys-process/criu/criu-2.2.ebuild
+++ b/sys-process/criu/criu-2.2.ebuild
@@ -38,6 +38,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PV}/${P}-flags.patch
"${FILESDIR}"/${PV}/${P}-makefile.patch
+ "${FILESDIR}"/${PV}/${P}-no-git.patch
"${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
)
diff --git a/sys-process/criu/files/2.2/criu-2.2-no-git.patch b/sys-process/criu/files/2.2/criu-2.2-no-git.patch
new file mode 100644
index 000000000000..0622225c2905
--- /dev/null
+++ b/sys-process/criu/files/2.2/criu-2.2-no-git.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index 7c85403..20992ed 100644
+--- a/Makefile
++++ b/Makefile
+@@ -179,9 +179,9 @@ test: zdtm
+ # Generating tar requires tag matched CRIU_VERSION.
+ # If not found then simply use GIT's describe with
+ # "v" prefix stripped.
+-head-name := $(shell git tag -l v$(CRIU_VERSION))
++head-name := $(shell if [ -d ".git" ]; then git tag -l v$(CRIU_VERSION); fi)
+ ifeq ($(head-name),)
+- head-name := $(shell git describe)
++ head-name := $(shell if [ -d ".git" ]; then git describe; fi)
+ endif
+ tar-name := $(shell echo $(head-name) | sed -e 's/^v//g')
+ criu-$(tar-name).tar.bz2:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3eb7012ce86e..4c677ff307ce 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,4 +4,6 @@ DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568e
DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966
-DIST apache-tomcat-9.0.0.M6-src.tar.gz 5023823 SHA256 7217416b1c6470f3653d978bbfdb153693aef74929da21c5823117a168992b2a SHA512 712a93d71bef2f6dbdd35d32cbf200045bacc1a27426cb9f92e3a645a7f59f3611adebebdc24168de569cea2c64500ea893acfba05670947f53d72abec0988f1 WHIRLPOOL fb98d23ac462cef450d1ed8c88eb8be88a0aad32b24cf1b5c8437e51966bfb3d5222a3368ea54a2f19b0be38118b3148bf7549d2d59f1c8267aaa29246ef1d62
+DIST apache-tomcat-8.0.36-src.tar.gz 4988679 SHA256 36db67592adda575fc08dd5f0cd3532934d2edb117028e29bdd9f702bf31ab10 SHA512 192a31eb42afdc345fa5ea5f05b03766e70a67841fca9bd9c76bcd47ae1d505fd3cd1fde6bc64e145add2b6a9e88ecc50ab1a0954942704c139ec3c7a6bf7286 WHIRLPOOL da1bb6570d62caedfe83948f2e850ec7e8bdba36925d1f000067864c98b1bd780aabf2f1cbcb66cb544db292156a98819e9cc6dfa42a345064f09dcc4471a7c3
+DIST apache-tomcat-8.5.3-src.tar.gz 5001008 SHA256 d0d1ecfd88d733cf3666cc39483ea092627840cd2cfab8fae09f93b7bf05d21d SHA512 7c4da46725c6e34669f538f406e699c235b99b4ec47a289f4fcbf93b49a35082cea3e041bee8a2772a29c240521d8720b2b50b5cda7afe0ec0f2b4f5cb29bda5 WHIRLPOOL 2ad999e8ee068d66164e2a256ee58f47799251fab60cf9af3a67128b131a07116a2faf2da6eef132e13f5df6ed78f1c44ac69bf5615178b63452fbffc62a4852
+DIST apache-tomcat-9.0.0.M8-src.tar.gz 5024499 SHA256 bef36f9ead80188a8859fc1fa9846e77e570c54c99c05388857dc6dd29f526f8 SHA512 b1778709bddf6b0d1263115a57c743fcb58286b58dda384b06079ddcab8188a63de48efd3f47b6314c92154dd01c7bd1c8858ac2ea82d20a3d90c80899edcf87 WHIRLPOOL 8083b108a49ac0e066104a5849fcc6ef6c1355c09d9854d50a4108df769384664d0b37aa0cc85f59361a080e73fb585de36916855e1fcef1a441c4225653aca6
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.36-build.xml.patch
similarity index 85%
rename from www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch
rename to www-servers/tomcat/files/tomcat-8.0.36-build.xml.patch
index f5d49c72628d..cefd59f55ae3 100644
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.0.36-build.xml.patch
@@ -1,11 +1,11 @@
-diff --git a/apache-tomcat-9.0.0.M1-src/build.xml b/apache-tomcat-9.0.0.M1-src/build.xml
-index eab0c45..63ac495 100644
---- a/apache-tomcat-9.0.0.M1-src/build.xml
-+++ b/apache-tomcat-9.0.0.M1-src/build.xml
-@@ -711,24 +711,30 @@
+diff --git a/apache-tomcat-8.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml
+index 1ba0dae..81a0a2c 100644
+--- a/apache-tomcat-8.0.36-src/build.xml
++++ b/apache-tomcat-8.0.36-src/build.xml
+@@ -701,24 +701,29 @@
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
+
+
-
+
@@ -50,7 +50,7 @@ index eab0c45..63ac495 100644
-@@ -1069,7 +1075,7 @@
+@@ -1053,7 +1058,7 @@
@@ -59,7 +59,7 @@ index eab0c45..63ac495 100644
-@@ -1103,7 +1109,7 @@
+@@ -1087,7 +1092,7 @@
@@ -68,7 +68,7 @@ index eab0c45..63ac495 100644
@@ -77,7 +77,7 @@ index eab0c45..63ac495 100644
@@ -90,7 +90,7 @@ index eab0c45..63ac495 100644
-@@ -1606,7 +1613,7 @@
+@@ -1594,7 +1600,7 @@
-@@ -1745,7 +1752,7 @@
+@@ -1733,7 +1739,7 @@
-@@ -1940,6 +1947,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
@@ -116,7 +116,7 @@ index eab0c45..63ac495 100644
@@ -124,14 +124,7 @@ index eab0c45..63ac495 100644
-+ maxmemory="512m" >
-
-
+@@ -2027,9 +2035,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
@@ -143,7 +136,7 @@ index eab0c45..63ac495 100644
-@@ -2775,7 +2786,7 @@ skip.installer property in build.properties" />
+@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" />
-@@ -2809,7 +2820,7 @@ skip.installer property in build.properties" />
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
-@@ -2866,7 +2877,7 @@ skip.installer property in build.properties" />
+@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" />
-@@ -2892,18 +2903,18 @@ skip.installer property in build.properties" />
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
@@ -192,7 +185,7 @@ index eab0c45..63ac495 100644
-@@ -2915,7 +2926,7 @@ skip.installer property in build.properties" />
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
@@ -201,7 +194,7 @@ index eab0c45..63ac495 100644
-@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" />
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
@@ -210,7 +203,7 @@ index eab0c45..63ac495 100644
-@@ -2945,7 +2956,7 @@ skip.installer property in build.properties" />
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
@@ -219,7 +212,7 @@ index eab0c45..63ac495 100644
-@@ -2963,7 +2974,7 @@ skip.installer property in build.properties" />
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
@@ -228,7 +221,7 @@ index eab0c45..63ac495 100644
-@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" />
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
@@ -237,7 +230,7 @@ index eab0c45..63ac495 100644
-@@ -2996,7 +3007,7 @@ skip.installer property in build.properties" />
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
@@ -246,7 +239,7 @@ index eab0c45..63ac495 100644
-@@ -3007,7 +3018,7 @@ skip.installer property in build.properties" />
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
@@ -255,7 +248,7 @@ index eab0c45..63ac495 100644
-@@ -3018,7 +3029,7 @@ skip.installer property in build.properties" />
+@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
+
+
++
+
++
+
+
++
+
+
+
+-
++
+
+
+
+@@ -1053,7 +1058,7 @@
+
+
+
+-
++
+
+
+
+@@ -1087,7 +1092,7 @@
+
+
+
+-
++
+
+
+
+
+
+-
++
+
+
+
+
++
+
+@@ -1594,7 +1600,7 @@
+
+
++ description="Prepare to build web services extras package" unless="noget">
+
+
+
+@@ -1733,7 +1739,7 @@
+
+
++ description="Prepare to build web services extras package" unless="noget">
+
+
+
+@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+
+
++
+
+
+
++
+
+
+
+@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" />
+
+
+
++ description="Download (and build) components necessary to compile" unless="noget">
+
+
+
+@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" />
+
+
+
++ description="Download additional components for the tests" unless="noget">
+
+
+
+@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" />
+
+
+
++ description="Download additional components for a distribution" unless="noget">
+
+
+
+@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+
+-
++
+
+
+
+
+-
++
+
+
+
+@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" />
+
+
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+
+
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch
deleted file mode 100644
index fa38d5d27b39..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 2016/05/04 11:07:55 1742251
-+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 2016/05/17 07:18:38 1744194
-@@ -370,40 +370,42 @@
- }
-
- Manifest manifest = jar.getManifest();
-- Attributes attributes = manifest.getMainAttributes();
-- String classPathAttribute = attributes.getValue("Class-Path");
-- if (classPathAttribute == null) {
-- return;
-- }
-- String[] classPathEntries = classPathAttribute.split(" ");
-- for (String classPathEntry : classPathEntries) {
-- classPathEntry = classPathEntry.trim();
-- if (classPathEntry.length() == 0) {
-- continue;
-+ if (manifest != null) {
-+ Attributes attributes = manifest.getMainAttributes();
-+ String classPathAttribute = attributes.getValue("Class-Path");
-+ if (classPathAttribute == null) {
-+ return;
- }
-- URL jarURL = jar.getJarFileURL();
-- URI jarURI;
-- try {
-- jarURI = jarURL.toURI();
-- } catch (URISyntaxException e) {
-- if (log.isDebugEnabled()) {
-- log.debug(sm.getString("jarScan.invalidUri", jarURL));
-+ String[] classPathEntries = classPathAttribute.split(" ");
-+ for (String classPathEntry : classPathEntries) {
-+ classPathEntry = classPathEntry.trim();
-+ if (classPathEntry.length() == 0) {
-+ continue;
-+ }
-+ URL jarURL = jar.getJarFileURL();
-+ URI jarURI;
-+ try {
-+ jarURI = jarURL.toURI();
-+ } catch (URISyntaxException e) {
-+ if (log.isDebugEnabled()) {
-+ log.debug(sm.getString("jarScan.invalidUri", jarURL));
-+ }
-+ continue;
- }
-- continue;
-+ /*
-+ * Note: Resolving the relative URLs from the manifest has the
-+ * potential to introduce security concerns. However, since
-+ * only JARs provided by the container and NOT those provided
-+ * by web applications are processed, there should be no
-+ * issues.
-+ * If this feature is ever extended to include JARs provided
-+ * by web applications, checks should be added to ensure that
-+ * any relative URL does not step outside the web application.
-+ */
-+ URI classPathEntryURI = jarURI.resolve(classPathEntry);
-+ URL classPathEntryURL = classPathEntryURI.toURL();
-+ classPathUrlsToProcess.add(classPathEntryURL);
- }
-- /*
-- * Note: Resolving the relative URLs from the manifest has the
-- * potential to introduce security concerns. However, since
-- * only JARs provided by the container and NOT those provided
-- * by web applications are processed, there should be no
-- * issues.
-- * If this feature is ever extended to include JARs provided
-- * by web applications, checks should be added to ensure that
-- * any relative URL does not step outside the web application.
-- */
-- URI classPathEntryURI = jarURI.resolve(classPathEntry);
-- URL classPathEntryURL = classPathEntryURI.toURL();
-- classPathUrlsToProcess.add(classPathEntryURL);
- }
- }
-
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch
new file mode 100644
index 000000000000..3c4e5c2a9d45
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch
@@ -0,0 +1,250 @@
+diff --git a/apache-tomcat-9.0.0.M8-src/build.xml b/apache-tomcat-9.0.0.M8-src/build.xml
+index dfec1f7..4dfc5d8 100644
+--- a/apache-tomcat-9.0.0.M8-src/build.xml
++++ b/apache-tomcat-9.0.0.M8-src/build.xml
+@@ -695,24 +695,30 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+
++
+
+
++
+
+
++
+
+
+
+-
++
+
+
+
+@@ -1053,7 +1059,7 @@
+
+
+
+-
++
+
+
+
+@@ -1087,7 +1093,7 @@
+
+
+
+-
++
+
+
+
+
+
+-
++
+
+
+
+
++
+
+@@ -1583,7 +1590,7 @@
+
+
++ description="Prepare to build web services extras package" unless="noget">
+
+
+
+@@ -1731,6 +1738,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+
+
++
+
+
+
++
+
+
+
+@@ -2578,7 +2589,7 @@ skip.installer property in build.properties" />
+
+
+
++ description="Download (and build) components necessary to compile" unless="noget">
+
+
+
+@@ -2612,7 +2623,7 @@ skip.installer property in build.properties" />
+
+
+
++ description="Download additional components for the tests" unless="noget">
+
+
+
+@@ -2669,7 +2680,7 @@ skip.installer property in build.properties" />
+
+
+
++ description="Download additional components for a distribution" unless="noget">
+
+
+
+@@ -2695,18 +2706,18 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+
+-
++
+
+
+
+
+-
++
+
+
+
+@@ -2718,7 +2729,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2737,7 +2748,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2748,7 +2759,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2776,7 +2787,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2799,7 +2810,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2810,7 +2821,7 @@ skip.installer property in build.properties" />
+
+
+
+-
++
+
+
+
+@@ -2821,7 +2832,7 @@ skip.installer property in build.properties" />
+
+
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+
+
diff --git a/www-servers/tomcat/tomcat-8.0.36.ebuild b/www-servers/tomcat/tomcat-8.0.36.ebuild
new file mode 100644
index 000000000000..d990243eaea3
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.36.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${FILESDIR}/${P}-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.3.ebuild b/www-servers/tomcat/tomcat-8.5.3.ebuild
new file mode 100644
index 000000000000..b0508e4c8d82
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ epatch "${FILESDIR}/${P}-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha6-r1.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha8.ebuild
similarity index 97%
rename from www-servers/tomcat/tomcat-9.0.0_alpha6-r1.ebuild
rename to www-servers/tomcat/tomcat-9.0.0_alpha8.ebuild
index 21e76fb21acf..76dbdc96dfdf 100644
--- a/www-servers/tomcat/tomcat-9.0.0_alpha6-r1.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.0_alpha8.ebuild
@@ -11,7 +11,7 @@ inherit eutils java-pkg-2 java-ant-2 prefix user
MY_PV="${PV/_alpha/.M}"
MY_P="apache-${PN}-${MY_PV}-src"
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3 Container"
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
HOMEPAGE="http://tomcat.apache.org/"
SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
@@ -52,7 +52,7 @@ java_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- epatch "${FILESDIR}/${P}-build.xml.patch" "${FILESDIR}/${P}-processmanifest.patch"
+ epatch "${FILESDIR}/${P}-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\