Sync with portage [Fri Jan 6 13:27:04 MSK 2017].

7 years ago · 87e7114f7d
parent 4b806a6016
commit 87e7114f7d
1064 changed files with 7002 additions and 3085 deletions
--- a/app-admin/apache-tools/apache-tools-2.4.25.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.25.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"

--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@ -1,2 +1,3 @@
 DIST bonnie++-1.97.2.tgz 102533 SHA256 3f34a4c52ae9b2c3d493af8f794ba18cbf6732e9b76c3a4fa64549d95d914ce3 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170 WHIRLPOOL 1f66eef8a583ce9cb851a6c301019ba76d104bf3a6322d504cd7c8d1eb073c48235efcff6fec2b2f49207aa696db1071c55c94a3943a01917b2a7aa7349b0b73
+DIST bonnie++-1.97.3.tgz 100166 SHA256 e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893 WHIRLPOOL d889c059b0bd5fb77948fd60aee3d1926f2967464a72e4c287cd14d2946e8dc73059d775bb4cfe1c0065ecbe159543dfdd519d880207974e50ec978a666721af
 DIST bonnie++-1.97.tgz 102604 SHA256 44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982 SHA512 985fd4d0ef643fda5363e61609a5d73206ecfdd1c27470cc7babeaf9b7d87136c6bf40f62366d3f3ea58c50a307fa62aea59dc5efa69854fff9c43d1c940d3ab WHIRLPOOL 23af9926691868a208fd69f7ec401fa0c2332835ccc63e4b0143497faabb02f21ddd56a41014b532287f4418e0ac92c712aff2bc0657ad2512961fa5aa3567b9
--- a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite"
+HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
+	"${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319
+)
+
+DOCS=( README.txt README-2.00 debian/changelog credits.txt )
+HTML_DOCS=( readme.html )
+
+src_configure() {
+	econf \
+		$(usex debug "--enable-debug" "") \
+		--disable-stripping
+}
+
+src_install() {
+	dobin bonnie++ zcav bon_csv2html bon_csv2txt
+	sed -i -e \
+		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+		bonnie++.8 || die #431684
+	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+	einstalldocs
+}
--- a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ SRC_URI="http://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"

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

 RDEPEND="sci-libs/gsl"
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,3 +1,4 @@
 DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f
 DIST docker-1.12.5.tar.gz 13693501 SHA256 81b337368efafb631a75f6ad5469413fd5828ce672592c374adf894dc05abd38 SHA512 a116f6c7ae83c21a0560b7860872f55d095687bf276685e78ebfaec5d63b6108fb1553ea0f5ea9d143bd495a4b213398a4d1032b6f4f4fb29b6e8c07c509deb2 WHIRLPOOL 8cf85f3954926491996b304bb0b4a136813e78039facf192222fed0d6d054853f6b6dfa221962fb3731884a4d1e01f3a34516b7d64eff4a74365de442faacf3c
 DIST docker-1.13.0_rc4.tar.gz 7734320 SHA256 1dedaf5171da17e71b51e5c2fec137dd379096a66be02473f7a2625f3e537aee SHA512 ced0fba2ef279db6061ed07c79e13912fc2af23a3736f5fd41ae7af23fe219b39c9461b878c0e68e40f22af2f4901f1b25466451a36c4f207e2070fa5715af7c WHIRLPOOL 42a33357ea821f772bc9ead821067314809858d00a475378c48aec8eb88ed8c4541a48d43e4b87221ef35c1254e1a9b97610dd12f154c29ea347f4cc2478e490
+DIST docker-1.13.0_rc5.tar.gz 7743446 SHA256 6213320b23c9f2bd38e197d0612e695d9677b84c1dd2b71f3c0f998caeb51408 SHA512 f8afaecf42585a46cbeb0457fff46e5c78cdceff437b52bd4009c351310bdc4efdee274031b6354c999308f3b8d376a3c45ebca13272ffc586212553d2f386cb WHIRLPOOL 81ed9d7758ebcd1e0856401dd3a7a37a6038ac69a7690f89082020ba1607bf8d9ca6566e9aa350253cc457789808c49c79f80b8a9cd5b6580df9a123df93086d
--- a/app-emulation/docker/docker-1.13.0_rc5.ebuild
+++ b/app-emulation/docker/docker-1.13.0_rc5.ebuild
@ -0,0 +1,287 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	DOCKER_GITCOMMIT="43cc971"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+
+	!app-emulation/docker-bin
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+
+	>app-emulation/containerd-0.2.2
+	app-emulation/runc[apparmor?,seccomp?]
+	app-emulation/docker-proxy
+	container-init? ( >=sys-process/tini-0.13.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
+	~NF_NAT ~NF_NAT_NEEDED
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT
+
+	~VXLAN
+	~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	# for where these kernel versions come from, see:
+	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
+	if ! {
+		kernel_is ge 3 16 \
+		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
+		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
+		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
+	}; then
+		ewarn ""
+		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
+		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
+		ewarn ""
+		ewarn "See also https://github.com/docker/docker/issues/2960"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-client || die
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+		grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed'
+	fi
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor pkcs11 seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	# time to build!
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	# build the man pages too
+	./man/md2man-all.sh || die "unable to generate man pages"
+}
+
+src_install() {
+	VERSION="$(cat VERSION)"
+	newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
+	newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+}
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@ -1,2 +1,5 @@
 DIST ganeti-2.15.2.tar.gz 4723007 SHA256 1e09d29cae5020142d20a96165b23f3b62b5511b875051b6374d09c4c13c0b83 SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85 WHIRLPOOL a09a13d64e7c6fa7823072d767fa6495cd814bb22e7a5fc708c8b339103a41da4e45f38574a2c665fe89c8774f220a2715c3aba180eb674eae603730dd2d25ad
+DIST ganeti-2.16.0~rc1.tar.gz 4794934 SHA256 014cbc02b05c681ef216791d23de33e3355adf2153fede91c4fb09f924efb5f1 SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be WHIRLPOOL e5a367ca728757a1a406519110b232875800ed5efe3dc4ba33ab2f0e97e0112d3eebf6235786e2074397c363a73991bf80ed21684a8b608eaba74b3ec102070b
+DIST ganeti-2.17.0~beta1.tar.gz 4880091 SHA256 57de10d300ee4a1b4f1a6625ef24ad4a459c6c5bf1ea83d73a95b0cf9cb6ddb9 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e WHIRLPOOL 3d2ba633e1a4b0c14ece75b1144920720497b533f83c93af3bdf6c2dcdefd3269b581ad4f75497866613ae3a51805ba855aa55b29c6271b9f660b96d48f56a64
 DIST ganeti_2.15.2-4.debian.tar.xz 42440 SHA256 d2b907ad54b6fad8bc9c023c718c6f1a35cbc487fa065291f465f1e518df6d02 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403 WHIRLPOOL 16acab23919541bfd1748ff9f5e243c483ed4b5b10bcd5c233821c06968671ce0fcdab86ec95a30f6162a308df1eca16424e94b80ea095dfc90931a4be930b26
+DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 SHA256 bb97edb134d45dffb2678604dff7f3b91904aa4b4e16c3c29e44e9919e45a737 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af WHIRLPOOL 11712b4232ec1e7401d2e8fbf2c66465ffacfb52129dc7d2736cfcb45140ef7734a43510688fd2b8dbac088b6547aacadd596d0def64f9a1cd1f3b88c053f39c
--- a/app-emulation/ganeti/files/fix_ftbfs_with_sphinx_1.4
+++ b/app-emulation/ganeti/files/fix_ftbfs_with_sphinx_1.4
@ -0,0 +1,47 @@
+Copied from 2.15.2 Debian Patches, as it was missed in the 2.16.0~rc1 debian patches.
+
+Author: Apollon Oikonomopoulos <apoikos@debian.org>
+Description: Fix FTBFS with sphinx 1.4
+ Suppress app.add_role warnings, as upstream knowingly overrides sphinx's
+ built-in manpage role. Without this, a warning is emitted which then turns to
+ an error when sphinx is run with the `-W' switch.
+ .
+ Also replace unicode ellipses in doc/design-query2.rst with three ascii dots,
+ as sphinx emits another warning for not being able to properly highlight these
+ lines as Python code.
+Last-Update: 2016-07-09
+Forwarded: no
+--- a/doc/conf.py
+++ b/doc/conf.py
+@@ -229,3 +229,8 @@
+ 
+ # If false, no module index is generated.
+ latex_use_modindex = False
+
+# We override the manpage role and sphinx issues a warning, which is treated as
+# error. Suppress role_add warnings to avoid FTBFS.
+
+suppress_warnings = ["app.add_role"]
+--- a/doc/design-query2.rst
+++ b/doc/design-query2.rst
+@@ -129,16 +129,16 @@
+   specific names, the filter must be specified as follows, with the
+   inner part repeated for each name::
+ 
+-    ["|", ["=", "name", "node1"], ["=", "name", "node2"], …]
+    ["|", ["=", "name", "node1"], ["=", "name", "node2"], ...]
+ 
+-  Filters consist of S-expressions (``["operator", <operants…>]``) and
+  Filters consist of S-expressions (``["operator", <operants...>]``) and
+   extensions will be made in the future to allow for more operators and
+   fields. Such extensions might include a Python-style "in" operator,
+   but for simplicity only "=" is supported in this implementation.
+ 
+   To reiterate: Filters for this implementation must consist of exactly
+-  one OR expression (``["|", …]``) and one or more name equality filters
+-  (``["=", "name", "…"]``).
+  one OR expression (``["|", ...]``) and one or more name equality filters
+  (``["=", "name", "..."]``).
+ 
+ Support for synchronous queries, currently available in the interface
+ but disabled in the master daemon, will be dropped. Direct calls to
--- a/app-emulation/ganeti/files/ganeti-2.16-kvmd-run-as-daemon-user.patch
+++ b/app-emulation/ganeti/files/ganeti-2.16-kvmd-run-as-daemon-user.patch
@ -0,0 +1,30 @@
+--- ganeti-2.16.0~rc1.orig/Makefile.am	2017-01-05 10:09:56.568213273 -0800
+++ ganeti-2.16.0~rc1/Makefile.am	2017-01-05 10:10:51.260260697 -0800
+@@ -2477,6 +2477,7 @@
+ 	  echo 's#@''PKGLIBDIR@#$(libdir)/ganeti#g'; \
+ 	  echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
+ 	  echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
+	  echo 's#@''GNTKVMDUSER@#$(KVMD_USER)#g'; \
+ 	  echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
+ 	  echo 's#@''GNTWCONFDUSER@#$(WCONFD_USER)#g'; \
+ 	  echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \
+@@ -2484,6 +2485,7 @@
+ 	  echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \
+ 	  echo 's#@''GNTMETADUSER@#$(METAD_USER)#g'; \
+ 	  echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
+	  echo 's#@''GNTKVMDGROUP@#$(KVMD_GROUP)#g'; \
+ 	  echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
+ 	  echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
+ 	  echo 's#@''GNTNODEDGROUP@#$(NODED_GROUP)#g'; \
+--- ganeti-2.16.0~rc1.orig/daemons/daemon-util.in	2017-01-05 10:09:56.450211013 -0800
+++ ganeti-2.16.0~rc1/daemons/daemon-util.in	2017-01-05 10:11:17.804769059 -0800
+@@ -103,6 +103,9 @@
+     rapi)
+       echo "@GNTRAPIUSER@:@GNTRAPIGROUP@"
+       ;;
+    kvmd)
+      echo "@GNTKVMDUSER@:@GNTKVMDGROUP@"
+	;;
+     noded)
+       echo "@GNTNODEDUSER@:@GNTNODEDGROUP@"
+       ;;
--- a/app-emulation/ganeti/files/ganeti-2.16-noded-must-run-as-root.patch
+++ b/app-emulation/ganeti/files/ganeti-2.16-noded-must-run-as-root.patch
@ -0,0 +1,26 @@
+--- ganeti-2.16.0~rc1.orig/configure.ac	2017-01-05 10:09:56.480211588 -0800
+++ ganeti-2.16.0~rc1/configure.ac	2017-01-05 10:15:34.462684390 -0800
+@@ -380,9 +380,9 @@
+    group_luxid="${withval}luxid";
+    group_masterd="${withval}masterd";
+    group_metad="${withval}metad";
+-   group_noded="$group_default";
+   group_noded="root";
+    group_daemons="${withval}daemons";
+-   group_mond="$group_default"],
+   group_mond="root"],
+   [group_rapi="$group_default";
+    group_admin="$group_default";
+    group_confd="$group_default";
+@@ -391,9 +391,9 @@
+    group_luxid="$group_default";
+    group_masterd="$group_default";
+    group_metad="$group_default";
+-   group_noded="$group_default";
+   group_noded="root";
+    group_daemons="$group_default";
+-   group_mond="$group_default"])
+   group_mond="root"])
+ AC_SUBST(RAPI_GROUP, $group_rapi)
+ AC_SUBST(ADMIN_GROUP, $group_admin)
+ AC_SUBST(CONFD_GROUP, $group_confd)
--- a/app-emulation/ganeti/files/ganeti-2.17-relax-deps.patch
+++ b/app-emulation/ganeti/files/ganeti-2.17-relax-deps.patch
@ -0,0 +1,21 @@
+--- ganeti-2.17.0~beta1/cabal/ganeti.template.cabal	2017-01-05 10:29:49.936067812 -0800
+++ ganeti-2.17.0~beta1/cabal/ganeti.template.cabal	2017-01-05 10:33:03.248770000 -0800
+@@ -54,15 +54,15 @@
+     , transformers                  >= 0.3.0.0
+     , unix                          >= 2.5.1.0
+ 
+-    , attoparsec                    >= 0.10.1.1   && < 0.13
+    , attoparsec                    >= 0.10.1.1   && < 0.14
+     , base64-bytestring             >= 1.0.0.1    && < 1.1
+     , case-insensitive              >= 0.4.0.1    && < 1.3
+     , Crypto                        >= 4.2.4      && < 4.3
+     , curl                          >= 1.3.7      && < 1.4
+     , hinotify                      >= 0.3.2      && < 0.4
+     , hslogger                      >= 1.1.4      && < 1.3
+-    , json                          >= 0.5        && < 1.0
+-    , lens                          >= 3.10       && < 4.13
+    , json                          >= 0.5
+    , lens                          >= 3.10
+     , lifted-base                   >= 0.2.0.3    && < 0.3
+     , monad-control                 >= 0.3.1.3    && < 1.1
+     , MonadCatchIO-transformers     >= 0.3.0.0    && < 0.4
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@ -0,0 +1,343 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+	inherit git-2
+	KEYWORDS=""
+	PATCHES=()
+else
+	DEBIAN_PV=${MY_PV}
+	DEBIAN_PATCH=1
+	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
+	[[ -n "${DEBIAN_PATCH}" ]] && SRC_URI="${SRC_URI}
+	  mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${DEBIAN_PV}-${DEBIAN_PATCH}.debian.tar.xz
+	"
+	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+	  "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+	  "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+	  "${WORKDIR}"/debian/patches/relax-deps
+	  "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+	  "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+	  #"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 # ported manually
+	)
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+	test? ( ipv6 )
+	kvm? ( || ( amd64 x86 ) )
+	${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+	dev-libs/openssl:0
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/bitarray[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/fdsend[${PYTHON_USEDEP}]
+	net-analyzer/arping
+	net-analyzer/fping
+	net-misc/bridge-utils
+	net-misc/curl[ssl]
+	net-misc/openssh
+	net-misc/socat
+	sys-apps/iproute2
+	sys-fs/lvm2
+	>=sys-apps/baselayout-2.0
+	dev-lang/ghc:0=
+	dev-haskell/cabal:0=
+	dev-haskell/cabal-install:0=
+	>=dev-haskell/mtl-2.1.1:0=
+	>=dev-haskell/old-time-1.1.0.0:0=
+	>=dev-haskell/random-1.0.1.1:0=
+	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+	>=dev-haskell/transformers-0.3.0.0:0=
+
+	>=dev-haskell/attoparsec-0.10.1.1:0=
+	<dev-haskell/attoparsec-0.14:0
+	>=dev-haskell/base64-bytestring-1.0.0.1:0=
+	<dev-haskell/base64-bytestring-1.1:0=
+	>=dev-haskell/crypto-4.2.4:0=
+	<dev-haskell/crypto-4.3:0=
+	>=dev-haskell/curl-1.3.7:0=
+	<dev-haskell/curl-1.4:0=
+	>=dev-haskell/hinotify-0.3.2:0=
+	<dev-haskell/hinotify-0.4:0=
+	>=dev-haskell/hslogger-1.1.4:0=
+	<dev-haskell/hslogger-1.3:0=
+	>=dev-haskell/json-0.5:0=
+	>=dev-haskell/lens-3.10:0=
+	>=dev-haskell/lifted-base-0.2.0.3:0=
+	<dev-haskell/lifted-base-0.3:0=
+	>=dev-haskell/monad-control-0.3.1.3:0=
+	<dev-haskell/monad-control-1.1:0=
+	>=dev-haskell/network-2.3.0.13:0=
+	<dev-haskell/network-2.7:0=
+	>=dev-haskell/parallel-3.2.0.2:3=
+	<dev-haskell/parallel-3.3:3=
+	>=dev-haskell/temporary-1.1.2.3:0=
+	<dev-haskell/temporary-1.3:0=
+	>=dev-haskell/regex-pcre-0.94.2:0=
+	<dev-haskell/regex-pcre-0.95:0=
+	>=dev-haskell/transformers-base-0.4.1:0=
+	<dev-haskell/transformers-base-0.5:0=
+	>=dev-haskell/utf8-string-0.3.7:0=
+	>=dev-haskell/zlib-0.5.3.3:0=
+	<dev-haskell/zlib-0.7:0=
+
+	>=dev-haskell/psqueue-1.1:0=
+	<dev-haskell/psqueue-1.2:0=
+	>=dev-haskell/snap-core-0.8.1:0=
+	<dev-haskell/snap-core-0.10:0=
+	>=dev-haskell/snap-server-0.8.1:0=
+	<dev-haskell/snap-server-0.10:0=
+	>=dev-haskell/case-insensitive-0.4.0.1
+
+	dev-haskell/vector:0=
+	xen? ( >=app-emulation/xen-3.0 )
+	kvm? (
+		dev-python/psutil
+		app-emulation/qemu
+	)
+	lxc? ( app-emulation/lxc )
+	drbd? (
+		|| (
+			<sys-cluster/drbd-8.5
+			sys-cluster/drbd-utils
+		)
+	)
+	rbd? ( sys-cluster/ceph )
+	ipv6? ( net-misc/ndisc6 )
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+DEPEND+="
+	sys-devel/m4
+	app-text/pandoc
+	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+	media-fonts/urw-fonts
+	media-gfx/graphviz
+	>=dev-haskell/test-framework-0.6:0=
+	<dev-haskell/test-framework-0.9:0=
+	>=dev-haskell/test-framework-hunit-0.2.7:0=
+	<dev-haskell/test-framework-hunit-0.4:0=
+	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+	<dev-haskell/test-framework-quickcheck2-0.4:0=
+	test? (
+		dev-python/mock
+		dev-python/pyyaml
+		dev-haskell/haddock:0=
+		>=dev-haskell/hunit-1.2.4.2:0=
+		<dev-haskell/hunit-1.3:0=
+		>=dev-haskell/quickcheck-2.4.2:2=
+		<dev-haskell/quickcheck-2.8.3:2=
+		sys-apps/fakeroot
+		>=net-misc/socat-1.7
+		dev-util/shelltestrunner
+	)"
+
+PATCHES+=(
+	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
+	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+	"${FILESDIR}/${PN}-2.10-rundir.patch"
+	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+	"${FILESDIR}/${PN}-2.11-tests.patch"
+	"${FILESDIR}/${PN}-lockdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
+	"${FILESDIR}/${PN}-2.15-python-mock.patch"
+	"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+	"${FILESDIR}/${PN}-2.16-noded-must-run-as-root.patch"
+	"${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
+	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+	"${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+	usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+	local user
+	python-single-r1_pkg_setup
+
+	if use multiple-users; then
+		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+			enewgroup ${user}
+			enewuser ${user} -1 -1 -1 ${user}
+		done
+	fi
+}
+
+src_prepare() {
+	local testfile
+	if has_version '>=dev-lang/ghc-7.10'; then
+		# Breaks the build on 7.8
+		PATCHES+=(
+			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+		)
+	fi
+	eapply "${PATCHES[@]}"
+	# Upstream commits:
+	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+	# 24618882737fd7c189adf99f4acc767d48f572c3
+	sed -i \
+		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+		cabal/ganeti.template.cabal
+	# Neuter -Werror
+	sed -i \
+		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+		Makefile.am
+
+	# not sure why these tests are failing
+	# should remove this on next version bump if possible
+	for testfile in test/py/import-export_unittest.bash; do
+		printf '#!/bin/bash\ntrue\n' > "${testfile}"
+	done
+
+	# take the sledgehammer approach to bug #526270
+	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+	eapply_user
+
+	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+	rm autotools/missing
+	eautoreconf
+}
+
+src_configure () {
+	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
+	local kvm_arch
+
+	if use amd64; then
+		kvm_arch=x86_64
+	elif use x86; then
+		kvm_arch=i386
+	elif use kvm; then
+		die "Could not determine qemu system to use for kvm"
+	fi
+
+	econf --localstatedir=/var \
+		--sharedstatedir=/var \
+		--disable-symlinks \
+		--with-ssh-initscript=/etc/init.d/sshd \
+		--with-export-dir=/var/lib/ganeti-storage/export \
+		--with-os-search-path=/usr/share/${PN}/os \
+		$(use_enable restricted-commands) \
+		$(use_enable test haskell-tests) \
+		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+		$(use_enable syslog) \
+		$(use_enable monitoring) \
+		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+		--enable-socat-escape \
+		--enable-socat-compress
+}
+
+src_install () {
+	emake V=1 DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+	if use kvm; then
+		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+	fi
+
+	# ganeti installs it's own docs in a generic location
+	rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+	newbashcomp doc/examples/bash_completion gnt-instance
+	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+	use monitoring && bashcomp_alias gnt-instance mon-collector
+
+	dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+	docinto html
+	dodoc -r doc/html/* doc/css/*.css
+
+	docinto examples
+	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+	docinto examples/hooks
+	dodoc doc/examples/hooks/{ipsec,ethers}
+
+	insinto /etc/cron.d
+	newins doc/examples/ganeti.cron ${PN}
+
+	insinto /etc/logrotate.d
+	newins doc/examples/ganeti.logrotate ${PN}
+
+	# need to dodir rather than keepdir here (bug #552482)
+	dodir /var/lib/${PN}
+
+	keepdir /var/log/${PN}/
+	keepdir /usr/share/${PN}/${SERIES}/os/
+	keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+	dosym ${SERIES} "/usr/share/${PN}/default"
+	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+	if use multiple-users; then
+		elog "You have enable multiple user support, the users for this must"
+		elog "be created. You can use the provided tool for this, which is"
+		elog "located at:"
+		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
+	fi
+}
+
+src_test () {
+	PATH="${S}/scripts:${S}/src:${PATH}" \
+		TMPDIR="/tmp" \
+		GANETI_MASTER="$(hostname -f)" \
+		emake check || die "emake check failed"
+}
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@ -0,0 +1,344 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1 versionator
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(get_version_component_range 1-2)"
+
+if [[ ${PV} =~ [9]{4,} ]] ; then
+	EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+	inherit git-2
+	KEYWORDS=""
+	PATCHES=()
+else
+	DEBIAN_PV='2.16.0~rc1'
+	DEBIAN_PATCH=1
+	SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
+	[[ -n "${DEBIAN_PATCH}" ]] && SRC_URI="${SRC_URI}
+	  mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${DEBIAN_PV}-${DEBIAN_PATCH}.debian.tar.xz
+	"
+	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+	  "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+	  "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+	  #"${WORKDIR}"/debian/patches/relax-deps # Ported manually
+	  "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+	  "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+	  #"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 # ported manually
+	)
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+	test? ( ipv6 )
+	kvm? ( || ( amd64 x86 ) )
+	${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+	dev-libs/openssl:0
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/bitarray[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/fdsend[${PYTHON_USEDEP}]
+	net-analyzer/arping
+	net-analyzer/fping
+	net-misc/bridge-utils
+	net-misc/curl[ssl]
+	net-misc/openssh
+	net-misc/socat
+	sys-apps/iproute2
+	sys-fs/lvm2
+	>=sys-apps/baselayout-2.0
+	dev-lang/ghc:0=
+	dev-haskell/cabal:0=
+	dev-haskell/cabal-install:0=
+	>=dev-haskell/mtl-2.1.1:0=
+	>=dev-haskell/old-time-1.1.0.0:0=
+	>=dev-haskell/random-1.0.1.1:0=
+	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+	>=dev-haskell/transformers-0.3.0.0:0=
+
+	>=dev-haskell/attoparsec-0.10.1.1:0=
+	<dev-haskell/attoparsec-0.14:0
+	>=dev-haskell/base64-bytestring-1.0.0.1:0=
+	<dev-haskell/base64-bytestring-1.1:0=
+	>=dev-haskell/crypto-4.2.4:0=
+	<dev-haskell/crypto-4.3:0=
+	>=dev-haskell/curl-1.3.7:0=
+	<dev-haskell/curl-1.4:0=
+	>=dev-haskell/hinotify-0.3.2:0=
+	<dev-haskell/hinotify-0.4:0=
+	>=dev-haskell/hslogger-1.1.4:0=
+	<dev-haskell/hslogger-1.3:0=
+	>=dev-haskell/json-0.5:0=
+	>=dev-haskell/lens-3.10:0=
+	>=dev-haskell/lifted-base-0.2.0.3:0=
+	<dev-haskell/lifted-base-0.3:0=
+	>=dev-haskell/monad-control-0.3.1.3:0=
+	<dev-haskell/monad-control-1.1:0=
+	>=dev-haskell/network-2.3.0.13:0=
+	<dev-haskell/network-2.7:0=
+	>=dev-haskell/parallel-3.2.0.2:3=
+	<dev-haskell/parallel-3.3:3=
+	>=dev-haskell/temporary-1.1.2.3:0=
+	<dev-haskell/temporary-1.3:0=
+	>=dev-haskell/regex-pcre-0.94.2:0=
+	<dev-haskell/regex-pcre-0.95:0=
+	>=dev-haskell/transformers-base-0.4.1:0=
+	<dev-haskell/transformers-base-0.5:0=
+	>=dev-haskell/utf8-string-0.3.7:0=
+	>=dev-haskell/zlib-0.5.3.3:0=
+	<dev-haskell/zlib-0.7:0=
+
+	>=dev-haskell/psqueue-1.1:0=
+	<dev-haskell/psqueue-1.2:0=
+	>=dev-haskell/snap-core-0.8.1:0=
+	<dev-haskell/snap-core-0.10:0=
+	>=dev-haskell/snap-server-0.8.1:0=
+	<dev-haskell/snap-server-0.10:0=
+	>=dev-haskell/case-insensitive-0.4.0.1
+
+	dev-haskell/vector:0=
+	xen? ( >=app-emulation/xen-3.0 )
+	kvm? (
+		dev-python/psutil
+		app-emulation/qemu
+	)
+	lxc? ( app-emulation/lxc )
+	drbd? (
+		|| (
+			<sys-cluster/drbd-8.5
+			sys-cluster/drbd-utils
+		)
+	)
+	rbd? ( sys-cluster/ceph )
+	ipv6? ( net-misc/ndisc6 )
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+DEPEND+="
+	sys-devel/m4
+	app-text/pandoc
+	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+	media-fonts/urw-fonts
+	media-gfx/graphviz
+	>=dev-haskell/test-framework-0.6:0=
+	<dev-haskell/test-framework-0.9:0=
+	>=dev-haskell/test-framework-hunit-0.2.7:0=
+	<dev-haskell/test-framework-hunit-0.4:0=
+	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+	<dev-haskell/test-framework-quickcheck2-0.4:0=
+	test? (
+		dev-python/mock
+		dev-python/pyyaml
+		dev-haskell/haddock:0=
+		>=dev-haskell/hunit-1.2.4.2:0=
+		<dev-haskell/hunit-1.3:0=
+		>=dev-haskell/quickcheck-2.4.2:2=
+		<dev-haskell/quickcheck-2.8.3:2=
+		sys-apps/fakeroot
+		>=net-misc/socat-1.7
+		dev-util/shelltestrunner
+	)"
+
+PATCHES+=(
+	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
+	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+	"${FILESDIR}/${PN}-2.10-rundir.patch"
+	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+	"${FILESDIR}/${PN}-2.11-tests.patch"
+	"${FILESDIR}/${PN}-lockdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
+	"${FILESDIR}/${PN}-2.15-python-mock.patch"
+	"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+	"${FILESDIR}/${PN}-2.16-noded-must-run-as-root.patch"
+	"${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
+	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+	"${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
+	"${FILESDIR}/${PN}-2.17-relax-deps.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+	usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+
+pkg_setup () {
+	local user
+	python-single-r1_pkg_setup
+
+	if use multiple-users; then
+		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+			enewgroup ${user}
+			enewuser ${user} -1 -1 -1 ${user}
+		done
+	fi
+}
+
+src_prepare() {
+	local testfile
+	if has_version '>=dev-lang/ghc-7.10'; then
+		# Breaks the build on 7.8
+		PATCHES+=(
+			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+		)
+	fi
+	eapply "${PATCHES[@]}"
+	# Upstream commits:
+	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+	# 24618882737fd7c189adf99f4acc767d48f572c3
+	sed -i \
+		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+		cabal/ganeti.template.cabal
+	# Neuter -Werror
+	sed -i \
+		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+		Makefile.am
+
+	# not sure why these tests are failing
+	# should remove this on next version bump if possible
+	for testfile in test/py/import-export_unittest.bash; do
+		printf '#!/bin/bash\ntrue\n' > "${testfile}"
+	done
+
+	# take the sledgehammer approach to bug #526270
+	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+	eapply_user
+
+	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+	rm autotools/missing
+	eautoreconf
+}
+
+src_configure () {
+	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
+	local kvm_arch
+
+	if use amd64; then
+		kvm_arch=x86_64
+	elif use x86; then
+		kvm_arch=i386
+	elif use kvm; then
+		die "Could not determine qemu system to use for kvm"
+	fi
+
+	econf --localstatedir=/var \
+		--sharedstatedir=/var \
+		--disable-symlinks \
+		--with-ssh-initscript=/etc/init.d/sshd \
+		--with-export-dir=/var/lib/ganeti-storage/export \
+		--with-os-search-path=/usr/share/${PN}/os \
+		$(use_enable restricted-commands) \
+		$(use_enable test haskell-tests) \
+		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+		$(use_enable syslog) \
+		$(use_enable monitoring) \
+		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+		--enable-socat-escape \
+		--enable-socat-compress
+}
+
+src_install () {
+	emake V=1 DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
+	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+	if use kvm; then
+		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+	fi
+
+	# ganeti installs it's own docs in a generic location
+	rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+	newbashcomp doc/examples/bash_completion gnt-instance
+	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+	use monitoring && bashcomp_alias gnt-instance mon-collector
+
+	dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+	docinto html
+	dodoc -r doc/html/* doc/css/*.css
+
+	docinto examples
+	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+	docinto examples/hooks
+	dodoc doc/examples/hooks/{ipsec,ethers}
+
+	insinto /etc/cron.d
+	newins doc/examples/ganeti.cron ${PN}
+
+	insinto /etc/logrotate.d
+	newins doc/examples/ganeti.logrotate ${PN}
+
+	# need to dodir rather than keepdir here (bug #552482)
+	dodir /var/lib/${PN}
+
+	keepdir /var/log/${PN}/
+	keepdir /usr/share/${PN}/${SERIES}/os/
+	keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+	dosym ${SERIES} "/usr/share/${PN}/default"
+	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+	if use multiple-users; then
+		elog "You have enable multiple user support, the users for this must"
+		elog "be created. You can use the provided tool for this, which is"
+		elog "located at:"
+		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
+	fi
+}
+
+src_test () {
+	PATH="${S}/scripts:${S}/src:${PATH}" \
+		TMPDIR="/tmp" \
+		GANETI_MASTER="$(hostname -f)" \
+		emake check || die "emake check failed"
+}
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@ -14,3 +14,4 @@ DIST elasticsearch-2.4.0.tar.gz 27364449 SHA256 3ae01140ae7bcbb91436feef381fbed7
 DIST elasticsearch-2.4.1.tar.gz 27364109 SHA256 23a369ef42955c19aaaf9e34891eea3a055ed217d7fbe76da0998a7a54bbe167 SHA512 69b22d5c2fc93e9bc83c5da415e110105d4d977aa98633041f51f8c55ba9e6045803584965367f6e1f962122ad81a8e07fefcc5a01c5381057ec921d65bc1751 WHIRLPOOL 893056d0cd23ae41e2cb9e3db4591108777b4360ad6be5c52782cc98379ab0f0c36b42758f9815fbaf8557c9e06723c03765fd9eb4cbfcf9fe0d3203d8e6039d
 DIST elasticsearch-5.0.0.tar.gz 32968292 SHA256 a866534f0fa7428e980c985d712024feef1dee04709add6e360fc7b73bb1e7ae SHA512 a4fa650d643c242a1f90059cfe6eb27e3d240b3deafc426abeae72c13aeae84b01ffb8b872b748619dfc58225ca29bde054fe10e1529522f9a06a1051991e4cd WHIRLPOOL a05a6dc785c00bb461ea286490cacc0222f9f95f0dea7ba61c6308cee0284edc53ee0a2047f723e990fa99f7ed09feda46313997b8f6dd487b042a6b26ecf8d6
 DIST elasticsearch-5.0.1.tar.gz 32944777 SHA256 542e197485fbcb1aac46097439337d2e9ac6a54b7b1e29ad17761f4d65898833 SHA512 3c4c5a692cc77b01b978d3a02f049fcce36b573b6a2097a9d6714618ec0e6de0583f750516ba461eb1d13386ffad636d8663134452edaaeb2b8889c701316598 WHIRLPOOL d5ceb8e87e36be880f3bf746bfa52f7431d62ff9cd666c9dc64093760474d973ffcad792fd0a5927bef61a8e36c2fced76e03eae42e77eb1d158dcd05579b858
+DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6
--- a/app-misc/elasticsearch/elasticsearch-5.0.1-r1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.0.1-r1.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+
+MY_PN="${PN%-bin}"
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_preinst() {
+	if has_version '<app-misc/elasticsearch-2.3.2'; then
+		export UPDATE_NOTES=1
+	fi
+}
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
+	esethome ${MY_PN} /usr/share/${MY_PN}
+}
+
+src_prepare() {
+	rm -rf bin/*.{bat,exe}
+	rm LICENSE.txt
+}
+
+src_install() {
+	dodir /etc/${MY_PN}
+	dodir /etc/${MY_PN}/scripts
+
+	insinto /etc/${MY_PN}
+	doins config/*
+	rm -rf config
+
+	insinto /usr/share/${MY_PN}
+	doins -r ./*
+
+	insinto /usr/share/${MY_PN}/bin
+	doins "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
+
+	keepdir /var/{lib,log}/${MY_PN}
+	keepdir /usr/share/${MY_PN}/plugins
+
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
+
+	newinitd "${FILESDIR}/elasticsearch.init7" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.conf3" "${MY_PN}"
+	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${MY_PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml and logging.yml"
+	elog "into the configuration directory of the instance:"
+	elog "/etc/${MY_PN}/instance"
+	elog
+	if ! [ -z ${UPDATE_NOTES} ]; then
+		elog "This update changes some configuration variables. Please review"
+		elog "/etc/conf.d/elasticsearch before restarting your services."
+	fi
+}
--- a/app-misc/elasticsearch/elasticsearch-5.1.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.1.1.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils systemd user
+
+MY_PN="${PN%-bin}"
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_preinst() {
+	if has_version '<app-misc/elasticsearch-2.3.2'; then
+		export UPDATE_NOTES=1
+	fi
+}
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 /bin/bash /usr/share/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	rm -rf bin/*.{bat,exe} || die
+	rm LICENSE.txt || die
+
+	default
+}
+
+src_install() {
+	keepdir /etc/${MY_PN}
+	keepdir /etc/${MY_PN}/scripts
+
+	insinto /etc/${MY_PN}
+	doins config/*
+	rm -rf config || die
+
+	insinto /usr/share/${MY_PN}
+	doins -r ./*
+
+	exeinto /usr/share/${MY_PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
+
+	keepdir /var/{lib,log}/${MY_PN}
+	keepdir /usr/share/${MY_PN}/plugins
+
+	systemd_newtmpfilesd "${FILESDIR}/${MY_PN}.tmpfiles.d" "${MY_PN}.conf"
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${MY_PN}.sysctl.d" "${MY_PN}.conf"
+
+	newinitd "${FILESDIR}/elasticsearch.init7" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.conf3" "${MY_PN}"
+	systemd_newunit "${FILESDIR}"/${PN}.service5 "${PN}.service"
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${MY_PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml and logging.yml"
+	elog "into the configuration directory of the instance:"
+	elog "/etc/${MY_PN}/instance"
+	elog
+	if ! [ -z ${UPDATE_NOTES} ]; then
+		elog "This update changes some configuration variables. Please review"
+		elog "${EROOT%/}/etc/conf.d/elasticsearch before restarting your services."
+	fi
+}
--- a/app-misc/elasticsearch/files/elasticsearch.conf3
+++ b/app-misc/elasticsearch/files/elasticsearch.conf3
@ -0,0 +1,60 @@
+################################
+# Elasticsearch
+################################
+
+# Elasticsearch home directory
+#ES_HOME=/usr/share/elasticsearch
+
+# Elasticsearch Java path
+#JAVA_HOME=
+
+# Elasticsearch configuration directory
+#CONF_DIR=/etc/elasticsearch
+
+# Elasticsearch data directory
+#DATA_DIR=/var/lib/elasticsearch
+
+# Elasticsearch logs directory
+#LOG_DIR=/var/log/elasticsearch
+
+# Elasticsearch PID directory
+#PID_DIR=/run/elasticsearch
+
+# Additional Java OPTS
+#ES_JAVA_OPTS=
+
+################################
+# Elasticsearch service
+################################
+
+# When executing the init script, this user will be used to run the elasticsearch service.
+# The default value is 'elasticsearch' and is declared in the init.d file.
+# Note that this setting is only used by the init script. If changed, make sure that
+# the configured user can read and write into the data, work, plugins and log directories.
+# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
+#ES_USER=elasticsearch
+#ES_GROUP=elasticsearch
+
+# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
+#ES_STARTUP_SLEEP_TIME=5
+
+################################
+# System properties
+################################
+
+# Specifies the maximum file descriptor number that can be opened by this process
+# When using Systemd, this setting is ignored and the LimitNOFILE defined in
+# /usr/lib/systemd/system/elasticsearch.service takes precedence
+#MAX_OPEN_FILES=65536
+
+# The maximum number of bytes of memory that may be locked into RAM
+# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
+# in elasticsearch.yml.
+# When using Systemd, the LimitMEMLOCK property must be set
+# in /usr/lib/systemd/system/elasticsearch.service
+#MAX_LOCKED_MEMORY=unlimited
+
+# Maximum number of VMA (Virtual Memory Areas) a process can own
+# When using Systemd, this setting is ignored and the 'vm.max_map_count'
+# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
+#MAX_MAP_COUNT=262144
--- a/app-misc/elasticsearch/files/elasticsearch.init7
+++ b/app-misc/elasticsearch/files/elasticsearch.init7
@ -0,0 +1,95 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${SVCNAME#*.}
+PID_DIR=${PID_DIR:="/run/elasticsearch"}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+	PIDFILE="${PID_DIR}/elasticsearch.${ES_INSTANCE}.pid"
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	PIDFILE="${PID_DIR}/elasticsearch.pid"
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+
+server_command="/usr/share/elasticsearch/bin/elasticsearch"
+server_args="-d -p ${PIDFILE} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
+
+depend() {
+	use net
+}
+
+start() {
+	local conf
+	local conf_file
+	for conf in elasticsearch.yml; do
+		conf_file="${CONF_DIR}/${conf}"
+		if [ ! -f "${conf_file}" ]; then
+			eerror "${conf_file} must be copied into place"
+			return 1
+		fi
+	done
+
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+
+	if [ -n "${MAX_LOCKED_MEMORY}" ]; then
+		rc_ulimit="${rc_ulimit} -l ${MAX_LOCKED_MEMORY}"
+	fi
+
+	if [ -n "${MAX_OPEN_FILES}" ]; then
+		rc_ulimit="${rc_ulimit} -n ${MAX_OPEN_FILES}"
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${PID_DIR}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+	start-stop-daemon --start \
+		--background \
+		--chdir "${ES_HOME}" \
+		--user="${ES_USER}" \
+		--pidfile="${PIDFILE}" \
+		--exec ${server_command} -- ${server_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop \
+		--pidfile=${PIDFILE} \
+		--user="${ES_USER}" \
+		--retry=TERM/20
+	eend $?
+}
--- a/app-office/geierlein/Manifest
+++ b/app-office/geierlein/Manifest
@ -1,2 +1,3 @@
 DIST geierlein-0.9.5.tar.gz 1124736 SHA256 7cc61913d6a282b5dc9803eb618d9fdd9c0d9d6e844a2096ec16f1b21176212c SHA512 e7df23350b61c903f8e52e4ef11b41458c587188b5e45a895b1798de23f0821c75721d1fd9efc09d6ecc9c0b2f722ddc487be6695d376fe331fc39f6a19e19b6 WHIRLPOOL 04944a7f85875664ccda6553b3ffe103e8dc237eee8a7b20b0f23e7f39384b8ac87999112c1ea1f19b10f2d5f0325ca74adec54e789895f40b2be47006763154
 DIST geierlein-0.9.6.tar.gz 1124754 SHA256 b3020caa738921dca905bc53f846d3c486a102ca305031f71f82ec59cd837cf6 SHA512 34143200d055719331b29c8741a703e78a0aa036662c8cc5b2c6f24c064c1d27c00eef34278bfeb5d044121e7e0a2bd873db5013fa0c24e1474411600fe289f1 WHIRLPOOL 4ef1e2424a4afeffb723947bfd6627e05d6eb763dd293739b7d3ed0abe14cbdf7bd83992c313500af81e628bb6266c65262b4ac12d4d3d5cfc18044c8264d381
+DIST geierlein-0.9.7.tar.gz 1124770 SHA256 5ad9cccc4ce0c569a49556d5064acf41f5acdd070b0208d6da349f5111e0a0ea SHA512 c9110c075f9255e13f9ff5d2fd5fb2e2b3427a9702c669998912b7f28595dd9e9675d66612ba27c37fa6b821acf2f8576c2077dcfda71f8490b8b2a46813d1e2 WHIRLPOOL 782354e026858efb620c7adac949de850696e3d8d186a44a88dc990a145ed5819604cfb294d60c8b22eb20a6fb36a387d05dc53d66a65e4900c0f6bfc5f026e0
--- a/app-office/geierlein/geierlein-0.9.7.ebuild
+++ b/app-office/geierlein/geierlein-0.9.7.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Submit tax forms (Umsatzsteuervoranmeldung) to German ELSTER"
+HOMEPAGE="https://stesie.github.com/geierlein/"
+SRC_URI="https://github.com/stesie/geierlein/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
+DEPEND=""
+
+# needs nodejs and a couple of modules we don't have packaged
+RESTRICT="test"
+
+src_compile() {
+	emake prefix=/usr
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		install || die
+	dodoc README.md
+}
--- a/app-office/scribus/scribus-1.5.2-r2.ebuild
+++ b/app-office/scribus/scribus-1.5.2-r2.ebuild
@ -157,7 +157,7 @@ src_install() {
 	# en_EN can be deleted always
 	for lang in ${IUSE_LINGUAS}; do
 		if ! use linguas_${lang}; then
-			_lang=$(translate_lang)
+			_lang=$(translate_lang ${lang})
 			safe_delete "${ED%/}"/usr/share/man/${_lang}
 		fi
 	done
@ -205,8 +205,6 @@ safe_delete () {
 			ebegin "Deleting ${x}"
 			rm "${x}" || die
 			eend $?
-		else
-			ewarn "${x} not found"
 		fi
 	done
 }
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@ -1,8 +1,3 @@
 DIST dvisvgm-1.10.tar.gz 831654 SHA256 339f4dcef0916c1daaf1b65d966737279464ec6858b28fda7196d8030d7f3735 SHA512 2d3cb2e6b36d6a3b996347b6031f67bb89bc76d2bf0244347e512e66333536638caf855d9856771b10245387abae99a06d4c6fe33def814cae639810b4cfe906 WHIRLPOOL 398e5378ce6e84768b73f7d6e9776eb177619de785a70d8fa416fecb275903e49c065ec23d78881eede9d4944525ecfba44d34a5d1b74b87dc1ef6ecf127b869
-DIST dvisvgm-1.2.1.tar.gz 611862 SHA256 497233213e86286df9c3db9b23d084d74704d5bf956c17770b4e0d945c2f642c SHA512 8a15515134c5c8a7c6731500535f7a10e0e8d27b44f79111e967cdb66505c4256644809372e28425f77bdf63bba8697e91dd6f13452bd1aa7e2d9d8869643766 WHIRLPOOL 03b3cbbb1e3bbb665f41e5c82c9870db730bcaa318550b0e5b069ff1fc3b0420d1975ea6ee4e02db030fa500b720bb80386886f06bf99b2cf8cddb7a8f4497c6
-DIST dvisvgm-1.3.tar.gz 589834 SHA256 16111448e49b49f1cac70f9d354d07b6136c5bd94f7c68a171e595bc6a857a01 SHA512 35166123fa8a39a4b32e3dbc57383fd1e011268931ce1d00dd04d77c947f5565b98d380dd888b34296dbfbf14b9cf00d2ee2bb27045103f37e7165c08aaf94d6 WHIRLPOOL b06e7fd1adf34a29817f6db5b3fbbf11f094b59b077e6d13351be732ac607d6314e94806f6412a94e827c5d127391884ef3e6cbb8ba18901b024b69209de7f2b
-DIST dvisvgm-1.4.tar.gz 615003 SHA256 d68b4c172e53f38e5067b5f09fb0577a13ae55658246008101e862f4ab2cf622 SHA512 14491b95262dd24f191cb757fc78ca6c06e6ad2b8b7eeea4c8451c4234be07a2353c726d38543cd27dcb6e30137d3ceea05ac64b7f65487a8271c7c4ccdcb15d WHIRLPOOL 628d47a69543307464216cc18d3519be6daa138955a4d6024af3907cc1448fbbab1f9ba3f586cc8cfffe735cabd3e30cafc867b95935a9d320661bf27d99683f
-DIST dvisvgm-1.5.2.tar.gz 646578 SHA256 cd79aa6b1b37aac6cbb56c94e4e8bc65efbf61000d590877275719c6638803ea SHA512 aba54e297c6b890bff42efe94f4d1e8e7936750cb8924d554bc82cb413578e7fafccb54a9bb9fe663a6a82837d4a116b5217d14c088cfc8b8a8580cd66875413 WHIRLPOOL 9bb4b04a2b7e5cbed11fbcbdaacaa3b9ab8806d41e9963323e5ff71483ada4c03f005abf43f30af6b5f9cd1ba7d55af6703ba0878a27c8f014d607d959667b4e
 DIST dvisvgm-1.8.1.tar.gz 706270 SHA256 6832e3f4b43fa0b96333c1857012e70a83f059b0d222239936e1d6fa3b62cc08 SHA512 6ca3f0e4ff28fa59d14dd5891b205db850bb8c91531e6bcda05a3e6bb7e2bca9d71eaca4bf408577cd756277e8f3b6be12e5b3102fb848b329f66b7a9eda0270 WHIRLPOOL 0bd6e23c2df1499f4d106d007ff995bbbeb70482bc0087ff3acfcb921085f24ac66374ee949f00ccc6ee56c104880a4a58ad365df0a5ce91c65409a3a3c097bc
-DIST dvisvgm-1.9.2.tar.gz 756357 SHA256 813f8ce35f7cd9c98647d50628c74d9389b2366e56fba696c083fc230e72418f SHA512 1ab510e7e003707a765429776891cd2fcda3fd17623123f858ed11af0d4cf36540f431626b4af653cb3395c94ec8edcd07120f599ed7b313c8dc34e7a4e24198 WHIRLPOOL 12520ca2c3727852106259d1b11f388844fe7aba1244c177ba778592b9ffd48eb07f63f8a57183b98b331648d3884f19e9697a2367f0b223bd5077196329a7b2
-DIST dvisvgm-1.9.tar.gz 733672 SHA256 254856acaa9f046053632d5cb2ae6c334c6767d4be727fd03dd1c5c48781c95a SHA512 01d94273513c5269454ff376deb9712df79f720fc2e3b84623e80a5375f16eec01b8f9df00946f659c0fc4ced28de62469d7d0236b3554be0ef8cb2182798fee WHIRLPOOL 1b067d111fb89f23808c6deb32f26b0c2a4005574e78b3cf359032298c46494fb6bc0994059bc23ad61c5f920abca5f8e72d7cd2afc5c8eb6e66311b3f9a9361
+DIST dvisvgm-2.0.4.tar.gz 2163747 SHA256 3553e3b0bd5936c10f2b16c97e2c4f8cc79908d4effb3ef1d598d30b1fec39b2 SHA512 fc1207505936d5e22a8d70e8d0778454d516131995c4feb494b8b427addb549012c77ceec95206be3c6ec394008f779cf879ace9b4e1bf364940049bfdc00b69 WHIRLPOOL d9b3a0a3c49d2b1ccd503e2de800603dd47c363af0c89ce328235f6ae1871499b3c400b9d77398b256ebd768b11b8948a29bd40a928df4fecc16828275ed369e
--- a/app-text/dvisvgm/dvisvgm-1.2.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.2.1.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
--- a/app-text/dvisvgm/dvisvgm-1.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.3.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
--- a/app-text/dvisvgm/dvisvgm-1.4.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.4.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
--- a/app-text/dvisvgm/dvisvgm-1.5.2.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.5.2.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
--- a/app-text/dvisvgm/dvisvgm-1.9.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.9.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
--- a/app-text/dvisvgm/dvisvgm-2.0.4.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.0.4.ebuild
@ -1,12 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=4
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic autotools

 DESCRIPTION="Converts DVI files to SVG"
 HOMEPAGE="http://dvisvgm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/mgieseki/dvisvgm/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
@ -22,9 +24,19 @@ RDEPEND="virtual/tex-base
 	app-text/ghostscript-gpl
 	>=media-gfx/potrace-1.10-r1
 	media-libs/freetype:2
+	dev-libs/kpathsea
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 	app-text/xmlto
 	app-text/asciidoc
 	virtual/pkgconfig
 	test? ( dev-cpp/gtest )"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	default
+}
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@ -1,2 +1 @@
-DIST linuxdoc-tools-0.9.71.tar.gz 613357 SHA256 1710b03d0e7151892c417363dd26c15d7f45d36411b6a341b0a4d3753519f476 SHA512 8383e5f08d58ca6395db1832c02e1af7b348c276187e8271564b229d811f5141128976924f110d6575fa94bb45d547a2f4c90acee523e78c849659cad592b7ae WHIRLPOOL d40660d2b3373e853adb3055d8053507c786e278906eedf1d9b9afb74a032bc464587fbd6e9320b7fa8aab3de334c12a899a2e8bf9f5addf0c13988bbdc0ced1
 DIST linuxdoc-tools-0.9.72.tar.gz 614429 SHA256 664bfc4e580a5e7b8917104aa93b7f5021367e24ee22d67411a5f3f27fa81ba4 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408 WHIRLPOOL a9185f1666675d1ed398b9b96e798c7788e52d1ad57e39692fd9d06174f111b559c9e4f62a5762b0d0af3a7fc3d7d943b9e788d2d9df031f3d0cf4e2595587ee
--- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch
@ -1,195 +0,0 @@
-See https://gitlab.com/agmartin/linuxdoc-tools/issues/4
-and https://gitlab.com/agmartin/linuxdoc-tools/issues/6
-
-diff --git a/Makefile.in b/Makefile.in
-index adb85d0..f215678 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -83,13 +83,14 @@ ifneq ($(BUILDDOC_FORMATS),)
- #    -- Build documentation
- 	@echo "Building documentation ..."
- 	(cd doc; \
-+		MAKE="$(MAKE)" \
- 		PREFIX=$(prefix) \
- 		BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
- 		BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \
-	 	PKGPERL5LIB=$(CURDIR)/perl5lib \
-	 	PKGDATADIR=$(CURDIR)/lib \
-+		PKGPERL5LIB=$(CURDIR)/perl5lib \
-+		PKGDATADIR=$(CURDIR)/lib \
- 		PKGENTITYMAPDIR=$(CURDIR)/entity-map \
-	 	BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
-+		BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
- 		sh Makedoc.sh)
- endif
-
-@@ -174,7 +175,7 @@ ifneq ($(BUILDDOC_FORMATS),)
- 	mkdir -m 755 -p $(doc_ddir)
- 	# cp -r doc/* $(doc_ddir)
- 	( cd doc && tar --exclude='CVS' -cpf - . ) | ( cd $(doc_ddir) && tar -xpf - )
-	rm -f $(doc_ddir)/Makedoc.sh
-+	rm -f $(doc_ddir)/Makedoc.sh $(doc_ddir)/Makefile
- 	find $(doc_ddir) -type d -print | xargs chmod 755
- 	find $(doc_ddir) -type f -print | xargs chmod 644
- endif
-diff --git a/doc/Makedoc.sh b/doc/Makedoc.sh
-index b7e2efb..da4be99 100644
--- a/doc/Makedoc.sh
-+++ b/doc/Makedoc.sh
-@@ -33,7 +33,7 @@ if [ "${BUILD_ENTITY_MAP}" = "true" ]; then
-     # Create a modified EntityMap.pm with entity-map location in doc
-     # build temporary dir. Need to properly install entity-map there.
-     mkdir $TMPDIR/Text
-    make -C ../entity-map install DESTDIR="$TMPDIR"
-+    ${MAKE} -C ../entity-map install DESTDIR="$TMPDIR"
-     sed < ../entity-map/EntityMap.pm.in > $TMPDIR/Text/EntityMap.pm \
- 	-e 's|\@localentitymapdir\@|'${TMPDIR}'/usr/share/entity-map|g' \
- 	-e 's|\@entitymapdir\@|'${TMPDIR}'/usr/share/entity-map/0.1.0|g'
-@@ -49,7 +49,7 @@ fi
- if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then
-     # --without-installed-iso-entities: Install iso-entities in
-     # "$TMPDIR/usr" and set it as iso-entities prefix.
-    make -C ../iso-entities install DESTDIR="$TMPDIR"
-+    ${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR"
-     ISOENTITIES_PREFIX="${TMPDIR}/usr"
- else
-     # --with-installed-iso-entities: Use system prefix.
-@@ -88,45 +88,42 @@ fi
-
- # Build actual documentation
- echo "- Building documentation for formats: ${BUILDDOC_FORMATS}" >&2
-+BUILDDOC_MAKE=""
- for docformat in ${BUILDDOC_FORMATS}; do
-     case ${docformat} in
- 	txt)
-	    echo "- Building txt docs" >&2
- 	    if [ -n "`which groff`" ]; then
-		$TMPDIR/linuxdoc --backend=txt --filter --blanks=1 ./guide.sgml
-+		echo "- Add to build list: guide.txt" >&2
-+		BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.txt"
- 	    else
- 		echo "- ++ Warning: groff not available, cannot build \"${docformat}\" format." >&2
- 	    fi
- 	    ;;
- 	pdf)
-	    echo "- Building pdf docs" >&2
-	    $TMPDIR/linuxdoc --backend=latex --output=pdf \
-			     --pass="\usepackage{times}" ./guide.sgml
-+	    echo "- Add to build list: guide.pdf" >&2
-+	    BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.pdf"
- 	    ;;
- 	info)
-	    echo "- Building info docs" >&2
-	    $TMPDIR/linuxdoc --backend=info ./guide.sgml
-+	    echo "- Add to build list: guide.info" >&2
-+	    BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.info"
- 	    ;;
- 	lyx)
-	    echo "- Building lyx docs" >&2
-	    $TMPDIR/linuxdoc --backend=lyx ./guide.sgml
-+	    echo "- Add to build list: guide.lyx" >&2
-+	    BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.lyx"
- 	    ;;
- 	html)
-	    echo "- Building html docs" >&2
-	    $TMPDIR/linuxdoc --imagebuttons --backend=html ./guide.sgml \
-		&& mv -f ./guide*.html ./html
-+	    echo "- Add to build list: guide.html" >&2
-+	    BUILDDOC_MAKE="${BUILDDOC_MAKE} html/guide.html"
- 	    ;;
- 	rtf)
-	    echo "- Building rtf docs" >&2
-	    $TMPDIR/linuxdoc --backend=rtf ./guide.sgml && if [ ! -d ./rtf ]; \
-		then mkdir -m 755 ./rtf; fi && mv -f ./guide*.rtf ./rtf
-+	    echo "- Add to build list: guide.rtf" >&2
-+	    BUILDDOC_MAKE="${BUILDDOC_MAKE} rtf/guide.rtf"
- 	    ;;
- 	dvi+ps)
- 	    echo "- Building latex docs" >&2
- 	    if [ -n "`which latex`" ]; then
-		echo "- Building dvi docs" >&2
-		$TMPDIR/linuxdoc --backend=latex --output=dvi \
-				 --pass="\usepackage{times}" ./guide.sgml
-+		echo "- Add to build list: guide.dvi" >&2
-+		BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.dvi"
-
- 		if [ -n "`which dvips`" ]; then
- 		    echo "   + dvips" >&2
-@@ -137,9 +134,13 @@ for docformat in ${BUILDDOC_FORMATS}; do
- 			    DVIPS_PAPER="letter"
- 			fi
- 		    fi
-		    dvips -t ${DVIPS_PAPER} -o ./guide.ps ./guide.dvi
-		    if [ -n "`which gzip`" -a -f ./guide.ps ]; then
-			gzip -fn ./guide.ps
-+
-+		    if [ -n "`which gzip`" ]; then
-+			echo "- Add to build list: guide.ps.gz" >&2
-+			BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.ps.gz"
-+		    else
-+			echo "- Add to build list: guide.ps" >&2
-+			BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.ps"
- 		    fi
- 		else
- 		    echo "- ++ Warning: dvips not available, cannot build \"guide.ps\"." >&2
-@@ -156,7 +157,9 @@ for docformat in ${BUILDDOC_FORMATS}; do
-     esac
- done
-
-+${MAKE} TMPDIR="${TMPDIR}" DVIPS_PAPER="${DVIPS_PAPER}" ${BUILDDOC_MAKE}
-+
- # Remove temporary directory.
-rm -rf $TMPDIR
-+rm -rf "${TMPDIR}"
-
- exit 0
-diff --git a/doc/Makefile b/doc/Makefile
-new file mode 100644
-index 0000000..79c5382
--- /dev/null
-+++ b/doc/Makefile
-@@ -0,0 +1,44 @@
-+
-+
-+%.txt: %.sgml
-+	@echo "- Building txt docs" >&2
-+	$(TMPDIR)/linuxdoc --backend=txt --filter --blanks=1 $<
-+
-+%.pdf: %.sgml
-+	@echo "- Building pdf docs" >&2
-+	$(TMPDIR)/linuxdoc --backend=latex \
-+			--output=pdf \
-+			--pass="\usepackage{times}" $<
-+
-+%.info: %.sgml
-+	@echo "- Building info docs" >&2
-+	$(TMPDIR)/linuxdoc --backend=info $<
-+
-+%.lyx: %.sgml
-+	@echo "- Building lyx docs" >&2
-+	$(TMPDIR)/linuxdoc --backend=lyx $<
-+
-+html/%.html: %.sgml
-+	@echo "- Building html docs" >&2
-+	$(TMPDIR)/linuxdoc --imagebuttons --backend=html $<
-+	mv -f ./guide*.html ./html
-+
-+rtf/%.rtf: %.sgml
-+	@echo "- Building rtf docs" >&2
-+	$(TMPDIR)/linuxdoc --backend=rtf $<
-+	mkdir -m 755 -p ./rtf
-+	mv -f ./guide*.rtf ./rtf
-+
-+%.dvi: %.sgml
-+	@echo "- Building dvi docs" >&2
-+	$(TMPDIR)/linuxdoc --backend=latex \
-+			--output=dvi \
-+			--pass="\usepackage{times}" $<
-+
-+%.ps: %.dvi
-+	@echo "- Building ps docs" >&2
-+	dvips -t $(DVIPS_PAPER) -o $@ $<
-+
-+%.ps.gz: %.ps
-+	@echo "- Building ps.gz docs" >&2
-+	gzip -fn $<
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-# Source tarball has SHA1 of release in the name of the second topmost directory
-GIT_SHA1="5a46c4ced4ef899b398bcedf8ccd29d6f2584100"
-
-inherit autotools-utils latex-package perl-module sgml-catalog toolchain-funcs
-
-DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
-HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
-SRC_URI="https://gitlab.com/agmartin/${PN}/repository/archive.tar.gz?ref=upstream/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ MIT SGMLUG"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="
-	|| ( app-text/openjade app-text/opensp )
-	app-text/sgml-common
-	dev-lang/perl:=
-	|| ( sys-apps/gawk sys-apps/mawk )
-	sys-apps/groff
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		virtual/latex-base
-	)
-"
-
-DOCS=( ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${P}-fix-parallel-doc-build.patch" )
-
-S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}"
-
-src_prepare() {
-	# Use Gentoo doc install path.
-	sed -i \
-		-e "s%/share/doc/${PN}%/share/doc/${PF}%" \
-		Makefile.in || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	perl_set_version
-	tc-export CC
-	local myeconfargs=(
-		--disable-docs
-		--with-texdir="${TEXMF}/tex/latex/${PN}"
-		--with-perllibdir="${VENDOR_ARCH}"
-		--with-installed-iso-entities
-	)
-	use doc && myeconfargs+=(--enable-docs="txt pdf html")
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-}
-
-src_install() {
-	# Prevent access violations from bitmap font files generation.
-	export VARTEXFONTS="${T}/fonts"
-
-	autotools-utils_src_install
-}
-
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
-
-pkg_postinst() {
-	latex-package_pkg_postinst
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	latex-package_pkg_postrm
-	sgml-catalog_pkg_postrm
-}
--- a/dev-lang/R/R-3.3.2.ebuild
+++ b/dev-lang/R/R-3.3.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -72,7 +72,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
 		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
+		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch \
+		"${FILESDIR}"/${P}-zlib-1.2.10-backport.patch

 	# fix packages.html for doc (gentoo bug #205103)
 	sed -i \
--- a/dev-lang/R/files/R-3.3.2-zlib-1.2.10-backport.patch
+++ b/dev-lang/R/files/R-3.3.2-zlib-1.2.10-backport.patch
@ -0,0 +1,20 @@
+Index: R.m4
+===================================================================
+--- m4/R.m4	(revision 71152)
+++ m4/R.m4	(revision 71889)
+@@ -3105,10 +3105,11 @@
+ #include <string.h>
+ #include <zlib.h>
+ int main() {
+-#ifdef ZLIB_VERSION
+-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
+-   version on the master site zlib.net */
+-  exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
+#ifdef ZLIB_VERNUM
+  if (ZLIB_VERNUM < 0x1250) {
+    exit(1);
+  }
+  exit(0);
+ #else
+   exit(1);
+ #endif
--- a/dev-lang/perl/files/perl-patchlevel-manifest.patch
+++ b/dev-lang/perl/files/perl-patchlevel-manifest.patch
@ -1,10 +0,0 @@
--- a/MANIFEST
-+++ b/MANIFEST
-@@ -4678,6 +4678,7 @@
- pad.h				Scratchpad headers
- parser.h			parser object header
-+patchlevel-gentoo.h			Gentoo's Perl patch level
- patchlevel.h			The current patch level of perl
- perlapi.c			Perl API functions
- perlapi.h			Perl API function declarations
- perl.c				main()
--- a/dev-lang/perl/perl-5.24.1_rc4.ebuild
+++ b/dev-lang/perl/perl-5.24.1_rc4.ebuild
@ -215,6 +215,7 @@ src_prepare_update_patchlevel_h() {
 	# it under the same terms as Perl itself.
 	local patchdir="${WORKDIR}/patches"
 	local prefix
+	local patchoutput="patchlevel-gentoo.h"

 	[[ -f ${patchdir}/series ]] || return 0

@ -252,9 +253,8 @@ do
 	# label: prepend to the hold space
 	:prepend x; H; d;
 	'
-done < "${WORKDIR}"/patches/series > "${S}/patchlevel-gentoo.h"
-
-	eapply "${FILESDIR}/perl-patchlevel-manifest.patch"
+done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
+echo "${patchoutput}" >> "${S}/MANIFEST"
 }

 src_prepare() {
--- a/dev-lang/php/php-5.6.28.ebuild
+++ b/dev-lang/php/php-5.6.28.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -31,7 +31,7 @@ IUSE="${IUSE}

 IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
 	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
+	enchant exif +fileinfo +filter firebird
 	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
 	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
 	mhash mssql mysql libmysqlclient mysqli nls
--- a/dev-lang/php/php-5.6.29.ebuild
+++ b/dev-lang/php/php-5.6.29.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"

 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
@ -31,7 +31,7 @@ IUSE="${IUSE}

 IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
 	coverage crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
+	enchant exif +fileinfo +filter firebird
 	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
 	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
 	mhash mssql mysql libmysqlclient mysqli nls
--- a/dev-lang/php/php-7.0.14-r1.ebuild
+++ b/dev-lang/php/php-7.0.14-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -31,7 +31,7 @@ IUSE="${IUSE}

 IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
 	coverage crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
+	enchant exif +fileinfo +filter firebird
 	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
 	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
 	mhash mssql mysql mysqli nls
--- a/dev-lang/php/php-7.1.0-r3.ebuild
+++ b/dev-lang/php/php-7.1.0-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -31,7 +31,7 @@ IUSE="${IUSE}

 IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
 	coverage crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
+	enchant exif +fileinfo +filter firebird
 	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
 	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
 	mhash mssql mysql mysqli nls
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/0.13"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-solaris"
 IUSE="examples static-libs test"

 DEPEND="test? ( dev-db/redis )"
--- a/dev-libs/jansson/jansson-2.9.ebuild
+++ b/dev-libs/jansson/jansson-2.9.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc static-libs"

 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@ -2,3 +2,4 @@ DIST libevdev-1.4.4.tar.xz 409856 SHA256 ed9979369b6a6e28f5897d099538549ecffb2b7
 DIST libevdev-1.5.2.tar.xz 397848 SHA256 5ee2163656a61f5703cb5c08a05c9471ffb7b640bfbe2c55194ea50d908f629b SHA512 7f07d2eb9feb3e4bd5ae512fa7000dd8d1ad8d5334fff9440262ab45aaec95ff311e3f9c9b1711259700b3f35613b192f5a2c8ac90fcb6842390bfd861e3e30c WHIRLPOOL 92a5679722caf6222036909a8a0dadc02503592e4b06e68e74f7deeaabc8e5335bc5a94c0d765913029350dfdb6f4ee7236459c1e637fc87cbc3635eec1c6a6f
 DIST libevdev-1.5.4.tar.xz 397876 SHA256 11fe76d62cc76fbc9dbf8e94696a80eee63780139161e5cf54c55ec21a8173a4 SHA512 9062b8c599ccc361d39bd0d06ee7dd7ddcca21541849a5f53ff1ec6d9760a8b575d90201a9a6b5ac5a01e7a77af9d191901bb1196976de52080e351717119f4e WHIRLPOOL 2d7fbc0942fe6a2a1c1d3ee0fffe43ec11fb4e88d8bdb251171b28d58de3426aa8dfbfe43600b49ffcf0ef2e21a4c9de87c239d76c1302b190af813c7fad791b
 DIST libevdev-1.5.5.tar.xz 406500 SHA256 320120782018b992956b3fa29495c323832860807ac8ea74537e636a0e0280b1 SHA512 cab1679c51566c673839f001c499cd854d502fd365a962547560859658be677552c30ebecba30faebfac1b4da795d480cf494c9317906a81c27d1f2aef58b133 WHIRLPOOL 59b0e07fd6b3c160eff143b2ec7cdc77ac80f5ccde979a978231694eec362d2bda24a92d0f1b76b9ef21d851801a58a76f6d22d4ed2bd4d8ca2c7f5f9ddbabe6
+DIST libevdev-1.5.6.tar.xz 407024 SHA256 ecec7e9d66b1d3692f10b3b20aa97fb25e874a784c5552a7b1698091fef5a688 SHA512 4e9f44e0957d9d83e46de095f1eb8a64d7db808ac5a397d266ec1149948b82aa3f123fcf3d47cd72aff2741cce13b2162324c195f892861de97d7beb19ef6b19 WHIRLPOOL bbc0be49280c07249d802a14b8f054a5a116a3b18bd42e3a6a700011f293f1b1b0c8dd40f611a1a68a9b1b3e7f07cc316acdba2e12ab24d66be662c9f36396ac
--- a/dev-libs/libevdev/libevdev-1.5.6.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.6.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_MULTILIB=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit python-any-r1 xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
+
+DESCRIPTION="Handler library for evdev events"
+
+if [[ ${PV} == 9999* ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+RESTRICT="test" # Tests need to run as root.
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@ -1,3 +1,4 @@
+DIST libsecp256k1-v0.0.0_pre20161213.tgz 147557 SHA256 1cb5350e50d8d7e9061835d40a06e8419d8dcf95210bdf887380d2b933217743 SHA512 f4d16fae972364fd04bfcfbaca1edde4410a7367a936f76c1e93b85ac3c9c45da58785f604a4fc14cdfb4d7a23395d2d274957ad83118e15a236dfff0d0f57dd WHIRLPOOL af3bf6aeffa66f2d442dcc11255a60e5f24d281b30751ddcf72d9abbfb052cb8197081b56281e4b19a99602eead204ca985ed74feeb4b1e5c89543c70014f454
 DIST secp256k1-v0.0.0_pre20141212.tgz 60007 SHA256 f5d3a7cac425caf64040395d99c1a91ab2ca1c973b228a66772ba4a290f355ce SHA512 ab2a211c1bf882ebb62e78891e4e12c3ed7244d46d532e37ff2a669ba08db8dcafec7b4c57c073310e463957fd2fa0dffb940c4f35b61890cb8ce86d4283f0f6 WHIRLPOOL 3aa8b7545ca24028ceb17e770fdbf997e2895212ec25a193fcd926660e78f16d704bf27a5b1aa7cf3cabe643c33b128bf0b0568172c15833eb82fcc58e5941c1
 DIST secp256k1-v0.0.0_pre20150423.tgz 77451 SHA256 7e4e78d5ded245b59dbe8abc9804fdf7ba41d9030936fb39766d5f2bd7e29b2e SHA512 a640188d83e9aa5a4292900c211e29815f2f1b57db4fbccfb8a3bf770bb52f0232d405044f317a3b6b6ea4d5a5107180dc4e374cf7ab06eb79676c270061c3b7 WHIRLPOOL 5796d32cd8f578ef28f6e79ced53fa505519273af39bdeaa413e9b48669ce7945d12437c6093f3aa0b3db9412dac50638c335a3f4f8cf0d4ffa8c94665a85f72
 DIST secp256k1-v0.0.0_pre20151118.tgz 125884 SHA256 75549cea9b22affda02d6731385a7184b60703f1ca0a4f098fec8c702a20f7b0 SHA512 3cc0a4973acf7936a7c6dc0abc37ee43ecd69e835069ed40765595d36ca597b43837b5d6f90499455599de03abfc775d7c9d019d26216b79b03dd6dc53a73e19 WHIRLPOOL 61eb9a709e8986db9113d305a989d44700f5e53143471485935bed0f79d18c745cb78f2b4b5e55614b6ca80a6bd29830b52108797bc21bc792789a7590597fed
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild
@ -15,13 +15,13 @@ SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${My
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="asm doc endomorphism gmp test"
+IUSE="+asm doc endomorphism gmp test"

 REQUIRED_USE="
 	asm? ( amd64 )
 "
 RDEPEND="
-	gmp? ( dev-libs/gmp:0 )
+	gmp? ( dev-libs/gmp:0= )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20150423.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20150423.ebuild
@ -15,13 +15,13 @@ SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${My
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm doc endomorphism gmp libressl test"
+IUSE="+asm doc endomorphism gmp libressl test"

 REQUIRED_USE="
 	asm? ( amd64 )
 "
 RDEPEND="
-	gmp? ( dev-libs/gmp:0 )
+	gmp? ( dev-libs/gmp:0= )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${My
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="asm doc ecdh endomorphism experimental gmp libressl +recovery schnorr test"
+IUSE="+asm doc ecdh endomorphism experimental gmp libressl +recovery schnorr test"

 REQUIRED_USE="
 	asm? ( amd64 )
@ -23,7 +23,7 @@ REQUIRED_USE="
 	schnorr? ( experimental )
 "
 RDEPEND="
-	gmp? ( dev-libs/gmp:0 )
+	gmp? ( dev-libs/gmp:0= )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+MyPN=secp256k1
+DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
+HOMEPAGE="https://github.com/bitcoin/${MyPN}"
+COMMITHASH="8225239f490f79842a5a3b82ad6cc8aa11d5208e"
+SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test_openssl"
+
+REQUIRED_USE="
+	asm? ( || ( amd64 arm ) arm? ( experimental ) )
+	ecdh? ( experimental )
+	java? ( ecdh )
+	test_openssl? ( test )
+"
+RDEPEND="
+	gmp? ( dev-libs/gmp:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	java? ( virtual/jdk )
+	test_openssl? ( dev-libs/openssl:0 )
+"
+
+S="${WORKDIR}/${MyPN}-${COMMITHASH}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local asm_opt
+	if use asm; then
+		if use arm; then
+			asm_opt=arm
+		else
+			asm_opt=auto
+		fi
+	else
+		asm_opt=no
+	fi
+	econf \
+		--disable-benchmark \
+		$(use_enable experimental) \
+		$(use_enable java jni) \
+		$(use_enable test tests) \
+		$(use_enable test_openssl openssl-tests) \
+		$(use_enable ecdh module-ecdh) \
+		$(use_enable endomorphism)  \
+		--with-asm=$asm_opt \
+		--with-bignum=$(usex gmp gmp no) \
+		$(use_enable recovery module-recovery) \
+		--disable-static
+}
+
+src_install() {
+	dodoc README.md
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+}
--- a/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild
@ -14,22 +14,21 @@ HOMEPAGE="https://github.com/bitcoin/${MyPN}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="asm doc ecdh endomorphism experimental gmp libressl +recovery schnorr test"
+IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test_openssl"

 REQUIRED_USE="
-	asm? ( amd64 )
+	asm? ( || ( amd64 arm ) arm? ( experimental ) )
 	ecdh? ( experimental )
-	schnorr? ( experimental )
+	java? ( ecdh )
+	test_openssl? ( test )
 "
 RDEPEND="
-	gmp? ( dev-libs/gmp:0 )
+	gmp? ( dev-libs/gmp:0= )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	test? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	java? ( virtual/jdk )
+	test_openssl? ( dev-libs/openssl:0 )
 "

 src_prepare() {
@ -37,24 +36,32 @@ src_prepare() {
 }

 src_configure() {
+	local asm_opt
+	if use asm; then
+		if use arm; then
+			asm_opt=arm
+		else
+			asm_opt=auto
+		fi
+	else
+		asm_opt=no
+	fi
 	econf \
 		--disable-benchmark \
 		$(use_enable experimental) \
+		$(use_enable java jni) \
 		$(use_enable test tests) \
+		$(use_enable test_openssl openssl-tests) \
 		$(use_enable ecdh module-ecdh) \
 		$(use_enable endomorphism)  \
-		--with-asm=$(usex asm auto no) \
+		--with-asm=$asm_opt \
 		--with-bignum=$(usex gmp gmp no) \
 		$(use_enable recovery module-recovery) \
-		$(use_enable schnorr module-schnorr) \
 		--disable-static
 }

 src_install() {
-	if use doc; then
-		dodoc README.md
-	fi
-
+	dodoc README.md
 	emake DESTDIR="${D}" install
 	prune_libtool_files
 }
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@ -16,6 +16,7 @@
    <flag name="experimental">Allow experimental USE flags</flag>
    <flag name="recovery">Enable ECDSA pubkey recovery module</flag>
    <flag name="schnorr">Enable Schnorr signature module</flag>
+    <flag name="test_openssl">Enable OpenSSL comparison tests</flag>
  </use>
  <upstream>
    <remote-id type="github">bitcoin/secp256k1</remote-id>
--- a/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"

 LICENSE="MIT"
 SLOT="2"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"

 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@ -1,2 +1,2 @@
 DIST pkcs11-helper-1.11.tar.bz2 380697 SHA256 05a078efe1261247f26751fa616de732a64dbe1ed6c83e8ea5e6e85d8f70ff2f SHA512 cab34a6c3336cf4077d5b7face9e4b8eeb12f0edb6e265704e481b5ef9738495a45d61a99153b244a91960ed353d79edb99b30f01b0e00efc524542c2a1ac4e1 WHIRLPOOL 8deacedebef01974faecc6861bee27626317379d922f774758fcbd1ec93cf4dc5d1a335144fe85764e92ed985193b5b81b8439b54c953e201b0f17e6b44f4cc8
-DIST pkcs11-helper-1.20.tar.bz2 416783 SHA256 dafaa71ea9735d7d4ca43f385c53a44bc642c5a7d380d1e2912a0969b3b717be SHA512 f22774bf5cdb247ef0780aaf8b6a55ad3456630c157c38f487564e49ab2439c6416eda4a123274b4e61e6483225388b430681ca213e976cb085262e3edb7f9e1 WHIRLPOOL f0c36539c3dbff42776c9cf71933d110369347e347b5f613bbc6a81cd746aef10967c5649ad43e253b7e6c8593399c2bf08153d79691a809a08ca65cf8ea4426
+DIST pkcs11-helper-1.21.tar.bz2 417527 SHA256 7bc455915590fec1a85593171f08a73ef343b1e7a73e60378d8744d54523e17c SHA512 064b04c1ece2db0757e14263955c0f7488edde5f5f4415ebda9c4370e608d7df681706ddefcdba2392e5642d00ebd4c211f15266bb39baf8da46ffaec4f3e572 WHIRLPOOL b6825820218f7335030e28ea9b49127d6ec7eddcdc435a0d01785e359b1ba621c51ed1e8f248e48d7cb55b3a756ee04d8fc9071db4d55f19faf0848b5a349328
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.21.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.21.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

--- a/dev-libs/softhsm/softhsm-2.2.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.2.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -8,7 +8,7 @@ DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="http://www.opendnssec.org/"
 SRC_URI="http://www.opendnssec.org/files/source/${P}.tar.gz"

-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="debug +migration-tool"
 SLOT="2"
 LICENSE="BSD"
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@ -1,3 +1,4 @@
 DIST sqlite3-ocaml-4.0.6.tar.gz 70620 SHA256 921be9aab70743d8e56e51fdcc23c0974e54991e416e23d5dd025ca8d1adb269 SHA512 8659207d4ea08d062c465f6ac03f754b3c3eb7a9d17b95bb08a9a578eb45b4683400435ca063ad9b0c52267da060823dcaa4c566e5bcedf9229f24726d32a2b3 WHIRLPOOL c4cb389931682ceca6460281887707cd89e2e6b068499dd7e9b1061123b35279b3ca044bc328e9f4538cfc1d38c6f46f46116f0f62ba01634b0e6eb766267c8f
 DIST sqlite3-ocaml-4.1.0.tar.gz 76762 SHA256 1ab50edeee261da6835bc3b80e3d30172e37f2f230d186ae0099c1539574b79b SHA512 d444534d02039b1b505c1dbe9dcee4e29c3b4b6a4ed1f480552598a59a0748ebba144a54656fdc6d652993a22adaa69434ebf97dca4ab17a379160587d497fec WHIRLPOOL 090ac0f2cc2b8f828e91b076751cc1e6f79206d49d4ca5708dc3cdbac47a45792dfbd637eadda00cce75c3ec33d219cd5c8cf7d13308317dd32a3a591d4847ac
 DIST sqlite3-ocaml-4.1.1.tar.gz 76848 SHA256 8d180fb9753e70508077ddec65a55cd485cdb7106e7eb2ac94ff6356d7dff7da SHA512 79cd4866b56fe75c269d2c912182b6b0d6c8fd84e483d7e63d465af42e3fb658550720de6bb0a26659a84b559b8b91c9d28487f0cb0c68fc18025efa6c2e5453 WHIRLPOOL d7d11b52f82946fa6c36949c94cf4ae499659aaf6a3c69e1587edcaa41ed0f8b240dbcaba686a17297fbd1871ca78ff320c07df00ccb1a3bbf41f8be61718440
+DIST sqlite3-ocaml-4.1.2.tar.gz 76879 SHA256 35dc12f238d171b1242c3bbc225ac947d1e34741dd6ff0a4da71197672b48191 SHA512 880f82fa9eba06114695bda56305245d2d9062f8136db85675463e97fbb8aee210df310d8d65d78e9eb1f882421581a97c4b7f20a790881f699b4d494be066f5 WHIRLPOOL 7e548b0032f4f439052a983321b201c7f2bf83f63df0354bc3a956cee2391f6048fd7089b3af239d3ec7ae9e68e823925411799b9c4c3d81d89bd5efda570bcf
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_PN="sqlite3-ocaml"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases"
+HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
+SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-db/sqlite-3.3.3
+	>=dev-ml/findlib-1.3.2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
--- a/dev-perl/BZ-Client/BZ-Client-4.400.0.ebuild
+++ b/dev-perl/BZ-Client/BZ-Client-4.400.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DJZORT
+DIST_VERSION=4.4
+inherit perl-module
+
+DESCRIPTION="A client for the Bugzilla web services API."
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/DateTime-Format-ISO8601
+	dev-perl/DateTime-Format-Strptime
+	dev-perl/DateTime-TimeZone
+	virtual/perl-Encode
+	virtual/perl-File-Spec
+	dev-perl/HTTP-CookieJar
+	virtual/perl-HTTP-Tiny
+	dev-perl/URI
+	dev-perl/XML-Parser
+	dev-perl/XML-Writer
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Clone
+		virtual/perl-Data-Dumper
+		dev-perl/DateTime
+		dev-perl/Test-RequiresInternet
+		virtual/perl-Test-Simple
+		dev-perl/Text-Password-Pronounceable
+	)
+"
+
+src_test() {
+	local bad_files my_test_control
+	bad_files=(
+		t/author-*
+		t/release-*
+	)
+	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+	if ! has network ${my_test_control} ; then
+		bad_files+=(
+			# Fail without network access
+			t/200bug.t t/300classification.t
+			# Do discovery probes
+			t/400component.t t/500group.t
+		)
+	fi
+	perl_rm_files "${bad_files[@]}"
+	perl-module_src_test
+}
--- a/dev-perl/BZ-Client/Manifest
+++ b/dev-perl/BZ-Client/Manifest
@ -1 +1,2 @@
 DIST BZ-Client-1.072.tar.gz 32692 SHA256 4f39e7739af68df67231719865e579b08d0bf1befebee69aad8015b229388f1a SHA512 d26c7e03d62013e5b308e33920e350ddaf5f93cc7a2939f1a6cee6746fa8e25138fad31454c0f0b8c1f4834ec939226b98d472891c0c1f22120e18a751755898 WHIRLPOOL 3415f6ad89d477c7c2fc2291428ee8144d57ee705af749c79f9b257054ccaca4510a53e79fd30f494f056891852f2c3cd098e14a393617ea2ff9f77833652a48
+DIST BZ-Client-4.4.tar.gz 64706 SHA256 74d821f512ef50fc1e943b8b4170ed0f496a41e49b93960f7793cb5d23b8835b SHA512 b3967179ba9f8139cb1921ffa1b154fdc0fced8a80425db4780eb940499bf62fd669da32673ee176ed65fbe47d168548fa267813cb42264cb9207a3c807e3ed8 WHIRLPOOL eb4d1c195897e891feecd8014e017ebe520ff1584ed3dcfa436822c85a281a208766f05916d01db1134f6d500f9793aed4e54bdce11b166f5d10526ab03d9911
--- a/dev-perl/BZ-Client/metadata.xml
+++ b/dev-perl/BZ-Client/metadata.xml
@ -1,8 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>perl@gentoo.org</email>
-	<name>Gentoo Perl Project</name>
-</maintainer>
+  <maintainer type="project">
+	  <email>perl@gentoo.org</email>
+	  <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">BZ-Client</remote-id>
+    <remote-id type="cpan-module">BZ::Client</remote-id>
+    <remote-id type="cpan-module">BZ::Client::API</remote-id>
+    <remote-id type="cpan-module">BZ::Client::Bug</remote-id>
+    <remote-id type="cpan-module">BZ::Client::Bug::Attachment</remote-id>
+    <remote-id type="cpan-module">BZ::Client::Bug::Comment</remote-id>
+    <remote-id type="cpan-module">BZ::Client::BugUserLastVisit</remote-id>
+    <remote-id type="cpan-module">BZ::Client::Bugzilla</remote-id>
+    <remote-id type="cpan-module">BZ::Client::Classification</remote-id>
+    <remote-id type="cpan-module">BZ::Client::Component</remote-id>
+    <remote-id type="cpan-module">BZ::Client::Exception</remote-id>
+    <remote-id type="cpan-module">BZ::Client::FlagType</remote-id>
+    <remote-id type="cpan-module">BZ::Client::Group</remote-id>
+    <remote-id type="cpan-module">BZ::Client::Product</remote-id>
+    <remote-id type="cpan-module">BZ::Client::User</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC::Array</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC::Handler</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC::Parser</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC::Response</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC::Struct</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC::Value</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC::boolean</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC::double</remote-id>
+    <remote-id type="cpan-module">BZ::Client::XMLRPC::int</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.70.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.70.0.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=KMX
+DIST_VERSION=0.07
+inherit perl-module
+
+DESCRIPTION="OpenSSL's multiprecision integer arithmetic"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/pkgconfig
+"
--- a/dev-perl/Crypt-OpenSSL-Bignum/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Manifest
@ -1,2 +1,3 @@
 DIST Crypt-OpenSSL-Bignum-0.04.tar.gz 13520 SHA256 73a1e3a2419054a5109629c55d3ec322415be07d6bb6029b830a30e8f1126fa3 SHA512 ea95da0a71e7534595d721a0c4ad95f43d93407b3ed465aad88d8809a11646da15254341b5c36c6248b80be844b36276079b1b050ad5dacbdf71f2bb06621403 WHIRLPOOL 100e82b2d5436f8a742b9b53d09b602d26b3f7244b9f8c1d20ef0f3a3ec87b6a639846ec8b6e1239641aa0e51167906cbc8c6f92323d59c2df4934afe4948cec
 DIST Crypt-OpenSSL-Bignum-0.06.tar.gz 15873 SHA256 c7ccafa9108524b9a6f63bf4ac3377f9d7e978fee7b83c430af7e74c5fcbdf17 SHA512 98e18ce2d8db09b2a552de641e403944e9e0f413b835dcf560fb8b552bd442a2753aea2ed7cb1b62cb261f1b6debfe56db82b15bd872bc45e12ff1aed92fa478 WHIRLPOOL f0347b7a620c923794fda847d2f96a9a3ecbe30b1b036bf1d5fb9556eb99d316ffdd8c1135bbe414eec0e98b8ecc6fedd95a129319926ace7a56767647e80750
+DIST Crypt-OpenSSL-Bignum-0.07.tar.gz 15996 SHA256 2ddae11eec0436f67fe7a1fcef8226a5275d7ad98fdc7802c6e9484b9a4a886d SHA512 b41bcdc4e4b8410dd90f59c4c6f67fdf82340fe94a71854372c0eae2ed5bcf28bef56f5221c669c7d3aeb02e888b714584c1cd46d0b8e84e3379bb4a7169be65 WHIRLPOOL 073566dcfe5a50bd1c5589548e3c05fb00ab43356b6117ea3d8c04c54b4e3c140af103b3f10dfc3ec7fdfb9e45e46afa30799b2596b4bff61eeba273b7e31e17
--- a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r2.ebuild
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -21,6 +21,10 @@ RDEPEND="dev-perl/Crypt-OpenSSL-Bignum
 "
 DEPEND="${RDEPEND}"

+PATCHES=(
+	"${FILESDIR}/${P}-openssl-1.1.0.patch"
+)
+
 SRC_TEST="do"

 mydoc="rfc*.txt"
--- a/dev-perl/Crypt-OpenSSL-RSA/files/Crypt-OpenSSL-RSA-0.280.0-openssl-1.1.0.patch
+++ b/dev-perl/Crypt-OpenSSL-RSA/files/Crypt-OpenSSL-RSA-0.280.0-openssl-1.1.0.patch
@ -0,0 +1,256 @@
+From fdbda9585f5c99670912e5c0517dbc7a9d92c74b Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Date: Sat, 1 Oct 2016 19:52:44 +0000
+Subject: [PATCH] libcrypt-openssl-rsa-perl: get it compiled with openssl 1.1.0
+
+Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=117481
+Bug-Debian: https://bugs.debian.org/828387
+
+---
+ RSA.xs | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 150 insertions(+), 23 deletions(-)
+
+diff --git a/RSA.xs b/RSA.xs
+index de512e7822d0..b384cb0e23a2 100644
+--- a/RSA.xs
+++ b/RSA.xs
+@@ -47,9 +47,119 @@ void croakSsl(char* p_file, int p_line)
+ 
+ #define THROW(p_result) if (!(p_result)) { error = 1; goto err; }
+ 
+#if OPENSSL_VERSION_NUMBER < 0x10100000
+
+static void RSA_get0_key(const RSA *r,
+                         const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
+{
+    if (n != NULL)
+        *n = r->n;
+    if (e != NULL)
+        *e = r->e;
+    if (d != NULL)
+        *d = r->d;
+}
+
+static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+{
+    /* If the fields n and e in r are NULL, the corresponding input
+     * parameters MUST be non-NULL for n and e.  d may be
+     * left NULL (in case only the public key is used).
+     */
+    if ((r->n == NULL && n == NULL)
+        || (r->e == NULL && e == NULL))
+        return 0;
+
+    if (n != NULL) {
+        BN_free(r->n);
+        r->n = n;
+    }
+    if (e != NULL) {
+        BN_free(r->e);
+        r->e = e;
+    }
+    if (d != NULL) {
+        BN_free(r->d);
+        r->d = d;
+    }
+
+    return 1;
+}
+
+static int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q)
+{
+    /* If the fields p and q in r are NULL, the corresponding input
+     * parameters MUST be non-NULL.
+     */
+    if ((r->p == NULL && p == NULL)
+        || (r->q == NULL && q == NULL))
+        return 0;
+
+    if (p != NULL) {
+        BN_free(r->p);
+        r->p = p;
+    }
+    if (q != NULL) {
+        BN_free(r->q);
+        r->q = q;
+    }
+
+    return 1;
+}
+
+static void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
+{
+    if (p != NULL)
+        *p = r->p;
+    if (q != NULL)
+        *q = r->q;
+}
+
+static int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
+{
+    /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input
+     * parameters MUST be non-NULL.
+     */
+    if ((r->dmp1 == NULL && dmp1 == NULL)
+        || (r->dmq1 == NULL && dmq1 == NULL)
+        || (r->iqmp == NULL && iqmp == NULL))
+        return 0;
+
+    if (dmp1 != NULL) {
+        BN_free(r->dmp1);
+        r->dmp1 = dmp1;
+    }
+    if (dmq1 != NULL) {
+        BN_free(r->dmq1);
+        r->dmq1 = dmq1;
+    }
+    if (iqmp != NULL) {
+        BN_free(r->iqmp);
+        r->iqmp = iqmp;
+    }
+
+    return 1;
+}
+
+static void RSA_get0_crt_params(const RSA *r,
+                                const BIGNUM **dmp1, const BIGNUM **dmq1,
+                                const BIGNUM **iqmp)
+{
+    if (dmp1 != NULL)
+        *dmp1 = r->dmp1;
+    if (dmq1 != NULL)
+        *dmq1 = r->dmq1;
+    if (iqmp != NULL)
+        *iqmp = r->iqmp;
+}
+#endif
+
+ char _is_private(rsaData* p_rsa)
+ {
+-    return(p_rsa->rsa->d != NULL);
+    const BIGNUM *d;
+
+    RSA_get0_key(p_rsa->rsa, NULL, NULL, &d);
+    return(d != NULL);
+ }
+ 
+ SV* make_rsa_obj(SV* p_proto, RSA* p_rsa)
+@@ -136,7 +246,7 @@ unsigned char* get_message_digest(SV* text_SV, int hash_method)
+     }
+ }
+ 
+-SV* bn2sv(BIGNUM* p_bn)
+SV* bn2sv(const BIGNUM* p_bn)
+ {
+     return p_bn != NULL
+         ? sv_2mortal(newSViv((IV) BN_dup(p_bn)))
+@@ -297,8 +407,15 @@ generate_key(proto, bitsSV, exponent = 65537)
+     unsigned long exponent;
+   PREINIT:
+     RSA* rsa;
+    BIGNUM *e;
+   CODE:
+-    CHECK_OPEN_SSL(rsa = RSA_generate_key(SvIV(bitsSV), exponent, NULL, NULL));
+    e = BN_new();
+    CHECK_OPEN_SSL(e);
+    rsa = RSA_new();
+    CHECK_OPEN_SSL(rsa);
+    BN_set_word(e, exponent);
+    CHECK_OPEN_SSL(RSA_generate_key_ex(rsa, SvIV(bitsSV), e, NULL));
+    BN_free(e);
+     RETVAL = make_rsa_obj(proto, rsa);
+   OUTPUT:
+     RETVAL
+@@ -325,10 +442,11 @@ _new_key_from_parameters(proto, n, e, d, p, q)
+         croak("At least a modulous and public key must be provided");
+     }
+     CHECK_OPEN_SSL(rsa = RSA_new());
+-    rsa->n = n;
+-    rsa->e = e;
+    CHECK_OPEN_SSL(RSA_set0_key(rsa, n, e, NULL));
+     if (p || q)
+     {
+        BIGNUM *dmp1, *dmq1, *iqmp;
+
+         error = 0;
+         THROW(ctx = BN_CTX_new());
+         if (!p)
+@@ -341,8 +459,7 @@ _new_key_from_parameters(proto, n, e, d, p, q)
+             q = BN_new();
+             THROW(BN_div(q, NULL, n, p, ctx));
+         }
+-        rsa->p = p;
+-        rsa->q = q;
+        CHECK_OPEN_SSL(RSA_set0_factors(rsa, p, q));
+         THROW(p_minus_1 = BN_new());
+         THROW(BN_sub(p_minus_1, p, BN_value_one()));
+         THROW(q_minus_1 = BN_new());
+@@ -353,13 +470,17 @@ _new_key_from_parameters(proto, n, e, d, p, q)
+             THROW(BN_mul(d, p_minus_1, q_minus_1, ctx));
+             THROW(BN_mod_inverse(d, e, d, ctx));
+         }
+-        rsa->d = d;
+-        THROW(rsa->dmp1 = BN_new());
+-        THROW(BN_mod(rsa->dmp1, d, p_minus_1, ctx));
+-        THROW(rsa->dmq1 = BN_new());
+-        THROW(BN_mod(rsa->dmq1, d, q_minus_1, ctx));
+-        THROW(rsa->iqmp = BN_new());
+-        THROW(BN_mod_inverse(rsa->iqmp, q, p, ctx));
+        CHECK_OPEN_SSL(RSA_set0_key(rsa, NULL, NULL, d));
+
+        THROW(dmp1 = BN_new());
+        THROW(dmq1 = BN_new());
+        THROW(iqmp = BN_new());
+
+        THROW(BN_mod(dmp1, d, p_minus_1, ctx));
+        THROW(BN_mod(dmq1, d, q_minus_1, ctx));
+        THROW(BN_mod_inverse(iqmp, q, p, ctx));
+
+        CHECK_OPEN_SSL(RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp));
+         THROW(RSA_check_key(rsa) == 1);
+      err:
+         if (p_minus_1) BN_clear_free(p_minus_1);
+@@ -373,7 +494,7 @@ _new_key_from_parameters(proto, n, e, d, p, q)
+     }
+     else
+     {
+-        rsa->d = d;
+        CHECK_OPEN_SSL(RSA_set0_key(rsa, NULL, NULL, d));
+     }
+     RETVAL = make_rsa_obj(proto, rsa);
+ }
+@@ -386,15 +507,21 @@ _get_key_parameters(p_rsa)
+ PPCODE:
+ {
+     RSA* rsa;
+    const BIGNUM *n, *e, *d, *p, *q;
+    const BIGNUM *dmp1, *dmq1, *iqmp;
+
+     rsa = p_rsa->rsa;
+-    XPUSHs(bn2sv(rsa->n));
+-    XPUSHs(bn2sv(rsa->e));
+-    XPUSHs(bn2sv(rsa->d));
+-    XPUSHs(bn2sv(rsa->p));
+-    XPUSHs(bn2sv(rsa->q));
+-    XPUSHs(bn2sv(rsa->dmp1));
+-    XPUSHs(bn2sv(rsa->dmq1));
+-    XPUSHs(bn2sv(rsa->iqmp));
+    RSA_get0_key(rsa, &n, &e, &d);
+    RSA_get0_factors(rsa, &p, &q);
+    RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
+    XPUSHs(bn2sv(n));
+    XPUSHs(bn2sv(e));
+    XPUSHs(bn2sv(d));
+    XPUSHs(bn2sv(p));
+    XPUSHs(bn2sv(q));
+    XPUSHs(bn2sv(dmp1));
+    XPUSHs(bn2sv(dmq1));
+    XPUSHs(bn2sv(iqmp));
+ }
+ 
+ SV*
+-- 
+2.1.4
+
--- a/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.8.0.ebuild
+++ b/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.8.0.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=0.008
+inherit perl-module
+
+DESCRIPTION="A minimalist HTTP user agent cookie jar"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+
+RDEPEND="
+	!minimal? ( dev-perl/Mozilla-PublicSuffix )
+	virtual/perl-Carp
+	dev-perl/HTTP-Date
+	>=virtual/perl-Time-Local-1.190.100
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		!minimal? (
+			>=virtual/perl-CPAN-Meta-2.120.900
+			dev-perl/HTTP-Message
+
+		)
+		virtual/perl-File-Spec
+		dev-perl/Test-Deep
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/URI
+	)
+"
--- a/dev-perl/HTTP-CookieJar/Manifest
+++ b/dev-perl/HTTP-CookieJar/Manifest
@ -0,0 +1 @@
+DIST HTTP-CookieJar-0.008.tar.gz 28754 SHA256 9507e039279f4c0deed7fcee8fadec5029b8a933c81eb78e7e8faaccb632dc65 SHA512 6e85c22084ba2959b385f4cd706b2b937fcdb68f219ee03ccdd69dd2a01ff34b72bf7f442e414e3da43199fc43624b781af0c7599f856dc580a5d0a7742c6aff WHIRLPOOL 5179b5f9de8e9c7230e16252a92fee30656bbdf9836dcdac3a3473936ccc26ee07d3a61e94c8c5d7a8d23feca9a337b1487df42bd9fb3649460600958bb87b27
--- a/dev-perl/HTTP-CookieJar/metadata.xml
+++ b/dev-perl/HTTP-CookieJar/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">HTTP-CookieJar</remote-id>
+    <remote-id type="cpan-module">HTTP::CookieJar</remote-id>
+    <remote-id type="cpan-module">HTTP::CookieJar::LWP</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-perl/Mozilla-PublicSuffix/Manifest
+++ b/dev-perl/Mozilla-PublicSuffix/Manifest
@ -0,0 +1 @@
+DIST Mozilla-PublicSuffix-v1.0.0.tar.gz 71669 SHA256 8185ca687ad1c51e18cb472831f80160d6432376a06a19f864d617147b003dee SHA512 79ed7256bccb33f1f428657bd60cccaf7be5d4793424337b94a812a41f46e90507b8c32b3aa8b381bf16d77f4a3f911301f757332e9144718efd2341996d9cc6 WHIRLPOOL 1cab25d4505601bcaab570873225b78f1996e0fbc95325c6cc1799efc956255f361c2e35669384f121d112e2ea88e4359167b0edd5930d81d0cb03d206972195
--- a/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.0.ebuild
+++ b/dev-perl/Mozilla-PublicSuffix/Mozilla-PublicSuffix-1.0.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RSIMOES
+DIST_VERSION="v${PV}"
+inherit perl-module
+
+DESCRIPTION="Get a domain name's public suffix via the Mozilla Public Suffix List"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-no-dynamic-update.patch"
+)
+RDEPEND="
+	virtual/perl-Exporter
+	dev-perl/URI
+"
+DEPEND="${RDEPEND}
+	virtual/perl-IO
+	>=dev-perl/Module-Build-0.280.0
+	test? (
+		virtual/perl-Test-Simple
+		virtual/perl-File-Spec
+	)
+"
+src_test() {
+	perl_rm_files t/author-* t/release-*
+	perl-module_src_test
+}
--- a/dev-perl/Mozilla-PublicSuffix/files/1.0.0-no-dynamic-update.patch
+++ b/dev-perl/Mozilla-PublicSuffix/files/1.0.0-no-dynamic-update.patch
@ -0,0 +1,90 @@
+From 7dcc6afa75d5318325856fdef0456f4ddf1672b1 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Fri, 6 Jan 2017 12:32:50 +1300
+Subject: [PATCH] Remove dynamic update code
+
+As this basically makes builds unreproducale anyway, and the download
+URI is invariant meaning we can't even approximate the same logic via
+SRC_URI without having frequently changing Manifests, but no change in
+URI.
+---
+ Build.PL | 26 --------------------------
+ META.yml |  2 --
+ 2 files changed, 28 deletions(-)
+
+diff --git a/Build.PL b/Build.PL
+index 7ef1ca0..1e7834d 100755
+--- a/Build.PL
+++ b/Build.PL
+@@ -5,11 +5,9 @@ use warnings FATAL => "all";
+ use utf8;
+ use open ":encoding(UTF-8)";
+ use Carp qw(croak);
+-use HTTP::Tiny;
+ use Module::Build;
+ use IO::File;
+ use Tie::File;
+-use URI;
+ 
+ my $builder = Module::Build->new(
+     dist_name => "Mozilla-PublicSuffix",
+@@ -28,11 +26,9 @@ my $builder = Module::Build->new(
+     'perl' => '5.008'
+   },
+   'configure_requires' => {
+-    'HTTP::Tiny' => '0',
+     'IO::File' => '0',
+     'Module::Build' => '0.28',
+     'Tie::File' => '0',
+-    'URI' => '0',
+     'perl' => '5.008'
+   },
+   'requires' => {
+@@ -43,28 +39,6 @@ my $builder = Module::Build->new(
+ );
+ 
+ my $dat_file = "effective_tld_names.dat";
+-my $get_new_list = $builder->y_n(
+-    "Check for a new version of the Public Suffix List?", "N"
+-);
+-if ($get_new_list) {
+-    my $http = HTTP::Tiny->new( timeout => 6 );
+-    my $list_uri = URI->new(
+-        "http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/$dat_file"
+-    );
+-    $list_uri->query_form({ raw => 1 });
+-    my %options = (
+-        headers => {
+-            "If-Modified-Since" => "Fri, 17 May 2013 00:00:00 UTC"
+-        }
+-    );
+-    my $response = $http->get($list_uri, \%options);
+-    if ( $response->{status} == 200 ) {
+-        IO::File->new($dat_file, "w")->print($response->{content});
+-    }
+-    elsif ( $response->{status} != 304 ) {
+-        croak "Unable to download public suffix list.";
+-    }
+-}
+ 
+ # Divide rules from list into sets:
+ my $rules = join " ", map {
+diff --git a/META.yml b/META.yml
+index b25bc9c..2697608 100644
+--- a/META.yml
+++ b/META.yml
+@@ -11,11 +11,9 @@ build_requires:
+   blib: '1.01'
+   perl: '5.008'
+ configure_requires:
+-  HTTP::Tiny: '0'
+   IO::File: '0'
+   Module::Build: '0.28'
+   Tie::File: '0'
+-  URI: '0'
+   perl: '5.008'
+ dynamic_config: 0
+ generated_by: 'Dist::Zilla version 6.006, CPAN::Meta::Converter version 2.150001'
+-- 
+2.11.0
+
--- a/dev-perl/Mozilla-PublicSuffix/metadata.xml
+++ b/dev-perl/Mozilla-PublicSuffix/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Mozilla-PublicSuffix</remote-id>
+    <remote-id type="cpan-module">Mozilla::PublicSuffix</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@ -1,3 +1,2 @@
 DIST Archive_Tar-1.3.15.tgz 19985 SHA256 25e4f296874d208f46a772425e924e9361720b92f6bddb1e1fa0d83669fcb0af SHA512 a4fdbbcc654428242a2123438adfc72b2d24e7d201b2d927a20f4df7952cf23ab9bb395757f4e88f1617a86a2430df4a6508f26b2e3ffdc4eefcbbcf0cf6bd71 WHIRLPOOL c20a77658652316d1a12b1212e54296102fae160bdc64c6a237239dada7f3d0b8aba0d10b823893fabd5937884fbbd525903fca7ee45f935314ffba74a61891b
-DIST Archive_Tar-1.4.0.tgz 20018 SHA256 f1eb4260d09d20de29a3c589019ed53a8be6b8c5832233de9de83984baef96d6 SHA512 d15825f54fb286473e3d96be82818046cbe0cda40f0968ef9e03c7d620cd3ae5db23c93a764cbcb3fb3ca39f41cc6d4a4f782ee2718ffa47c83e1fd9a5aedba9 WHIRLPOOL 4450bb5537285f2b02cad263ab5973c8f18b7489124ea86012a04a21c68b4897f09de92a757c5369baa953ddf9ff009581a74dcc0b4e93db46e0a14a47daed9d
 DIST Archive_Tar-1.4.2.tgz 20624 SHA256 941bbf52f7d8535352a75da69d31650e3e1288bea4e8824741267a66391e64a4 SHA512 dad5872c82fb9fd961dc06d173610f60d0e05b4c05428e3410beb5a6cdf05de27704edf805e7db80c4031409af5d7d59e7abe43cef7aa11fd9d086b1c6e8e761 WHIRLPOOL 828415ecd6b75bd42f1b6719541bfadbaaaceae2f2cfe608fec867f6739480ba0df8e6cd0a5898412253575a06620d1b8087775096f425670f727d57a8dc03c8
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.0.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.0.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tar file management class"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-DEPEND=">=dev-lang/php-5.4:*[pcre(+)]
-		>=dev-php/PEAR-PEAR-1.9.0
-"
-RDEPEND=">=dev-lang/php-5.4:*[bzip2,posix,zlib]
-	${DEPEND}"
-PDEPEND="dev-php/pear"
-HOMEPAGE="http://pear.php.net/package/Archive_Tar"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php/Archive
-	doins Archive/*
-
-	dodoc docs/*
-}
--- a/dev-php/PEAR-Auth_HTTP/Manifest
+++ b/dev-php/PEAR-Auth_HTTP/Manifest
@ -1,2 +1 @@
-DIST Auth_HTTP-2.1.6.tgz 9327 SHA256 d6cabbe1835a2af6bbd42141461c0259cc6891c1f19a91afda9b04b695374216 SHA512 83e6d52dbe7401f3671ad3d0dc39b075bf95ee81fc7f3912e1601dbc207c35aea9b8ee3ac3c9829d92e17093d9d46111c1d28994c945b36d176bd22395c81d60 WHIRLPOOL e98fda51b2cb257d4ed5c8f93409c945a589d1abff514438210431542d0b7bfcc2d71d95cff3b30ac9c3f553c401ef16e260f588d395e927f16aa8e0dbb3abfc
 DIST Auth_HTTP-2.1.8.tgz 8626 SHA256 bd3f37de04cbfd99c16fc2ca0ecf807611b0ceb5a943f6cedf359183c074e03c SHA512 e25686d289cd95b3ceea1d6836b1bd31ba36a755dc2ebf57d0d250d4169467bf5d313be3234e989557d4239f0ecb40150e561c087a34f228b0848190b98349b6 WHIRLPOOL e665a9a13907f7cb66c65a1ed76b1bbe814864ddffa20d86b18dc2c801ac2b203fcfb178b0a6d4b2a01a380c9b131d8b95f29c1bd6d06e0c4d2093a00c5a2dd8
--- a/dev-php/PEAR-Auth_HTTP/PEAR-Auth_HTTP-2.1.6-r1.ebuild
+++ b/dev-php/PEAR-Auth_HTTP/PEAR-Auth_HTTP-2.1.6-r1.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="Create HTTP authentication systems similar to Apache's realm-based .htaccess mechanism"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-RDEPEND="dev-php/PEAR-Auth"
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@ -1,4 +1,3 @@
 DIST Crypt_GPG-1.3.2.tgz 339001 SHA256 67f77bfb9b21dd428587f5bd336e4b9b2e200a1b62160e7ae0d0dfffd1357899 SHA512 c045942798f2974d1d200413864708b4476b53d1999b721f1b51fd6cfafb23c05479a391ebc7ebe513f5a88641d63d991e7ba59b7edcbd8397efde365528f999 WHIRLPOOL 27124bb96e28d7206f56e0d0fcbee603b3f1516a4d61a98e4a72139cae7e76b357f025bde04baec83530ff4ad6ec2a7d35d92a114ad9269ff198c06c94d63aef
-DIST Crypt_GPG-1.4.0.tgz 348446 SHA256 5a1d45655c74eb187695cc1a1810256fbbc640fc728481086d64a365dcb1635e SHA512 a27f24f66271484fe9d837c48c4fd68e53d24ed1d1c6baa55b1942ed5a82e4c8d5e25bed86b112cd5f9927b70ad40caead3fd3e1ddb87e4e2d983dd73302d498 WHIRLPOOL c0f2f076700619b1b680efb3032e9471172880afd237a68b4a87a1211e6c11648564e3da75530cf56a86e827691ee467eac695419b3697180355621c34e0edd7
 DIST Crypt_GPG-1.4.2.tgz 345962 SHA256 8e1cf98b5bf37fead50745327261c021efac8c1ee2bddd57c38be57e8f1bc969 SHA512 c0384f0b4a35f8e7d7189b0b08c277c2629e7fa84e13f2c8c92aaafbeace7a60b6e18f2347571e7bcdf4bc504fd9463f080d9c2938063fdfcabc8f44dd7f4950 WHIRLPOOL ea6e2d0dfbfc56cf4bec5bcdfa312a5f43109c305b699b501e102e81908ad1ba350a97525b5d9ada45d6713ef64512744b6e04f208b5dc2f029ad01fedbffb4e
 DIST Crypt_GPG-1.6.0b1.tgz 344406 SHA256 a69ba79b8e5a75b3b4635045d9af1c83080b5224a1cf34b642aa86e8c50ec851 SHA512 2ac367edf13fdcccd4c279958fd414ae36cf2cebcc03fe5d561d9c918da7ef663d756c150287c96b5f7316609b1bd744d314c806dd47c7c8c25711d9e4076d29 WHIRLPOOL 851b79c95cc55ec07098b605d739ee78c9d0c14dbb6056baa8b57cdf9b773ea635e47185a80229bfdf96da88d179d7e3462960bf9d995f606727fab3a42ddf82
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.4.0.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.4.0.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit php-pear-r1
-
-DESCRIPTION="GNU Privacy Guard (GnuPG)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-DEPEND=">=dev-lang/php-5.2.1:*[posix,unicode]"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	dev-php/PEAR-Console_CommandLine"
--- a/dev-php/adodb/adodb-5.20.9.ebuild
+++ b/dev-php/adodb/adodb-5.20.9.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz"

 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""

 # If you want to be picky, we should require that PHP be built with at
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@ -1,2 +1 @@
-DIST mongodb-1.1.7.tgz 806777 SHA256 65bfb564d9a53a7642a02f07085bd9055b43522250649886ed65a37771cf9b49 SHA512 306e738dc19efd88cb3759130837c4870773969f71aed9932a6449dde1421df60042638a55ac2ce5f1d713fdb05a47eb5de6b478fe5a695042f149ca9110f6a9 WHIRLPOOL 8c690a436519422b9502104df9a694c64cbe12cecfc138d1c6ccb0916aa0743ed00021e79dca396b9dbb8e5f227076f3e7d5b0b203a1603093aa21311727cb4a
 DIST mongodb-1.1.8.tgz 806900 SHA256 b93ae7dc9bd270823965f8903c9acf47fe3a0ba7a630d08e8173ff091d593ae0 SHA512 1026b4081cd1c35f1f6fee6332c21dbe739320236377c0ed21b8d64447a9ba26464a919ceb9c16b332a64f12b834700472d6cbfb336d09d841c97ca0b402bf17 WHIRLPOOL 9cd2ce71f06684a3717e1cc016684d54b877f31166cbd194dc595dc878ebdda0320210ed090ac85d2aef40c94299499feedcf52faa712cec1c14aef1ae1f25d5
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.1.7.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.1.7.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="mongodb"
-USE_PHP="php5-6 php7-0"
-DOCS="README.md"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="MongoDB database driver for PHP"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl pcre sasl"
-
-for target in ${USE_PHP}; do
-	slot=${target/php}
-	slot=${slot/-/.}
-	PHPUSEDEPEND="${PHPUSEDEPEND}
-	php_targets_${target}? ( dev-lang/php:${slot}[json,ssl,zlib] )"
-done
-unset target slot
-RDEPEND="
-	${PHPUSEDEPEND}
-	>=dev-libs/libbson-1.3.3
-	>=dev-libs/mongo-c-driver-1.3.3[sasl?,ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pcre? ( dev-libs/libpcre )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-# pkgconfig needed if system libraries are used for bson and libmongoc
-DEPEND="${RDEPEND} virtual/pkgconfig"
-
-src_configure() {
-	local my_conf="--enable-mongodb --with-libbson --with-libmongoc "
-	my_conf+="--with-pcre-dir=$(usex pcre yes no) --with-mongodb-sasl=$(usex sasl yes no)"
-	php-ext-source-r2_src_configure
-}
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.1.8.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.1.8.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -31,7 +31,12 @@ RDEPEND="
 DEPEND="${RDEPEND} virtual/pkgconfig"

 src_configure() {
-	local PHP_EXT_ECONF_ARGS=( --enable-mongodb --with-libbson --with-libmongoc )
-	PHP_EXT_ECONF_ARGS+=( --with-pcre-dir=$(usex pcre yes no) --with-mongodb-sasl=$(usex sasl yes no) )
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-mongodb
+		--with-libbson
+		--with-libmongoc
+		--with-pcre-dir=$(usex pcre)
+		--with-mongodb-sasl=$(usex sasl)
+	)
 	php-ext-source-r3_src_configure
 }
--- a/dev-php/pecl-redis/pecl-redis-3.1.0-r1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-3.1.0-r1.ebuild
@ -20,7 +20,7 @@ DEPEND="igbinary? (
 	php_targets_php5-6? ( dev-php/igbinary[php_targets_php5-6] )
 	php_targets_php7-0? ( dev-php/igbinary[php_targets_php7-0] )
 	php_targets_php7-1? ( dev-php/igbinary[php_targets_php7-1] ) )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND} !dev-php/pecl-redis:7"

 # The test suite requires network access.
 RESTRICT=test
--- a/dev-php/pecl-taint/Manifest
+++ b/dev-php/pecl-taint/Manifest
@ -1,2 +1 @@
-DIST taint-2.0.0.tgz 15573 SHA256 2b4c7572460be03bb4304319e23c845a89a098b983821acb9be1476c2e902110 SHA512 f6a8ca778e57cb26fe7e6a9cf8f43e41a66ccd9532f6903f0c12a8c81ec07037e7ab705aee5c94b6def7c2e0a726565473d2c71fd397b2aa87a4333920a7d2ac WHIRLPOOL 905f4f7232ea9f4fc1db8712f8e688f7db4f8763e37e8f991a0ac0ac03b52aa889502b7f4eb6931fd02dbc8327c89ae835f85e3422b9c01568117f71d2f6ee78
-DIST taint-2.0.1.tgz 18358 SHA256 981b1f0369674ff1e3555368c68a92b3376e324f91c88ee71dfdfceca6a9b322 SHA512 9a2b4c937d4adee24ab0d84d283665b683ecee45e871781ee1bfd8cd4bc4e11a9b1bdda647c63bd44861e95ab07f0af1e3bd902bec537961d57131e5a615893e WHIRLPOOL 187ff4d0c54ecbe4730f8aa3f4e61220e4e3f456c09ecdb2fba61a9745129b66cd0d84905be51be4f452af04cfd8f5e59c3ea63a0adad6143d1e162c7e274592
+DIST taint-2.0.2.tgz 18550 SHA256 2d0f672890a5c2b341f99db10e5a96f8e1e77c6e690e189d8c4a9545d410139b SHA512 fe1375062f716a32b093942d173cf78024ed457fb5980ec8b50852ca922d8e15ec82696be2478cbbf8b9cd0620be0c2f88b18de55dec4dacec5be664b95c7108 WHIRLPOOL b1e197df36918813d900926a8739edb8c4873a91b740165f5b56bc5680c996a6fa4bc15b734db5195a66427d28ef45de1a2b8063058de3f0f18e3d3578c77b7a
--- a/dev-php/pecl-taint/pecl-taint-2.0.0_beta.ebuild
+++ b/dev-php/pecl-taint/pecl-taint-2.0.0_beta.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_PHP="php7-0"
-MY_PV="${PV/_beta/}"
-inherit php-ext-pecl-r2
-
-DESCRIPTION="Extension used for detecting XSS codes(tainted string)"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-pkg_postinst() {
-	elog 'In order to enable this extension, add'
-	elog '  taint.enable=1'
-	elog 'to /etc/php/<sapi>-<slot>/ext/taint.ini'
-}
--- a/dev-php/pecl-taint/pecl-taint-2.0.1_beta.ebuild
+++ b/dev-php/pecl-taint/pecl-taint-2.0.1_beta.ebuild
@ -1,21 +1,20 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-USE_PHP="php7-0"
-MY_PV="${PV/_beta/}"
-inherit php-ext-pecl-r2
+USE_PHP="php7-0 php7-1"
+inherit php-ext-pecl-r3

-DESCRIPTION="Extension used for detecting XSS codes(tainted string)"
+DESCRIPTION="Extension used for detecting XSS code (tainted strings)"
 LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

 pkg_postinst() {
-	elog 'In order to enable this extension, add'
+	elog 'To enable this extension, add'
 	elog '  taint.enable=1'
 	elog 'to /etc/php/<sapi>-<slot>/ext/taint.ini'
 }
--- a/dev-php/phpdepend/Manifest
+++ b/dev-php/phpdepend/Manifest
@ -1,2 +1 @@
-DIST PHP_Depend-1.1.1.tgz 181421 SHA256 64a03e82f6b38b4bd0187a27c2cc2bf47c76790b0f4e806dcdeab36ccc6e40f9 SHA512 688e8d0000a14fcc5eb4469d02177c6894f9172d2ae3813712c0af745f75327b6434a1a770d1c299bfce7c380fe5aeb3b9f9de26f4bf984d733437142bf7621b WHIRLPOOL f492e67b6e77985face1b50814dcbe4744d08cd83b8abfac8bc36254f4b67a866a53d3e15a9020a4a2ded7d5c12bbf36b949b2590aa778c8f5bd4ee7371679b6
-DIST phpdepend-2.2.2.phar 677194 SHA256 fdf8439b1485a6e8f02817e31621b5f929aad43dac9a672d076b054ecd354e4c SHA512 47519aa9f60b2dd393794fc6588f10f247b035367d514234d1e84bb564ff4ebd148dd299342722e4629847b0c0b625ba61a30bbe374215e4731a6d8187374ccc WHIRLPOOL df88d89480577ee662a553884642fbbebe00ae6764c2754ded10e237a54bd1da1d9199874158d0c7bf2e46bd98296596fb5cda4bd96407a40f04c25439a5a4b8
+DIST phpdepend-2.3.2.tar.gz 187985 SHA256 6edbb892ece8a9e811d9bee071442ca9b393ac3a4110b3d1db45e0c9c0b03887 SHA512 00c9af24f9e17f1935d2d0315b4204d47d4a6d1ebcf4e22e9860ff4eb9292e25da7171f2a95b2ba545872b55042f3ac6c495105f67635fdd1386e96494f8ccdd WHIRLPOOL 42bd82efca09fd672c6c087a8067f02f9b8d6717df2023ab38499f8833a81a93833940e466707f985cdd938c6d86075ad526af02e4fe53582c23b3e392b64ca1
--- a/dev-php/phpdepend/files/autoload.php
+++ b/dev-php/phpdepend/files/autoload.php
@ -0,0 +1,19 @@
+<?php
+$vendor_dir = '/usr/share/php';
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+  require_once("${vendor_dir}/Fedora/Autoloader/autoload.php");
+}
+
+\Fedora\Autoloader\Autoload::addPsr4(
+  'PDepend\\',
+  __DIR__ . '/../src/main/php/PDepend'
+);
+
+
+\Fedora\Autoloader\Dependencies::required(
+  array(
+    "${vendor_dir}/Symfony/Component/Config/autoload.php",
+    "${vendor_dir}/Symfony/Component/DependencyInjection/autoload.php",
+    "${vendor_dir}/Symfony/Component/Filesystem/autoload.php"
+  )
+);
--- a/dev-php/phpdepend/files/channel.xml
+++ b/dev-php/phpdepend/files/channel.xml
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
-    <name>pear.pdepend.org</name>
-    <summary>PHP Depend PEAR channel</summary>
-    <suggestedalias>pdepend</suggestedalias>
-    <servers>
-        <primary>
-            <rest>
-                <baseurl type="REST1.0">http://pear.pdepend.org/rest/</baseurl>
-                <baseurl type="REST1.1">http://pear.pdepend.org/rest/</baseurl>
-                <baseurl type="REST1.2">http://pear.pdepend.org/rest/</baseurl>
-                <baseurl type="REST1.3">http://pear.pdepend.org/rest/</baseurl>
-            </rest>
-        </primary>
-    </servers>
-</channel>
--- a/dev-php/phpdepend/phpdepend-1.1.1.ebuild
+++ b/dev-php/phpdepend/phpdepend-1.1.1.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_PN="PHP_Depend"
-PHP_PEAR_URI="pear.pdepend.org"
-
-inherit php-pear-lib-r1
-
-DESCRIPTION="Static code analyser for PHP"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-HOMEPAGE="http://www.pdepend.org"
-
-RDEPEND="${RDEPEND}
-	>=dev-lang/php-5.2.3"
-
-src_unpack() {
-	# we only have one file in $A and it contains a lone zero block
-	tar xf "${DISTDIR}/${A}" --ignore-zeros
-}
--- a/dev-php/phpdepend/phpdepend-2.2.2.ebuild
+++ b/dev-php/phpdepend/phpdepend-2.2.2.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="Static code analyser for PHP"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-HOMEPAGE="http://www.pdepend.org"
-SRC_URI="http://static.pdepend.org/php/${PV}/pdepend.phar -> ${P}.phar"
-
-RDEPEND=">=dev-lang/php-5.2.3:*[phar]"
-S="${WORKDIR}"
-
-src_unpack() { :; }
-
-src_install() {
-	insinto /usr/share/php/${PN}
-	insopts -m755
-	newins "${DISTDIR}/${P}.phar" ${PN}.phar
-	dosym /usr/share/php/${PN}/${PN}.phar /usr/bin/${PN}
-}
--- a/dev-php/phpdepend/phpdepend-2.3.2.ebuild
+++ b/dev-php/phpdepend/phpdepend-2.3.2.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN=pdepend
+
+DESCRIPTION="Static code analysis for PHP"
+HOMEPAGE="http://www.pdepend.org/"
+
+# The test suite is absent from the release tarballs because
+# the only build system that Composer understands is "cp -r".
+# To obtain the tests, we would need to grab a VCS snapshot.
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Warning: the "range" dependencies below only work so long
+# as the libraries they refer to are not slotted.
+RDEPEND="dev-lang/php
+	dev-php/fedora-autoloader
+	( >=dev-php/symfony-config-2.3.0 <dev-php/symfony-config-3 )
+	( >=dev-php/symfony-dependency-injection-2.3.0
+		<dev-php/symfony-dependency-injection-3 )
+	<dev-php/symfony-filesystem-3"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	dodoc CHANGELOG
+
+	# The executable will only look for autoload.php in one place, so we
+	# create an (otherwise pointless) vendor directory to house it.
+	insinto "/usr/share/${PN}/vendor"
+	doins "${FILESDIR}/autoload.php"
+
+	insinto "/usr/share/${PN}/src"
+	doins -r src/main
+
+	# The executable uses relative include paths, so the one users will
+	# actually run needs to be symlinked into the source tree.
+	exeinto "/usr/share/${PN}/src/bin"
+	doexe "src/bin/${MY_PN}"
+	dosym "/usr/share/${PN}/src/bin/${MY_PN}" "/usr/bin/${MY_PN}"
+}
--- a/dev-php/phpmd/Manifest
+++ b/dev-php/phpmd/Manifest
@ -1 +1 @@
-DIST PHP_PMD-1.5.0.tgz 49534 SHA256 fd6533e6c794eb33422a301269fa928b124df6fc555c8d4b8786bdcb9b49529c SHA512 6846be145e3c52e2fc687aa910a3de8080e9cbdf56e88039077eceae59459fb4c833d61dccfffa68a8098abdb4b3c17c837398329216f8afa9f4b1ed41ce6e2d WHIRLPOOL 1269df2e60e0b2815d94c4d33a1af07c864bdf4b267bd1955f530afffca43da5fa2415936a7041fb2fae6d8b652c4f5be9aa3e801823734c1349b9964f1e2672
+DIST phpmd-2.5.0.tar.gz 56360 SHA256 1c35a200f2cfcfb8266cd01d710000943bc9db4205d842d802c726ed98bb872d SHA512 93e5eac4755ce9dbe003935a5768c2798f13c3a40d5a7c188d3a70edc1fe76646b72144a62f943f3fc95f83131f96b315a63e327971c3c4404d600fcd5f43d18 WHIRLPOOL de2a70f0766f68d08e56f2885f8d94d5d6bdc2281eb8da2ea687f1298bc7d9cb761fb08230f0b5719f7e3b03b3739c8cda48c44e35c90e5dff2d0a219c84ece7
--- a/dev-php/phpmd/files/autoload.php
+++ b/dev-php/phpmd/files/autoload.php
@ -0,0 +1,14 @@
+<?php
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+  require_once('/usr/share/php/Fedora/Autoloader/autoload.php');
+}
+
+\Fedora\Autoloader\Autoload::addPsr4(
+  'PHPMD\\',
+  __DIR__ . '/../src/main/php/PHPMD'
+);
+
+
+\Fedora\Autoloader\Dependencies::required(
+  array('/usr/share/phpdepend/vendor/autoload.php')
+);
--- a/dev-php/phpmd/files/channel.xml
+++ b/dev-php/phpmd/files/channel.xml
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
-    <name>pear.phpmd.org</name>
-    <summary>PHP Mess Detector PEAR channel</summary>
-    <suggestedalias>phpmd</suggestedalias>
-    <servers>
-        <primary>
-            <rest>
-                <baseurl type="REST1.0">http://pear.phpmd.org//rest/</baseurl>
-                <baseurl type="REST1.1">http://pear.phpmd.org//rest/</baseurl>
-                <baseurl type="REST1.2">http://pear.phpmd.org//rest/</baseurl>
-                <baseurl type="REST1.3">http://pear.phpmd.org//rest/</baseurl>
-            </rest>
-        </primary>
-    </servers>
-</channel>
--- a/dev-php/phpmd/metadata.xml
+++ b/dev-php/phpmd/metadata.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>php-bugs@gentoo.org</email>
-<name>PHP</name>
-</maintainer>
-<longdescription lang="en">
-PHP mess detector
-</longdescription>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">phpmd/phpmd</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-php/phpmd/phpmd-1.5.0.ebuild
+++ b/dev-php/phpmd/phpmd-1.5.0.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_PN="PHP_PMD"
-PHP_PEAR_URI="pear.phpmd.org"
-
-inherit php-pear-lib-r1
-
-DESCRIPTION="PHP mess detector"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-HOMEPAGE="http://www.phpmd.org"
-
-RDEPEND="${RDEPEND}
-	>=dev-php/phpdepend-1.1.1"
--- a/dev-php/phpmd/phpmd-2.5.0.ebuild
+++ b/dev-php/phpmd/phpmd-2.5.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="PHP mess detector"
+HOMEPAGE="http://www.phpmd.org/"
+
+# The test suite is absent from the release tarballs because
+# the only build system that Composer understands is "cp -r".
+# To obtain the tests, we would need to grab a VCS snapshot.
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/php[xml]
+	dev-php/phpdepend"
+
+src_install() {
+	dodoc AUTHORS.rst CHANGELOG CONTRIBUTING.md README.rst
+
+	# The executable will only look for autoload.php in one place, so we
+	# create an (otherwise pointless) vendor directory to house it.
+	insinto "/usr/share/${PN}/vendor"
+	doins "${FILESDIR}/autoload.php"
+
+	insinto "/usr/share/${PN}/src"
+	doins -r src/main
+
+	# The executable uses relative include paths, so the one users will
+	# actually run needs to be symlinked into the source tree.
+	exeinto "/usr/share/${PN}/src/bin"
+	doexe "src/bin/${PN}"
+	dosym "/usr/share/${PN}/src/bin/${PN}" "/usr/bin/${PN}"
+}
--- a/dev-php/symfony-config/Manifest
+++ b/dev-php/symfony-config/Manifest
@ -1 +1 @@
-DIST symfony-config-2.1.0.tar.gz 30897 SHA256 62ac4ca9d918a596773825c0f45c6f8541d6899c260b7bb8237832000e0fa0e1 SHA512 c02c1532d62f1608538ca4f672f25f254b566c5d2c12e07b4d681d67b8a4f7fa7244659cc10f3967fcee15de9f7a1f8c81c3d1ca836dee57564ed342f2133aaf WHIRLPOOL 7de9201feb1cfdca9a3342d29f8cdf57d35d3f2a4bfddada1354fd701fe0be33f66eccf1c30880902ec90e9131f54decc69c730e03e27ca14168ab6f1a1c6607
+DIST symfony-config-2.8.15.tar.gz 51013 SHA256 75b0a514b92f86e8721bd3e6c313ca1b6c095a372356b8df8f38e39a67a5e1e3 SHA512 96ae8b84d97b5ce79b7eee589de0423ee998ae00e5f1d5cb25befa92e605903b9f8aabb99b9afbc100891d9399f2c9cf59d63be559644bb8531b050fab817538 WHIRLPOOL c8629dd77c5d8f2b0455939f1f6514fa1f7e694e2fa740d142f00352727a443921adb3e0d504f145efa40e6ee3928cb808dd1313bee6892378cee491acb33384
--- a/dev-php/symfony-config/symfony-config-2.8.15.ebuild
+++ b/dev-php/symfony-config/symfony-config-2.8.15.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

--- a/dev-php/symfony-dependency-injection/Manifest
+++ b/dev-php/symfony-dependency-injection/Manifest
@ -1 +1 @@
-DIST symfony-dependency-injection-2.1.0.tar.gz 73560 SHA256 30a693b561743655daa1b58314af0102d2ae8294c73da90e4759b847659f0d4e SHA512 2e21da1eb1dfff9ba9f8cf4c0d62ff2c021e40f611bba0ba98ff0c29dff35774eb252cf04c53437b1a40065209579c48116833fa4f72a674348fd4df8a01ffa7 WHIRLPOOL 260f6ff1a432133d34bd2c6239239ffcc677e7050910447fb02d1ac4126e75fb6104b32ece5b7613142a5199a20c2b8a5fc13c6d789ea2735e261872a8b07cf4
+DIST symfony-dependency-injection-2.8.15.tar.gz 116157 SHA256 923e0693d1d629a09876b654663246911398a8262c7e1e7558a14ba0b1aa1fc9 SHA512 232d88c6740166b087991fb43f5dc4b93b9770cc570760336049035a037901017076891f61516281e74e60a15e78b4d836a5741246965e9def047b5e4ce6bb8d WHIRLPOOL 00973393cec3d4669117f848c954e3fecb438b405e73afe7d4163d9d21a7980981f9f226f731ccafe85aa334ece738588b168e25de7259b7d624ccb0a0c672a6
--- a/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.1.0-r1.ebuild
+++ b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.1.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST HTTP-CookieJar-0.008.tar.gz 28754 SHA256 9507e039279f4c0deed7fcee8fadec5029b8a933c81eb78e7e8faaccb632dc65 SHA512 6e85c22084ba2959b385f4cd706b2b937fcdb68f219ee03ccdd69dd2a01ff34b72bf7f442e414e3da43199fc43624b781af0c7599f856dc580a5d0a7742c6aff WHIRLPOOL 5179b5f9de8e9c7230e16252a92fee30656bbdf9836dcdac3a3473936ccc26ee07d3a61e94c8c5d7a8d23feca9a337b1487df42bd9fb3649460600958bb87b27`
				`@ -0,0 +1 @@`
				`DIST Mozilla-PublicSuffix-v1.0.0.tar.gz 71669 SHA256 8185ca687ad1c51e18cb472831f80160d6432376a06a19f864d617147b003dee SHA512 79ed7256bccb33f1f428657bd60cccaf7be5d4793424337b94a812a41f46e90507b8c32b3aa8b381bf16d77f4a3f911301f757332e9144718efd2341996d9cc6 WHIRLPOOL 1cab25d4505601bcaab570873225b78f1996e0fbc95325c6cc1799efc956255f361c2e35669384f121d112e2ea88e4359167b0edd5930d81d0cb03d206972195`