Sync with portage [Tue Apr 5 08:41:38 MSK 2016].

8 years ago · 5fd985680b
parent ed3fc4752f
commit 5fd985680b
353 changed files with 3655 additions and 4293 deletions
--- a/app-admin/collectd/files/collectd.initd-r1
+++ b/app-admin/collectd/files/collectd.initd-r1
@ -28,7 +28,7 @@ depend() {
 }

 _checkconfig() {
-	if [ $(eval sed '/^$\|^#/d' \"${COLLECTD_CONFIGFILE}\" | grep --count 'LoadPlugin[[:space:]]\+oracle') -ge 1 ] ; then
+	if [ $(sed '/^$\|^#/d' "${COLLECTD_CONFIGFILE}" | grep 'LoadPlugin[[:space:]]\+oracle' | wc -l) -ge 1 ] ; then
 		if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then
 			. /etc/env.d/50oracle-instantclient-basic
 			export ORACLE_HOME
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -6,8 +6,8 @@ EAPI="5"

 inherit eutils flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
-	inherit subversion autotools
+	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	inherit git-r3 autotools
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
--- a/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild
@ -209,6 +209,8 @@ src_prepare() {
 	# take the sledgehammer approach to bug #526270
 	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'

+	epatch_user
+
 	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
 	rm autotools/missing
 	eautoreconf
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@ -1,223 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS_LIVE_OVERRIDE="true"
-OPENGL_REQUIRED="optional"
-inherit check-reqs kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-
-case ${PV} in
-	2.[456789].[789]?)
-		# beta or rc releases
-		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-	2.[456789].?|2.[456789].??)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# master branch live ebuild
-		SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
-marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
-+truetype vc xbase +xml"
-
-# Don't use Active, it's broken on desktops.
-CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_author? ( calligra_features_words )
-	calligra_features_gemini? ( opengl )
-	calligra_features_krita? ( eigen exif lcms opengl )
-	calligra_features_plan? ( kdepim )
-	calligra_features_sheets? ( eigen )
-	vc? ( calligra_features_krita )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/boost
-	dev-qt/qtcore:4[exceptions]
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/libiconv
-	attica? ( dev-libs/libattica )
-	color-management? ( media-libs/opencolorio )
-	crypt? ( app-crypt/qca:2[qt4(+)] )
-	eigen? ( dev-cpp/eigen:3 )
-	exif? ( media-gfx/exiv2:= )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		app-text/libwps
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
-	kde? ( $(add_kdebase_dep kactivities) )
-	kdepim? ( $(add_kdeapps_dep kdepimlibs) )
-	lcms? (
-		media-libs/lcms:2
-		x11-libs/libX11
-	)
-	marble? ( $(add_kdeapps_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdeapps_dep okular) )
-	opengl? (
-		media-libs/glew
-		virtual/glu
-	)
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql:*
-		dev-libs/libpqxx
-	)
-	spacenav? ( dev-libs/libspnav )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vc? ( <dev-libs/vc-1.0.0 )
-	xbase? ( dev-db/xbase )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.8.7:3[extensions(+)]
-		dev-libs/icu:=
-	)
-	calligra_features_krita? (
-		dev-qt/qtdeclarative:4
-		x11-libs/libX11
-		x11-libs/libXi
-	)
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}
-	x11-misc/shared-mime-info
-"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-# bug 394273
-RESTRICT=test
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		# Switch to ^^ when we switch to EAPI=6.
-		#local prod=${cal_ft^^}
-		local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
-		use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
-	done
-
-	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
-	# first write out things we want to hard-enable
-	mycmakeargs+=(
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DCREATIVEONLY=OFF"
-		"-DPACKAGERS_BUILD=OFF"
-		"-DWITH_Soprano=OFF"
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with color-management OCIO)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen3)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with import-filter LibEtonyek)
-		$(cmake-utils_use_with import-filter LibOdfGen)
-		$(cmake-utils_use_with import-filter LibRevenge)
-		$(cmake-utils_use_with import-filter LibVisio)
-		$(cmake-utils_use_with import-filter LibWpd)
-		$(cmake-utils_use_with import-filter LibWpg)
-		$(cmake-utils_use_with import-filter LibWps)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kde KActivities)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble CalligraMarble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use opengl USEOPENGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres CalligraPostgreSQL)
-		$(cmake-utils_use_build postgres pqxx)
-		$(cmake-utils_use_with spacenav Spnav)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with vc Vc)
-		$(cmake-utils_use_with xbase XBase)
-	)
-
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	kde4-base_src_configure
-}
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@ -3,7 +3,6 @@ DIST mongodb-src-r2.6.11.tar.gz 16461163 SHA256 e1a64a1ef7114f3e8ed3c7acaa4e97ff
 DIST mongodb-src-r2.6.12.tar.gz 16462842 SHA256 2dd51eabcfcd133573be74c0131c85b67764042833e7d94077e86adc0b9406dc SHA512 ceed10f2da50ca390f56cc79d39ea4db7a1ef6764e37dae61c3f3f664708be72de09443bbf94f8e58479e4f2923ff2ab9eee45652e82271b3bad591e03ef7657 WHIRLPOOL 1587ef45ee17f9e3357a92b480ea739192076ead280c44c801650d01d2ae29a627a96db611eac6c9b6b47e5e619e2362df94e1792348709b3ea5a4970a8751a0
 DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
 DIST mongodb-src-r3.0.10.tar.gz 29336823 SHA256 7dbecb1e32c35dca1b0e00cd55ba08bfde558d2f9036f8b9b583e6d442b9a83c SHA512 99cd96387b14ef02803ef8c88e260cd898362765e797029cec79b9a286d5a43b76fe3e147929e38578d5203954c26e8d60f814d40ba1572a870605e3b25a6707 WHIRLPOOL 84e520777142e55bef08e87295087e3633c650a78a9c3bc35d116e85d7e2e65e420e2b678ecb214588a0dee7808fe3505169673ff1dbe6bd6f150d2928f87625
-DIST mongodb-src-r3.0.8.tar.gz 26245612 SHA256 3574f2f577e212ff1876485e1502c91f70f996fbbcc5a4657fe440ac76bd97a5 SHA512 3b8578ed2a6196cda0867d219214e1dc9fe95ecaa8320cdee3766c9a8a78e9cf66013769a3fbbf03ccf9a35d97e02a1eaa5fe8fc7429a0d76dd78486db7520ac WHIRLPOOL ded0b84b940c66b8a7ef6b363f179a4b2c1ddc23a3077b9cadb01f76c2a90956f0a720e713d4806db6132ac96b1026b82c2bf966ec3869af095e12590ea04d0e
-DIST mongodb-src-r3.0.9.tar.gz 26249669 SHA256 5b6f189458739a327a2ad4a5ecab4f733c6a6751ccb067ec8879a0f98f2b97c3 SHA512 4ebcd89394ea0ccbd84adde1a6ce1776d86873bea13520c31bf3a783a922598cadd9ce1c11998f028e5e1affe6cb6639d1a4ff9c0e5771ff88bed873ddf7dc97 WHIRLPOOL a7d6cb51ee62717bcc2e612ae8e72ea43be7c9867c0de3fa2afc1d5c731bc3b1ca04ac70a351feaba71c27e00cf6cbf9b9997c4276362f98a725350aff37b750
+DIST mongodb-src-r3.0.11.tar.gz 29336301 SHA256 8b25bae2636960650246ea60f270f276b2ff8fc80f1776be252eb6ab20d74d15 SHA512 db91f94cd8b59915286b00bb91493de6ca880e63bb132b2cff59ffd8bc76307996e7cd3772f5c598f90fc87d5a515661661fcb348680ffa509d15526da851e81 WHIRLPOOL 59a4ebb4f114e9aec05fb3992014d6a6303d0dfa5174ae52757601bdf851455a074ce1a6ea3c9d8a10d9d7ba235159f0aca28f5e9a4807486246d2c8c92ee661
 DIST mongodb-src-r3.2.3.tar.gz 29607224 SHA256 82030ada190095b5d95c0b59e9cf74efe9db602b49d2b8857b06f2683a5227fa SHA512 43b652da8fb461c36be1566965985aed036d53a8f4ed2a5f4a67e08571697c4030eb682a2a14ebc41991757d7083a268c5161b536d20dc1b3de13dac8df1da53 WHIRLPOOL 2e262616f0f317185330c8386ea31f81af9d7713dd02e70a4292d2ace17b22fadaead8666840679aa3eedccb624a48817cf68d1d29af3840e4af10aa77d434a5
 DIST mongodb-src-r3.2.4.tar.gz 29647777 SHA256 b60743cc641de975c38e6e69ebbef60059ee9fe176cdd98bfab8d5c844dab42c SHA512 fb7b3ea3c704cde023ec540f4a142d3beba217f33e8c30da04318e365c5d52cbfa00b98824c53485b5f8918a83095c9b26db43861d80029e8e924e66dd8ea694 WHIRLPOOL ffd0ac839f3279776602ccf829ac629557f43ea50a5640bebc5532bc77072035181cf5d456ec467dca9d1a1f26adb2f1ab1de06968ca501c7b1dfe26fdc9a4ff
--- a/dev-db/mongodb/mongodb-3.0.11.ebuild
+++ b/dev-db/mongodb/mongodb-3.0.11.ebuild
--- a/dev-db/mongodb/mongodb-3.0.8.ebuild
+++ b/dev-db/mongodb/mongodb-3.0.8.ebuild
@ -1,156 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-SCONS_MIN_VERSION="2.3.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos libressl mms-agent ssl +tools"
-
-RDEPEND="app-arch/snappy
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/boost-1.57[threads(+)]
-	>=dev-libs/libpcre-8.30[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	sys-libs/zlib
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:= )
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8.2:*
-	sys-libs/ncurses
-	sys-libs/readline
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	# Maintainer notes
-	#
-	# --use-system-tcmalloc is strongly NOT recommended:
-	# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
-	#
-	# --c++11 is required by scons instead of auto detection:
-	# https://jira.mongodb.org/browse/SERVER-19661
-
-	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX) --c++11"
-	scons_opts+=" --disable-warnings-as-errors"
-	scons_opts+=" --use-system-boost"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-stemmer"
-	scons_opts+=" --use-system-yaml"
-
-	if use debug; then
-		scons_opts+=" --dbg=on"
-	fi
-
-	if use prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	if use kerberos; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.0.0-fix-scons.patch"
-}
-
-src_compile() {
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-	escons ${scons_opts} core tools
-}
-
-src_install() {
-	escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} dbtest
-	"${S}"/dbtest --dbpath=unittest || die "dbtest failed"
-	escons ${scons_opts} smokeCppUnittests --smokedbprefix="smokecpptest" || die "smokeCppUnittests tests failed"
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
-		ewarn "!! IMPORTANT !!"
-		ewarn " "
-		ewarn "${PN} configuration files have changed !"
-		ewarn " "
-		ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
-		ewarn "  http://docs.mongodb.org/manual/reference/configuration-options/"
-		ewarn " "
-		ewarn "Make sure you also follow the upgrading process :"
-		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
-		ewarn " "
-		ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
-		ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
-		ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
-		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
-	fi
-}
--- a/dev-haskell/binary/binary-0.7.6.1.ebuild
+++ b/dev-haskell/binary/binary-0.7.6.1.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 RESTRICT=test # binary[test]->test-framework->text->xml->binary
--- a/dev-java/glazedlists/Manifest
+++ b/dev-java/glazedlists/Manifest
@ -1,2 +1,3 @@
 DIST glazedlists-1.7.0-source_java15.zip 879565 SHA256 e3f2370ed80fce8c104f2ac1e820c10b2c691390783e163ec02b2db5e6ab3d36 SHA512 bbf711ee5939486014f5cb9bd6dd6b1e86246f54d21e081285be1dd967ca852dd95d4bd2cf97b32d9fa578c2bb0eecf72951f4ad94e50dea3bd33387a426053f WHIRLPOOL 10a2f361e2dc47b54085ef847478bd281cd56b356245a2371d9803673fccb162c25e4d6963db6d006b737446031848f2aba77f387856e9ac94ca090a0d08edc4
 DIST glazedlists-1.8.0-source_java15.zip 1169436 SHA256 1afbded7118d3026a666622c8a6aa46bc41ae09c9e832125fe3dc3a3dba5d42b SHA512 3fc3f339a248a8aad897409d752464d60b504474ae1e4d99fa7fbb41d767928137711d5d9979154b53d677e42746e2df2dfefdc71fa4a8017ec70ab23dc4b6a5 WHIRLPOOL b5d37cebde2be0a57032be29667763d97b54f3d1a5b48e40e09b5ce09e3ae654776c4d6817c09c018fad7fb0d9bdbdde6b6198e4405250fcc2451d008c90fb40
+DIST glazedlists-1.8.0.zip 1169436 SHA256 1afbded7118d3026a666622c8a6aa46bc41ae09c9e832125fe3dc3a3dba5d42b SHA512 3fc3f339a248a8aad897409d752464d60b504474ae1e4d99fa7fbb41d767928137711d5d9979154b53d677e42746e2df2dfefdc71fa4a8017ec70ab23dc4b6a5 WHIRLPOOL b5d37cebde2be0a57032be29667763d97b54f3d1a5b48e40e09b5ce09e3ae654776c4d6817c09c018fad7fb0d9bdbdde6b6198e4405250fcc2451d008c90fb40
--- a/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
+++ b/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A toolkit for list transformations"
+HOMEPAGE="http://www.glazedlists.com/"
+SRC_URI="http://java.net/downloads/${PN}/${P}/${P}-source_java15.zip -> ${P}.zip"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+JAVA_SRC_DIR="source"
+
+JAVA_ENCODING="ISO-8859-1"
--- a/dev-java/microba/Manifest
+++ b/dev-java/microba/Manifest
@ -1 +1,2 @@
 DIST microba-0.4.4-full.zip 631831 SHA256 33c3779dd243d7415b137dff5d15d292589390b08f398f77fef581099aa1b5c8 SHA512 80103b33ebb50e0dafa82b713218bbedbf59424922424515a453a49d1be416960a78c6c4d987eede5ab168f806cf0bb7ffcc900a6a19827e51e9bf612d08e742 WHIRLPOOL c2bd6033dc3e18597e6d0219bde742d09dde70e72a82012a14d27966c0d12ea9ca725d3dc2d8732bc557979cea8e6808a7ed5ba9b3a3be04b33dd1071bdb9dbe
+DIST microba-0.4.4.3.zip 89737 SHA256 793ce6623d9eb9d0c765c2f7dc8caeff56020adcebb3227ece0ca30eea159cab SHA512 17933578fe101053a1004a1aa0ef342ffa1dc1f2ea2d670fa8aa2523c7d8207bb79e54755e58d0b7ce5ba627ca3b348ac10870718622e818f4097a966acc0a10 WHIRLPOOL c94e947b9f033aad529b018d8e33a3c69dd45081ddb48eb6c05ba86e24868fd0348a4fe3a6d5eb7d8fee3937e8361208da6bc1847613acc19e83d964118d450d
--- a/dev-java/microba/microba-0.4.4.3.ebuild
+++ b/dev-java/microba/microba-0.4.4.3.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Swing components for date operations and palettes"
+HOMEPAGE="https://github.com/tdbear/microba"
+SRC_URI="https://github.com/tdbear/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/jgraph:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="jgraph"
+
+JAVA_SRC_DIR="src"
+
+src_install() {
+	java-pkg-simple_src_install
+	mv change.log.txt CHANGELOG || die
+	mv readme.txt README || die
+	dodoc {README,CHANGELOG,README.md}
+}
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@ -1 +1,2 @@
+DIST xpp3-1.1.4c.jar 128334 SHA256 113c8174cda963aa8c9e46f59945838dbe1a094cc736e476d640453e07d9e9c6 SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445 WHIRLPOOL 9ac4437b500387abb597e35d2e95acd0140ab9fc6b272776ffee97a43a290b6ef855ef9f3ea2875cba0e451b76987c7a14328f9effa3923555f2ebecf61a34c0
 DIST xpp3-1.1.4c_src.zip 959795 SHA256 c12c8c1bab5ce2c1d28a4075319d78c51d986581284b920faa5ed85df60437f4 SHA512 e9513b8c97a2fd04154f3717b802b81cb01c584e693303f6c6dcb763aa07e03f2f50178b80926457cb7f9147ff91c3e49cfce5e8ed522b4885d634f2f5a792fd WHIRLPOOL 6c0b541d1617e073827b9824c82014b106561d5941f2e68cae564a4d45e7c9af6f027030da1950b9a4e6d959a6659271fbe0f7a7069b3148860ae628a8fcd67d
--- a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An implementation of XMLPULL V1 API"
+HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/xpp3-1.1.4c-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
--- a/dev-lang/clojure/Manifest
+++ b/dev-lang/clojure/Manifest
@ -1,3 +1,4 @@
 DIST clojure-1.5.1.tar.gz 540021 SHA256 ee6cc9360e3545a35cdd6a9ae48b5f4034ef2eb2aaa19721df976078952a805b SHA512 8bc4b7098ec11a3cd4d077f32607c5d23118d5f84b88af69b2051c4dd5b17f28f092b77206fba87e23f1163d2d0f7a2c37b1b1ffa1bcfef3ad4c8f74695d71cd WHIRLPOOL e77d13a771903100a3fe6b0ade84375217c5b150498e727a7cef2d856a4004e640e0c95717fb67be6cae1fbab7611189a1f3999726f7bbec43968eef646dcb32
 DIST clojure-1.6.0.tar.gz 579154 SHA256 70b664b24bd8cc7bf0b5519cfa5fa98424eb3e23303fec04b24a03b8bc4f0b4a SHA512 52bf54d157dae77e71e53bac421daa1bca7ef55b837600c8b04751a545cbed0f04d3718543031d1e5b8ca43e2518d356082b9f8c029c2e318996450cfaee9c81 WHIRLPOOL b79b008773ad678e6418a719183c5b240ad0629d3a32384ec6e5979f0377ba2bd39768f27b71da815342bffbd8bdfa5b66cb24e90cf4f489273b33515f591509
 DIST clojure-1.7.0.tar.gz 614331 SHA256 51a950b5b67575869a52debbafe52967759757f2e302a0bd42fb56b0e9859a74 SHA512 243d3120fa1a0f559c1f6b4724d0f7ba72e6f6dd009d0849377087e890aa04dba7c119862001d0c543eb0e35ef5c13cc8967ad494ffa9522daa9f8b1dfc77ef1 WHIRLPOOL 6c002d736968bc5af91eb2f8f593ded5ac14582aeecac67d62a9125c1911986313fece4a19e946b742292df1673b787cc1506c7ff22abe3e534e433e1403e35b
+DIST clojure-1.8.0.tar.gz 627688 SHA256 9d2a9f29a59aadb2abcce27afaaacf3b33b5f2bbf7c2a7c82b3a1837ea81d9ed SHA512 fa5714397e679f77260db054bdc0891a311e7bd14bfceb2dd0494480fb9cf21fc74dd295e75070105ff0cdd50842390a748d8782397c549f51d85d18d54a1231 WHIRLPOOL efa4a24b5316686beb8343f42809381bee2ddebe67dbc8f7f27aaf5fb86baba5ca5f76e7096acc62e94d98cbd40434ad698324f29d667abb76be4d13756f0c87
--- a/dev-lang/clojure/clojure-1.8.0.ebuild
+++ b/dev-lang/clojure/clojure-1.8.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A dynamic programming language that targets the Java Virtual Machine"
+HOMEPAGE="http://clojure.org/"
+SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 Apache-2.0 BSD"
+SLOT="1.8"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE=""
+RESTRICT="test" # patches welcome to fix the test
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S=${WORKDIR}/clojure-clojure-49e5003
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar ${P/_/-}.jar
+	java-pkg_dolauncher  ${PN}-${SLOT} --main clojure.main
+	dodoc changes.md CONTRIBUTING.md readme.txt
+}
--- a/dev-lang/gdl/gdl-0.9.6-r1.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6-r1.ebuild
@ -100,19 +100,19 @@ src_configure() {
 		-DMPICH=OFF
 		-DBUNDLED_ANTLR=OFF
 		-DX11=ON
-		-DEIGEN3="(usex eigen)"
-		-DFFTW="(usex fftw)"
-		-DGRIB="(usex grib)"
-		-DGSHHS="(usex gshhs)"
-		-DHDF="(usex hdf)"
-		-DHDF5="(usex hdf5)"
-		-DLIBPROJ4="(usex proj)"
-		-DNETCDF="(usex netcdf)"
-		-DOPENMP="(usex openmp)"
-		-DPNGLIB="(usex png)"
-		-DPSLIB="(usex postscript)"
-		-DUDUNITS="(usex udunits)"
-		-DWXWIDGETS="(usex wxwidgets)"
+		-DEIGEN3="$(usex eigen)"
+		-DFFTW="$(usex fftw)"
+		-DGRIB="$(usex grib)"
+		-DGSHHS="$(usex gshhs)"
+		-DHDF="$(usex hdf)"
+		-DHDF5="$(usex hdf5)"
+		-DLIBPROJ4="$(usex proj)"
+		-DNETCDF="$(usex netcdf)"
+		-DOPENMP="$(usex openmp)"
+		-DPNGLIB="$(usex png)"
+		-DPSLIB="$(usex postscript)"
+		-DUDUNITS="$(usex udunits)"
+		-DWXWIDGETS="$(usex wxwidgets)"
 	)
 	if use imagemagick; then
 		if has_version media-gfx/graphicsmagick[cxx]; then
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@ -13,6 +13,7 @@ DIST ghc-bin-7.10.2-r1-x86-noncurses.tbz2 113572461 SHA256 3ad1e2888d26b6858cd1e
 DIST ghc-bin-7.10.2-x86.tbz2 113900477 SHA256 eefb7a3002e3dcdd6d936b2b2826eadf3cd100352babad4c9a355b944064240a SHA512 61dae4b9c80bfef6b1e0550c77b70f25d11f4a9fbe3b57d6c4ad451b4b584884432405d39dc32b9f85f3a5ad9d02657356ae0ebd99518848f3d330314c74b595 WHIRLPOOL da0d7eb62d2ee2aeb80a3f495da2ff123e29151b7517fbcd212f83ab3722638f10019511f4f237e8e001c68dd957ed2817fb0f1a2b42c2710239343f1d801496
 DIST ghc-bin-7.10.3-alpha.tbz2 183558856 SHA256 780ac45b9b38fb40f08eeb7dae741649ac19dce2271df4bc764cac9be6c5c225 SHA512 08709fe9b4036ab41715c9a637a2a160104e3ab9e0ed9efaaf73428e3cfe19619e50c42b72c60bbbd27be2b9c2ea68f63d72c1a27d4519756e7c0d909f724230 WHIRLPOOL f488ecc945c6100ba86b9ae25eb6a472693556be0205a6c8634f2c235e779fe17b391ced7fec5d89c0c6c3d21583fe9f9b80bf628f3307890becf3f3ffb57a96
 DIST ghc-bin-7.10.3-amd64.tbz2 112040431 SHA256 c3c71aff288f7de2785d1c3d54f0fd636144eb3dcb590bdda087b0775203e517 SHA512 e1554b3944edbe8e16537de5a29132dc6a22d780d9a700cdc9b76387b94191164398d6f2242bf8199527802572e2bb02545569d4f0930a0ee0dbfdeb25978558 WHIRLPOOL c2497a9565abf7d37e7928f508f7bf7241dd529aa252da708517f9f067e3d016341b7a73cac34888b99c9b84a8d01fd9e8d76f2b332d53e0d708b078f20ee807
+DIST ghc-bin-7.10.3-ia64.tbz2 238680956 SHA256 0da9b5966f0920341f4cf041b814817e1ed06060e8a491481ab19a68153767db SHA512 3694011aec8a6dc37889418b318993cb82f9b46a5175dd837713f396c8f59a19a920e0b0669fe3b4ec37d5bd8837c115264c0a8fc97c5a4ce06a3bdd52fcfce5 WHIRLPOOL 9e059a953607b6477ea7c27bf55175d838c6aa3c57fcf92f13fa6112e9e728037073047be300a5a757395d759d30545546cb46816ec879a2d31c3c0a78868e42
 DIST ghc-bin-7.10.3-ppc.tbz2 125832171 SHA256 67817636f5b91e04ecf94972c0bfe8e4e95efde82c4e23495b869da750409822 SHA512 4eb111e3686656a83515f59d4ace8bc28806dcabfcee5201ce29aee38b8efcefaaf70c50bee55202c2d2abbfbf231a6b41df8b13199332c53055adb1754a3191 WHIRLPOOL 8ec420bebf60b059c10ff0985993def7d1f40919d82e94b845b918f9ca146c8dd087f2abe9c2c7744e0f53acb75a752f8f7f6b72dabc04752dac22045302db2f
 DIST ghc-bin-7.10.3-ppc64.tbz2 142469712 SHA256 c8fa2ea861d4c5373f7f67fd3a29db4e48593d669c8616c2f349592af7e4846f SHA512 eb59d3abc8b10010311d59df9473c5ea649eb0dd7f9ad41a1929a540a0ef8c20abaccd68254f8abab037fb1fc94d824f474e18e4316b8f2a7a954d0645a2a2a4 WHIRLPOOL 14ccfbcf818a80f1daf39b44dc7562304af925e548407ce0deecd2d4593f4e138da38cfe63d4e5b8b0303c0237c678c27eaac4331288ee9b9dcbcf8be7390f74
 DIST ghc-bin-7.10.3-sparc.tbz2 163105069 SHA256 b9ef4179d87f4a56e9a786b28b0674f817118c73784b0dce283affadab296875 SHA512 d467a42487378d7dee311eb33aa1c151f5c16a6e7a4ab5bd8177df229f474adf19da3e1ca1064943a40abafcab6852b0589dd34413da82b33a03ede1ac17bf5d WHIRLPOOL 26ecb662f1d0eae524388008c24b3d25f954668aba781e997afd934c10b379b32e3376bc3a1232b066de84d3e1d1ad838dcef667b0f7606d0ac52acd7ef78a72
--- a/dev-lang/ghc/ghc-7.10.3.ebuild
+++ b/dev-lang/ghc/ghc-7.10.3.ebuild
@ -28,7 +28,7 @@ arch_binaries=""
 arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
 arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PVR}-amd64.tbz2 )"
-#arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )"
 arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )"
 arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
 arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
@ -46,7 +46,7 @@ yet_binary() {
 		#	return 0
 		#;;
 		amd64) return 0 ;;
-		#ia64) return 0 ;;
+		ia64) return 0 ;;
 		ppc) return 0 ;;
 		ppc64) return 0 ;;
 		sparc) return 0 ;;
@ -73,7 +73,7 @@ BUMP_LIBRARIES=(

 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc ghcbootstrap ghcmakebinary +gmp"
 IUSE+=" binary"
 IUSE+=" elibc_glibc" # system stuff
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@ -1,2 +1,3 @@
 DIST nasm-2.11.08.tar.xz 764872 SHA256 c99467c7072211c550d147640d8a1a0aa4d636d4d8cf849f3bf4317d900a1f7f SHA512 f7caf42d0fe1b850de13180a1f363e34a6d44a02696312dd8f12f4116ad1c1f3d01e6606c3a79fb881e76fc70d20894d85b333c84a75d60265ff9551f7b8cde4 WHIRLPOOL d13f342d59aedf2510347f847a2f5fb276a3bdb9e7b8c5cac6ac4e204a03ea31e477adc19facbf68f939245aae72971b232f1a0fc461ef554458f8956403c623
+DIST nasm-2.12.01.tar.xz 780112 SHA256 9dbba1ce620512e435ba57e69e811fe8e07d04359e47e0a0b5e94a5dd8367489 SHA512 c016b2b26f2ef00fe8de673dc7b2effa55ddd23d1f15145380c2767a2cd4a5c60c77732faebcd5868b325f780c0bf76a5e0c49eb6189609b21e2493d2af9347c WHIRLPOOL 4659275043c947461a03450efe184a425019aa99b30607c33b1dd302dd02091a9f1dfaf80382c4466b7df295bc09add6ad9587e3050ea4567a4605f956e1bcdd
 DIST nasm-2.12.tar.xz 774808 SHA256 f34cc1e984ed619b8f9e96cea632e3c6fdea5e039069dbcb63397b7bd004f5a8 SHA512 6aef9cdebf0e846e476bc57c42bfe6efcbeecf65a3b3fec3c4b5777e5d490e9a4d0cce2b551a8d7b995c1e36ea838526b55355f70d000a78cdd005ac83e41b56 WHIRLPOOL 7717077d80f613afc6d4812215fa8d9f552a7ec7e9c4af6b0965499d155c46c553a2be060c8c46fb252d23fd0432d32fbc878df9dec4832383f58661c7b01c91
--- a/dev-lang/nasm/nasm-2.12.01.ebuild
+++ b/dev-lang/nasm/nasm-2.12.01.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="http://www.nasm.us/"
+SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="dev-lang/perl
+	doc? ( app-text/ghostscript-gpl sys-apps/texinfo )"
+RDEPEND=""
+
+S=${WORKDIR}/${P/_}
+
+src_configure() {
+	strip-flags
+	econf
+}
+
+src_compile() {
+	emake nasmlib.o
+	emake all
+	use doc && emake doc
+}
+
+src_install() {
+	emake INSTALLROOT="${D}" install install_rdf
+	dodoc AUTHORS CHANGES ChangeLog README TODO
+	if use doc ; then
+		doinfo doc/info/*
+		dohtml doc/html/*
+		dodoc doc/nasmdoc.*
+	fi
+}
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,5 +1,7 @@
 DIST php-5.4.45.tar.bz2 12703324 SHA256 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582 SHA512 ba22207da70e5e8ddf9a1f41bbeb54ef4917630006c3412db8f858782baaa3ff49d7e5ca59bed76c37fc11dc518c475b81f33f0f32c533c8f00be338e0b0d9c5 WHIRLPOOL b34e465dd193e9c1f5dedd7c6f279bb10471e31120f2a84246927f160adb1e54ea56563c719e59ed0654e2fd0805cebcc00198d6f6153791edef52fd0f2288a7
 DIST php-5.5.33.tar.bz2 13686486 SHA256 c490b1ed4df596b48eb68f630d89ca512945e2650840e7dace1119cc7e600aa9 SHA512 a0ac57adcc4b0caec153265a8d1ded8d4d0f71b44f08158feb0add9c8fdd36826767882e85dd03399cf146800eddcb6b6cc1b21051d4fc4371e3f61b1169132b WHIRLPOOL 373c61677adb89506cc4621d1c7a0732f6454a8679a797807631f2286188bb990dfcaf34b4108edf7b1819424100fa0d7060f0f792a65dc5f1c130cfa00e6b45
+DIST php-5.5.34.tar.bz2 13686681 SHA256 af88884416a92619de842ad0fd23f7f7e8140efb0b9194f98a38a78781e5851c SHA512 c4269f79f5acaac64e9d2e20feef4bbd5aa7a84e69445dee64bf068197d611aa8ceb3697ae6461d8c96068be7839f22eeaff61f201f6e7a8749d284eaa68c0f8 WHIRLPOOL f4771f614176242a9a3e27185c98822493ca1b1982b5b11b3ee53d952534c69a73e0625b589723cc153da0978b27a8e55c7f9056b81b7a282dc385d22f4fdf02
 DIST php-5.6.19.tar.bz2 14100438 SHA256 2a24a3f84971680ac0a4c71050067de4f76ee235aa4a041fae21bfa69975c168 SHA512 c8c2b3bdfc1a8abe834612c33123b4f103e841c230b53934fb7bafe11af7f1175f02ca54c92f33e8e603485e6283897bebb51acc55d1213b7433024684215c14 WHIRLPOOL f026e8779c531f887b1e292e5f1d6eafd0e3ae46f83ae8efb830ad8e0f91d86e5b002dda9e6a02987db6230557ff773d8c52dd2db423d792aed1aca292e5b92b
-DIST php-7.0.4.tar.bz2 14027088 SHA256 a246c503709c189ba8e1e22ed2cb22abc27da43a997ff1b3318e181baf529dcc SHA512 9d1dc761cdd9103a91299e01117c1790550e3b94e7694dcc2555d83e5abe3d2170acd6226e8501c5f2a77b5c374b1c9f5ea009999d476818c2682a54def86b96 WHIRLPOOL 08b6b023854af693d85a6e48b3ec83f10ede0c07ac6d18b1b3b2a4d8208dcc7ba55900985be812c3325703bc291d8a842d7754c1b7754e2c52c72e7488d6d8df
+DIST php-5.6.20.tar.bz2 14162188 SHA256 5ac7bf7caec7a79b18cf458e786fd1609ad2da771224b80bc15cc6f01b22bf1f SHA512 9e26f2564ee7329ab50d4d8d27f029c4f88317ea761888138e60d13a3cf51e49676ded406a3ec18433be2ec5d2a49c904eaa9f32d473b99d11550025e026a61c WHIRLPOOL 679c8ee4b3ddf18d94598982969fd12d053493fbe70d4b9f8d3eda4ed9ab0bb6f83d912bb7f8ebd99264beea992cce7c1083d257576551fadf537b5655d23d57
+DIST php-7.0.5.tar.bz2 14086522 SHA256 2c09af7fe64537ea795f098b9b542ead407ef83f7cdc65b3787115ccbbb51de9 SHA512 13d6dcd339211b22761586f2804c7470634e00b36e5e0b7bcf5188c017f950cbf49a2d4dd41047a7d44c70ed9474097a7290fc84ee3c26532e2ad8a2cbe706d7 WHIRLPOOL 368db472c91b3d6b2f76adb1df3feb2feeeb7d7396711c9c91b4515caf0e89612b7e58bff0d807b5d32af1b4f9aeacc20a93246a8644af11e52b3dcb0dbd20e2
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
--- a/dev-lang/php/php-5.5.34.ebuild
+++ b/dev-lang/php/php-5.5.34.ebuild
@ -0,0 +1,784 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)
+	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP"
+		APACHE2_MOD_CONF="70_mod_php"  # provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
--- a/dev-lang/php/php-5.6.20.ebuild
+++ b/dev-lang/php/php-5.6.20.ebuild
@ -0,0 +1,807 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +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
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+DEPEND="${DEPEND}
+	berkdb? ( || ( 	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( dev-libs/gmp:0 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0 )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+	fi
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+		|| die
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	# Add user patches #357637
+	epatch_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with mssql mssql "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with systemd fpm-systemd)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_with truetype t1lib "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib)
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -r "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/sbin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP"
+		APACHE2_MOD_CONF="70_mod_php"  # Provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes"
+	elog "php${SLOT/./-} in order to compile extensions for the ${SLOT} ABI."
+	elog
+	elog "This ebuild installed a version of php.ini based on"
+	elog "php.ini-${PHP_INI_VERSION}. You can choose which version of"
+	elog "php.ini to install by default by setting PHP_INI_VERSION"
+	elog "to either 'production' or 'development' in your make.conf."
+	elog "Both versions of php.ini can be found with the PHP docs in"
+	elog "${EPREFIX}/usr/share/doc/${PF}"
+	elog
+	elog "For more details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
--- a/dev-lang/php/php-7.0.4-r1.ebuild
+++ b/dev-lang/php/php-7.0.4-r1.ebuild
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@ -1,2 +1,3 @@
 DIST libgit2-glib-0.22.8.tar.xz 429300 SHA256 05c9453b195f1af0df2a5d8bc71472c9fb26d14bb8fbb5b688ad1b8ef7a30959 SHA512 caa0076127cd846b31bc9d341ecb0a07b0a4e960b16387b241f1e322627d304636bf59c34a657675444a7a5be66ab645416be0be14cc0e841078f5ce2ac7c9fd WHIRLPOOL 831b57d9da81c5fb3e5ad06a6e7080b1570e2b215eb193a3704cb4b7caa2e361c3290e0b15ab3d27ecc4402756e9d1cd4e8db0da0ea4cd119eafefe32a987213
 DIST libgit2-glib-0.23.10.tar.xz 450552 SHA256 398ea6ff5fb1eafa61f2908da5ff8722dc051a2081be6cbed76a2ab07ecab1af SHA512 bf85ca562bb1e00fb65d499d133daaa9deeb8abe37e1caa33148c469e91f43f685c222fe976985b4a5e9cef4ebaec9e92d90d5a87287f0c6012f798ed9755a07 WHIRLPOOL 91d55e52c507a80d28f110f7feb183dd046db4389732ff4a68996156ef2a04e956c71ef485c36c9b8f945208f699bed883d5c914eb8e53db1301c7e9b59eb1f1
+DIST libgit2-glib-0.24.0.tar.xz 456724 SHA256 d616c268821c28ff8dc1a6419dbf8555fa48e31dc6509c10f5151be7690f4845 SHA512 d613fc1aa17543500c448a6d0d90f7e0c17bacd1cced4a9d7a126fb1ebf96981fe9613b96cea397e7cfe46c2bb17b4c9de0535e5985f682bcb388fe5dd4dcc0a WHIRLPOOL f827845587794904d603527d82d6b10ae226e9e4709695b2e00cb1b640eb1d34c7751e5e5d78d59d694cf9696c4cd95bcc246e346524d114f846ae836d2ce987
--- a/dev-libs/libgit2-glib/libgit2-glib-0.24.0.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.24.0.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 python-r1 vala
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="python ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
+# of changing their API in each release in ways that break libgit2-glib
+RDEPEND="
+	>=dev-libs/libgit2-0.24.0:0/24
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/gobject-introspection-0.10.1:=
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+	ssh? ( dev-libs/libgit2[ssh] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable vala)
+}
--- a/dev-php/PEAR-Log/Manifest
+++ b/dev-php/PEAR-Log/Manifest
@ -1,2 +1,3 @@
 DIST Log-1.12.7.tgz 46898 SHA256 7db9d8dae364e3cde16de2087a371eb862479f33d32631db947620b20d2306c0 SHA512 1c1bed9bb73a729ff8a48ed1ae0aca63384c6a14217a0aca6f9be886c1b477a07bc38a3a169e1c32430efb1b63c265fd705929e4ee5e18444f8c518a13997fc7 WHIRLPOOL d5011b48f3b1880764b2d3b1f1deeec5cf061f3e75639ab7e790e87f8551bb0b36d3ed63f33f1483314dd056e2280f8690ee92290ef11ca3f2e9d2de3cf85e7e
 DIST Log-1.12.8.tgz 46725 SHA256 2f6c27ea105b401bda3b31f2a50a20cf54ca6eda175f045db1b4251b073799b3 SHA512 ab382fe684818ed6cc5f14a4ee5df8b89cf6f9b6e110368be5b4986fe8013e185b37f9385190a85f6ff22ac3191853a96914643d3a6e4c02535927e40df7a1fe WHIRLPOOL cd904c2d5180953cecafdbb73d15ef64473245e001a087cdf351cb8062f5ca296f8c704ff2b1f6a80eff1b17f2271fec6f4eea1970b3a55df1414859176b7180
+DIST Log-1.13.0.tgz 46718 SHA256 9ad581d0be9b249c0066db393d936dd861925ced7e635064fee1ccdf2c6fa109 SHA512 be80bb0c15b594e178ec7cc871c6e84c7d32398843167e67699e55d3ab1fcf0ae86baa84100c8f3115da01da343c91614744245f95320dc499b85f4c6646a81c WHIRLPOOL ae809147f4b1ce35f2e0b20b84cf133e8443aaee1ad83b8880ce4ff61d77d9fc93f473b3fb9fd85cac028ccbd8c1a6d83ce26ed6d8a9c475b648109228c0857d
--- a/dev-php/PEAR-Log/PEAR-Log-1.13.0.ebuild
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.0.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit php-pear-r1
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="The Log framework provides an abstracted logging system"
+LICENSE="MIT"
+SLOT="0"
+IUSE="minimal"
+
+RDEPEND="!minimal? ( >=dev-php/PEAR-DB-1.7.6-r1
+	dev-php/PEAR-Mail
+	>=dev-php/PEAR-MDB2-2.0.0_rc1 )"
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@ -3,3 +3,4 @@ DIST astroid-1.4.1.tar.gz 179485 SHA256 2417a2c62f07bb77485efb6dd94567ac165808a4
 DIST astroid-1.4.2.tar.gz 181042 SHA256 b734fa504179a93aa03314df48b45fb1d9d0d8770a1126e7a126c9ac4aebd5c3 SHA512 faddbb830370232f4b3ea6cdd454da352a682b73062d9bac37ac28711dc6b17a071278d7b5019a7ba85ac4c1845752db42c0fe122be082bbc262a159b92276e2 WHIRLPOOL 18443d0dbfd6575836209c523b5d3c7eebf509a23395bb0e0e2bac43c117b3b2269c9bf6ddb4cfc896b1232f1f4d9a86ac3ebf40ba950a25070a8771e54cc7ac
 DIST astroid-1.4.3.tar.gz 181329 SHA256 8e9ce4e925a17442cec085a7fce05478b99e482c13819c619b7cdd793777bf6b SHA512 a4c607ef16bda0561254fa177c319e6f139de12385a277e780c8db641a4aac3cc49712be3bf9b529609f3e303194d1caa7ba44b564662aaf32c6847aab4808d0 WHIRLPOOL 1086fed0948d8135970a951f5e2c2d2f8678e1b5169898f9df1407b40bbeea7dbcd80d16c759686ed5effd962e8c2054778873848e38545961c450b72bae9e9e
 DIST astroid-1.4.4.tar.gz 181733 SHA256 7f7e5512efe515098e77cbd3a60e87c8db8954097b0e025d8d6f72f2e8ddc298 SHA512 f78f749e9542145060ba997f2e46945c13cffda74fb77f05b358bf4c22bac8b9924889627148d205538f515413293733471d238fea62a084ab9727e8d239d6ce WHIRLPOOL 12aedaa9ad5c3cbffd641e292fc829e90ffc4aab30e35d7cdb71e88a3fcfb24a3fbda342adedddba4c3f72c3d96216a9cb6c58ad4f2183cdb0f4784dd21dd0b2
+DIST astroid-1.4.5.tar.gz 182251 SHA256 729b986aa59fb77af533707c385021b04e60d136b5f21cc766618556d0816cf6 SHA512 abcc31e927ec9abd8be277f9b586f409dc2632be8c84bae0521ca2fe17b5a13325429494918357e998fb56221a72476194a7a6d3238b1cd81b88e827d97f6328 WHIRLPOOL 34578ddbb52505c33844b94c7801c46b0e6d321cfd16ee866a6955e0a0ae942c7e912675bf857248daa9b5420a50eb1cc865dd3fceb9e42b293cf686272fe72f
--- a/dev-python/astroid/astroid-1.4.5.ebuild
+++ b/dev-python/astroid/astroid-1.4.5.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# https://bitbucket.org/logilab/astroid/issues/276/testfailures-with-141
+RESTRICT=test
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]"
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? (
+#		${RDEPEND}
+#		>=dev-python/pylint-1.4.0[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
+#	)"
+# Required for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
+}
--- a/dev-python/pylint/pylint-1.5.5-r1.ebuild
+++ b/dev-python/pylint/pylint-1.5.5-r1.ebuild
@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-lin
 IUSE="doc examples test"

 RDEPEND="
-	>=dev-python/astroid-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/astroid-1.4.5[${PYTHON_USEDEP}]
 	<dev-python/astroid-1.5.0[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
--- a/dev-python/specutils/Manifest
+++ b/dev-python/specutils/Manifest
@ -1 +1,2 @@
 DIST specutils-0.1.tar.gz 3494885 SHA256 b7df818eb3e41ea01e00db1ac470e9c2f24adabfb131d57d53b4c792accea1cd SHA512 43e67c56d77bb06a1a96674755d843ba89d6da7b887f5fef8f2c190487c0a802631c9b782ca58b27216d449ee47353e9c0bf5a9cd73c2db4e5fb683f68a9c6c4 WHIRLPOOL 252ecab3688b26078e3b9da570c6ba5e7a137e7b5f9598074487ccec32f5c9ee7c3424afb5426c7a9b5ce6ed9d2a0825db3263882b43918a67bd24dfa05f03d1
+DIST specutils-0.2.tar.gz 3348219 SHA256 e232013a0615105b07a388be1a5faca2b26a71ee19dcf454508229188356df98 SHA512 ac05a795ddf3e690c7f5f7fe1a4b0340b546363ac132ce78bedc6ce364feb7418d896e18302ce391717cc507dbd37de210f5b6dfcfda2c44f9f8e0191619bace WHIRLPOOL 885e8060519842652d845a5afb69fecea5768ba00d7e05877e31349a546ad80b36a132fb0e4ca6ae82b8eb9a7c49dc5180baaf245051c62f3776c74f060f35ca
--- a/dev-python/specutils/specutils-0.2.ebuild
+++ b/dev-python/specutils/specutils-0.2.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python package for astronomy spectral operations"
+HOMEPAGE="https://specutils.readthedocs.org/"
+SRC_URI="https://github.com/astropy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		  dev-python/matplotlib[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/ )
+	distutils-r1_python_install_all
+}
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@ -1 +1,2 @@
 DIST cvs-fast-export-1.26.tar.gz 668913 SHA256 ebca4b19ba9045bc1b733f729042d7a98dd6675dac3030239f718b13a99949ed SHA512 81d240ae387b4231415335b4a0d294ae81f6ecbc97077d92a1738aca17642b9a7e7ee3f7806890ceafc5c65c50d4370c39c36ee21c927a4fcd30ebfa3bbe472e WHIRLPOOL 1a59b9e5e0b30d935f463a58873c3554315d0d512b4d9482d5fc2341bdb194b16bd017a444f9e21f8ce2181a3bcf6e85aa09584467b1a9e6845ed92b8a75c4f8
+DIST cvs-fast-export-1.38.tar.gz 396524 SHA256 7106c2e85b9fca680230879547dc102186637bd1fbcc5a913127483603d9731a SHA512 ed2aabc417b093c1742ea15bd21855c600a46a5ab72758d15bab24672b6e648531416a6b28c17e6faedd67b4c697b004ba3316cd65cb0ec638566c26878e9428 WHIRLPOOL aba8deba5f3ef8ef7bf38dedf7cd941c24ba709083ff94cfa6c45ae8ebd42f789d1c44276521a752a7b3869d20537964bd05a0689d0ba90a7b180abcc5384bd1
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.38.ebuild
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.38.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast-export history from a CVS repository or RCS collection"
+HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-text/asciidoc"
+
+RESTRICT=test # upstream does not ship them in tarball
+
+src_prepare() {
+	tc-export CC
+	export prefix=/usr
+
+	# respect CC, CFLAGS and LDFLAGS. don't install cvssync
+	sed \
+		-e 's/cc /$(CC) $(LDFLAGS) /' \
+		-e 's/^CFLAGS += -O/#&/' \
+		-e 's/CFLAGS=/CFLAGS+=/' \
+		-e 's/$(INSTALL).*cvssync/#&/g' \
+		-i Makefile || die
+}
+
+src_install() {
+	default
+	dodoc README
+}
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@ -1 +1,2 @@
 DIST opengfx-0.5.3-source.tar.xz 9638892 SHA256 28d253ffa7a3618f7c4efb3b1076bc652204c2412d3cee57a6b9ffc13bda4014 SHA512 41b41192dcf95e2ac03e7028f55aca486c13a8709a62fe5970918494b0009ee07118e0d04d10426fea35ee82c842d28fc58f8c258df2e8ebe0b17e40c892f829 WHIRLPOOL 309c8e5ef1fb83328712c0516c55ecbc53f75117a1fc2aedbe9e61db05bf14ffe4f9fec6ff6a1f50dfc408735de3d5b754d97b026957b02271b213ffc32a9872
+DIST opengfx-0.5.4-source.tar.xz 9638204 SHA256 6b6e33dbe11b2c668c3b7ac1534b7a8eb567d702f42c99bd871c69e6682ee655 SHA512 42f8438c747b42a77cf9d86c5da60ce3ce84ed347d714c345f3871806f9e35f2ed4729b445e0ee319f3e2edd53458dfbaad5ca42e389c3a2e800bce19223cdb1 WHIRLPOOL 3cd952b9f0ddddcc61acc6077f828c40eccf87835964a9ecdf5b1e27e4e6569a13acce9224a0ba52b4ba2fca5906a3b990c24ac11bfbfeb6c3e5c1f859928184
--- a/games-misc/opengfx/files/opengfx-0.5.4-Makefile.patch
+++ b/games-misc/opengfx/files/opengfx-0.5.4-Makefile.patch
@ -0,0 +1,31 @@
+--- opengfx-0.5.3-source/Makefile
+++ opengfx-0.5.3-source/Makefile
+@@ -99,8 +99,8 @@
+ AWK            ?= awk
+ GREP           ?= grep
+ PYTHON         ?= python
+-UNIX2DOS       ?= $(shell which unix2dos)
+-UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
+UNIX2DOS       ?= $(shell which unix2dos 2>/dev/null)
+UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "")
+ 
+ # Graphics processing
+ GIMP           ?= gimp
+@@ -196,7 +196,7 @@
+ endif
+ 
+ # Days of commit since 2000-1-1 00-00
+-REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days")
+REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)")
+ 
+ # Filename addition, if we're not building the default branch
+ REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi)
+@@ -719,7 +719,7 @@
+ 	$(_E)
+ endif
+ 	$(_E) "Release:"
+-	$(_E) "bananas:     Upload bundle to BaNaNaS
+	$(_E) "bananas:     Upload bundle to BaNaNaS"
+ 	$(_E)
+ 	$(_E) "Valid command line variables are:"
+ 	$(_E) "Helper programmes:"
--- a/games-misc/opengfx/opengfx-0.5.4.ebuild
+++ b/games-misc/opengfx/opengfx-0.5.4.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="OpenGFX data files for OpenTTD"
+HOMEPAGE="http://bundles.openttdcoop.org/opengfx/"
+SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444)
+
+DEPEND=">=games-util/nml-0.4.0
+	games-util/grfcodec"
+RDEPEND=""
+
+S=${WORKDIR}/${P}-source
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+}
+
+src_compile() {
+	GIMP= emake help  # print out the env to make bug reports better
+	GIMP= _V= emake bundle_tar
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}/openttd/data/"
+	doins *.grf opengfx.obg
+	dodoc docs/{changelog.txt,readme.txt}
+	prepgamesdirs
+}
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@ -1 +1,2 @@
 DIST openttd-1.5.3-source.tar.gz 10042384 SHA256 a5525de811ff83e89774d9a7344c7f63ec282b956c3f015af259fd79f54d18e5 SHA512 8185ea4b8e5ac9456c7067a5d662b4a2e1724e14fc0455705ec3b72943421cc5cb10cb67a4f483c47ff2fa6621a219cababd08e21086209a53241a74607b5466 WHIRLPOOL 839067c2c6f8f87ea74df376f3d3d5e2a126c5198f69efce1205603da67d97c1a1b0d5dc3b349aa92f916179ccc48581418b5aa1e9e7e250f636fae78bcbf7ac
+DIST openttd-1.6.0-source.tar.gz 10064454 SHA256 32f63477aba1ccf238dfe0538a6660163c2b725e077978e570e38d023d269cad SHA512 d235e6e094b2e3fda0cf58a2dce1e5d779654bee638def60f00da4e7c6443b00a6f3b204d5a63cf56e141074c8aa3700ce7e9f1b1eccbb5cd36260f1892ad501 WHIRLPOOL 497272ccc3836710a68cabfbf5b925a30c3d23ee332e5ba5fa24a2b79b199d2b7ce6bd22507ea977986382ae32193247b9eedee638419d1e6f41165f5fa8abd9
--- a/games-simulation/openttd/files/openttd-1.6.0-cflags.patch
+++ b/games-simulation/openttd/files/openttd-1.6.0-cflags.patch
@ -0,0 +1,42 @@
+--- openttd-1.4.4/config.lib
+++ openttd-1.4.4/config.lib
+@@ -1450,12 +1450,6 @@
+ 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
+ 			LDFLAGS="$LDFLAGS -noixemul"
+ 		fi
+-
+-		if [ "$enable_profiling" = "0" ]; then
+-			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
+-			CFLAGS="-fomit-frame-pointer $CFLAGS"
+-		fi
+-		CFLAGS="-O2 $CFLAGS"
+ 	else
+ 		OBJS_SUBDIR="debug"
+ 
+@@ -1466,14 +1460,6 @@
+ 				CFLAGS="$CFLAGS -G0"
+ 			fi
+ 		fi
+-		if [ $enable_debug -ge 2 ]; then
+-			CFLAGS="$CFLAGS -fno-inline"
+-		fi
+-		if [ $enable_debug -ge 3 ]; then
+-			CFLAGS="$CFLAGS -O0"
+-		else
+-			CFLAGS="$CFLAGS -O2"
+-		fi
+ 	fi
+ 
+ 	if [ $enable_debug -le 2 ]; then
+@@ -1498,11 +1484,6 @@
+ 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
+ 	fi
+ 
+-	if [ "$enable_profiling" != "0" ]; then
+-		CFLAGS="$CFLAGS -pg"
+-		LDFLAGS="$LDFLAGS -pg"
+-	fi
+-
+ 	if [ "$with_threads" = "0" ]; then
+ 		CFLAGS="$CFLAGS -DNO_THREADS"
+ 	fi
--- a/games-simulation/openttd/openttd-1.6.0.ebuild
+++ b/games-simulation/openttd/openttd-1.6.0.ebuild
@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
+HOMEPAGE="http://www.openttd.org/"
+SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
+RESTRICT="test" # needs a graphics set in order to test
+
+RDEPEND="!dedicated? (
+		media-libs/libsdl[sound,X,video]
+		icu? ( dev-libs/icu:= )
+		truetype? (
+			media-libs/fontconfig
+			media-libs/freetype:2
+			sys-libs/zlib
+		)
+	)
+	lzo? ( dev-libs/lzo:2 )
+	iconv? ( virtual/libiconv )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="
+	!dedicated? (
+		openmedia? (
+			games-misc/openmsx
+			games-misc/opensfx
+		)
+		aplaymidi? ( media-sound/alsa-utils )
+		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
+	)
+	openmedia? ( >=games-misc/opengfx-0.4.7 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+}
+
+src_configure() {
+	# there is an allegro interface available as well as sdl, but
+	# the configure for it looks broken so the sdl interface is
+	# always built instead.
+	local myopts=" --without-allegro"
+
+	# libtimidity not needed except for some embedded platform
+	# nevertheless, it will be automagically linked if it is
+	# installed. Hence, we disable it.
+	myopts+=" --without-libtimidity"
+
+	use debug && myopts+=" --enable-debug=3"
+
+	if use dedicated ; then
+		myopts+=" --enable-dedicated"
+	else
+		use aplaymidi && myopts+=" --with-midi='/usr/bin/aplaymidi'"
+		myopts+="
+			$(use_with truetype freetype)
+			$(use_with icu)
+			--with-sdl"
+	fi
+	if use png || { use !dedicated && use truetype; } || use zlib ; then
+		myopts+=" --with-zlib"
+	else
+		myopts+=" --without-zlib"
+	fi
+
+	# configure is a hand-written bash-script, so econf will not work.
+	# It's all built as C++, upstream uses CFLAGS internally.
+	CFLAGS="" ./configure \
+		--disable-strip \
+		--prefix-dir="${EPREFIX}" \
+		--binary-dir="${GAMES_BINDIR}" \
+		--data-dir="${GAMES_DATADIR}/${PN}" \
+		--install-dir="${D}" \
+		--icon-dir=/usr/share/pixmaps \
+		--menu-dir=/usr/share/applications \
+		--icon-theme-dir=/usr/share/icons/hicolor \
+		--man-dir=/usr/share/man/man6 \
+		--doc-dir=/usr/share/doc/${PF} \
+		--menu-group="Game;Simulation;" \
+		${myopts} \
+		$(use_with iconv) \
+		$(use_with png) \
+		$(use_with cpu_flags_x86_sse sse) \
+		$(use_with lzo liblzo2) \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+	if use dedicated ; then
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
+	fi
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+
+	if ! use lzo ; then
+		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
+		elog "required, disabling it does mean that loading old savegames"
+		elog "or scenarios from ancient versions (~0.2) will fail."
+		elog
+	fi
+
+	if use dedicated ; then
+		ewarn "Warning: The init script will kill all running openttd"
+		ewarn "processes when triggered, including any running client sessions!"
+	else
+		if use aplaymidi ; then
+			elog "You have emerged with 'aplaymidi' for playing MIDI."
+			elog "This option is for those with a hardware midi device,"
+			elog "or who have set up ALSA to handle midi ports."
+			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
+			elog "Available ports can be listed by using 'aplaymidi -l'."
+		else
+			if ! use timidity ; then
+				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
+				elog "in USE. Music may or may not work in-game. If you happen"
+				elog "to have timidity++ installed, music will work so long"
+				elog "as it remains installed, but OpenTTD will not depend on it."
+			fi
+		fi
+		if ! use openmedia ; then
+			elog
+			elog "OpenTTD was compiled without the 'openmedia' USE flag."
+			elog
+			elog "In order to play, you must at least install:"
+			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
+			elog "following 6 files from a version of Transport Tycoon Deluxe"
+			elog "(windows or DOS) to ~/.openttd/data/ or"
+			elog "${GAMES_DATADIR}/${PN}/data/."
+			elog
+			elog "From the WINDOWS version you need: "
+			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
+			elog "OR from the DOS version you need: "
+			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
+			elog
+			elog "File names are case sensitive, but should work either with"
+			elog "all upper or all lower case names"
+			elog
+			elog "In addition, in-game music will be unavailable: for music,"
+			elog "install games-misc/openmsx, or use the in-game download"
+			elog "functionality to get a music set"
+			elog
+		fi
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@ -1 +1,2 @@
 DIST grfcodec-6.0.4-source.tar.xz 165756 SHA256 7ec1f903cc48b73be9192a23f3fa14dc2a024d8edc4d2dfafa245e700e650cdb SHA512 cfbbd1cfae7f2d2ba08ca32d8af68f6885c15dddb6ab941bed32d6c15bf9581e0b4ba19a16a5e48e6d6e070438732df232d3f3f008d42baad77a93f931ad0331 WHIRLPOOL 6cbd33a2aa503c858b1b5eeabd8d201e54d68ea618369b464de05f262236303e4f5960119ba86ed792c076c354ce757c804f01a6e1f90d552be276f26004028d
+DIST grfcodec-6.0.5-source.tar.xz 166788 SHA256 db149e98095de107a8d6f715f03376380f201ea158e0cdc53585d9a1b5cbe8a2 SHA512 b578c6d53b69a1d43d59039f26a028e1437536102150fc2bddfff349ef3c7f720ee31e682ccc5df892c2660e167663c2ab12c3fa63c720022ab14d0645d0bf99 WHIRLPOOL d36ea24172724821fdcb10bf80630ba8adf822675b78e6df414395b1b210fa792c864bfb7e11d8c1e9a38e89d33d9aec91ec3f6c4a5951e9f8301f8b3fbacb38
--- a/games-util/grfcodec/grfcodec-6.0.5.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.5.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM=mercurial
+	EHG_REPO_URI="http://hg.openttdcoop.org/${PN}"
+fi
+
+inherit toolchain-funcs ${SCM}
+
+DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files"
+HOMEPAGE="http://dev.openttdcoop.org/projects/grfcodec"
+[[ -z ${SCM} ]] && SRC_URI="http://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+[[ -n ${SCM} ]] && S=${WORKDIR}/${PN}
+
+RDEPEND="media-libs/libpng:0"
+DEPEND="${RDEPEND}
+	!games-util/nforenum
+	dev-lang/perl
+	dev-libs/boost"
+
+src_prepare() {
+# Set up Makefile.local so that we respect CXXFLAGS/LDFLAGS
+cat > Makefile.local <<-__EOF__
+		CXX=$(tc-getCXX)
+		BOOST_INCLUDE=/usr/include
+		CXXFLAGS=${CXXFLAGS}
+		LDOPT=${LDFLAGS}
+		UPX=
+		V=1
+		FLAGS=
+		EXE=
+	__EOF__
+	sed -i -e 's/-O2//g' Makefile || die
+}
+
+src_install() {
+	dobin grfcodec grfid grfstrip nforenum
+	doman docs/*.1
+	dodoc changelog.txt docs/*.txt
+}
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@ -1 +1,2 @@
 DIST nml-0.4.2.tar.gz 377834 SHA256 eb4c2107682f14c58c5fbffc5f26c206fd3c8fc6972a3e28478e3e7f2bb773d7 SHA512 0d9c9f1de91cd91962aeacc0e5c59b351a2e4729f97d7fc2eb49f6d6487c1e1a7a98fb8f793689520c6e828fd6cdf39e952f13d0dc2f198234e3e6ad47fe6d8b WHIRLPOOL d4d994125c04c53528ae4cf9e3ca4643d2ef1e71636453404196b200a275649b2846683406bbae6f76e98573ea92962c23e295adeba3f6086026c0b8fd676c75
+DIST nml-0.4.4.tar.gz 377998 SHA256 af66146b5cf7e0a06a80ae2882d6899faf4ed27b41ce4c8aca934b8f8ba66972 SHA512 fd7b8d7abfc8b5ea694eedf00bbc4069a82de942178a58ec05e9d3efe7c8663103ffb6b98f7614ce165eb7cba42cb4c7589f77fb67dd95eb6293f62b3179c7b0 WHIRLPOOL cb1175430e97ba56b5dff85447c7be8dde9e25e92f10d98f0a79f34c5fd55e83209d6ff4e82d646f644f5ad5ef1ecbeef7196d3f89a6e1dc001d04b284cb38f6
--- a/games-util/nml/files/nml-0.4.4-pillow3.patch
+++ b/games-util/nml/files/nml-0.4.4-pillow3.patch
@ -0,0 +1,11 @@
+--- nml-0.4.4.orig/nml/lz77.py
+++ nml-0.4.4/nml/lz77.py
+@@ -25,7 +25,7 @@
+     @return: Compressed data.
+     @rtype:  C{bytearray}
+     """
+-    stream = data.tostring()
+    stream = data.tobytes()
+     position = 0
+     output = array.array('B')
+     literal_bytes = array.array('B')
--- a/games-util/nml/nml-0.4.4.ebuild
+++ b/games-util/nml/nml-0.4.4.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into grf/nfo files"
+HOMEPAGE="http://dev.openttdcoop.org/projects/nml"
+SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/{changelog,readme}.txt )
+PATCHES=( "${FILESDIR}"/${P}-pillow3.patch )
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/nmlc.1
+}
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@ -1 +1 @@
-DIST pyfa-1.19.1.tar.gz 6688136 SHA256 f597019117b335971287fd47c1faa5be049f8a6879d4144b6c8a0039f35cea98 SHA512 b5f09ca0dde528636c5e6bc0b6987b6203dfc70ad9aa0c9238150e83de76ac138e302b5db7f40d885d6702c4c1eabae184d49af0a84e6bf3402036df24d296f6 WHIRLPOOL 8f5e42065d9945c96c7cca13301ab6ed0a286db7dc3041926af920dddf5605910ea9c259d00db1e937f2329f6156d0b4ed36330ea6d89f14bd0db9abccfca0ff
+DIST pyfa-1.20.1.tar.gz 7415996 SHA256 13e5f04590a8b9c15f72d6cde4a11af2465670c5ea78322fcfb14d3d7b00ed15 SHA512 11a1e9619e604dc0c28463efa2d106b677dc3b9177ef6a442a5a26e24055776a1b26e330fc7b6e2589a60213d989e8539eab653792f5804cc76c584fadeee07c WHIRLPOOL a087143205417787d549a044ec4fd80890bb8223b626638bc4f9407cc5e712023163d4891518ee8d8f54a459f45eb0752eaa494c8740a33d751298371829ea9a
--- a/games-util/pyfa/pyfa-1.20.1.ebuild
+++ b/games-util/pyfa/pyfa-1.20.1.ebuild
--- a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
+++ b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
@ -0,0 +1,10 @@
+--- gnome-user-share-3.14.2/data/dav_user_2.4.conf.orig 2015-06-03 20:21:27.512774376 -0600
+++ gnome-user-share-3.14.2/data/dav_user_2.4.conf      2015-06-03 20:21:33.588774303 -0600
+@@ -9,7 +9,6 @@
+ LimitXMLRequestBody 100000
+ 
+ LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
+-LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
+ LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
+ LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
+ LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 multilib
+
+DESCRIPTION="Personal file sharing for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# FIXME: could libnotify be made optional ?
+# FIXME: selinux automagic support
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3:3
+	>=gnome-base/nautilus-2.91.7
+	media-libs/libcanberra[gtk3]
+	>=www-apache/mod_dnssd-0.6
+	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+	>=x11-libs/libnotify-0.7:=
+"
+DEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-3.9
+	app-text/yelp-tools
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Upstream forces to use prefork because of Fedora defaults, but
+	# that is problematic for us (bug #551012)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
+	epatch "${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/
+}
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@ -1,3 +1,2 @@
 DIST attica-5.18.0.tar.xz 60464 SHA256 bc97eb3fde1b77f14e7b3169aeefab674f5caa43998705a2b7c7f534959ad7d8 SHA512 7fb2014dede5491511db058e39793544c536991381865bb6d2b67509094fd69ceec56ec832fa7b632862559b3279481d502ac3ef2c2f74864c015090605e1e69 WHIRLPOOL c5a7b2198a031d7977bb37580faa35867255247d3146078ea06e97f26e753b46c0917b8da25ec733cc815741d220164496a25666d589024e2108d9976f78ea61
-DIST attica-5.19.0.tar.xz 59800 SHA256 9b06375988eadf67da3c22c9c434adcaddfcadadff161fafee1a3327b6957b31 SHA512 1dcdda6927c9a0e5eaff96f7bd32de30565758f037745baaa06206e5af52b819fa89d94623a9dbac5d40127012a4072e21bd66a338d37bc39eda0b7a58f3aa37 WHIRLPOOL b16a812dd40d7da2100329d9e3275a65974dcf4ffe0d646fd3474f4a2f17c8d87af2f30c126d4bc26f95e17cabc979dfef0bb9b06cd360406b8062260609a910
 DIST attica-5.20.0.tar.xz 59792 SHA256 7a2968a249b347876f3f32a8c28fde188b68d5fecf0ce638d8a7d898fb4694f8 SHA512 d09e5004e0ee69f164addaad69535d2c6f2aa92aad9c0e020a50e13390a859a24195deccce6ba41ed8ada1f62894556adcf8fb18a7663ac2caf204909971b6c5 WHIRLPOOL cf10cfe3eec47e8fc7dd6d06b124ae4416580949af2b2b159d50815fcbbd12d48c68d9b0f215f3c16a2cf96a244ebd09faf7f0bd9d04bac3928d35292fb3b31a
--- a/kde-frameworks/attica/attica-5.19.0.ebuild
+++ b/kde-frameworks/attica/attica-5.19.0.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtnetwork)
-"
-DEPEND="${RDEPEND}"
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@ -1,3 +1,2 @@
 DIST baloo-5.18.0.tar.xz 180692 SHA256 88a2e89a102674e8fab19103e979550ebe2c4b31c05b29f6c18fe500b669b669 SHA512 90d788d40003f64b7a7fcd19a4a1800606cd35cca879d0855e48351b41859f1bf02d21972ca54b7aed1c3143bc250b926a3525011c5e69c8f3b8e4c117d6df3d WHIRLPOOL e66d375ac502d5d826b434de6b98bd58fad3b0f40f62f85c49e8ad00ea6a9c0be07067530bc125f8f093c86dff97fb80515014082ce483532994a52ce07214d6
-DIST baloo-5.19.0.tar.xz 183060 SHA256 6f6b94d464fb5da0a2256565d362aca979e3d220f11fa4c8a99d17380207de0b SHA512 966e061a87b122e0f75d5c4f4af6489c5eb859578313843bcb169bb16c61c795d023922055ab187e15ecfa288acdc59d5ef1d99cedefecb1b5464852d73afeb2 WHIRLPOOL f7da7ef8c15e7e347e3e891c3813077dc9fa9cf0281a56c284aec2c8870a2fc4bb4400e3b7fc71c022d73e9d52b1e61a3678991b42a1db17d7cfb7961c5d1d96
 DIST baloo-5.20.0.tar.xz 183772 SHA256 f2f4abe72078b30fd50c6a2d11d3a4f093b2f59582845d6affcf8d9887c6cccb SHA512 0e37647c501ed6deb41e7c4f79a15a54875cf33fe7fc002056f2ca7f7e227c673bc978dc824eee953432396600367d994df472eaf1e375d5ebe2eff87d6d83cf WHIRLPOOL 5757e042098b9750c2ae539f7ed53581fb412e890468e55d59a2ae6ee5839d49fd66ccde460d0a2433f9a26def5718ef81a6bf983203c1ec1530c5d9a23b3f0b
--- a/kde-frameworks/baloo/baloo-5.19.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.19.0.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Framework for searching and managing metadata"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep solid)
-	>=dev-db/lmdb-0.9.17
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-base/baloo:4[-minimal(-)]
-"
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@ -1,3 +1,2 @@
 DIST bluez-qt-5.18.0.tar.xz 73396 SHA256 79e5c663c2c2287530f9351f108045dad52de0c5576892863fb17147f8397d9f SHA512 6fe887d9001ea348c80c84d79af4a037d4b3a822f84abafcdb38f485a8b0f49627aa227d0ac420088f3406eb6aa31b6ec9f6f2d7cec193dafb026df3689d8034 WHIRLPOOL 7c4443a4ee825144c05be79404b8f87d9621c1242551a4c4c1c98785c5daf6bb043db53bbce28fdb7ea0d84331d7fc1e3ba33958c625856b8172d556ae868b9e
-DIST bluez-qt-5.19.0.tar.xz 73392 SHA256 db5b1d29f507b1af8ed7854341278ad210e3cde54c738b1db9d65af8f3890918 SHA512 06a03fa37d8a76251957484c4f99841fa1b51d69ad6d87c4fdb709e4bfa3fa000579458e2cbb3c1cbeab8de22b9509801392996a6292722f89536779fba186b8 WHIRLPOOL bb054e4021bffc8cb09a168513e7b3ac32b3acc58e15b9b3dc86af4a64730471e355d950f33a7331d4194aec3dfefa40eca3f3f6416c987b1d5cb26f1bfb1e54
 DIST bluez-qt-5.20.0.tar.xz 73412 SHA256 c3bf51428e188fb6a076d17809d7796f9fe6a8327e86c156e2b84c5f4b7ab252 SHA512 d37f9f5850088905b61f8ae17e9ede69dc894f524d6f496255446797c976ffcde96932400f2468428aa007f56658c85a9790c2c9fe4656bfd45deac3ab2ec630 WHIRLPOOL 5217f7b932592e2f67482237bf21021e146fcd413d60c7f0a59f1b646ca932b35540a19a033b6c63bdab7935f0f71b9feca3ce7b40286e1a56911770981aeb3d
--- a/kde-frameworks/bluez-qt/bluez-qt-5.19.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.19.0.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5 udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtnetwork)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/bluez-qt
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@ -1,3 +1,2 @@
 DIST breeze-icons-5.18.0.tar.xz 1415276 SHA256 9f7007cdc805083812583d575b3ce2880f41f32f5337582c55a6acfc4bc69128 SHA512 38ed12602fc1967dc11481638ccc5407362b510e8f6ef6eba1c7153d1a451ae6a0ddcf73ffd6cf1bd9850574e07ed131692d3cd38d6bff573815803ea964d535 WHIRLPOOL ef24f992b36ddff4bd2a05e5b941e318607e73b3e8ecc7b6f30de178d5f6056ac11f0d82bc9bc77bd5223a57c2ee03760466f8d98cb3b59e19e5996fa047c511
-DIST breeze-icons-5.19.0.tar.xz 1525492 SHA256 40eef069527d735d0380e6ef121ee96ec7d46e6ec93e7f96c34cb74025e8912f SHA512 f3a25e3171788560bf2f3e317cd695e56fc8f8395a32c68a3d2ca33471b9909a603519a08e84eb28e1b01ef09d04022bae92a4471b7b356514347042033b24e0 WHIRLPOOL b295665b62cbe01d3ebc68146a834ea05c6ac366eef19440c37ce0edc2bc84a7a52e508b36971f5d198b8a1d5a3acfedd56809c1301ee96c8107c107d7789295
 DIST breeze-icons-5.20.0.tar.xz 1537900 SHA256 445b5cb8774cb224f804abea7864a8bf6307b6a4d1958b4caf1d251f02f98204 SHA512 fd1c6ec0624d5d457bd75dad21a3bf2e86cefcab8797fa0fc2cee6a04199f662fcbfe26f9cf6856bb43eb278d18604886765db34dc4eca061fb91d592ce261a7 WHIRLPOOL 37b518e82f4ff065f206d72cc1a21a26b1f516a7d11c3cb923f834acac0799cd67ec2b8b50c5beb2b7c77709301578af2ee223cde9ededa6586b743435cc2a4b
--- a/kde-frameworks/breeze-icons/breeze-icons-5.19.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.19.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
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_DOXYGEN="false"
-inherit kde5
-
-DESCRIPTION="Breeze SVG icon theme"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="$(add_frameworks_dep extra-cmake-modules)"
-RDEPEND="!<kde-plasma/breeze-5.4.3:5"
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@ -1,3 +1,2 @@
 DIST extra-cmake-modules-5.18.0.tar.xz 284172 SHA256 7ea049840eef3a0ff5253dbbcac72e6368c40798d83fedc35d8c94a0b4bfe0ce SHA512 d07409af086a840c72fd743392fca6c5a180b75a28419b600f35db5677e3a13e27a1fb9babbc673a188338720f524a9343b39d7c8f46e92199d5c36fa55394fa WHIRLPOOL 88d432c8f02c6fb4fa8be25790d2973d162acbdfb2915fac92073a93ee579af2db83c024e6bd99b591f93e5f2766474b6e4ade4e726bdd0fc180d54692db2cdb
-DIST extra-cmake-modules-5.19.0.tar.xz 285124 SHA256 c3d02fbeaa3af9bc1165365be00a97746475c26d85695e16d7f1a8ac168483b6 SHA512 35797569ee44ac288430710afabda6aff3288c2270b0ef7bfd0ace166f8392799294020be3b0dbf8fae25218ef7296979a26f07c9a99ece6986946f243d4a7f5 WHIRLPOOL 46dcbf6054389917a9c5799592b45a6e051cee740581b225e295cc7bbc71df03b79e285770e60c4726db166e138be5ce86db1acbf8cc41fb1278edb326d76d97
 DIST extra-cmake-modules-5.20.0.tar.xz 285056 SHA256 2c8ff0c7289edfaa95007e622c87a5fa95e9e2a2ed291eb25a61f06ea92ac34c SHA512 3bcf7a2a556b9b49cbec3bdc690b4a8b7116f2c24ad35231d2bebb26eac528a11b3fc5e501785035d27b7829aba2bd91beeeeb117e31b83a82d167bde8d364fb WHIRLPOOL c00b4f906781b5e0792b9b0b8dc01dd8e503edd15572d963b3cbf9054de7221f9417379d673b3868399037f44f516c36ca4e9bea1726e34fae280b3809b75aef
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.19.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.19.0.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-util/cmake-2.8.12
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-"
-RDEPEND="
-	$(add_qt_dep qtcore)
-"
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HTML_DOCS="$(usex doc)"
-		-DBUILD_MAN_DOCS="$(usex doc)"
-		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@ -1,3 +1,2 @@
 DIST frameworkintegration-5.18.0.tar.xz 1782972 SHA256 3b072fac7d4fc4a1c5981000799b5da2bb703d1c1f3747c7092282590b421c1a SHA512 40a90aa5e779d33af35e446bbfcff6ca475b9430cd3c6146411ca542a972ba72c9a92342e6c55d5d60934df7d660a775aabf297b01e5252334e4a5f8a0bfe1e7 WHIRLPOOL 1f0861753049e15803d83227bd8110dd4f7c0541392ceb60a11cd860567d85b3cf9d5dbf63db62c0977499c6bb1da1bf4be360e750bfdc09ca4b359328a1ed98
-DIST frameworkintegration-5.19.0.tar.xz 1784504 SHA256 c3cb58b4758b28df9121c44aaadac74fb4546b968ec071a2ef177bc6cf3d8a02 SHA512 f9bdda8f819843100ca47ffb807ef1633a1ed08e894cd4df2f679f2ffda6c595eec18bd3396a01bdff74e1acb2280a8c8f616be4f32da1f01237d509f89c5e1a WHIRLPOOL e7bb00dbd70d18c35aa6fff54d36567b76190dcc1a178d13f69f394cfa3b51624af76097cc3cbe897c7a4de087c668bae34a53cafde9309ae068cc8e5b3ec239
 DIST frameworkintegration-5.20.0.tar.xz 1784792 SHA256 4f6c2fcd98417501aeb483196324eb4bb0b970aa9f380168076abc78ce73c432 SHA512 071fc8582362d074cd0ca1db4976b1ea0b6fb102cf81e8913434bddf06aa0d7394e75b5fdd4c836297303b8cb5c80e449017b8f1f88241dc2982cf14c269f0ff WHIRLPOOL b947d1fb06ae2afebe6299bf52555a97c73664b6fbe8996c297cc268b4b917807c0aa821b308e9ac8fa46aa3de5fb9e2b7e6c8e28c5e70479357f911dfaacb73
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.19.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.19.0.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-QT_MINIMAL="5.5.1"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for integrating Qt applications with KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_plasma_dep oxygen-fonts)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '' '' '5=')
-	$(add_qt_dep qtwidgets)
-	media-fonts/noto
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}"
-
-# requires running kde environment
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@ -1,3 +1,2 @@
 DIST kactivities-5.18.0.tar.xz 181888 SHA256 b95e76570963a9f8797f103e32ddf58382c104e935fc27de3f48eea3db300a5b SHA512 f21a162234f068083d3aae0b184ba6fd7253c0dd40c989300c9553eb1a04ec2136476e212e0b19b52f2aa68c08079a882bca1c624a1532d5cc4860b0e13468d1 WHIRLPOOL cde7404bea3eb6c289e328f9d0590dc27f6f95d7cb2c9c3afb199122f7699fef7516e64bc944807a9bf9676cd6358a96fc49e93fa54e8bdbf5393a4fd10ba90b
-DIST kactivities-5.19.0.tar.xz 151552 SHA256 43cff33c5c4a232206bf6ffdaa1ea3f50e40339e4568a7376992fc61970eb47a SHA512 8354979888fc23108237482a37686c302527d79c7d16f3c858a7627c8a018d425fee0f2b810e62fd9552552d90c4fbc0235b4066082f3fc011ccfa91c8db2514 WHIRLPOOL aca6d791c3288c9957a4a7c8d9c5fdec0dc9a9edb1090627d63cd0c62a75f8686d3c90e8caade0c26be7c33ad40625b534dc8ca32e60cd2499c4872119969907
 DIST kactivities-5.20.0.tar.xz 67280 SHA256 5b0a664f77749c441d61417f9dce5cb8a11668f7e7db1a7613378f555dac3795 SHA512 b881597d3d64a30da6a23f1e8eb5b94a356e0b0033bbd305ae88e880ae4d770a2a41f3c4a95607e5fc8cd91ce11a05f4e45e34e87039d8fc43cab51a521089f6 WHIRLPOOL e8ac0e4f1071d840f2abba9a4fa7046a25d69b5de29a0d3d85db8e4f5df2121c43c8162317e1d8d3a364ff90936aa90d8c477eddc5232d9cbc2980b79ad1c161
--- a/kde-frameworks/kactivities/kactivities-5.19.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.19.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for working with KDE activities"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative widgets)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.54
-"
-
-PATCHES=( "${FILESDIR}/${P}-crash.patch" )
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@ -1,3 +1,2 @@
 DIST kapidox-5.18.0.tar.xz 132828 SHA256 1a9cfbe26b301601c8918cc98783885602e69365dc6e96ecc558c67ead9c4cc1 SHA512 9f77d53273c1d7b1b4da2a40be984640901a219637b78a557e4ff1b66cc5baa4d07ee9a744e2987d281e805e057951254f73f3acfc7ed24701fda35b45320ad1 WHIRLPOOL d5dbc13cd7ddff989ad9710a31776887b16b0129f1a25e514a073c82ad607a6d082142c13bc9ff2dc8d7efbb56a4cdaa933b2350f39324bfad43333aa1916bff
-DIST kapidox-5.19.0.tar.xz 132800 SHA256 df8749d2181a1fdbde6d17d17e9a6bbd5bf74ccf22157120b6d5b4997b182729 SHA512 09ba83d384b0676c6fa33191c2729c529399d2c621adcaba4c9df3120f3d4e91d6a01dd9c78dd5cbab8bd7e014735ad085e9b201d6a801332089f6083b4c043b WHIRLPOOL 6b52519f49e667f04252405107ed96e171527491574f3ab1e5554a29859d2cceb69c026128f127e4f3128ff0a52a13eaa651d556d2cd06e9e9fe70320c52e0e6
 DIST kapidox-5.20.0.tar.xz 132952 SHA256 35c8457aa603313413f8d34730297afc8761fb47fdd33c4383e1cbca24287e3c SHA512 f4da654abd81143a321fc924e8eb05159481dfdd14f9435922055a9f0f0311b82d4fd595d769d0f8d678cd9351473be1180eedf1771dc39a3a627cbcf7dd2a69 WHIRLPOOL 66b8d252b8be8a2236d4b34b1b43bd2c4d90ba2d6ab9cdbe8e350f9e5070beaa5de8207419140bd4b1d2a9e8fc5bb152fe6d566bdd21db395c9d1f38fef7bafd
--- a/kde-frameworks/kapidox/kapidox-5.19.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.19.0.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_DEBUG="false"
-KDE_DOXYGEN="false"
-KDE_TEST="false"
-DISTUTILS_SINGLE_IMPL="true"
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	media-gfx/graphviz[python,${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@ -1,3 +1,2 @@
 DIST karchive-5.18.0.tar.xz 109176 SHA256 059e81e707b09ac2cba69264cfa4ac17bcc93f9838b02495fd6325e2114f055e SHA512 56767d28ffacec0987dc932a3720870caa45fbdc162ff5c5b3f6f6f3b3f4bacf1091d00d00c627698c2bb8ea64524131e9b412d6b52a4289efd06fe3eb2ee50c WHIRLPOOL 1315a15266cfaeaa8970861ba424b2fa9a90b768947263ff545ebc31a3ccae0316de5261ac4bd1b32bdb037dad67983067bdcbd5f1e4fe91f36c3d6c3f1e53ea
-DIST karchive-5.19.0.tar.xz 109292 SHA256 bb7a52fc3e0a6cffd0db144a3c4582e6461de1fa6ff1d1905ca1097d62bd7a10 SHA512 d578c515d7f8a59270673b15d8329ca86d8f9719e3d51f55feaf683b7505ee436b4dfd88c369c6a9d788b0f9186e3690d4685c1dc9153f7fa1b1058657f4eeea WHIRLPOOL 07a50ff0afb2890bc49767bde82f45df4a0ea64d39a09da21ff0574bc03de9315d0ab728f87579ec718ef42c1163fca68b9e2784b5e5e1d23ac75ef6c96355c8
 DIST karchive-5.20.0.tar.xz 109308 SHA256 519506583fe7c4722c8d1f4017d19deefd73407a1f19402235900fe3a570eecb SHA512 e7bee2b3f6de3d04e9914684e13439997de9b16b5c074a107a54af0b010260935b50d8552f2343f90fba451311f93a48bc60bdd0cd4af539ba81cb434a87661a WHIRLPOOL db753e9e4733b4882bcb3862d36d7b1235e62eb44fd524208fe2feb16816486d35ddb030f805669312b493c81a5217b482e443b5f61cbc5579398103b34b89ad
--- a/kde-frameworks/karchive/karchive-5.19.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.19.0.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+bzip2 +lzma"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@ -1,3 +1,2 @@
 DIST kauth-5.18.0.tar.xz 82372 SHA256 96803c911621798ea1dc4df17c93691c762e4abc8d2ae010613a0cbed8f17b92 SHA512 694557ff533e90c031a89e15ce1205569b239f8286fc069a8ff2db7e09bcb9ea11b31c139fd424c887a9e2a5f4e55b0ed569a7ce055cced693011fb65db27166 WHIRLPOOL 8ade1b0efb28dd9aecbc76944dd5ba2b9529a9ea541709ec6c2b4f2b42801ad0cfd24a6c1f917ba27400478d17c42415252154d3f3fb22f696c75b21ae531f99
-DIST kauth-5.19.0.tar.xz 82444 SHA256 5a7777cc81a5c96876ae670ab56fc5c2ae92c347dca3e468bd59c009058ca93a SHA512 1a83dd6f5cf3d1714f9560bf0f37c79a82789d00f749cd4e4141b7083858e23bc95d0e7153a48235475f9dc79e9c211ae6e7bfeac943b5f0c0a3c4e80873b6f5 WHIRLPOOL f1663e7ad18616caeb54464c4ee9d8d04b82a75c085434bb7a7d6f5d0042b6770f86a8c74fe79feb14a0e42a7f1cd0ad633187c37738e182e039ab89b37bbfed
 DIST kauth-5.20.0.tar.xz 82676 SHA256 5d070ba231cf98aa1b5d09f8caec15fce510a37cc44cdda0e11095840c1f591f SHA512 c62b78f856c75b2d6377b22c954106ae3bf57f42248d103945271f45e438a15d3d8f794eb35d3c01d4a365df74535f45b61973f72f62dbf5962343aaf38aa95a WHIRLPOOL 11770cfb8b3ef57d7c10bffea9a068e2c7a06e89898d8fa0ad1831b494c97e0c3cde5ede36a367137fe1df44d940a18f7d63ea8d32c23232f43f53ed46b94b62
--- a/kde-frameworks/kauth/kauth-5.19.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.19.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework to let applications perform actions as a privileged user"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nls +policykit"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	policykit? ( || ( $(add_frameworks_dep polkit-qt) sys-auth/polkit-qt[qt5] ) )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package policykit PolkitQt5-1)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@ -1,3 +1,2 @@
 DIST kbookmarks-5.18.0.tar.xz 115068 SHA256 363c56b19b25d19eaa3b8988fcb6000823cca0637ac5460bc4a61c2d82712262 SHA512 acf2f6ec6a1f5fd4a519d404ff69414dc1320941c356f58aea0f435916b3e75a9994ff7782c55a4e5985e0e8b85a032b201647668c330af411a25c40d336b3d7 WHIRLPOOL 35d87cb34a16285307c641de91f8077fbc43574980b7bc64b282f7afdd4851c6dc216f1cbd760fce1c8aac50f6de371b78fd88953ae1b7a1e27660c1ec66ea23
-DIST kbookmarks-5.19.0.tar.xz 115472 SHA256 4d273e41c0d5517a434cc8a6d86ea31a3da266ef556fd51eb6880cd6ae448160 SHA512 7377a561e1c6165060a5ee5f8374bb7b827dddaf4bd29616e24f62cb7040181a08a8f68ea8d75561635486613f3fc77238d9c0ca0375c8fe5ae39d1c9dd9214b WHIRLPOOL 8d151f77382a97f22034917b037b8ae8699a96452321c6d9379d3bf2b79855bd7612ba80ba8149d9d57f50fc47da4b03790c1052d622fd05083a2e8ae011a65d
 DIST kbookmarks-5.20.0.tar.xz 115472 SHA256 8409f3d2fa0fd80d978073570e7ef161039851e2286b17e9c98d4e432bd39524 SHA512 c0559b486a7191ab4e7dff36d7e8c4f7652dbb4e8832a2abe7c7da360ab6101da4c32795d3f1bc0cc6917682506463cd2b2c5986f975d5038d6358769927efd7 WHIRLPOOL 13ba8b622399e84f1c7c99cfeb155e3daaccc8486fb6e10cc719938151112aa5127b16e0cdc280844c07471822d5cf89acbba45444d621968a56cfaf437691f7
--- a/kde-frameworks/kbookmarks/kbookmarks-5.19.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.19.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kconfigwidgets)
-	nls? ( $(add_qt_dep linguist-tools) )
-"
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@ -1,3 +1,2 @@
 DIST kcmutils-5.18.0.tar.xz 234900 SHA256 d7e141b1adee96079c749547070ad5cd14fa3ca49d39750e0a3d60161118a3d4 SHA512 b9ece5ca849ad8cdf31001319cf82d5ec62690f77dd2e3cbc20b6941a3b1724c59f3213eedd4d03cc54b78e8c24d5abf7ffd842de663eb48d7a3da6bbbddff8c WHIRLPOOL 3b7a612a27a283ef75ed4a423b675f43ea2a14b9c32573b75b8a83f5d3e761fc5fc3e41f323114e43355c7b45aa47b7b2f764c799d3235b1d47fbc414d52f3aa
-DIST kcmutils-5.19.0.tar.xz 234700 SHA256 a87d450d277aad703c82e8eb5924bdfec6471df95494f51cf309e3fdc7920d62 SHA512 2e809c8e073ee110da2863af7b41b938b4543683a131b6ce233982ac2fc2edbe2b02eb359ff7df00aa9642e4abbe6b0e48857113e4172c7fd3f49675843304a8 WHIRLPOOL 162663e3f9a9d93b239ee879d360ea1bedabc277f93dc4daf03f85b429948b886b4db63cd2d1d846168829eaa066a255cfe8b9a2b670269910643a2911b1b0c5
 DIST kcmutils-5.20.0.tar.xz 234636 SHA256 3564999a0ae88a7dc7fe1ab8e248b0eef0ddb37655b0a9dd91890913fe714552 SHA512 d44fc9d8d744c7ca60d2f12b3ac18e81165fd7814dc018a8aa843ad447e7fe4bcebe06fe5fb4b5cc34c901a26e57825cfe9da972ca3265aaa363730f3adeb64a WHIRLPOOL e776acd159abec56de0042484584e8c2971c4300e21c63dbf3cab023cdbd849820804b4907944b5023e2ad28a173a346502e12f6dee20b5f5c131db44bbb3570
--- a/kde-frameworks/kcmutils/kcmutils-5.19.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.19.0.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-FRAMEWORK_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to work with KDE System Settings modules"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@ -1,3 +1,2 @@
 DIST kcodecs-5.18.0.tar.xz 217008 SHA256 9098cec9ed88287cf000580c2381a60faad45e1f7b70a1a391c2b579fe6dd2c6 SHA512 e1734f9fe9823f48b209acae2bdfb7c7cbecf3c5a4414370b31486e7f4cf68dc54d38dd727ce2bc979f4b79620bed2c5c33d71b0be5c3b6c67b6155f844ffd1f WHIRLPOOL dd365f84d0d999f36b693628f007324510842179941d00c835dc975b51cc51f0327e161e212b23c263cf4e423d3e36191211e861531c52191f9b801b450c774f
-DIST kcodecs-5.19.0.tar.xz 217428 SHA256 c6bce99acc1e024e7ade4a9ade5ebd5f2be9100b1bda239109c5a6ed4818f7e7 SHA512 0765c64f456ce73e3abc0e34744d27fa98ead88afa783632bde9dc2851fe64ba0e393c8c0fec1ad8ce3e069bc971b3ffe591bdc4f9c236114e8f2af7a8785ab8 WHIRLPOOL 1a1cd46d1efe5d68e8adff385b67cbfaf5ecc954b372f46256141a1567fe21031c924b7b18c4889f2909f544af61299ba1617e76d11020c617201deddf5ca9fd
 DIST kcodecs-5.20.0.tar.xz 217452 SHA256 b08b419aaa1137083be32885afac8cfa7b3f1c3c874b5046e57c1f70cf0d3122 SHA512 2b8470cec286328893bd1f2a82272c883b04ba36ef12879e0663de2c67e09e22835415994953d05c44e9280d9c423d4d22aa9cc939ee94867a0e301c61d43ad6 WHIRLPOOL e5ebb98f170b00882e107d9024f3fc25a0c34d25959bd0a2470ab1fef69a97237f4a3c38a0b9278c14c694b8ffa004cd975b0e20f92df6d9316ea9fa2cd24565
--- a/kde-frameworks/kcodecs/kcodecs-5.19.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.19.0.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nls"
-
-DEPEND="nls? ( $(add_qt_dep linguist-tools) )"
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@ -1,3 +1,2 @@
 DIST kcompletion-5.18.0.tar.xz 115836 SHA256 cb9cd9e2c156df65f6de8057ad855808922b072cf042882de91c9f4aef23723e SHA512 a2215038e5a8738650f3abf99becdc4a0fa13420506827cb284818ff4cc56b5aa0ff960db940791ca37718b63d579b523c7f9a5e0c8906ee3018f3ce18c7325a WHIRLPOOL e5b50da4ea7530dcc9abc3dcfcc65a0264adb35cb7e671ff493a911c1437951cc2ed662f633acc3476e2e866eb95f7ae4c143c3ec21020dbeafbf19a77fa8413
-DIST kcompletion-5.19.0.tar.xz 115900 SHA256 8d3fe5f6c3438c20ea552fffde479a616f9559d1124c631f278cade166f1c016 SHA512 375e3951f223205ef5d63f8013055bd390fc6cd7a9c46cec3882cc43e51788186028a5e5a0cf78f928fb658d73e108ce9ac83b36e1eae4e485c9eba1a808023d WHIRLPOOL 3a4a9062573412c694f9d8dcf33fa21f2b0e31ab7fc593fe44c45a92b42e60f70bae237182343d018768c884c93a8772c4d01946ec3e8db6cdad9499447d299a
 DIST kcompletion-5.20.0.tar.xz 115908 SHA256 a503a1516012ecc5b6eaa328c31dfd0d6c527a8a78489d9d372dba90d0ec1b4f SHA512 dd3aeac68be71c23b84bdea14aad44324ae5cb349122ded7dd1b54a2157f50915b74cfd1da62f07166ca2c10de4389466709646220e7530938f319694d273dca WHIRLPOOL fd32a7587bd462907c8cbcd3aff87aab83ae7881fdd1eb7b015e9d3b06c7fa4f0e5b4de6da542a693f48bb56beaf5b6c9b0f414225948b88f15846f3de29ab6f
--- a/kde-frameworks/kcompletion/kcompletion-5.19.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.19.0.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@ -1,3 +1,2 @@
 DIST kconfig-5.18.0.tar.xz 224884 SHA256 36a4c887080bff674bccd302985ff9a401d8e1a8a0649616ff686f4d1ddceee8 SHA512 0ce1554c4097902b2c044bdb245c97c6c5b975e0d496a486117db0ca1e10fb8a7757871bb741829cfea0fc9457737d68f6341ea13d74a0dc4f52081df6fc9f32 WHIRLPOOL e7d7d0fdcf9d582efd86a12285a1c70f059396af0e4666c153f9669448cfdc99400f4235ae0a64331ba0e14036b4dc24940e9a01aa17d1e969ab9ebb3db19bc7
-DIST kconfig-5.19.0.tar.xz 224788 SHA256 b536a75a82fd00915204bbefb5f33dce1ada0a600cc47e947a13408fa883655a SHA512 9a5a16246cf8546cd923d4e98f1b73fc7f3e745abb48b2fe24551d65d227d96d3f912a29d760b051310eabb1de9063db31a40431916106b53b7d172077c129f3 WHIRLPOOL 9b0128afbe8d72dbfb662f803ea8e9d5246439fd9dadaac4b9c50985373476c3d4d01441455a369765f07094b45875776aef366170fbd7f1051811ebb610cc7c
 DIST kconfig-5.20.0.tar.xz 224772 SHA256 ebd7dd5c6960eac1aee299bd804ab864cad235ef30d312256b01b57ed9ff635b SHA512 d1851fc4056fd771a2e284a31a174dcca5c68505a7f2285bb7857e13ed8fe27a9ff0867e4be6d94be51f20d805c09845f1991e3396f088145d42f1703810fdeb WHIRLPOOL 1a7e266bb37f87e23c5d8fef0c597850506bea1e21f47a24ae35a8e1a175218d0627c9c6a24fd6c3fe6a0b6201085edb48435f41cdcf9f7569dcf00210e12a03
--- a/kde-frameworks/kconfig/kconfig-5.19.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.19.0.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-
-# bug 560086
-RESTRICT="test"
-
-DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@ -1,3 +1,2 @@
 DIST kconfigwidgets-5.18.0.tar.xz 358820 SHA256 35a25df3d79ec4ae50f80e496218b8898564011f6eadbe7cb742e70b08102122 SHA512 883dc52b8ea39e59e867f1aefe7cc73caf7d8d6cf75b0c4169d69f820157477d5213da25731dc8caee0c6673c8923f172d0a11bdf84af2dad85af53e10437f73 WHIRLPOOL 93872e7828e23342821054c3492ce5239a9f3ef3cde5db75259a3a09c8d220b655a0ad69e3c588d97b56bbf40486cd50029bab96e8cc0780e58871565e164362
-DIST kconfigwidgets-5.19.0.tar.xz 359100 SHA256 fb7a748eb1ceee2a33027581707d1942b1eae239526873367f924b06d9118dda SHA512 42c5390a987f183332b8b6bc3f23736cc67a43c1bd7c614ca85cb7fb286c82ebb7056655c74eec1cc5e8eb30a3d8c3af0519dd5bb4ddbd397f01b68adda50a9d WHIRLPOOL b61e4a8f2c6a4d09fe5ebf9d3865b0e7629bbe7c082c41f94705da8ab314c4cd5e3738e508ad48469da57451c06e366828d024609f9a42cf48cc0933b141f278
 DIST kconfigwidgets-5.20.0.tar.xz 359172 SHA256 c707529939e66d14bff03c320c0bf3237c760034344b2d8b28a4a4e53be079ba SHA512 111dbe8d9be343072071e7d50d806976e8851026a657c6925cd986432a8bd04eb850c36741f23b06347d081ae6db3b02b5f18f8eb4256166ec012cd9ae606be2 WHIRLPOOL bdc000f258cb130c2d24721745528a26f3a161799ff359386dd201bc37403cb71a3dd0dc29c680521e82d3871fd52831709d9abc39ad05293e6465b61ce39888
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.19.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.19.0.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing an assortment of configuration-related widgets"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	!<kde-frameworks/kdelibs4support-5.3.0:5
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@ -1,3 +1,2 @@
 DIST kcoreaddons-5.18.0.tar.xz 312104 SHA256 ee7785642f3bcbb513c6a236f8f13a14809ee58b69a7a885c4c63688acbac817 SHA512 1a1fcd2ac01b54c2d95eaa62119642d392aaeaa79aab4f36fb926e22342e30a4e6dd73cf5ea386eb7c04fc0f3aba54818a213c47b88f91a5a2ae31bcbc679bcd WHIRLPOOL c321ca4655ceba8d907e6762258618d6346305bffe9b0da764c8aa2645c459b78ebfb485655be507b6cdb4034c65583b02d2e6dae29d90749001970b3d5d0a5d
-DIST kcoreaddons-5.19.0.tar.xz 312568 SHA256 9c35aa5df72874cf74266d10bd60b077f6d1f4b77e3a01c645a237b7e303551f SHA512 040caed5ad45f0a538d8348c46b3abd8aafdae676a1575e75d8fab0a56081d76896ab68fcbe97b1eaf6120e2ad13edcfced2a76be14cc66318977dfdbfa7c742 WHIRLPOOL 74793f2b2d6787e1ef0210f3eb316e8053708465e707aa19a69eb651d2dc1d30bb500f6711fe21179174fc40fa3bfefd6260bf2f71c157d99bfb1f90ef0f0f8e
 DIST kcoreaddons-5.20.0.tar.xz 313068 SHA256 ac3819517744f1868c664045eaf9231cdf1c090dec3d329257ee7b56dc94fe69 SHA512 b01f597d0449e77d33d1fc72b388abf3ed420806b3ec5c182db4a9cb5098d8f9ec855f7429acc7a039fb298cf91c4d8f979eeddb1239cb622f5971f8b15de8af WHIRLPOOL 16cb731fd8e6a1aea6a5bff7ec72bf56a3580e68c8d77fdcc7ff18c20455d0544d5f7a9987db130041cf5a158ffecf9ce70e5ff42126a13f4967256e9d124b2a
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.19.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.19.0.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="fam nls"
-
-RDEPEND="
-	$(add_qt_dep qtcore 'icu')
-	fam? ( virtual/fam )
-	!<kde-frameworks/kservice-5.2.0:5
-"
-DEPEND="${RDEPEND}
-	x11-misc/shared-mime-info
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		$(cmake-utils_use_find_package fam FAM)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@ -1,3 +1,2 @@
 DIST kcrash-5.18.0.tar.xz 20124 SHA256 bcf4f57ecf3393e73ea3754c4930887fab34422f27e85059a492ac0af23f6266 SHA512 a668e57206e9dde4184af5614b8a00d7d1ffb460267cb90f664da6608c83c519ff905feaf2910271bb4e6d3a42fb2bf25a9fc9007b9fcdcc01e8c27c712de4f4 WHIRLPOOL badf1acfa6a82c1572dff77de58be7b4b1fb93bb5d71cac5ce55ae4882e9c3d3956916ca19909c8bc947d92281d672dd7b75cbeb4de7e67d6e69f9c4df3bb818
-DIST kcrash-5.19.0.tar.xz 20104 SHA256 d4bfd6e52d65e2385c643cdc23838ae05ff4f7ba0d28f781e526491dee1bc0b7 SHA512 379a67c1f9532324f818e12001c6b3eb26bd0fd1091a90153d559140b3aeff6bb7ff4dc052a400bf39a9c11daef0dcafc4ad3ea44b7a837ca8bfb209f30a91b3 WHIRLPOOL 9725179149742c064e54b52e7e57ae8c5e7f5f4a748081357975256239b2880d112abbf88f82c9a94670a8279b88be10843b3bd541f9715cfc1d2be43a7607d7
 DIST kcrash-5.20.0.tar.xz 20108 SHA256 b75c9c5716e83075df5824f00be585616ed78063ffed39928f152d9b9a1628a7 SHA512 cc3a82a908a4ebc9989337ac1f73a114e22130b6eef54ef2f98984921c991b83a00d26ef4c4c3f3d20eba5ced73b066cd69b7412cc845d0cf0f8051a1fcfec45 WHIRLPOOL c893d45b7f768915c93afe911448eb8a7d6eef5c39aa927efe41e028bfa1ac22bd326ba9666cfe76609882ef08d6e3e75a5c91fa65526a4df7be32885b320fdc
--- a/kde-frameworks/kcrash/kcrash-5.19.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.19.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nls X"
-
-# requires running kde environment
-RESTRICT="test"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtwidgets) )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@ -1,3 +1,2 @@
 DIST kdbusaddons-5.18.0.tar.xz 33848 SHA256 487d4859bf3e87e10ba76907f3417ec0b21624fda6d6aed25ca687affee03c51 SHA512 aca4438c62f6d72850a4b0eed5a6c470d1021c3bddaae0a28fdf4c718d6819175f5bcd10d92e88d804523ae4cbc2fafd3178933a86d03328360f4af439364024 WHIRLPOOL c75857a3632692e8a33c038be6376e7edf0173273c82c112a94b3adc646571aba398fd01df0ccc64414eb12f39e0f7e5e6b0229c70bf244f0d6f07309a587312
-DIST kdbusaddons-5.19.0.tar.xz 33812 SHA256 485cc76762c44ce2417e7d04e4e6d33ea29abb74b9a534ca5273d009665465ad SHA512 6f801967af8518979cdf8d5ae13fc16b0c7d45a47b194b49d48cc598216a49918ef84b0219c0f825e1107a6532a5db37f40dd10d34a3dc6047bca58980786d64 WHIRLPOOL c1675e609f28c2df0131540b89a76c653776500d6ba68b22159bcaed601b9496f70b00d69bbe954abb3611187c323f98a182629f6f1d6bbd62ff9819651685c1
 DIST kdbusaddons-5.20.0.tar.xz 33800 SHA256 c6803a065ce51e2d6c18f3baef3769419b5d6ea2a14b19a9c7089662b187dfea SHA512 58b0bfd67ff293cfdf5b4e59d4d9c2f1e780bf38b06b5b1313ea8ddbba20f44576a1ebc33283c490bf53b1ffc59ab19b6b15fd5fb33f208a75df61b9691e1f80 WHIRLPOOL 801aee85705f5e79e63436e35d93dcb6683c9560b7c36ad6a0cabc5d04c3543f7e024361ee28da0205d90a23646e78f895de3fb85160db79fd40ebb3fe8d7e08
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.19.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.19.0.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Framework for registering services and applications per freedesktop standards"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nls X"
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@ -1,3 +1,2 @@
 DIST kdeclarative-5.18.0.tar.xz 167512 SHA256 46a5cead4e8df189de16fdeedba52088ce2c06b73be4f013d3e3e96a84e5fb56 SHA512 f43949945e1c51cb19982abcd73b737d8d85d21bf1d286502cb898efea92dd70c21c09abf20984d3bcae227bd2ba24303c2758b463755471f57699a62c0559c0 WHIRLPOOL 6361e24cd055c5a12f6ae3dce9e2ca1b5f03fb775220975cbcda474c49b1dd347d2efca816bac4c1874e40264601f0e97f18e92c9f40d872f9a4807e28d0827b
-DIST kdeclarative-5.19.0.tar.xz 167340 SHA256 4f146f455fac81a5d968e189419c4ed2cb7315fa62f4fef1bef54b7efc17e00d SHA512 8fca2dfc2c63155f2901d45ba5b5f41cb6384d7b0beb8d125d3fd32a019fe30105b642880b087801621cddc3d418445069f71b7ded50541ad0b6a2604399c53d WHIRLPOOL d00891ea4dec4d3ae66877ce5d0b688a2ce6bd75b39507547141d814ee10f7d602628be1fa06f02a673391eea68736d3788ade872bf605ccca01e30425a34d14
 DIST kdeclarative-5.20.0.tar.xz 167316 SHA256 292c6b24148f7eacfbdcfe4e6b3a1a642601d6161767abae1efab465bfaccc87 SHA512 9644cc19479090a40bbcbcbb7dabf4ffa69fb75860f5d2fabc4e2828d96ad865c5133d30ee1dbae97ebfe1ea8d5ba307f471c29198a177c30646b6ee8fc0d95b WHIRLPOOL a5d7e08b8075edb35aa222cea6c2b865de6445cfb44a1c68432f42600ba690e12c153956d81f1516d76af45aa9502fc1ed2d8da11ed402a4000702261d509e1a
--- a/kde-frameworks/kdeclarative/kdeclarative-5.19.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.19.0.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing integration of QML and KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@ -1,3 +1,2 @@
 DIST kded-5.18.0.tar.xz 36112 SHA256 457d912d2f0ee3c5043776f045889b5b504a13199048f11967d453d5fdb1ba78 SHA512 acc7f1c8812839f479efd7905cda973d516caffcbca289397cff5efc39009a27f13faf68471d806c34c1a4fc1194bf73beaaf6c320531b4052ce982c111a3f73 WHIRLPOOL aed61f0f110a1b721a9c357926f11844d478d05d69d7e961f91b5ad73b234f53fbc873757a0f3ef0278002b3c907b61d54070d2298689bc4b3fcdc991aa75444
-DIST kded-5.19.0.tar.xz 36068 SHA256 1fa66b42312bc7c1ba23fe02dca04d9bd52c98e7a6a9754ac6c763252078db5b SHA512 9ee81b89cc29e2fd50f27a364bd52267e3d878df7ad9ec3cd2cfe9c2c71e84e06b37856c067df3ffc5500f7303ba5635a42334e7a2af0935e8ec7ad4573a97aa WHIRLPOOL f63c8a8faa0d073d9b36546b074a02a088c808e1878e430be3acc01a9846d17b4138418b0625a23b89ecf2f900a954ecad05775b0f5386ae5a88086029825e82
 DIST kded-5.20.0.tar.xz 36036 SHA256 a3abd8ad7656da34387374857f5f537cc8247b22b9f1ca076717cb6f41d77865 SHA512 bff8759a533521753339f57196dfd1f36c5d777539daedcdbb04e224a0bf808c694971eaf51773c4002b709dd79c82df58b4ad8bcc1df4ec74e669dba9213798 WHIRLPOOL 11e7144a26c0e99f938431723c95b6d8b13004b606eb47f4214bc011ac5b118b3b7c1c933c47b136376a7f7bb38a6102a8f7830a02f712e5a822f712d20423d9
--- a/kde-frameworks/kded/kded-5.19.0.ebuild
+++ b/kde-frameworks/kded/kded-5.19.0.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Central daemon of KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@ -1,3 +1,2 @@
 DIST kdelibs4support-5.18.0.tar.xz 3222800 SHA256 a821dafa24ea74bc3bc59f4edad331005fca0b99fd219c0c32908b6aad84903a SHA512 a0718c23f05ffba75bdf3e28b5328d9193d22542c03e0142cdd46e21ec2ea45490a77847da5fd458774005a69ff0467a8c445ff14f1936c4be06ea2770776d8f WHIRLPOOL 05bcac10abe34ba3d7b67fb3ccf88e40b7e3f015bd409729ff71d7973b2594dc6ce630989a75d614f1795823949846fd70ba01df0294d1a213115302a02866b5
-DIST kdelibs4support-5.19.0.tar.xz 3225356 SHA256 f60a9b9a950191f5ecbd1fa8a8ccb4ad4327e92e66f3ac0c00c8bb67a4581647 SHA512 60f5b4bd1eb84d51443b3266a5d970b9a66eafc1394b6268cce429ea8bd60137475ef2667c5e8f742ecbe1e2339bd08b92008d207e7e6c8d390f0e4bd3240816 WHIRLPOOL c13b1ce43e14f4de33697ee20d23d07bf974f90a37ad690be2b02d9d8d10363fb0a81212ae4e6ce7a7b8e2145155306c20a5d10116973dc4d90d5f06409c1182
 DIST kdelibs4support-5.20.0.tar.xz 3227608 SHA256 5492e549dc865d56a0da5826fcb9e6e90ed4ba9567107913da0298552172da23 SHA512 896d3e913d6973779738d24a5f6ab207100e115284e78297fd490e1d2f63944a140f6c2790725388c5897767d91cd416bdf365334495bdeee64c4fbf596df6fb WHIRLPOOL bc5b10d88d8f22605190469adb1c074bb236169b9f659ec0a4949a932b4c46fd4957cfe83d2aa5a101fb5e85d64b1d98f4e48bae1045ae46b161382528342fde
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.19.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.19.0.ebuild
@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework easing the development transition from KDE 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesignerplugin)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/openssl:0
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	virtual/libintl
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kitemmodels)
-	$(add_qt_dep qtxml)
-	!<kde-apps/kcontrol-15.08.0[handbook]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-lang/perl
-	dev-perl/URI
-	$(add_qt_dep designer)
-	test? ( $(add_qt_dep qtconcurrent) )
-	X? ( x11-proto/xproto )
-"
-
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@ -1,3 +1,2 @@
 DIST kdesignerplugin-5.18.0.tar.xz 87072 SHA256 76849708e7e95eb051d4d2ebcddd0424f99d2ac9658204eceab0f5be51777498 SHA512 f024dcd832bfeef10b3a8a65b6d6f54c9da67a93ad8cf9d84d78b17ab4e479bc2d231f0146f7b0cc94439b2b963340e211688f43daa4e8905191c799136c291a WHIRLPOOL 4103c834d286d3ea4fbd3c5d43da4bc0f84e6ea30b2dffac4794545906ecd644999f2064b81569ae46467c1ee3b6ec0620c62619603f11390239b7824b5ec68b
-DIST kdesignerplugin-5.19.0.tar.xz 87088 SHA256 4573434c533a6ee601383b7f8c97611b77db82535610447a36e9e4a8fcae3686 SHA512 5deeb8b1d0fa119b1dcd72c8cb0b71ecf1edec91e3574678e8b3ba729cdbd6f9ce54f86264c03ebd9c9b938eb54004af875151f72961d7d5eeb985885a018490 WHIRLPOOL 28eae63eba78e1649c586746d6bb89d12a025afe4b572c1c453590ec66794d3904ccc3a01b7c4677c681acffdbed63a4a1ac97808cd1689ec0f7b6ffe03bbd3c
 DIST kdesignerplugin-5.20.0.tar.xz 87096 SHA256 e3ae79952ce7c3d1913d4ae30ed13026ca9f5b36139199e84f67a1bce4bcb6f2 SHA512 d3eb8c9a4d4fff584fcf2adcf72fb5060ed4c076e3441eed96a3da969cecb54decaeb092129734ddf2126abc131753e3bf84e76668a1bab7adf589c98069c8af WHIRLPOOL c6f828fc5717ccef778c292bf5e4cce8df251e1878219130d6b8baf25ba6c32b7255cc0398dae146f007a4a9b4bf6c708680f2237a095fc291327e1e2f0ad9b9
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.19.0.ebuild
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.19.0.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="designer nls webkit"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	designer? (
-		$(add_qt_dep designer)
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kiconthemes)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kplotting)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-		$(add_frameworks_dep sonnet)
-	)
-	webkit? (
-		$(add_qt_dep designer)
-		$(add_qt_dep qtgui)
-		$(add_frameworks_dep kdewebkit)
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer KF5IconThemes)
-		$(cmake-utils_use_find_package designer KF5ItemViews)
-		$(cmake-utils_use_find_package designer KF5KIO)
-		$(cmake-utils_use_find_package designer KF5Plotting)
-		$(cmake-utils_use_find_package designer KF5TextWidgets)
-		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
-		$(cmake-utils_use_find_package webkit KF5WebKit)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@ -1,3 +1,2 @@
 DIST kdesu-5.18.0.tar.xz 44120 SHA256 03e5c3db3ea8ebe0b24ddb91d2c6f33b32772ce178f8c485b1e40242e2ae1237 SHA512 3714f367ddd4040cc396bcd98f3ab39e0c7a955ff60b49e960c6f4fe4782ba5cdaa1682beb2496c14d4105dd4cc642cce2b5fe8a384afa7d73da18556065d1a2 WHIRLPOOL cb613f86a70f5eba2a3df82c04a1891a82541bca5d4c8f761285e494d3da0856bdc1f0d0180f0544873364875064b34f3b289460f44f2cc19f069452cafd8b33
-DIST kdesu-5.19.0.tar.xz 44116 SHA256 ff4129bdbda956519f9e14994291493428ce7ea47c7e8acc68770513e5a988a7 SHA512 8c3ea2c5711987e832b633ce93d1be2ab9cd76a2e854c8301289aa8b65aea8d727481d121d83f7dbdab037623ff76130cfe983f26a7fd4040175920f6358428b WHIRLPOOL 11861ec7875384e462d6ce60be78961985aa3fae15c98ad778b5b07b67fe75c349224baf27570ac4e1fae0dea315f833cef89d6c7178d8c4c4b34395325abf4c
 DIST kdesu-5.20.0.tar.xz 44096 SHA256 bb8b0759356b6abf99d563dab614c95e2db267bcca5077e7e15dd1967aca9655 SHA512 508a46a736cc9a62fdb66949c3f2686731260f5d72b1e0076adf9d6b6a575df50c50b937394ccce35d4e52ae3d2741e17b05ec93a45869e668f2cbaf96852c95 WHIRLPOOL 2c74127d72b7f2d1ac63c8d05240e120dfb7c98cdea070655934e510b53221f520c2612ce8f9dc1009d3627fd61592d7f9e02bf48346282aaa55282e15a6699a
--- a/kde-frameworks/kdesu/kdesu-5.19.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.19.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to handle super user actions"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@ -1,3 +1,2 @@
 DIST kdewebkit-5.18.0.tar.xz 29348 SHA256 d45205621f3277a009bb9334b137c8f6aee31e01bd2b71d39a0581e9ba3019aa SHA512 6b9aace101cca1e6a7fb738b1c140d25affcbd829848bbca2e7970c8edca2ecaecd32a5514fdebec732bbe41ae31acc3eb95c14b23e911396ffe39f98d7d5b50 WHIRLPOOL b24a1d309b78a78af899e2969bd41fc5a98222da2663dde728bca0c7cb14f318f8e0b24dcfbb92edbffcb25e5f356d8191bcac5e509c817964faa5a2e1236ebb
-DIST kdewebkit-5.19.0.tar.xz 29356 SHA256 1282e3f7fb7f5697b26ab6c35e0f9e444e14fdd5148958b775eebd0eadc26511 SHA512 997a023a69e9f3aedb6f2fc0def13174bbd31ea97b3d6e303ed7f5603e8fa1e1e9c4c99ab594f23d04e9017bca48a42a5db8f8ca027e030361326fb4c904d04d WHIRLPOOL 980089d1f5262c36a408fb96063febe8aa848b25e7e7fe0e9677c3589f4b4dd6bd545d379242bc946b5faa0fe4f7daae82e12e2aaf1d8a1d5163b951976875da
 DIST kdewebkit-5.20.0.tar.xz 29360 SHA256 a915f77e074f98791dc90ce96fc9fd0def706462b3bde7fa0b82a84bf7b47156 SHA512 ba53114882ba3186f226ab8b837b1623af7ffb86b23ac9590324f5154db1ecd69b07e7f59c7c3b2030899f2c210358789ae0b2555f24764bc52993153748d261 WHIRLPOOL f0f16408dc7370bdd65dcb24803158beb6a764f98123d808d610c76589cd6cda40f750b6e1a9a7860ff024a3c05ea2f67ba90abf295ced0704ee2cee72d93bf9
--- a/Show More
+++ b/Show More