Sync with portage [Thu Sep 28 11:43:20 MSK 2017].

2017-09-28 11:43:21 +03:00 · 2017-09-28 11:43:21 +03:00 · 22ebc395c0
commit 22ebc395c0
parent 09b562634a
299 changed files with 3883 additions and 7422 deletions
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@ -1,5 +1,4 @@
 DIST puppet-lint-2.0.2.gem 60928 SHA256 d8d5336f14d9e484c33007c8527596154c2be8b5e7fb5a9f43f978298381f294 SHA512 e3cdba2cb3c55b73489bdd9e8df24f225ff8134cebc1f2a05a7118905c59eab47e8998f5afc6294288f4a7e226029e17351812b918ee51b81be921e16c94f692 WHIRLPOOL 168c57cc2884e7a4304fa205cbd5fa4c566f0f159bd1d373d11d400ff75a00626885a18998b139793f4fbbe3602fb6ce4f0231ce42e118da8faa1d8f1bec4f13
-DIST puppet-lint-2.1.0.gem 66048 SHA256 9e22529314ed737b4cde3f1e1f221e044661534e85149e70abf0546d1f633be1 SHA512 52b39c97c8b8b8d242a0260e2d7587e70c5e04873c67fd1986f5808ec92b0d17e93a112c67c67f594225b77a7cbbad0a893f0d5433a9826c1cf8b8dc3b2108c4 WHIRLPOOL 09073c354dbd37582fcec4291cf27a149e490afc41c7d690bf45dd427ddb204d25fe207e8ad340af75a68f7a516bf819f38372906c57fd697afb02b0afca1d77
-DIST puppet-lint-2.1.1.gem 67072 SHA256 e5b8d674f0ecc5049905d561309a6c420688aa74d8e0615d4bdf8c3fa6ebee89 SHA512 076aa2ca845a907c329651f0c43e0ff51e7f014e9530c00d6f3c4a79e36a075e6905cde24382969cacc740832050a4a6bbe522fd8d70139e36cef1bdd98689e7 WHIRLPOOL e7ef01008a9a739deedc489cbadcd1469d6da05b183088cb54c454324232ec014bffb3d0638e2fae57f38eeeca19ce1bcc242b4cb8daec3df4054c990174c7f3
 DIST puppet-lint-2.2.1.gem 74240 SHA256 f7f191e8bcd8ff35744bd5197548d283ecc1e117e08b6a3f0e614cb306140d87 SHA512 16aeaf4614104c5d3642c7c61acacbb33f4c0518a18c814cf2cc20aa40c19ac2e392758a980178d50c80c41544c8164d407ad7cd8d783a0d97b1606c55680570 WHIRLPOOL 71cebaebeb9d7e825db185a97c98d3b785bbcdb240f3e5c364ed145f017e205e09db3c03086dc1ab32d0474b43aa46f7284d5e41b4bf42dbc734b85ae42a930b
 DIST puppet-lint-2.3.0.gem 76288 SHA256 39393fe622b3e3c9585afcdda887b42117dfeac2317fbcd5548e0ddaa668e4bf SHA512 d0c21bad8eb5e7e2352de7e919ad44cccfb0086980a52e8d26b167c29a2a78e2e6efb692c8ac88c28cffcec125e1bf2f26973dca642d2ee9fea62a1342dfb709 WHIRLPOOL d6bb940745292ca90020c1eb1e1bee94ed479ef96dae23f4a34758431df9eb84cc46c9ad4acebf33613be54fd8c97cb59180f1895ecdbd454de9e79084c5f37e
+DIST puppet-lint-2.3.2.gem 82432 SHA256 872f0da4ea05ec561ed4b25ce2bba13626790e2239eab1b826e62af9a2d215be SHA512 5da388ad11285172e74de775d691ea49ebbbcadf938e7bddadff1bb9c9485dc30d7fa51e51db74d7912d23434223e3625e267a6785bd7f37243136553716db5e WHIRLPOOL e8559628e4e068161e1fec37f7f39f9228568132a6d977e4c2d87c1a1af741fd515ee43589b05d238c01aa43a257a29ac926e5d57d538bc3481f8aa6ee8ac822
--- a/app-admin/puppet-lint/puppet-lint-2.1.1.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.1.1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit eutils ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
--- a/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"

 RUBY_FAKEGEM_RECIPE_TEST="rspec3"

@ -23,3 +23,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/rspec-its:1
 	dev-ruby/rspec-collection_matchers:1
 	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha07.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha07.ebuild
@ -1,272 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
-SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl caps nls unicode"
-
-RDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	nls? ( virtual/libintl )
-	!app-cdr/cdrkit"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	nls? ( >=sys-devel/gettext-0.18.1.1 )"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-FILECAPS=(
-	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
-	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
-	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
-)
-
-cdrtools_os() {
-	local os="linux"
-	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
-	echo "${os}"
-}
-
-src_prepare() {
-	default
-
-	gnuconfig_update
-
-	# This fixes a clash with clone() on uclibc.  Upstream isn't
-	# going to include this so let's try to carry it forward.
-	# Contact me if it needs updating.  Bug #486782.
-	# Anthony G. Basile <blueness@gentoo.org>.
-	use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
-
-	# Remove profiled make files.
-	find -name '*_p.mk' -delete || die "delete *_p.mk"
-
-	# Adjusting hardcoded paths.
-	sed -i -e "s|opt/schily|usr|" \
-		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
-		|| die "sed opt/schily"
-
-	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
-		|| die "sed doc"
-
-	# Respect libdir.
-	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
-		|| die "sed multilib"
-
-	# Do not install static libraries.
-	sed -i -e "s|include\t\t.*rules.lib||" \
-		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
-		|| die "sed rules"
-
-	# Enable verbose build.
-	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
-		RULES/*.rul RULES/rules.prg RULES/rules.inc \
-		|| die "sed verbose rules"
-
-	# Respect CC/CXX variables.
-	cd "${S}"/RULES || die
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
-	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top"
-	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
-		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
-		-e "/COPTOPT=/s|-O||" \
-		-e 's|$(GCCOPTOPT)||' \
-		cc-gcc.rul || die "sed cc-gcc.rul"
-	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
-		rules.cnf || die "sed rules.cnf"
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS || die
-	local os=$(cdrtools_os)
-
-	sed -i \
-		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
-		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-		-e "s|^\(LDPATH=\).*|\1|" \
-		-e "s|^\(RUNPATH=\).*|\1|" \
-		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
-		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
-		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
-		-e '/^DEFUMASK/s,002,022,g' \
-		Defaults.${os} || die "sed Schily make setup"
-	# re DEFUMASK above:
-	# bug 486680: grsec TPE will block the exec if the directory is
-	# group-writable. This is painful with cdrtools, because it makes a bunch of
-	# group-writable directories during build. Change the umask on their
-	# creation to prevent this.
-}
-
-ac_cv_sizeof() {
-	cat <<-EOF >"${T}"/test.c
-	#include <inttypes.h>
-	#include <stddef.h>
-	#include <stdint.h>
-	#include <sys/types.h>
-	int main () {
-		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
-		test_array [0] = 0;
-		return test_array [0];
-	}
-	EOF
-
-	local i=1
-	while [[ ${i} -lt 20 ]] ; do
-		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
-			echo ${i}
-			return 0
-		fi
-		: $(( i += 1 ))
-	done
-	return 1
-}
-
-src_configure() {
-	use acl || export ac_cv_header_sys_acl_h="no"
-	use caps || export ac_cv_lib_cap_cap_get_proc="no"
-
-	# skip obsolete configure script
-	if tc-is-cross-compiler ; then
-		# Cache known values for targets. #486680
-
-		tc-export CC
-		local var val t types=(
-			char "short int" int "long int" "long long"
-			"unsigned char" "unsigned short int" "unsigned int"
-			"unsigned long int" "unsigned long long"
-			float double "long double" size_t ssize_t ptrdiff_t
-			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
-			"char *" "unsigned char *"
-		)
-		for t in "${types[@]}" ; do
-			var="ac_cv_sizeof_${t// /_}"
-			var=${var//[*]/p}
-			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
-			export "${var}=${val}"
-			einfo "Computing sizeof(${t}) as ${val}"
-		done
-		# We don't have these types.
-		export ac_cv_sizeof___int64=0
-		export ac_cv_sizeof_unsigned___int64=0
-		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
-
-		export ac_cv_type_prototypes="yes"
-		export ac_cv_func_mlock{,all}="yes"
-		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
-		export ac_cv_func_dtoa_r="no"
-		export ac_cv_func_sys_siglist{,_def}="no"
-		export ac_cv_func_printf_{j,ll}="yes"
-		export ac_cv_realloc_null="yes"
-		export ac_cv_no_user_malloc="no"
-		export ac_cv_var_timezone="yes"
-		export ac_cv_var___progname{,_full}="yes"
-		export ac_cv_fnmatch_igncase="yes"
-		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
-		export ac_cv_file__usr_src_linux_include="no"
-
-		case $(cdrtools_os) in
-		linux)
-			export ac_cv_func_bsd_{g,s}etpgrp="no"
-			export ac_cv_hard_symlinks="yes"
-			export ac_cv_link_nofollow="yes"
-			export ac_cv_access_e_ok="no"
-
-			export ac_cv_dev_minor_noncontig="yes"
-			case ${ac_cv_sizeof_long_int} in
-			4) export ac_cv_dev_minor_bits="32";;
-			8) export ac_cv_dev_minor_bits="44";;
-			esac
-
-			cat <<-EOF >"${T}"/test.c
-			struct {
-				char start[6];
-				unsigned char x1:4;
-				unsigned char x2:4;
-				char end[5];
-			} a = {
-				.start = {'S', 't', 'A', 'r', 'T', '_'},
-				.x1 = 5,
-				.x2 = 4,
-				.end = {'_', 'e', 'N', 'd', 'X'},
-			};
-			EOF
-			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
-			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="no"
-			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="yes"
-			fi
-			;;
-		esac
-	fi
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	# If not built with -j1, "sometimes" cdda2wav will not be built.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
-}
-
-src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
-
-	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
-	cd "${S}"/cdda2wav || die
-	docinto cdda2wav
-	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
-	cd "${S}"/mkisofs || die
-	docinto mkisofs
-	dodoc ChangeLog* TODO
-
-	# Remove man pages related to the build system
-	rm -rvf "${ED}"/usr/share/man/man5 || die
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo
-		einfo "Darwin/OS X use the following device names:"
-		einfo
-		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
-		einfo
-		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
-		einfo
-	fi
-}
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@ -3,4 +3,5 @@ DIST krb5-1.14.3.tar.gz 12279888 SHA256 cd4620d520cf0df0dd8791309912df2bb20fcba7
 DIST krb5-1.14.4.tar.gz 12283989 SHA256 03a61a4280c9161771fb39019085dbe6a57aa602080515ff93b43cd6137e0b95 SHA512 5eb16b909d69143bfa8b2a7ba4c0deb74408462a5ec1241e97f37e30d29e259767be91a4533119e2c5e92d1fcbcab97038b2e45ad3361b5a61c3dc562c6d0d67 WHIRLPOOL 9a4ed044fd96fef4875ba9d281a94b5ee9d393e9f2c92c3bc65600fb447928358918389aef2d1f371e4726213b9497d63719b981a819cdacf791eb1385f5b850
 DIST krb5-1.14.5.tar.gz 12322802 SHA256 262485c15af1208b69b55bef39cd246a892b5f41adf1956055ba52884a4dc7bf SHA512 2484f9581b5e0b99cc49ba7f8770ea3a8751e756c98cc552d92ca223575eac58f6f1a9c268254ead4435d2d49b50ccf3181eb7bdbd56874c43f91bcfc2a66d3b WHIRLPOOL 638c046cf257cdb0f5b940681790ab779f103b4488413979ac3072b3117f251710a284910dbcb8806d965c3a97ea2f62965050de0e07356208b23786cebfde08
 DIST krb5-1.15.1.tar.gz 9375538 SHA256 437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45 SHA512 068b4c012722d8c232049d2a617f7ee28ceeaba6be94a78439e69e37b66cfdc49085641e42cfb03b2fbb72d21517b537e437061ec4dd2bf864f31e55e05fe918 WHIRLPOOL 1415295882eccbaf550d05d4b5bcae77c3c6fde1f5354b2ffac09f73148f22a223c38d73d80eb4c0e3b7e9fd528891645e114713e11a5eaa14520cdbe6b097c6
+DIST krb5-1.15.2.tar.gz 9380755 SHA256 1639e392edf25e3b6cfec2ae68f97eb53e07c2dbe74bfeede0108465d5d1c87e SHA512 e5814bb66384b13637c37918df694c6b9933c29c2d952da0ed0dcd2e623b269060b4c16b6c02162039dadebdab99ff1085e37e7621ae4748dafb036424e612c2 WHIRLPOOL 5b798a677cef9b32ef9320fab142f33cd1f420264cd29299a15834955a0f323001fc9fc5054eb41ef23bd33709ce47aad6436f8c54ee9e6e8c85327db6f0adeb
 DIST krb5-1.15.tar.gz 9327157 SHA256 fd34752774c808ab4f6f864f935c49945f5a56b62240b1ad4ab1af7b4ded127c SHA512 e71008ac3055a511ecbe6adfb9b328f0a01b33e8a73276d75b80d5db783f7bde63987c855584fb6075a6f5c88135d9871f51b2469e34ac8ee3d89b9add22d8f1 WHIRLPOOL 77572929805f2db35b46e6cf5d83058376025c7a924c1f5034ffaa18c209ecd9078c9ff5142f7848f76e6d586db8ec4c985dba32bbbe27d439c3cd8288ef59e8
--- a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
+
+CDEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	eapply -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+	eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
--- a/app-editors/padre/padre-1.0.0-r1.ebuild
+++ b/app-editors/padre/padre-1.0.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -106,3 +106,8 @@ src_configure() {
 	unset DISPLAY
 	perl-module_src_configure
 }
+src_prepare() {
+	sed -i -e 's/^use inc::Module::Install/use lib q[.];\nuse inc::Module::Install/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
--- a/app-editors/padre/padre-1.0.0.ebuild
+++ b/app-editors/padre/padre-1.0.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -104,3 +104,9 @@ src_configure() {
 	unset DISPLAY
 	perl-module_src_configure
 }
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install/use lib q[.];\n use inc::Module::Install/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -1,2 +1,2 @@
-DIST libvirt-3.3.0.tar.xz 14043384 SHA256 29e00984174e33cf2183b478382c017de26860452ffee17b73871051264ebb1b SHA512 69166ddd7d4b9ef3b1bf2466e781139ef9b4d224a64acc7b8e6fca8786d36482138a1fe7b7407c0fca3b3d012cb418d168671a3e65e428f023c16493b7718c2d WHIRLPOOL 1b2688f6b9a89608677070b5ce1fd2b2af115336126d4214071bc1abba25056d54dbbf16d6bdfab7582b252a833d3e53e51175d552d5c936b08973c0eed76643
 DIST libvirt-3.6.0.tar.xz 14797704 SHA256 3a2c97f6950796f300f6a2e0404f4de8e51c3b9430cdb82738439adb0ac59e3d SHA512 6cde735a18cb71c9e6dbb25cd2a8f9c72d55ad7d74bdf97b00d784593f0bc59498917fb235ce04de4428899241520d87bf19c015b80282b3d0c12918d9b8b288 WHIRLPOOL 8185ad998158bac9aa6bc0dd0f590a3d9fb393ad94d308bdc84e60ac5c56e110d5f4a2355e2a10b01a6521d8261ae7484aee275e12a17cc7f2830f169e990596
+DIST libvirt-3.7.0.tar.xz 14803752 SHA256 4e7bcb209eeef99f026484293abc733e30ed06dabcdde62c4c3e95f71b2b67ba SHA512 b3f7021ef4c6954430f8fa503f0c49e3df4f662b228cb631ba2c2139ecec2307dde6cec05037cc28663e82ab1001296c20c5c68acd183cd364dd484a7746f498 WHIRLPOOL 93ae283bd9048983ea6f1bb9572a94313b40c0d7e82c8d61fc36c6b2fde6b2d1a16333a2ac89ef0675130eda07b5268d2ed3ddaef8305dd04858291559b95850
--- a/app-emulation/libvirt/libvirt-3.6.0.ebuild
+++ b/app-emulation/libvirt/libvirt-3.6.0.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS=""
 	SLOT="0"
 else
 	# Versions with 4 numbers are stable updates:
@ -80,7 +80,6 @@ RDEPEND="
 		>sys-process/numactl-2.0.2
 		sys-process/numad
 	)
-	openvz? ( sys-kernel/openvz-sources:* )
 	parted? (
 		>=sys-block/parted-1.8[device-mapper]
 		sys-fs/lvm2[-device-mapper-only(-)]
--- a/app-emulation/libvirt/libvirt-3.7.0.ebuild
+++ b/app-emulation/libvirt/libvirt-3.7.0.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
 	SRC_URI=""
-	KEYWORDS="amd64 x86"
+	KEYWORDS=""
 	SLOT="0"
 else
 	# Versions with 4 numbers are stable updates:
@ -18,7 +18,7 @@ else
 	else
 		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	SLOT="0/${PV}"
 fi

@ -70,7 +70,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	elibc_glibc? ( sys-libs/glibc[rpc(+)] )
 	firewalld? ( net-firewall/firewalld )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
 	libssh? ( net-libs/libssh )
@ -80,7 +80,6 @@ RDEPEND="
 		>sys-process/numactl-2.0.2
 		sys-process/numad
 	)
-	openvz? ( sys-kernel/openvz-sources:* )
 	parted? (
 		>=sys-block/parted-1.8[device-mapper]
 		sys-fs/lvm2[-device-mapper-only(-)]
@ -126,7 +125,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
 	"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488
+	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch          # bug #609488
 )

 pkg_setup() {
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@ -80,7 +80,6 @@ RDEPEND="
 		>sys-process/numactl-2.0.2
 		sys-process/numad
 	)
-	openvz? ( sys-kernel/openvz-sources:* )
 	parted? (
 		>=sys-block/parted-1.8[device-mapper]
 		sys-fs/lvm2[-device-mapper-only(-)]
--- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils gnome2-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-chewing"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="Chinese Chewing input method for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-chewing"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
--- a/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils gnome2-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-chewing"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="Chinese Chewing input method for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-chewing"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-configtool"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-configtool"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
--- a/app-i18n/fcitx-libpinyin/Manifest
+++ b/app-i18n/fcitx-libpinyin/Manifest
@ -4,3 +4,4 @@ DIST fcitx-libpinyin-0.3.1_dict.tar.xz 15143832 SHA256 0b553c90d37c36e82ad692803
 DIST fcitx-libpinyin-0.3.3_dict.tar.xz 15145448 SHA256 cac02fb2ac19d9072d58e2d9383297e21942caf71b528aee8fa36c55c899d1e1 SHA512 1d77bb0a73ef2f94058ad8f991c628097c87b0ea9c7c4480d23c972ff20ea8ea2653113c8100f1611911606fe84a470650e1a2e9cc6d596d3e80960bb00900c2 WHIRLPOOL ea9f470a92ad55fbdc561d0df1ba51414c716fac158c8db28cccd18d2f106339ee8dc9eba03067f2473289f485dd1118ffedee6ea5b0fbcd0517f6ef5e68abb8
 DIST fcitx-libpinyin-0.5.1_dict.tar.xz 15147796 SHA256 9464ff6bcff8ff5f89059845a26ece5fe2659b66f65fd0c4a092ee818752adc7 SHA512 85d26e5c036f5fb82005c677d8924e68236f52fab2ddf0e19472e84ca4ae66d9e8e7ec7a84cc7b7cb1da796df2e51f267336640b7957b5caf91ea13e273da411 WHIRLPOOL 676d9f71e2daf76a2b7677f381b32adb28cf3c4034ba949008b95b0fd9df9cd55ec5dfd86a3ae289e86b7e0758d72586e5d6e93267309e49ed1b2627dadb4ec7
 DIST fcitx-libpinyin-0.5.2_dict.tar.xz 15149780 SHA256 26e916d39db952901c95d97d8a6bd22f0a2dd004549553f58562dec04823f66f SHA512 9ff0d55d78f6ef7967df685c494351bc61ee3f6b47924cf265c781bb7ec2d109ddc92f310b65315f4ccbca8e65eb21fa410fb0b255eec52bb3247dc7e5e04368 WHIRLPOOL d9577baa908a7a14d6d70f9fc213f8e85af671aacbd8b9cdd5fabc77b965c03be8fb5acca93df25657739e5667e3ad211782d9a203d05e45eaf913d313982d3d
+DIST fcitx-libpinyin-0.5.3_dict.tar.xz 15149856 SHA256 fccd408b9fad8becebf7f736e3309e775d045d6383742892385b69be91f89b4c SHA512 d132e0c007bd62286cfa89f6605a5315b6f5ae94a75bdd389fff1061e1547ad64c615fb0b75189d8cf35fa289a53e5d485911e06e368b2bf3af7b5a996fcd08a WHIRLPOOL 0bd75c39e148056bce90ddaff9e949b9d43093f56ec80ca0b972e40a005da8f39e481726af9d4fef993149c50287af2069fc27ae9bc3493fd7a4523f2569f6ff
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
@ -11,12 +11,12 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE="dictmanager"
+IUSE="dictionary-manager"

 RDEPEND=">=app-i18n/fcitx-4.2.8
 	<app-i18n/libpinyin-1.3.0
 	dev-libs/glib:2
-	dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4]
+	dictionary-manager? ( >=app-i18n/fcitx-4.2.8[qt4]
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 		dev-qt/qtwebkit:4 )"
@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_configure() {
-	local mycmakeargs="$(cmake-utils_use_enable dictmanager QT)"
+	local mycmakeargs="$(cmake-utils_use_enable dictionary-manager QT)"
 	cmake-utils_src_configure
 }

--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.3.ebuild
@ -12,14 +12,14 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dictmanager"
+IUSE="dictionary-manager"

 RDEPEND=">=app-i18n/fcitx-4.2.8
 	app-i18n/libpinyin
 	dev-libs/glib:2
 	sys-apps/dbus
 	virtual/libintl
-	dictmanager? (
+	dictionary-manager? (
 		>=app-i18n/fcitx-4.2.8[qt4]
 		dev-qt/qtcore:4
 		dev-qt/qtdbus:4
@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_configure() {
-	local mycmakeargs="$(cmake-utils_use_enable dictmanager QT)"
+	local mycmakeargs="$(cmake-utils_use_enable dictionary-manager QT)"
 	cmake-utils_src_configure
 }

--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.1.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.1.ebuild
@ -22,14 +22,14 @@ fi
 LICENSE="GPL-2+ GPL-3+"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dictmanager"
+IUSE="dictionary-manager"

 RDEPEND=">=app-i18n/fcitx-4.2.8
 	>=app-i18n/libpinyin-1.9.91:=
 	dev-libs/glib:2
 	sys-apps/dbus
 	virtual/libintl
-	dictmanager? (
+	dictionary-manager? (
 		>=app-i18n/fcitx-qt5-1.1
 		>=dev-qt/qtcore-5.7:5
 		>=dev-qt/qtdbus-5.7:5
@ -51,7 +51,7 @@ src_prepare() {

 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_QT=$(usex dictmanager)
+		-DENABLE_QT=$(usex dictionary-manager)
 	)

 	cmake-utils_src_configure
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.2.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.2.ebuild
@ -22,14 +22,14 @@ fi
 LICENSE="GPL-2+ GPL-3+"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dictmanager"
+IUSE="dictionary-manager"

 RDEPEND=">=app-i18n/fcitx-4.2.8
 	>=app-i18n/libpinyin-2.1.0:=
 	dev-libs/glib:2
 	sys-apps/dbus
 	virtual/libintl
-	dictmanager? (
+	dictionary-manager? (
 		>=app-i18n/fcitx-qt5-1.1
 		>=dev-qt/qtcore-5.7:5
 		>=dev-qt/qtdbus-5.7:5
@ -53,7 +53,7 @@ src_prepare() {

 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_QT=$(usex dictmanager)
+		-DENABLE_QT=$(usex dictionary-manager)
 	)

 	cmake-utils_src_configure
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin"
+fi
+
+DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dictionary-manager"
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libintl
+	dictionary-manager? (
+		>=app-i18n/fcitx-qt5-1.1:4
+		>=dev-qt/qtcore-5.7:5
+		>=dev-qt/qtdbus-5.7:5
+		>=dev-qt/qtgui-5.7:5
+		>=dev-qt/qtnetwork-5.7:5
+		>=dev-qt/qtwebengine-5.7:5[widgets]
+		>=dev-qt/qtwidgets-5.7:5
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+src_prepare() {
+	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+		ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT=$(usex dictionary-manager)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils gnome2-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
@ -22,15 +22,15 @@ fi
 LICENSE="GPL-2+ GPL-3+"
 SLOT="4"
 KEYWORDS=""
-IUSE="dictmanager"
+IUSE="dictionary-manager"

-RDEPEND=">=app-i18n/fcitx-4.2.8
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/libpinyin-2.1.0:=
 	dev-libs/glib:2
 	sys-apps/dbus
 	virtual/libintl
-	dictmanager? (
-		>=app-i18n/fcitx-qt5-1.1
+	dictionary-manager? (
+		>=app-i18n/fcitx-qt5-1.1:4
 		>=dev-qt/qtcore-5.7:5
 		>=dev-qt/qtdbus-5.7:5
 		>=dev-qt/qtgui-5.7:5
@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 DOCS=(AUTHORS)

 src_prepare() {
-	if [[ "${PV}" == "9999" ]]; then
+	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 		ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
 	fi

@ -53,7 +53,7 @@ src_prepare() {

 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_QT=$(usex dictmanager)
+		-DENABLE_QT=$(usex dictionary-manager)
 	)

 	cmake-utils_src_configure
--- a/app-i18n/fcitx-libpinyin/metadata.xml
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@ -10,7 +10,7 @@
 		<name>Cjk</name>
 	</maintainer>
 	<use>
-		<flag name="dictmanager">Enable dictionary manager</flag>
+		<flag name="dictionary-manager">Install dictionary manager</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">fcitx/fcitx-libpinyin</remote-id>
--- a/app-i18n/fcitx-m17n/Manifest
+++ b/app-i18n/fcitx-m17n/Manifest
@ -1 +1,2 @@
 DIST fcitx-m17n-0.2.3.tar.xz 33504 SHA256 84f9a9ac9e8c94db0c124d1c9cafa352191894b4d04d926611c5b0759e86de39 SHA512 6e78b70fb2e3139a59f49d25026c075893a8f192dd2083641ab3e56595a4f631ff13307dd647fd0eedd510dade690d97b44cbdeca96e086855f73910dc5d02af WHIRLPOOL e007a15f5908f37c115934e77ffbb446621ca132e87d13dea7aaed98e1cc566f1376229739572664b1cc90a9ef0ed6f4fafec719310a98815a4bc7d70625e5a3
+DIST fcitx-m17n-0.2.4.tar.xz 35076 SHA256 cf82158b907ba6b79aad3e4c26f9e0e2457a270619548adc31e9f77412144597 SHA512 b7c483e9c88e58a47ead294c36ed182558f09b41996e97faaba9fd3a96612f6a0fc240fdcb95db9a08c1546abe5fc97337957e2124844bd011363b7468f6e112 WHIRLPOOL 5559814bb1756b57e873eff4e5a2b36855da9fd84319bef091a931d8e7172b0fc519ca019c7a541e694d5dc3a26981d37d42d49e574dd654e0040e682bc650f3
--- a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-m17n"
+fi
+
+DESCRIPTION="m17n-provided input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-m17n"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-libs/m17n-lib
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
--- a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-m17n"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="m17n-provided input methods for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-m17n"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
@ -24,7 +24,7 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""

-RDEPEND=">=app-i18n/fcitx-4.2.8
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	dev-libs/m17n-lib
 	virtual/libintl"
 DEPEND="${RDEPEND}
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="Fcitx input method module for Qt 5"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="Fcitx input method module for Qt 5"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
--- a/app-i18n/fcitx-sayura/Manifest
+++ b/app-i18n/fcitx-sayura/Manifest
@ -1 +1,2 @@
 DIST fcitx-sayura-0.1.1.tar.xz 18756 SHA256 36b5d79fed0cefaff7832c82473404e96d68cc8560b1d626884604b0aad7bea6 SHA512 1eda91ae985df65982cf6f4e67b676bb8eb7117cd1aad7c2a90e81c13fa2a806bbff5eda7bb7e797cb26cb46bbda51931ecffd50384a89ead24ad90777183dc3 WHIRLPOOL ddcec7ba970868795df0ccf4eb3ebacb9a9ec29f6f05762fb5253ca6cc59fab78459fc11cb715bcc53856e5093378fb99f572ccd615fe84bbe053574efa1b69f
+DIST fcitx-sayura-0.1.2.tar.xz 25400 SHA256 4cf1c26625efbcae05e6a741b6f955d85c4d4970ab0642fd9ecdb1ac6d757f74 SHA512 2118c95d4f831e5f4e0af0549ae3eb4f16bff8b30b03452837bd14f35fcb524f730b27ceb7c14cf6a4db7400a67070929a75465195b5524187e97c7ca02de466 WHIRLPOOL 1fb0146a639ae74b51185c2eef86bf7a5e5e424d5d3d4cb0c6c21357ca55c0ad527aade5a161d9cbcfadde3dee721fb444f6adf5cdc5ea8603bb33c3de948e66
--- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-sayura"
+fi
+
+DESCRIPTION="Sinhala Sayura input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sayura"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
@ -3,9 +3,9 @@

 EAPI="6"

-inherit cmake-utils
+inherit cmake-utils gnome2-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-sayura"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="Sinhala Sayura input method for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sayura"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
@ -24,10 +24,18 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""

-RDEPEND=">=app-i18n/fcitx-4.2.8
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libiconv
 	virtual/libintl"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 DOCS=()
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@ -1,3 +1,4 @@
 DIST fcitx-unikey-0.2.0.tar.xz 70944 SHA256 152da48ffeb665fc5d88202f6491fa5f4d11284792c2ef079bea4a94c8b125e1 SHA512 10c5c2c5b7e4f40710daccc485b220ed4cdadc6e866636032873a86f9f8489490a42671c9d02aedbbda78a94e40801dd888efc9b692d26ff81fe6d1fe2e10fa7 WHIRLPOOL d6dfd445bd5aa98ec28ab0bd9668f288d67f27874ecdd079f78956172f3d5695fd990ce9e70f190a26edd1eab4f48a8263efc8682fe93679a85fc1db2f6745be
 DIST fcitx-unikey-0.2.4.tar.xz 72308 SHA256 726e5999c00e93856639258298688c835db1e80e4ac4d5ff0786433c0593c195 SHA512 d55fe71bbcbc420e0ba3ec61ad3c7e9293e33f30b6303d90591d5a94e89d7bbc513dc940ae5a081b81c0d973fa6674872a695eac03cfbbefb460609993219221 WHIRLPOOL 9178a4ec7bcf0b6f969295bef0b066b266e336352c52f9a8761cb1cb6456df6c3d90a90d90212c2fbe137ebc07a1cf6b79f82e959dc6ad3806158675ee040fbb
 DIST fcitx-unikey-0.2.5.tar.xz 72640 SHA256 8e0bc06d7771074e17acf7045f43aa3a6d9dc2c0e48f8d52548af9b393607b18 SHA512 b70cbc468c44677a6f831ab92539dc01386eec66d8b40eba57efc7130a3811548b5b1e8213c278fd26d1eac169d43913a5fe0f3728e925c874e7360ccd93636a WHIRLPOOL 5c223124a9750b1a060b9dc0f99236676f29f1280bc787e306d65a746671f667dfface3f23bb441d2122d9b33ed0d1a58491feea5c026c23dd91f51b71113c1b
+DIST fcitx-unikey-0.2.6.tar.xz 75124 SHA256 9830910f628d455d2701ba430e6cb5b41409a2ac2f9b098e5ed6aaa54d15a3cf SHA512 18efb387387c29bb059e1260bfb3c91e97f9989aedbe590596f1ad8659e9fad20777f048f20fb24e0fb5e2318eee1c25fc20a2d57ac846368c4c9bebf4eb2b90 WHIRLPOOL 6003fa47cba0908268f51ea50a55b62afe3dcd5a6c6f00ef773c3c68f914bce151c3103f5425050a1e79868a6ba383a5e7cd1b1d89221d9cc5c2dda9d46fe331
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-unikey"
+fi
+
+DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+macro-editor"
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	virtual/libintl
+	macro-editor? (
+		>=app-i18n/fcitx-4.2.9:4[qt4]
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT=$(usex macro-editor)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils gnome2-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-unikey"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
@ -24,10 +24,10 @@ SLOT="4"
 KEYWORDS=""
 IUSE="+macro-editor"

-RDEPEND=">=app-i18n/fcitx-4.2.8
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libintl
 	macro-editor? (
-		>=app-i18n/fcitx-4.2.8[qt4]
+		>=app-i18n/fcitx-4.2.9:4[qt4]
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 	)"
@ -45,10 +45,6 @@ src_configure() {
 	cmake-utils_src_configure
 }

-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@ -1,6 +1,7 @@
 DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
 DIST fcitx-4.2.9.2_dict.tar.xz 8735848 SHA256 2cdd7c138163f717aacca8eabb18a4a823c808a408e4b0770f5be2e3e892de20 SHA512 9228fc4629479e2c518e0d0a7dbe604f6e56e864b41927d120e1f0b7a277ff53ff1b393870480bc1660662751a31885ddc1ddf43133a11edc2e96cbc7701daee WHIRLPOOL 8f19cd9f34a3957ff42e94ca7a5e28db5feecf658e9ca2535430fe6dd7a269ba9833e9273e8fd87d00a426027aebd97741c3fe909d9a0b0577ae6f64a8f4ba75
 DIST fcitx-4.2.9.3_dict.tar.xz 8737864 SHA256 543cc301f274367429880cb80c53349ed44435e7c64d757cca9b0d1844e2a91e SHA512 813b55c4b13e9d36bdaed6e4d072a841aa7f067f937b46d1fdbc03e8176b76ce83b056e24e2c0fe944f1347c5fe6a8d9bfdd6b0b2ed054e3017f3926fa36bcdd WHIRLPOOL b54c52025a48350c37712a64048ae2cec4e891c75607ded8ce35940252d2c242430e6ff0e64c86e1319b89b57b388c05760728a861cd58af0c99edd634f20c97
+DIST fcitx-4.2.9.4_dict.tar.xz 8731804 SHA256 e4f9069ac82afd72cdaf9d317377113ce361a9f086b930c12026127a3543953a SHA512 2e8ead59a154a857dfc011af83715dbe1225cbccf1e2c6ced1d9aaf92a7881f89fbe806da3c66ed1805cf27994c91a2d463c455be726b7d4b73c07bfde83972b WHIRLPOOL 113c13ea4eff8de68096ea7bfc1a92c62f5c78395436b5885761863c689a2613d0f5bde8a19ea5b1cc45d032fba4b2a6d2790d31e1d46cf9890d8b33df2049e5
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 SHA256 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 WHIRLPOOL 858b51723035e24756c0ece15ee28f9d25dbc86ca447c50e070f085e47b864f26201a100d3d968bcecf5711e76f99c7908eeabe7bc6d5b3b17d6cf2c53c3204b
 DIST fcitx-data-pinyin.tar.gz 1608886 SHA256 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 WHIRLPOOL c5584213cab5b3729c159759909819bef42d4dba899e58df331aa12b47f5544545d9ba3f8ac7291835cb80c5e180a3a8b31360e9b9e43e4f38387b0eeee74b46
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 SHA256 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3 WHIRLPOOL 3b09c21b8f948538b10218bd52ed12235f8d8a1986db7c09a35de5454c89305d5ada27177c8501b6bf72324aa1824a384822a7fbb440d63ce081265b1fa34c65
--- a/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils gnome2-utils xdg-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
 		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
 		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
@ -77,7 +77,7 @@ PATCHES=(
 DOCS=(AUTHORS ChangeLog THANKS)

 src_prepare() {
-	if [[ "${PV}" == "9999" ]]; then
+	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
 		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
 		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
--- a/app-i18n/fcitx/fcitx-4.2.9.4.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.4.ebuild
@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
+fi
+
+DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
+		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
+		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
+		https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
+		https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="GPL-2+ LGPL-2+ MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libiconv
+	virtual/libintl
+	x11-libs/libxkbcommon
+	X? (
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrender
+		xml? (
+			x11-libs/libxkbfile
+			x11-misc/xkeyboard-config
+		)
+	)
+	cairo? (
+		x11-libs/cairo[X]
+		x11-libs/libXext
+		pango? ( x11-libs/pango )
+		!pango? ( media-libs/fontconfig )
+	)
+	enchant? ( app-text/enchant:0= )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( dev-lang/lua:= )
+	nls? ( sys-devel/gettext )
+	opencc? ( app-i18n/opencc:= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	)
+	xml? (
+		app-text/iso-codes
+		dev-libs/libxml2
+	)"
+DEPEND="${RDEPEND}
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS ChangeLog THANKS)
+
+src_prepare() {
+	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
+	fi
+
+	# https://github.com/fcitx/fcitx/issues/250
+	sed \
+		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
+		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
+		-e "/find_package(XkbFile REQUIRED)/a\\        find_package(XKeyboardConfig REQUIRED)\n    endif(ENABLE_X11)" \
+		-e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
+		-i CMakeLists.txt
+
+	cmake-utils_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GIR=$(usex introspection)
+		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
+		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
+		-DENABLE_LIBXML2=$(usex xml)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_OPENCC=$(usex opencc)
+		-DENABLE_PANGO=$(usex pango)
+		-DENABLE_QT=$(usex qt4)
+		-DENABLE_QT_GUI=$(usex qt4)
+		-DENABLE_QT_IM_MODULE=$(usex qt4)
+		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DENABLE_TABLE=$(usex table)
+		-DENABLE_TEST=$(usex test)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XDGAUTOSTART=$(usex autostart)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -r "${ED}usr/share/doc/${PN}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit cmake-utils gnome2-utils xdg-utils

-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
@ -13,7 +13,7 @@ fi

 DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
 		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
 		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
@ -73,7 +73,7 @@ DEPEND="${RDEPEND}
 DOCS=(AUTHORS ChangeLog THANKS)

 src_prepare() {
-	if [[ "${PV}" == "9999" ]]; then
+	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
 		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
 		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
@ -85,7 +85,8 @@ src_prepare() {
 	sed \
 		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
 		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
-		-e "/find_package(XkbFile REQUIRED)/a\\    endif(ENABLE_X11)" \
+		-e "/find_package(XkbFile REQUIRED)/a\\        find_package(XKeyboardConfig REQUIRED)\n    endif(ENABLE_X11)" \
+		-e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
 		-i CMakeLists.txt

 	cmake-utils_src_prepare
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.4.9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.4.9999.ebuild
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@ -1,2 +1 @@
-DIST hstr-1.21.tar.gz 45851 SHA256 f0e9762f2a9587f0995bbd51cb64526ae852c2425ceb8ceee0747efba80ac6b3 SHA512 dbcb8766ca7f5ca2265f30726c451b9fe9a51d9dc7a08293fae1e9eb5cb2f562a5a9fa96fa90bd703ae3db0446628c884349c636060fbebd97bd7413a5c6e4d0 WHIRLPOOL 33cc21efe738efe7dd2bccf7c7fc7b79e6b0fb9bca0d458232a44695a0c422aa6184962ea69964e5b8e22a73aa7c54dc859dbb9666ab8b0e48abfeb6d8c72afd
 DIST hstr-1.22.tar.gz 46487 SHA256 c4995e7041dc66e2118f83bd4c6c7f4cff5b4c493ca28bd7e4aef76edeff71ba SHA512 5f31434410963c236f4e0d1117f09849b0a391d4173924d9eb2b2ddb9977a8bcb5a0c9b2e01045b618d01dfbcebd9c5db41534cb6abbb024a3515d5994b442cd WHIRLPOOL 30c6e42c91eebbcf55d6e8d89921d0760e3bda8e84ece0e2ccc7ef6be51dae15806f3db434b79a3afa4e8a9ebe63462fa927cc305c7a8d89a5d0651aa342493e
--- a/app-shells/hstr/hstr-1.21.ebuild
+++ b/app-shells/hstr/hstr-1.21.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Shell history suggest box"
-HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
-SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/ncurses:0="
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CONFIGURATION.md README.md )
-
-src_prepare() {
-	sed \
-		-e 's:-O2::g' \
-		-i src/Makefile.am || die
-	autotools-utils_src_prepare
-}
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@ -1 +1,2 @@
 DIST gnatmem-gpl-2016-src.tar.gz 80104 SHA256 bd39c7b18e4f52fdd029b999f7e1af52d01c975063c28ae1ef6875e4fc5e224f SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b WHIRLPOOL 8aee794c18efcbdbb50a4d58b9f247de30dea8d5b0a41034b1e20ad7786eefab5dfd14bf99994340a993d67989eab939ba78097d46933d841686d1bbc68fce0b
+DIST gnatmem-gpl-2017-src.tar.gz 80106 SHA256 11a27a66030b1a074875ccdaa0ffb06e86d687e1904ab0f5922e08bb488e5e7c SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897 WHIRLPOOL 6599c8b77e89d7bc1f6b1eea459009aa2626173a7ebe47b65ead3ba76a109699ff8d0f27cfe1cea9fb0a8cb90cf9a897f70cf8af4647f21feec87b422e544c1b
--- a/dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch
+++ b/dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch
@ -1,9 +1,13 @@
 --- 1/configure.in.old	2016-12-08 20:57:53.942004080 +0100
 +++ 1/configure.in	2016-12-08 21:00:10.393677257 +0100
-@@ -6,19 +6,14 @@
- if test ${GNATBIND} = "no"; then
-    AC_MSG_ERROR(Ada compiler needed,1)
- fi
+@@ -2,23 +2,14 @@
+ AC_INIT(gnatmem.gpr.in)
+ AC_CANONICAL_SYSTEM
+ AC_PROG_CC(gcc)
+-AC_CHECK_TOOL(GNATBIND,gnatbind,"no")
+-if test ${GNATBIND} = "no"; then
+-   AC_MSG_ERROR(Ada compiler needed,1)
+-fi
 +AC_CONFIG_HEADERS(config.h:config.in)
 +AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.])
 AC_ARG_WITH(binutils-buildtree,
--- a/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch
+++ b/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch
@ -0,0 +1,89 @@
+--- 1/configure.in.old	2016-12-08 20:57:53.942004080 +0100
+++ 1/configure.in	2016-12-08 21:00:10.393677257 +0100
+@@ -2,23 +2,14 @@
+ AC_INIT(gnatmem.gpr.in)
+ AC_CANONICAL_SYSTEM
+ AC_PROG_CC(gcc)
+-AC_CHECK_TOOL(GNATBIND,gnatbind,"no")
+-if test ${GNATBIND} = "no"; then
+-   AC_MSG_ERROR(Ada compiler needed,1)
+-fi
+AC_CONFIG_HEADERS(config.h:config.in)
+AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.])
+ AC_ARG_WITH(binutils-buildtree,
+             [AC_HELP_STRING(
+              [--with-binutils-buildtree=<dir>],
+              [Specifify location of binutils build tree])],
+             BINUTILS_OBJDIR=$withval,
+             BINUTILS_OBJDIR=no)
+-AC_MSG_CHECKING([for binutils build tree validity])
+-if test -f "$BINUTILS_OBJDIR/bfd/libbfd.a"; then
+-   AC_MSG_RESULT(yes)
+-else
+-   AC_MSG_RESULT(no) 
+-   AC_MSG_FAILURE([need valid binutils build tree directory (got $BINUTILS_OBJDIR)])
+-fi
+ 
+ AC_ARG_WITH(binutils-sources,
+             [AC_HELP_STRING(
+@@ -26,21 +21,6 @@
+              [Specifify location of binutils sources])],
+             BINUTILS_SRCDIR=$withval,
+             BINUTILS_SRCDIR=auto)
+-if test "$BINUTILS_SRCDIR" = "auto"; then
+-   BINUTILS_SRCDIR=`cat "$BINUTILS_OBJDIR/Makefile" | sed -n -e "/^ *srcdir *=/ s/^ *srcdir *= *// p"`
+-   case "$BINUTILS_SRC_DIR" in
+-     /*) ;;
+-      *) # assume we have relative path
+-         BINUTILS_SRCDIR="$BINUTILS_OBJDIR/$BINUTILS_SRCDIR";;
+-   esac
+-fi
+-AC_MSG_CHECKING([for binutils source dir validity])
+-if test -f "$BINUTILS_SRCDIR/bfd/Makefile.in"; then
+-   AC_MSG_RESULT(yes)
+-else
+-   AC_MSG_RESULT(no)
+-   AC_MSG_FAILURE([need valid binutils sources directory])
+-fi
+ 
+ AC_SUBST(BINUTILS_OBJDIR)
+ AC_SUBST(BINUTILS_SRCDIR)
+--- gnatmem-gpl-2016-src/gnatmem.gpr.in.old	2017-02-02 22:15:30.247906007 +0100
+++ gnatmem-gpl-2016-src/gnatmem.gpr.in	2017-02-02 22:17:22.604974363 +0100
+@@ -10,8 +10,10 @@
+    for Languages use ("ada", "c");
+ 
+    package Compiler is
+      for Driver ("C") use External ("CC", "gcc");
+       for Default_Switches ("ada") use ("-O2", "-W", "-Wall", "-gnatpg");
+       for Default_Switches ("c")   use ("-O2",
+                                        "-I..",
+                                         "-I" & BINUTILS_OBJDIR & "/binutils",
+                                         "-I" & BINUTILS_OBJDIR & "/bfd",
+                                         "-I" & BINUTILS_SRCDIR & "/include");
+@@ -19,8 +21,8 @@
+ 
+    package Linker is
+       for Default_Switches ("ada") use
+-         (BINUTILS_OBJDIR & "/bfd/libbfd.a",
+-          BINUTILS_OBJDIR & "/libiberty/libiberty.a",
+         ("-lbfd",
+          "-liberty",
+           "@LIBDL@",
+           "@LIBZ@");
+    end Linker;
+--- gnatmem-gpl-2015-src/src/libaddr2line.c.old	2017-01-04 21:03:36.185233702 +0100
+++ gnatmem-gpl-2015-src/src/libaddr2line.c	2017-01-04 21:04:17.680455390 +0100
+@@ -23,9 +23,9 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "bfd.h"
+-#include "libiberty.h"
+-#include "demangle.h"
+#include <bfd.h>
+#include <libiberty/libiberty.h>
+#include <libiberty/demangle.h>
+ 
+ static asymbol **cur_syms;		/* Symbol table.  */
+ static bfd *cur_bfd;
--- a/dev-ada/gnatmem/gnatmem-2016.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2016.ebuild
@ -14,26 +14,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/573995c8c7a447658e0affa2 -> ${MYP}.t
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="gnat_2016 gnat_2017"

 RDEPEND=""
-DEPEND="dev-ada/gprbuild"
+DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]"

 S="${WORKDIR}"/${MYP}

 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )

-pkg_setup() {
-	GCC=${ADA:-$(tc-getCC)}
-	export GNATBIND="${GCC/gcc/gnatbind}"
-	if [[ -z "$(type ${GNATBIND} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set ADA=gcc-4.9.4 in make.conf"
-		die "ada compiler not available"
-	fi
-}
-
 src_prepare() {
 	default
 	mv configure.in configure.ac
--- a/dev-ada/gnatmem/gnatmem-2017.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2017.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multiprocessing autotools
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnat_2016 gnat_2017"
+
+RDEPEND=""
+DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	mv configure.in configure.ac
+	eautoreconf
+}
+
+src_compile() {
+	gprbuild -Pgnatmem.gpr -j$(makeopts_jobs) \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}
+}
+
+src_install() {
+	dobin obj/gnatmem
+}
--- a/dev-ada/gnatmem/metadata.xml
+++ b/dev-ada/gnatmem/metadata.xml
@ -5,11 +5,23 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<use>
+		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
+		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
+	</use>
 	<longdescription lang="en">
-		The gnatmem utility monitors dynamic allocation and deallocation activity in a program, and displays information about incorrect deallocations and possible sources of memory leaks. It provides three type of information:
+		The gnatmem utility monitors dynamic allocation and deallocation
+		activity in a program, and displays information about incorrect
+		deallocations and possible sources of memory leaks. It provides three
+		type of information:

-		General information concerning memory management, such as the total number of allocations and deallocations, the amount of allocated memory and the high water mark, i.e. the largest amount of allocated memory in the course of program execution.
-		Backtraces for all incorrect deallocations, that is to say deallocations which do not correspond to a valid allocation.
-		Information on each allocation that is potentially the origin of a memory leak. 
+		General information concerning memory management, such as the total
+		number of allocations and deallocations, the amount of allocated memory
+		and the high water mark, i.e. the largest amount of allocated memory in
+		the course of program execution.
+		Backtraces for all incorrect deallocations, that is to say
+		deallocations which do not correspond to a valid allocation.
+		Information on each allocation that is potentially the origin of a
+		memory leak. 
 	</longdescription>
 </pkgmetadata>
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@ -1,7 +1,3 @@
-DIST icedtea-bin-core-3.4.0-amd64.tar.xz 61846296 SHA256 254e4e889061e8632cbb61b86b568e9e8c143342e3fdb02cfa96f068ec0db7a9 SHA512 56bd24ec9dfc75256201a930274713630f1fb062747f721cbe75e2de41a60497f2dd9294a9b726614ce3e260400a663a2c25fd43c31705318d646b58383ba960 WHIRLPOOL 9695ee029e0df02493ddd92d6f74818d145d9fb0426838c6312d8bca949599cd11cf29d7b05929fd366deea3adedce2cfa2d6ee6ba5d7727e7e4d23532ad66e8
-DIST icedtea-bin-core-3.4.0-arm.tar.xz 53464220 SHA256 c5a793a6b967943bf51d334db15ea8608358d308dd9c5c8ba7ea4609d6d5ef85 SHA512 5bb1986caeedbdcae26637a4bea1177fc5cf89fa026245093083d9ff6d1a378878286ef7f6e5bd9527ce6fca3a6a5e9e152f87f68ce56afa66a86f65f4d6817a WHIRLPOOL 7a08039cd6934c73db4c72fa787566880d8ed66c47bf28a76bd4913695c2526c05464cb8a15522816abbf3d3fb5f9e76373e7ae51019cd21f1005ccd53a4624f
-DIST icedtea-bin-core-3.4.0-ppc64.tar.xz 54156476 SHA256 4ab0d286746e583be1d630e1e125a1abb9c77b0933f4e3d5002bcfef8e421b17 SHA512 705cd2479622db75af6732afd79fc20cb1f20d2b402372b0e40225dfc20d9d96fa5ae85654b6dc77cbf79257064f48e39bd02d35fe1d70881d96d1c64cf3730f WHIRLPOOL 0cf0e7097d4a33d448906109fe8b27cd9bbbdf715d690cae4704a339c82831ca65ab6b8ca4efb99ee4c99c24cd78384aae953b7f2e1cc14e4652c5aebf1c44fe
-DIST icedtea-bin-core-3.4.0-x86.tar.xz 61316304 SHA256 673dd4eb192b769c3781d3f286fb7cfcd71ca61a376070d511239f6903ff2e65 SHA512 52091c3e5eb7b453169d87aeeda348c122d5c7c03ec801fde11cb6cdb6f97ae5daa4889bfb724a50feba63ab073ca5a2c341c67a812ccb2bcd0f3866c11e74a2 WHIRLPOOL 6ee9e1239eb5981bb66056256e4c3d1e49b1dd91a9eb988bbc3146cf2317c07aed15d8e1bb8929cadbb4b235cbee7f7bbe9bf45e2eb3283cff7f5598cf2f058b
 DIST icedtea-bin-core-3.5.1-amd64.tar.xz 61880160 SHA256 159cfafc2b48d1042cc8b2ea9fec596f4ef59d7774d83c1606c8c213355d9b3d SHA512 1b7d8bfc8509ce0cc12406d14d70450b239838763b990d71b102a01400d6fee4359401c198669236a07794e410462a575b7b0fa2083b49e0c0f6fe637690db08 WHIRLPOOL 1bf461a833d8824136b629be7a88f8f96d18f11537b75735b0de07e073f3b9e018c0d5b0d9de6095159092dafef18af8f98ec11e7b08646e4b6d7685049dbfe9
 DIST icedtea-bin-core-3.5.1-arm.tar.xz 57957952 SHA256 b9b95ac5b6281f0ddbd5bbea24f1a84d2a1c517087f9775d33aedaa58fa888c8 SHA512 824782e010c037390e64c7a60e101c94f216a05fa94f854978cdcfa7351583554557d0b22a3fb46ee1033a9be2476cf58509ab5150d58f460e770f7399bb6b3d WHIRLPOOL 4063feef1b53261264f0793f514e79c4b394bf5ab8fd66cff8baa1a3ee9014885eae17b27d58809e9b82525ac4ff67bcb458f274a8136a7d263cc19bebede169
 DIST icedtea-bin-core-3.5.1-arm64.tar.xz 58951988 SHA256 f88a4f6c18956e6b1aba0e7d10936105ab39eef44d1a1b83ecdad7e187b4738f SHA512 023eb7743d055db28d67b234947860f1ecd362cfd38234e839092f9f182762673c50b7130e4db4c12a1dfc91d319e9546b8cdbd8486630800327e82c9940090f WHIRLPOOL 6a695ddbe3a105b4ff1cd370c1d5594276fa188666ad0e01cfce4192059a4eb297779e993328133879ff3cea3799ac70d27d8c4e2f8dd97e9db1bedd03e4a2af
@ -10,13 +6,8 @@ DIST icedtea-bin-core-3.5.1-ppc64le.tar.xz 54240304 SHA256 0bac113ea9e165fcf2cf5
 DIST icedtea-bin-core-3.5.1-x86.tar.xz 61349068 SHA256 85bea3a4291b8140a1ed5d7e5585fb3fdd67c0f05dbfde41df7882e7f3f4f171 SHA512 89bbcc3f5340894c6500179e3be8f75d9eead0480758db76133ca18ce6d216a6ede2f4ab820f56b220fd66060433d1c135fe7993339384d70cbfed0aa072ed20 WHIRLPOOL 6c3660bac05571c1a25e53ad20bb06d622e9286c6cd0c080c99e15b14ddba72567e8912ead3078745e2874ce0e9441bf879afd5d2fc8e10dc55fa1890ccb93e0
 DIST icedtea-bin-core-7.2.6.11-amd64.tar.xz 53452816 SHA256 19db272211ea35da58ecc1ad8ac6f8daf0e2834501c3cab3ca765d6d28451967 SHA512 2801c07230c8fe041ff7b945afc67da582dc820c02ab4c948919ada7e728613a20afb86cf0f552102047c2e10738f0e16d388eebc5b3a44cb245e1eb2829ec4a WHIRLPOOL 1887e66db8312c56ac92b27eda55f19f6621fbb795eb94c888be6766c10b50ca257de961eb72f93702fcee4a37188242cb474c974f23421b958be94c479bb97d
 DIST icedtea-bin-core-7.2.6.11-x86.tar.xz 55369568 SHA256 90143af039d56edebf073c38f199dd9c2f7a0f8f22ee28cdd25d5ce5f77c094e SHA512 90b2bd9b79bf287a6a76850e7d60f26de309b07180b8ca42709784c9ecef04e150a35760398b47967a87fb6391aea430ec22d6e7d1e7b8068e8069b27d26646c WHIRLPOOL bad37af054535d964e696d43ae99acde61228d84110350c852fff5ff97cd6fc6a70d053c4962aeb52b99c24a4b7c87625696e3c4fcb7f01c6363ae0ff5c86963
-DIST icedtea-bin-doc-3.4.0.tar.xz 11684272 SHA256 fb6d16f81bfc1b6d8c9bbf93a07797a3b667c7e3fbf6083292cfb858b6f58056 SHA512 06682cdb16fa7a49918f892aeb9ab6bf3fb4a4fc2b64cc555b38d38f826a70fa2451a5c549d0f1c113fc20f216d9ae3ab2fd81cd88ea79a14af94854e9ef3799 WHIRLPOOL 666aec67b8f1fe8d4bc2bdb0a5873ece59cebb44c480074d694365a04c40c17bc54913394fcbf6ce6257bac35e9e831217ec0806e63d9f7a66a97a480e6d4dbd
 DIST icedtea-bin-doc-3.5.1.tar.xz 11682876 SHA256 09df364aac70225f2dc19e43c157e1283e6e76a6f813de61a1ce35be7ac87d08 SHA512 df43658202c08e10ada2f5179c9f6eae15ffed3981b95495cc7ee7a9b4bf3b5f7957dce156451ef589edb0f0b9f50eb4faff1942263dfec665a83e75fad55caf WHIRLPOOL 1563a7d4bfc21acaf576ff291a110ab9bf4280cf9c5f9e582665faa32fd87969213b98540c0ec4cdabaf64c0a94ddedc9cbe3e1d134ca59a3796d1a58b7f8015
 DIST icedtea-bin-doc-7.2.6.11.tar.xz 10611016 SHA256 b1d785364491a62420f8fded47a936c292e962e5b208b852c7235e1a80f69667 SHA512 6a1d43f469b98288b138b0a0e520185d89e487c61afaadfa82afffd7b0c5c5377c2fb03ce6abfb12da22ce54eb989371d82dca5b49d561e63bd2230961c2fa17 WHIRLPOOL b7482657675223cbe924e75cb428191e7dd23ab203a56ccd466c522fa0d52299aca2b12f811d27b44a4a8e2b038216184c311344d44a0499530d0c7214f518d4
-DIST icedtea-bin-examples-3.4.0-amd64.tar.xz 1856216 SHA256 05d187bf937fb162ec828ae7fe214e739d4fb1d237320897eff5e196626c86af SHA512 0ec78903919ad524cdd0d9458c6c2ab437d38f2487807e8854e28df04a8126a43529f22080958e90ec16d7a0d9c72d01570058b383e507b2f1a96b7b7d9578e3 WHIRLPOOL 8dfaed413f1f722458e3b1c5616beacebe65b9a8dbec4e892e0c3b69135a0fbc3c2af2aba19ec0a2841a15bdbab4e051275e1ef84a2c870c6e2c6e11e3be85cb
-DIST icedtea-bin-examples-3.4.0-arm.tar.xz 1840060 SHA256 546f99327d2dc1908a057842781c91693bd92c18663e4af65ab82da929de64cf SHA512 0bd3a13f77e69099b11c0dfee8437b43d64bee4f9ed411af523042c5a53ebff592832e5ff8973bfd9c2858789938b1cabbd230e9b6498721249315b7442a7d9e WHIRLPOOL e9096453f7d8fbde8636981aa140d7606380c05b31d8b1fa03430438f4650bc87dc51e890b8416d2fc06922a8e32f7ce32cb8ef0fdcf89dc0fc6706392904a2b
-DIST icedtea-bin-examples-3.4.0-ppc64.tar.xz 1848048 SHA256 0fe715e84b6f405dc4a24e4c0e958b4691938c12452452747eccee3983c74967 SHA512 89565814818b8a07db3e65b49fd1d750521018ae9acc7800184fe511e327b904fdd6d91c7d7bdf85243685719ee9981abd19d4a727c12b936d75acc57ed80f76 WHIRLPOOL dd8a28b15c32c35c9bdfba9a24b6417ea984c15395de106e432b99dd2874a2aa90abd62aaf11f8ad822418ec1bf0068126c433115ee65b5e41d7fbd062538025
-DIST icedtea-bin-examples-3.4.0-x86.tar.xz 1862844 SHA256 e61b53cb1320492ddadcf428ffc15f9a6178ebcffbeefc2bce8a870021ed809a SHA512 128f6afab5f634bab49c11e41b2e763629a728364031b5e27ab84240878b0c07cabaf94b3b7c43182fd6776a48c341074957b250f036ce42fae84754339282e3 WHIRLPOOL 37f60ac345a34dc708de62b89779eaf010438a18f49d6d3cc07b0bed8c080596e01169185c4d1e8579efa83559bb98d8d0c56694507530d53059dc0bd0105701
 DIST icedtea-bin-examples-3.5.1-amd64.tar.xz 1856316 SHA256 990c86ce2a2c6e15db35d62a4ec49bb192476345d2d1f73b1faaa1f099c74884 SHA512 f32b55e03308c2e3cc7d8e823b53c8a6009e710c7120a665bafea1ae209664c24e2c0a3f408315461066dab67faa343199778ad0c255e3861b0c90f9bda72dbf WHIRLPOOL 5829a269bddf786786736dced0dbaa6db285e2184fc7cd3fe948415f2f0ad5a52ab8df6e16f5c1fe3cdc999072c5c474667e1507c2ac5d98fb5e78c3af903655
 DIST icedtea-bin-examples-3.5.1-arm.tar.xz 1840324 SHA256 6d81c9781c69ddf98fe06d9942d7e1e695a2eb28e1b42b1b1b6a7b0d41922ec4 SHA512 f40461e5267f43e8990d88784bff02ab4b85b5d41bf9d4bd519dd6c9a215779ce37c19a8572dabe72cbfd84db27eac9d71d12b15f9f6c1549cfc1a607fd957b8 WHIRLPOOL 21df1a426b3a5f97389bf9704eac79ab7e6d17275b2b8c32e932e0ba13a1d3f513fa37ddb1408dc95cfc302b744b1106fde22b2e8fbc6e3557209036a0384419
 DIST icedtea-bin-examples-3.5.1-arm64.tar.xz 1835880 SHA256 c147717e0b97ba78c0a9e5348acc58e15d31bfe193dba478f1e375130df60d90 SHA512 502f4e2220a8616c154fc9e7de742407bb48f92cc41e50eb5a334579cc12c5597adde5c673250fc5028ce88488f6289217047ad6709e3e146d99557c94c36c20 WHIRLPOOL d42b82fd73533fecde0bc6c1a64bf07593727e8c396f8578c7aa9354f07bbc2721945462954c576180c52397cba3132e97c48430dd21aa8def190c2212bf7ec5
@ -25,6 +16,5 @@ DIST icedtea-bin-examples-3.5.1-ppc64le.tar.xz 1845336 SHA256 1332ae34d932fcb70c
 DIST icedtea-bin-examples-3.5.1-x86.tar.xz 1862744 SHA256 bfe2ca3d365c83eb56f74e5f1c92ae72b82ba1b350d0a72145723aa7c2227522 SHA512 a803c9c91401f1a85a81d49b261445121b9ee9b5858df6ee711900684421027b4543b6f789395dff30a38afc726d5cc2e5b8307ad18996cc88ef235e6f9546a5 WHIRLPOOL 4faf5df1382c6b4021e6bb2086c35c6192240658ca5f75fb5279431ad9bb49585f5eab0142ada0c0bce42684f145c3d01374e323d6a58d3928aa3ded0cbe06f9
 DIST icedtea-bin-examples-7.2.6.11-amd64.tar.xz 1796180 SHA256 18757fb3b88ff425340a389109487931906c9237158ce75597be8d3e125e111b SHA512 c2f714674956cac81b24d1a929638a38fa972dd9aed1e05ae17397b58ea334053d2e5fd2800c8242c25c1f9ccddc814f4e42aa49cb82b00dca7e18b31a6f3670 WHIRLPOOL 72874ed26a3e0b363edc29187e94e6c9b2121c2946323639556c02050e3539ce92c10593ec797593c85224b3b9692313676741e030c068c4438b7897dad8508c
 DIST icedtea-bin-examples-7.2.6.11-x86.tar.xz 1797116 SHA256 f2dd2bef16173d55c0865f471637475ff1a39d027cf7044f2c4dd5c251745abe SHA512 2b91c01e2495914d0c70a6c9885246ebf7b48a9edfdb8fc0f9904db65eb3aa65ce97cec50062e39e91fc55217abccc408a4893137379e88689873907f74fd4dc WHIRLPOOL 018f9b102f06f2304b66f006b3f6a17fad00daf9815140ce5dd383ab69ef2055ebb9d92ad25c3d4a5043eea0f512f25c83bc0ad6163b621c8e421698664dcba6
-DIST icedtea-bin-src-3.4.0.tar.xz 45704380 SHA256 c5a91481c3830148041404785316a203e37cbc3f8673cc97feccff443a4d61a5 SHA512 00cf87bbcb271202aaa08efdb3d804f92a5a8f158f998f689f0360a715485180c767fead34cbfdb8230465427227edf9c16c8779ee010301f25a7a2ad8a06c54 WHIRLPOOL bf80985e409636a0d0bab7849efd48eb19ea8bfaac75663e106129c9b2f511865f3ccaac4cd2a9f2402ae70d905aad2efd6a3edab2dcd0503f423f3ba645d4b7
 DIST icedtea-bin-src-3.5.1.tar.xz 45725832 SHA256 713c32f6d7b4a7ecd790a5749f6505ef11d4268643f254316f3d50ab38c0ff90 SHA512 f16d760c810c48dcd3f0d152a88e4adf14631cf6e4bbf3caa61cd0aa95a82fd7c6845708077b1ec0c61e91bd35bd9ef7e24d9b8266d9902cd32588c75f84ca17 WHIRLPOOL 9f43f63bbf884e4b78a305c737e9cf825cd0d4583cbd95c388aa65d0c136b8cd6a98c3896633d196fbf26bbc9575adf6c7edbca0eceeb4777b423fbe465dee56
 DIST icedtea-bin-src-7.2.6.11.tar.xz 40213908 SHA256 f5bcfa36dcf9e4320b27ea66bda2e44396600a6e2ee1b4ab57483e0603b48177 SHA512 2a1c699ea3e781d2ff81ebbb803cd06ecf1438195a6d40f04eeb8dfb03cbc4eb4934a9563f6328a7ae4ce67f6bc14aa5cd72c84948e45632d0ab92cc14f6ecc5 WHIRLPOOL 71d1f05099e6b1f2633624b33f34d38471a13ddca187437cdc10f08cd4abb861715903b9cc856ee1dbacdef3b54eb8bb83df36f3ca2e27cea9b0a88dee2e691e
--- a/dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild
@ -1,155 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm ppc64 x86"
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )"
-
-for abi in amd64 arm ppc64 x86; do
-	SRC_URI+="
-		${abi}? (
-			${BASE_URI}/${PN}-core-${PV}-${abi}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${abi}.tar.xz )
-		)"
-done
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-
-IUSE="+alsa +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.42:2%
-	>=media-libs/fontconfig-2.11:1.0%
-	>=media-libs/freetype-2.5.5:2%
-	>=media-libs/lcms-2.6:2%
-	>=sys-libs/zlib-1.2.8-r1%
-	virtual/jpeg:62%
-	alsa? ( >=media-libs/alsa-lib-1.0% )
-	cups? ( >=net-print/cups-2.0% )
-	gtk? (
-		>=dev-libs/atk-2.16.0%
-		>=x11-libs/cairo-1.14.2%
-		x11-libs/gdk-pixbuf:2%
-		>=x11-libs/gtk+-2.24:2%
-		>=x11-libs/pango-1.36%
-	)
-	!headless-awt? (
-		media-libs/giflib:0/7%
-		=media-libs/libpng-1.6*%
-		>=x11-libs/libX11-1.6%
-		>=x11-libs/libXcomposite-0.4%
-		>=x11-libs/libXext-1.3%
-		>=x11-libs/libXi-1.7%
-		>=x11-libs/libXrender-0.9.8%
-		>=x11-libs/libXtst-1.2%
-	)"
-
-RDEPEND=">=sys-devel/gcc-5.4.0[multilib?]
-	>=sys-libs/glibc-2.22[multilib?]
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-java )
-	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
-	!multilib? ( ${RDEPEND//%/} )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# I wouldn't normally use -f below but symlinks in the arm files
-	# make this fail otherwise and any other approach would be tedious.
-
-	if ! use alsa; then
-		rm -fv */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-}
-
-multilib_src_install() {
-	local dest="/opt/${P}-${ABI}"
-	dest="${dest/%-${DEFAULT_ABI}/}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	if multilib_is_native_abi; then
-		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-		use doc && dodoc -r ${P}/doc/html
-
-		# doins doesn't preserve executable bits.
-		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-		if use examples; then
-			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-		fi
-
-		if use source; then
-			cp ${P}/src.zip "${ddest}" || die
-		fi
-
-		# Use default VMHANDLE.
-		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	else
-		local x native=$(get_system_arch ${DEFAULT_ABI})
-
-		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
-			dodir "${dest}"${x%/*}
-			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
-		done
-
-		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
-			[[ ${x##*/} = ${native} ]] && continue
-			[[ -e "${ddest}"/${x#*/} ]] && continue
-			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
-		done
-
-		# Use ABI-suffixed VMHANDLE.
-		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	# Each invocation appends to the config.
-	java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
-	if use multilib; then
-		multilib_foreach_abi multilib_src_install
-	else
-		multilib_src_install
-	fi
-
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@ -1,4 +1,4 @@
-DIST mercury-extras-13.05.2-gentoo-patchset-1.tar.gz 3513 SHA256 0d57f37e67fa7092243eaaf1edad5024628ff7ce40545aa722baa514d3553ddf SHA512 bd2639de9195519803c2653c898928203bdad83b04cbd868bc74f98b605bc80791c50c16546c545d8bfcd605eebef7dff9ca79be4022eb601f54b29c748e2f9d WHIRLPOOL 703faf67f9be5877225d75d47b8752f94bb55276f9858120bc3c25eb90f3d07e369bebdd64a64a35524fca7621162687146fc1c5993af58956775562ec8ad331
+DIST mercury-extras-13.05.2-gentoo-patchset-3.tar.gz 3538 SHA256 96a041d185778befa98c98b232041738878666a33bd695dbc7d1e2ab9eccca41 SHA512 c151f876768c6b6ab7b46b4e2501569586249f5e185e534ebb5817206ac0844cd081ccae86a26ef85f27eab9d851017393c837728bd194520a549a0a60f738ef WHIRLPOOL 3b8eccd3252027a99a700240a45be2a1dc650055e65a4699ee3f93b8aca39da9057787e576c3e76a48a9134f25cff2c3e7a9ab88c1fc25a6eb2580d1f38ddb42
 DIST mercury-extras-14.01-gentoo-patchset-1.tar.gz 3856 SHA256 2ea27bc699998834298dab3f9c1179681ac528b32f005493cd5027d0dbe52fbc SHA512 c584efd4c7af54d2e8d5af0a63acced118f356527a2bf692262e37366e1018247aac8c1bb8f700f08f8f0a2c95d979e215e3c949ec1dc2994ab40048eb5b253c WHIRLPOOL 4b5169eb5cdd70caa350e562c276a59bfe9eca5fc3d66d10a3e10b6b653d0a41dd18409c1d26a66a20d1cecf31282408fcbf2d3e5321f16a57f095dd4907165f
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
 DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
@ -5,7 +5,7 @@ EAPI=2

 inherit eutils multilib

-PATCHSET_VER="1"
+PATCHSET_VER="3"
 MY_P=mercury-srcdist-${PV}

 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@ -1,2 +1,3 @@
 DIST tuprolog-2.9.2.tar.gz 6262268 SHA256 4205dff584b492e10f214c71ce7bc0e81297a915156ca1e10cfac8b34c8c0a6e SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316 WHIRLPOOL 18dceea5e95be3e60b10fa8692970e61d9b16b2f518ac342de271ac7c6cb8313e8e9ca359fb93753d43a2c09780e47f212776ce560f9c2fefdb21d44f3316c77
 DIST tuprolog-3.0.0.tar.gz 6275327 SHA256 1c7a423cbd3faa626f8398a48ec6396c2d17431a77b1f22179d713cc76aeeb09 SHA512 7998dadb04b1314d096a33c54d11977534565accb3811b93a22f606fd838d2f9b0a6defe882992977a093832e1565283d3951dcc791809620deb61d3511c02d3 WHIRLPOOL 915a21632a2c86f33de25cc05ec75f3e40b33a0ba80f73219cfab6d06f69af07bc9d143a3d1cd80fbfd27fdeba9d4259f389f1a33704bfac2151403b26424e12
+DIST tuprolog-3.0.1.tar.gz 6326591 SHA256 e4ed2689dd5496175cddcfe299b442d92d580d778a0fd9a4c7beededa20dfbb7 SHA512 56fa96f717b5c8e56fd2979f2953744964d844e5abf215456e31309d3d92bde142f9bff55e6442b6de55f219c7f143a275ccf89359ff2f2944459bbc94770afa WHIRLPOOL 81d8421242ce8308418b7c40b7db6554cdbd92a4966aef4d73c414b675fca9148f5fce52ec2ef2a0c62025eda1c790013fb1b6bd20ac53a16f7be3fc61149004
--- a/dev-lang/tuprolog/files/build-3.0.1.xml
+++ b/dev-lang/tuprolog/files/build-3.0.1.xml
@ -0,0 +1,108 @@
+<?xml version="1.0" ?><project default="jar" name="tuprolog">
+
+	<!-- some properties -->
+	<property name="src.dir" value="src"/>
+	<property name="build.dir" value="build"/>
+	<property name="docs.dir" value="docs"/>
+	<property name="dist.dir" value="dist"/>
+	<property name="test.dir" value="test"/>
+	<property name="test.build.dir" value="test.build"/>
+	<property name="jarfile" value="${ant.project.name}.jar"/>
+	<property file="build.properties"/>
+
+	<path id="compile.classpath">
+		<fileset dir="lib" includes="*.jar"/>
+		<pathelement path="${gentoo.classpath}"/>
+	</path>
+
+	<!-- init -->
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${dist.dir}"/>
+		<mkdir dir="${build.dir}"/>
+		<mkdir dir="${docs.dir}"/>
+		<mkdir dir="${test.build.dir}"/>
+	</target>	
+
+	<!-- compile everything -->
+	<target depends="init" name="compile">
+		<javac deprecation="off"
+			destdir="${build.dir}"
+			encoding="ISO-8859-1"
+			srcdir="${src.dir}"
+			target="1.7">
+			<classpath>
+				<path refid="compile.classpath"/>
+			</classpath>
+		</javac>
+		<copy todir="${build.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java"/>
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- build the jar file -->
+	<target depends="compile" name="jar">
+		<jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
+		<jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
+			<manifest>
+				<attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
+				<attribute name="Class-Path" value="."/>
+			</manifest>
+			<zipgroupfileset dir="lib" includes="*.jar"/>
+		</jar>
+	</target>
+
+	<!-- generate javadocs -->
+	<target depends="init" name="javadoc">
+		<javadoc
+			author="false"
+			destdir="${docs.dir}"
+			encoding="ISO-8859-1"
+			breakiterator="yes"
+			packagenames="alice.*"
+			sourcepath="${src.dir}"
+			use="true"
+			version="true"
+			verbose="no"
+			windowtitle="${ant.project.name} API">
+			<classpath>
+				<path refid="compile.classpath"/>
+			</classpath>
+		</javadoc>
+	</target>
+
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}"/>
+		<delete dir="${dist.dir}"/>
+		<delete dir="${docs.dir}"/>
+		<delete dir="${test.build.dir}"/>
+	</target>
+
+	<!-- run testsuite -->
+	<target name="test">
+		<path id="dist.classpath">
+			<fileset dir="${dist.dir}">
+				<include name="*.jar"/>
+			</fileset>
+		</path>
+		<javac classpathref="dist.classpath"
+			deprecation="off"
+			destdir="${test.build.dir}"
+			encoding="ISO-8859-1"
+			srcdir="${test.dir}/unit"
+			target="1.7"/>
+		<junit fork="yes" failureproperty="test.failed" printsummary="yes">
+			<classpath>
+				<path refid="dist.classpath"/>
+				<pathelement path="${test.build.dir}"/>
+			</classpath>
+			<formatter type="xml"/>
+			<test name="alice.tuprolog.TuPrologTestSuite" todir="${test.build.dir}"/>
+			<test name="alice.tuprolog.ExceptionsTestSuite" todir="${test.build.dir}"/>
+		</junit>
+		<fail message="Test failure(s) detected" if="test.failed" />
+	</target>
+</project>
--- a/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
+++ b/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
@ -0,0 +1,137 @@
+diff -urN tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java	2017-09-27 12:31:06.689334505 +0200
+++ tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java	2017-09-27 12:50:04.193286931 +0200
+@@ -9,11 +9,11 @@
+ import java.net.URL;
+ import java.net.URLClassLoader;
+ import java.util.*;
+-import cli.System.Reflection.Assembly;
+//import cli.System.Reflection.Assembly;
+ 
+ import alice.tuprolog.event.LibraryEvent;
+ import alice.tuprolog.event.WarningEvent;
+-import alice.util.AssemblyCustomClassLoader;
+//import alice.util.AssemblyCustomClassLoader;
+ 
+ /**
+  * @author Alex Benini
+@@ -179,31 +179,7 @@
+ 				} else
+ 				// .NET
+ 				{
+-					Assembly asm = null;
+-					boolean classFound = false;
+-					className = "cli."
+-							+ className.substring(0, className.indexOf(","))
+-									.trim();
+-					for (int i = 0; i < paths.length; i++)
+-					{
+-						try
+-						{
+-							asm = Assembly.LoadFrom(paths[i]);
+-							loader = new AssemblyCustomClassLoader(asm, urls);
+-							lib = (Library) Class.forName(className, true, loader).newInstance();
+-							if (lib != null)
+-							{
+-								classFound = true;
+-								break;
+-							}
+-						} catch (Exception e)
+-						{
+-							e.printStackTrace();
+-							continue;
+-						}
+-					}
+-					if (!classFound)
+-						throw new InvalidLibraryException(className, -1, -1);
+					throw new InvalidLibraryException(className, -1, -1);
+ 				}
+ 			}
+ 
+@@ -462,4 +438,4 @@
+ 		return optimizedDirectory;
+ 	}
+ 
+-}
+\ Manca newline alla fine del file
+}
+diff -urN tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java	2017-09-27 12:31:06.696334504 +0200
+++ tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java	2017-09-27 12:50:04.194286931 +0200
+@@ -18,7 +18,7 @@
+ package alice.tuprologx.ide;
+ 
+ import alice.tuprolog.*;
+-import alice.util.AssemblyCustomClassLoader;
+//import alice.util.AssemblyCustomClassLoader;
+ 
+ import java.io.File;
+ import java.net.URL;
+@@ -26,7 +26,7 @@
+ import java.util.ArrayList;
+ import java.util.Hashtable;
+ import java.util.StringTokenizer;
+-import cli.System.Reflection.Assembly;
+//import cli.System.Reflection.Assembly;
+ 
+ /**
+  * A dynamic manager for tuProlog libraries.
+@@ -155,10 +155,7 @@
+ 	        	// .NET
+ 	        	if(System.getProperty("java.vm.name").equals("IKVM.NET"))
+ 	        	{
+-	        		Assembly asm = Assembly.LoadFrom(file.getPath());
+-	        		loader = new AssemblyCustomClassLoader(asm, new URL[]{url});
+-	        		libraryClassname = "cli." + libraryClassname.substring(0, 
+-	        				libraryClassname.indexOf(",")).trim();
+	        		throw new InvalidLibraryException(libraryClassname,-1,-1);
+ 	        	}
+ 	        	// JVM
+ 	        	else
+diff -urN tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java
+--- tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java	2017-09-27 12:31:06.699334504 +0200
+++ tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java	1970-01-01 01:00:00.000000000 +0100
+@@ -1,21 +0,0 @@
+-package alice.util;
+-
+-import java.net.URL;
+-
+-public class AssemblyCustomClassLoader extends java.net.URLClassLoader
+-{
+-  public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)
+-  {
+-    super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));
+-    // explicitly calling addURL() is safer than passing it to the super constructor,
+-    // because this class loader instance may be used during the URL construction.
+-    for (URL url : urls) {
+-    	addURL(url);
+-	}    
+-  }
+-  
+-  public void addUrl(URL url)
+-  {
+-	  addURL(url);
+-  }
+-}
+\ Manca newline alla fine del file
+diff -urN tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java
+--- tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java	2017-09-27 12:31:06.700334504 +0200
+++ tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java	2017-09-27 12:50:04.195286931 +0200
+@@ -1,7 +1,7 @@
+ package alice.util.proxyGenerator;
+ import javax.tools.*;
+ 
+-import cli.System.Reflection.Assembly;
+//import cli.System.Reflection.Assembly;
+ 
+ import java.lang.reflect.*;
+ import java.util.*;
+@@ -29,7 +29,7 @@
+     }
+     
+     if(System.getProperty("java.vm.name").equals("IKVM.NET"))
+-    	ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools"));
+    	throw new UnsupportedOperationException("IKVM.NET not supported!");
+     
+     jc = ToolProvider.getSystemJavaCompiler();
+     if (jc == null) {
--- a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
+++ b/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
@ -0,0 +1,12 @@
+diff -ur tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java
+--- tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java	2017-09-27 12:31:12.908334244 +0200
+++ tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java	2017-09-27 19:30:31.813282027 +0200
+@@ -32,7 +32,7 @@
+ 		assertNotNull(engine.getLibrary("alice.tuprolog.StringLibrary"));
+ 		Library javaLibrary = new alice.tuprolog.lib.OOLibrary();
+ 		engine.loadLibrary(javaLibrary);
+-		assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.JavaLibrary"));
+		assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.OOLibrary"));
+ 	}
+ 	
+ 	public void testGetLibraryWithName() throws InvalidLibraryException {
--- a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://tuprolog.unibo.it/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-3 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=virtual/jdk-1.7:=
+	 dev-java/javassist:3
+	 dev-java/commons-lang:3.1"
+
+DEPEND="${RDEPEND}
+	dev-java/ant-core
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+		dev-java/hamcrest-core:1.3
+	)"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-ikvm.patch
+	epatch "${FILESDIR}"/${P}-oolibrary-unit-test.patch
+
+	cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit:4
+	java-pkg_jar-from hamcrest-core:1.3
+	cd "${S}"
+	ANT_TASKS="ant-junit4" eant test || die "eant test failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dojar dist/2p.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r docs/* || die
+		dodoc doc/tuprolog-guide.pdf
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins doc/examples/*.pl
+	fi
+}
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@ -1,4 +1,4 @@
 DIST XSB360.tar.gz 12842882 SHA256 bb8d2b30e598574e263ddb48b7569e5582953a0c4f8b16d55f6bbf306e9e7faa SHA512 2ac2f4d4c7501479648b7f618815d4cd996969791a617f2148ef7498cf08bacd67eab298136303b6804cb689129ae3365e1490ec693f2232f9c9f1ad515d9c6c WHIRLPOOL 057a1939ff4115c2fc4cd91f10458a4d89847b6394723ea05a4a86d9e7986ee3c03f7ff1b2eff2389ec3c1be7d20b69cdf77be016066cf261b2af131dfbb2176
 DIST XSB370.tar.gz 12322913 SHA256 282936b17ca581e6f546a4cb15687653ad19144897c4776b01a8caf7027ebc6d SHA512 e2c11b0e5fbbffc2fb6d493e39b7dd74de43509ea1c844f1b3e5d1002c116d6fb8b245905b7b512499e40765a6603d4bef883052bdeec4a3078011c305f85a9f WHIRLPOOL 7fad63fbd66e902eaccc5ae1e542787a824d4396df1a49f08b003cada4f424eaf563b0eff693296e7adecb46bfd24931938baf5dde95ad01694dfcdf4b2fb4ef
 DIST xsb-3.6.0-gentoo-patchset-2.tar.gz 7051 SHA256 14fe682df72677e09c9ecaee7a1ef1b0f8f155344789ce90a917bc5a02735947 SHA512 285211c9d1fa52acff707b0ad38f3da06374b8ac187ad66e9148508cbc0ec5c0f60b3e4461705b072510360ce72f81b5d5cfa4bbd1258510e7abfbbe8f0788b0 WHIRLPOOL 5c82f3b268a86b0f5bdbf0a4ffbe755253367d6d84cb24f7c6c2bf216833fb40afe4ca357148c882d57cc754cd75fc1ff7beca3084eeb104a015581e5872b337
-DIST xsb-3.7.0-gentoo-patchset-0.tar.gz 5111 SHA256 cd907853e43ab9a6249511a9313cde4d0c2484ffd35c6fb1f82310fdcd6c7e16 SHA512 6bee94326c99a186b61f4eea62fab4d5d61c3dead65adbf2543249f16febe463e45d23f8b761ef11a276cc29cc3558a592a58c168fcc4265ccdfc83b75dfb4ed WHIRLPOOL 4146000f30cdd8c64bc15521e3ffb086aee43efabce13267191f3191af4f7b33bf10b02c0fdd73d20bffdd02bd0daff2c9f34292eabc963dcfcfbb902bf41dbd
+DIST xsb-3.7.0-gentoo-patchset-1.tar.gz 5297 SHA256 c0340b390be98fdda506e7f7d2e34b03310be2a81964eec5875f1daccd1bfc30 SHA512 f8d8e9d12aa8daeb0942a7983ca43ac4db773de890efbff03ef5558f5d5ae09ad5d6bdf5171df6de3705a10186ae3f6e43c9bb1759dbd8e5315ca2ce1d7e53c7 WHIRLPOOL f9be3b49b6df83a03c712ea1bb36dbad576d537fe4a6978058d8c9a64ea06059d7360097c667a92182d54eed5f34becdcd66df7c22f8e2f9bd0781c894863b89
--- a/dev-lang/xsb/xsb-3.7.0.ebuild
+++ b/dev-lang/xsb/xsb-3.7.0.ebuild
@ -5,7 +5,7 @@ EAPI=5

 MY_P="XSB${PV//./}"

-PATCHSET_VER="0"
+PATCHSET_VER="1"

 inherit eutils autotools java-pkg-opt-2

--- a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild
+++ b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -14,7 +14,7 @@ SRC_URI="https://github.com/edicl/cl-ppcre/archive/${MY_P}.tar.gz -> cl-ppcre-${

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

 RDEPEND="=dev-lisp/cl-ppcre-${PV}*
--- a/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild
+++ b/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

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

 RDEPEND="dev-lisp/flexi-streams"
--- a/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild
+++ b/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/edicl/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"

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

 DEPEND="virtual/commonlisp
--- a/dev-lisp/flexi-streams/flexi-streams-1.0.16.ebuild
+++ b/dev-lisp/flexi-streams/flexi-streams-1.0.16.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

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

 RDEPEND="!dev-lisp/cl-${PN}
--- a/dev-lisp/sbcl/files/concurrency-test.patch
+++ b/dev-lisp/sbcl/files/concurrency-test.patch
@ -1,16 +0,0 @@
-diff -r -U1 sbcl-1.1.12.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.1.12/contrib/sb-concurrency/tests/test-frlock.lisp
--- sbcl-1.1.12.orig/contrib/sb-concurrency/tests/test-frlock.lisp	2013-09-30 20:15:42.000000000 +0700
-+++ sbcl-1.1.12/contrib/sb-concurrency/tests/test-frlock.lisp	2013-10-14 20:43:05.586366791 +0700
-@@ -19,5 +19,5 @@
- 
-(defun test-frlocks (&key (reader-count 100) (read-count 1000000)
-+(defun test-frlocks (&key (reader-count 50) (read-count 500000)
-                           (outer-read-pause 0) (inner-read-pause 0)
-                          (writer-count 10) (write-count 10000)
-+                          (writer-count 10) (write-count 5000)
-                           (outer-write-pause 0.0001) (inner-write-pause 0))
-@@ -84,3 +84,3 @@
-     (handler-case
-        (sb-ext:with-timeout 60 (test-frlocks))
-+        (sb-ext:with-timeout 240 (test-frlocks))
-       (sb-ext:timeout (c)
--- a/dev-lisp/sbcl/files/gentoo-fix_linux-os-c.patch
+++ b/dev-lisp/sbcl/files/gentoo-fix_linux-os-c.patch
@ -1,14 +0,0 @@
--- a/src/runtime/linux-os.c	2009-05-01 13:30:51.000000000 +0300
-+++ b/src/runtime/linux-os.c	2010-03-24 02:30:48.000000000 +0200
-@@ -56,11 +56,7 @@
- #include "cheneygc-internal.h"
- #endif
- 
-#ifdef LISP_FEATURE_X86
-/* Prototype for personality(2). Done inline here since the header file
- * for this isn't available on old versions of glibc. */
- int personality (unsigned long);
-#endif
- 
- size_t os_vm_page_size;
- 
--- a/dev-lisp/trivial-gray-streams/Manifest
+++ b/dev-lisp/trivial-gray-streams/Manifest
@ -1,2 +1 @@
-DIST trivial-gray-streams-2008-11-02.tar.gz 3522 SHA256 827eff9528b469f18c332d0dec68a2498ca9261950635b1cd8e589a492b589a4 SHA512 81ca798988511237a5a4c9ae4e0b15253404c47e245cc644211ffc58015fd46fa1623fecf7f07ea5df7acf80fff24782410ef832f08fd55f71c57daad6ced787 WHIRLPOOL 07b4ba232c7a6156667a084adf56684c3d04ace96d56a282298fd7e284760b60c1fefa09f90053e1400fed5c2d6cb25dbb2756697c08ad15b2647fd72933e26e
 DIST trivial-gray-streams-20170830.tar.bz2 7520 SHA256 0aa3640bb5862b3427950d6732c0d3cef18a7b3d401d50f2ec8537017bd9db07 SHA512 4fbcfff5f2875daaf9c9bb286e2f753fccbb9840bb3c3593b9755204475aaf34241c1ffc2c93b5bf2c3428400e91082b01f15812eb51251afcabe9a57d5df3fa WHIRLPOOL 0d18affea069d4871277cbe64d6e09a2b90ee6de189e3108fdd6c7b76faf84021b191509958dc3ffcc71af9f9ad5a8983ba4d3c7dc773b0e24981cabf02746fe
--- a/dev-lisp/trivial-gray-streams/trivial-gray-streams-20081102.ebuild
+++ b/dev-lisp/trivial-gray-streams/trivial-gray-streams-20081102.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit common-lisp-3
-
-MY_PV=${PV:0:4}-${PV:4:2}-${PV:6:2}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A thin compatibility layer between Gray Stream Common Lisp implementations"
-HOMEPAGE="https://common-lisp.net/project/trivial-gray-streams/"
-SRC_URI="http://common-lisp.net/project/cl-plus-ssl/download/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="!dev-lisp/cl-${PN}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	rm "${S}"/Makefile
-}
--- a/dev-lisp/trivial-gray-streams/trivial-gray-streams-20170830.ebuild
+++ b/dev-lisp/trivial-gray-streams/trivial-gray-streams-20170830.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""

 RDEPEND="!dev-lisp/cl-${PN}"
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@ -1,3 +1,2 @@
-DIST brython-3.3.0.zip 9405649 SHA256 4b63b4758bbf08e865fcda647e064265ddc12a6d0cdb76489a614c73c28a8d02 SHA512 03b0dfcdd1be4a415423317d74fc0c941cdac5682a17a19ccf81d9b19058fda342d21397870a1a8e74a445155f7f736977278d21c38fb22251c8ed4a4489b194 WHIRLPOOL 5356a58b155b1783c9bc30c2e9d015660824002101fe6ab9fb183833b370a3aea71cc40ae4c67908f828e202a81968dfb9c4a77e825638f3f02439d56ed1a329
-DIST brython-3.3.1.zip 9420425 SHA256 f485004d20de86877b9008d0942b308ad2f52565bafc2a2c6968ec43dd336a72 SHA512 070573db3ef7cd571df32798564496f2036c375abb396785f2ad7fef321b028baa6f554642a6cb76a25e892b569d4c8ea6e4bc2251f8171b7721669d158470ec WHIRLPOOL a959cae1de4a6bbb4bc973861a14f3d4b976012a1f9853955163203ee9c1cc09178a7190a9289673c5c93fb5ad6adc994f776c1a56888586756ce1c2e51dc3fa
 DIST brython-3.3.2.zip 10140819 SHA256 396326912d311d56ec6e2ba413f059e8f2242cd6ebb43154031f427df917a98c SHA512 bfe93b238805de90a4421a3a0c210ed5bc863cf4609949252813d61b96bd1b52aa927eeac621932bec68ac8b23be793adee53327be387bae6a95db7ea89b5155 WHIRLPOOL b25c136e30a943e188987a556d600006e7b54adf4243109d1ca27747e2b16f6201b504ea35f5f4ddc22ad32d66ad4ab02e0ccef306439b8a6ef7f5b7149dc826
+DIST brython-3.3.3.zip 10040987 SHA256 b48f236a55a220520ca98b5c1caf705d8eff1742e622c8440d7bc23632ca6984 SHA512 e182a6c859cd18b90b205f751260b0b5c8d250746e48844c59cd61608dfdaf0fd6f0f25b8061de9505b7c5d094ac68fe57536c52cb31adb48f04c2cc5624e249 WHIRLPOOL b604b4a0bba610fc84ca059696ed37fe8b6735a806c7616fb1f41a378271ab16e76f4f063a51568ec774af2ff694551ea4f67970a77230551223aaa1071c4be8
--- a/dev-python/brython/brython-3.3.2-r1.ebuild
+++ b/dev-python/brython/brython-3.3.2-r1.ebuild
@ -3,7 +3,9 @@

 EAPI=6

-inherit webapp
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit webapp python-single-r1

 DESCRIPTION="A Python 3 implementation for client-side web programming"
 HOMEPAGE="http://www.brython.info"
@ -11,14 +13,16 @@ SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.zip -> ${P}.zip"

 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""

-RDEPEND="dev-lang/python:*"
-
-DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 need_httpd_cgi

+pkg_setup() {
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
 src_install() {
 	dodoc LICENCE.txt README.md
 	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
--- a/dev-python/brython/brython-3.3.3.ebuild
+++ b/dev-python/brython/brython-3.3.3.ebuild
@ -3,7 +3,9 @@

 EAPI=6

-inherit webapp
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit webapp python-single-r1

 DESCRIPTION="A Python 3 implementation for client-side web programming"
 HOMEPAGE="http://www.brython.info"
@ -12,11 +14,15 @@ SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.zip -> ${P}.zip"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"

-RDEPEND="dev-lang/python:*"
-DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 need_httpd_cgi

+pkg_setup() {
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
 src_install() {
 	dodoc LICENCE.txt README.md
 	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@ -1,2 +1,3 @@
 DIST celery-3.1.24.tar.gz 1330180 SHA256 99b8085ff3013c8cebb9211857fadf5f402882ccada863d67c4d74db60be027a SHA512 6f2e1c5fe417183bc44f39deee669957800b805790475bea1c93d9efb37e0bb6db5aed9606ff79350f404c145908e3af6fa5ce94d86fb70238f2c2f2425ddd3c WHIRLPOOL cc16895b3641a78cfe6de4f5012520ec78a5c5e831e39b1d2a75897a12cb9ec18ea3366f682650d86620d10b27898bbefa7f2b8ed81a7649a97f40b1ab7fb57c
 DIST celery-4.0.2.tar.gz 1337804 SHA256 e3d5a6c56a73ff8f2ddd4d06dc37f4c2afe4bb4da7928b884d0725ea865ef54d SHA512 1110b634cafa13f9d9ab0b0a7a17042325271bd5ea45a5f442e36e871db87b87e3f496d54b771d274a1676900d9dfdc7e21887943dfd1a299a9fcd8b3f6d2189 WHIRLPOOL 050a041d32a4fb2a9b9658b2e70972cd5606fb13f848fdb7848faeb0116be7d1e061ed8e1d631be46b2740a4307d474396fe1599daea2c20ac58111fb6c99d55
+DIST celery-4.1.0.tar.gz 1331689 SHA256 77ff3730198d6a17b3c1f05579ebe570b579efb35f6d7e13dba3b1368d068b35 SHA512 5232adc43ba55d01f2b030382075750033e0c5c2abdc8308903e0cef7a465513b7765e2ae495da6555b377452ae233500530ef9d57e584a5352a54c5f4731c64 WHIRLPOOL febd876eff4e5b62be9f08da5712d3b76c366b279e2296ea8e5c5b00728ba1fcbfeb1eb9ca6d5a53abf31953f28c51ef9116cd50cff0ec541a417c5d9f59c54b
--- a/dev-python/celery/celery-4.0.2.ebuild
+++ b/dev-python/celery/celery-4.0.2.ebuild
@ -32,6 +32,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
 		dev-python/gevent[$(python_gen_usedep python2_7)]
 		>=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
@ -43,6 +44,7 @@ DEPEND="
 		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
 		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.5.1[${PYTHON_USEDEP}]
 	)
 	doc? (
 		dev-python/docutils[${PYTHON_USEDEP}]
--- a/dev-python/celery/celery-4.1.0.ebuild
+++ b/dev-python/celery/celery-4.1.0.ebuild
@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 bash-completion-r1
+
+DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
+HOMEPAGE="http://celeryproject.org/ https://pypi.python.org/pypi/celery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# There are a number of other optional 'extras' which overlap with those of kombu, however
+# there has been no apparent expression of interest or demand by users for them. See requires.txt
+IUSE="doc examples redis sqs test yaml"
+
+RDEPEND="
+	<dev-python/kombu-5.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/billiard-3.5.0.2[${PYTHON_USEDEP}]
+	<dev-python/billiard-3.6.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/vine[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/gevent[$(python_gen_usedep python2_7)]
+		>=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		>=dev-db/redis-2.8.0
+		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.5.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-1.3[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7 python3_4)
+		)"
+
+# testsuite needs it own source
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		mkdir docs/.build || die
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	# Main celeryd init.d and conf.d
+	newinitd "${FILESDIR}/celery.initd-r2" celery
+	newconfd "${FILESDIR}/celery.confd-r2" celery
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	newbashcomp extra/bash-completion/celery.bash ${PN}
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "zookeeper support" dev-python/kazoo
+	optfeature "msgpack support" dev-python/msgpack
+	#optfeature "rabbitmq support" dev-python/librabbitmq
+	#optfeature "slmq support" dev-python/softlayer_messaging
+	optfeature "eventlet support" dev-python/eventlet
+	#optfeature "couchbase support" dev-python/couchbase
+	optfeature "redis support" dev-db/redis dev-python/redis-py
+	optfeature "couchdb support" dev-db/couchdb dev-python/couchdb-python
+	optfeature "gevent support" dev-python/gevent
+	optfeature "auth support" dev-python/pyopenssl
+	optfeature "pyro support" dev-python/pyro:4
+	optfeature "yaml support" dev-python/pyyaml
+	optfeature "memcache support" dev-python/pylibmc
+	#optfeature "threads support" dev-python/threadpool
+	optfeature "mongodb support" dev-python/pymongo
+	optfeature "sqlalchemy support" dev-python/sqlalchemy
+	optfeature "sqs support" dev-python/boto
+	#optfeature "cassandra support" dev-python/pycassa
+}
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@ -1,2 +1,2 @@
-DIST libvirt-python-3.3.0.tar.gz 179552 SHA256 e0bb7dcb98bef4933bb9d5e6e944388cdb002515eb9053a42447e89e4642fe57 SHA512 3d90e99abe813f2ba684c24631d8e8cd6a5b44564351ae3f0b75d426f80d046c00ed6358273b68ad751707a93666564dfecfb7fb7d93d2c27c71a344542fe793 WHIRLPOOL dab0e88aecc007f41505d20bc9886b9508cab7d19211f426cad7e2c65da720b4a236acbd3acd77bb35d7e3a98431764f5722035cc2f62c813864a76d42b8b73e
 DIST libvirt-python-3.6.0.tar.gz 181778 SHA256 ecb9cbc8b1f33b245b04e3a937d8483584ab7a18258b217be96661343a4b1ad0 SHA512 333f991fc69b509b2eda67ee70dea39cc9d1ff36b1abb6a881296313ffebfb5ed41de8443534f19b27a70271548214fa94a12e7f59dc217492edf0bb5555ede9 WHIRLPOOL 6f13ee521713c3540e649c9c9edf6fc0427e0c4563305a42366796352fc99867bc79dd5ce61db0d7b79dc02957f8854c5664f5b5952a402c614e19264167546b
+DIST libvirt-python-3.7.0.tar.gz 182372 SHA256 1e4a8a8b08ef8f2502088f26ce3aced415d55ef808d8301dfed023f45154c06f SHA512 2f37d860d9ee203af3765a1b8d7f8981a8e51b5e6c78170d4bd80d0b23b9f5997725d81ff8c4ed4e5bb218346913321a3b4b8e2d337fd3cb8eeb95ac78256413 WHIRLPOOL b35f8aa071beb14ebf4be233bac190c6022d7ad56788f28bf3c8d265faa8fc514e0604beea9ccd8b703079fbec65de5c5b20ec6b8d00693cf6a6c7b9afc8bd75
--- a/dev-python/libvirt-python/libvirt-python-3.7.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-3.7.0.ebuild
@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS="amd64 x86"
+	KEYWORDS=""
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@ -3,3 +3,4 @@ DIST pytest-3.0.3.tar.gz 731934 SHA256 f213500a356800a483e8a146ff971ae14a8df3f2c
 DIST pytest-3.0.6.tar.gz 748748 SHA256 643434a9f1a188271da35e20064cb8b6c5440976c5bb541dc7b5b0e3cf75d940 SHA512 0e983f1f52c18327537d20be30425f4c74037d1fbf6b4aedf2646cf21d450fa9b2b20625f26f5db759b4fe1fd28c6640cb1df88e667efaeea6642e7f02f01e06 WHIRLPOOL 708e5041135883ba31d9712880672f64bf05c0bf40a544061cb42fed4d2aec111bfdf82b63f10e8a87c2b76870e3ea364b396258f0674d2199e43fe93cf2922e
 DIST pytest-3.0.7.tar.gz 743866 SHA256 b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab SHA512 f458929614fca5bc9542b9adfe2fa5d2c5b97ec13e331d3a9caf256d2d005b3dad9c11d01b2eb62332648f90608ba297a1edc2c20b7630ec4f69114299720a2a WHIRLPOOL 2febc111fed67573296f8c4a758ea36c2a2e81bd425442beace139f7e1bd3eaab7aa2fdcf8e0280871b0692e19d70efe18d780e4dd7336c9dd5d6fb0db2df6c5
 DIST pytest-3.1.2.tar.gz 766406 SHA256 795ec29fbba70b22a593691ce8bcd4bdde2dc96e8099731f73c7d8bb3ce879bf SHA512 6b8bf6280481295585169798351105749301a2b088fa89a48c463578a25edcb1fe7ea4100668bc3013a0a6dfd0ceab31c683e9280ece4f79575ca37909502d5c WHIRLPOOL 5c685f928080a5d6d1a979a0dbda1bc851eff855c76bb471ebf131047506c934e68a2e4733c4b265d291558ec1084d0276e77e469bd3d5ec0d91daa97c5eb989
+DIST pytest-3.2.2.tar.gz 786396 SHA256 f46e49e0340a532764991c498244a60e3a37d7424a532b3ff1a6a7653f1a403a SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db WHIRLPOOL 6d41e74696ed879d78f8a50dabb7775fa7631bfd5a6a1dd9df89269d6d3174683776982451f83b32c197cd801796e671e7431b542376a7d343b00e9fc21616b3
--- a/dev-python/pytest/pytest-3.2.2.ebuild
+++ b/dev-python/pytest/pytest-3.2.2.ebuild
@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.33"
+COMMON_DEPEND="
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
+		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-python/logilab-common
+"
+
+python_prepare_all() {
+	chmod o-w *egg*/* || die
+	# Disable versioning of py.test script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_nose.py not written to suit py3.2 in pypy3
+	if [[ "${EPYTHON}" == pypy3 ]]; then
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+			--ignore=testing/BUILD_nose.py \
+			|| die "tests failed with ${EPYTHON}"
+	else
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX testing || die "tests failed with ${EPYTHON}"
+	fi
+}
+
+python_compile_all(){
+	use doc && emake -C doc/en html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/en/_build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@ -1 +1,2 @@
 DIST python-iptables-0.11.0.tar.gz 73582 SHA256 55bdd0d8e3d0b4c27e4d61bf6f21ada1e19146c0adf65e5093e254a126abcce9 SHA512 5bbaeb09dc256738e3a168fa5941f39e50074eb1ac3ce18545a48c55eb06ef70fd974ad3153dc07ca67b1ef88a2a2c537a9f8d3ac85add990f6d15e9d37aa0a4 WHIRLPOOL 5ecc28a1f65389e63c962408f058ac0795a5ebd846320f4d9de4ad35e6bb7a8ee7dff4555af0c4c9c42d303b7b0f6de372c042d4219141446680ba45b8216ac4
+DIST python-iptables-0.12.0.tar.gz 40831 SHA256 9815fd5ba780fd14b5f8cf8a93e007c0e603019738813a806e37553cd72e4c33 SHA512 bf79288fac53542e523c8ed0e4e0711792cf524100e39f57f10d3581d1b958712875a765f690b3d5ec6e28af9de48d2f3dd0a787c7037ebfc6f8bf87b5e321b2 WHIRLPOOL 360c3dec7c1122ba53cf7f158ff463937a119fbc818ac879403ac943c0f0d04043c89559468274332e3050e4fd84a8d95f8a30b7a783aaa0c023420278c3422c
--- a/dev-python/python-iptables/python-iptables-0.12.0.ebuild
+++ b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for iptables"
+HOMEPAGE="https://github.com/ldx/python-iptables"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="net-firewall/iptables
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# tests manipulate live iptables rules, so disable them by default
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@ -1,3 +1,2 @@
 DIST haml-4.0.7.gem 121856 SHA256 3754d0f7c21cf261a30b207a94524211293b921492fab58c89d1ede7e7933f57 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568 WHIRLPOOL 62f1f152dbf8eea15ef3935d8e85b062f5a3f079a3cc4e4ad47056acfe7427b443611f092f591ff957f348d1727ce43b23d9f88083a4678b30d759a2ecd6e659
-DIST haml-5.0.1.tar.gz 123154 SHA256 c6580d96245f85d26c2d953cabb14c3035941e82b897684d528a10491fa5cb42 SHA512 deb5dc4746a0bc4b5103880c2364b6354eaa7968b6fa3df5a0a216a5c26c524e985c4a1e39df1de90b303d490b8d9ed9daa65eb00c0cbbbf772cd6b577c773be WHIRLPOOL 8174e1b5b027604157297f6c9f1bcd03bbfe20357a55799bfaa55e179025c53daab64d024eb8ab765592980199c758f4a8e901df975695c1326e1699b1d85b0b
 DIST haml-5.0.2.tar.gz 124000 SHA256 76e1024120d00454e11d6061a630ce785bf7092ba9063bbe1926ae51fceeb619 SHA512 c266a48424db4c9949d29bdb72f2c96ef5878a78ae98867b9259b0e2e2f581cb9fecf4c51091e6bce3ba4d86c60b44e8c7e95759a8aec8c95d59b9707903032e WHIRLPOOL ffaf5249f3241573c4752d31031b290a5190da14701b5f194660c342bffd546b38f279707a9befcfbb72f8ec70fe994966bcfce5c4f576ff1a1fd97615ea3d2c
--- a/dev-ruby/haml/haml-5.0.1.ebuild
+++ b/dev-ruby/haml/haml-5.0.1.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="http://haml-lang.com/"
-SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-RDEPEND="${RDEPEND} !!<dev-ruby/haml-3.1.8-r2"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/nokogiri
-		dev-ruby/railties:4.2
-		dev-ruby/activemodel:4.2
-		dev-ruby/actionpack:4.2
-	)
-	doc? (
-		dev-ruby/yard
-		>=dev-ruby/maruku-0.7.2-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
-		-e '1igem "actionpack", "~>4.2"'\
-		-e '1igem "activesupport", "~>4.2"; gem "activemodel", "~>4.2"'\
-		-e '1igem "railties", "~>4.2"'\
-		test/test_helper.rb || die
-	# Remove test that fails when RedCloth is available
-	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^  end/ s/^/#/"\
-		test/filters_test.rb || die
-}
--- a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.0.ebuild
+++ b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.0.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"

 RUBY_FAKEGEM_RECIPE_DOC="rdoc"

--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@ -38,7 +38,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 LICENSE="GPL-2"
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@ -2,5 +2,6 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb
 DIST postfix-3.1.2.tar.gz 4337569 SHA256 1ab9b4ee6bf9eb37d2467a63244132aab22ac23b91a72f327334e236b0d30f6b SHA512 58493d1890c3235d74a18365294ca764bd3b3f278b9825da931005165af60250342c6cf477c3b3575e50858d99cd3ee40f22bece094eb61e9be6c3cf0313d571 WHIRLPOOL 37e90ef6275a7f2dc8f712bb05348861098697438f274a5c5b69f50b31d55574af262a658657863c93f77fdeba2d37bf7b30dc43bf1629615f496ede19a89c00
 DIST postfix-3.1.6.tar.gz 4341308 SHA256 e5eb005fd133c6a32ca03e796e0192945eb877be8eb727f30d25547c997c5aa6 SHA512 646317393d33fcec99bef7f3dc142a847591927bc034c0c71e578baedad1875040cfeabdaa3436312f60485cb69bbdb31197aa9e7526a457946d7749b781099b WHIRLPOOL 66a087da3b33353a22176b9162fe0679f8ff35e48ae693a3315d52232e662638d48b8827648c0b0368e018161e1ade6a671773c109208ded9659cca26b1b5ea1
 DIST postfix-3.2.2.tar.gz 4390318 SHA256 d06849418d119d09366997b2b481bb23f737629769b4e4a52da42fb3ad8b0576 SHA512 9432fa8b181db99b8e2d72b2a0f640d1456b10c42615f0a002638f7f788d748b8bb55cd36409a368ac4f6d22033d1d059728fa33980fb93d465b6dfd5ae26418 WHIRLPOOL 7681299ffb747316f1366350f5fac5cf5f156ed9681a26ec6ed5dca0ab42a6a95f93e943bd6ccaccac259c2f7dd1cd1ba441a8968a8988d59ac2208fdbb2f480
-DIST postfix-3.3-20170910.tar.gz 4397230 SHA256 d6382513a569ea28139d174d90f55df2e89ef3f19dff693d926db17d3524e778 SHA512 96f198abe86a73ccb78e2de3536406eca424c28310d4d664262b4e30a4a30f019ea480d5f7beace7001338481c1c4c5b7fa4c9ea81085258ab1894d1785924f6 WHIRLPOOL 0e9f58fdba8b5e8e8bcc50fcc82ea436bad3aa60c5ef1d8c235e35e79a25b5cbd20b0cc7977d8cee52de4c5b8140a8b4928a9b98a031158c682dd3ab68cb3019
+DIST postfix-3.2.3.tar.gz 4390567 SHA256 5b0b975d075ea7561028d4109c581549b794aa92d733429ea6d9fa57751140bf SHA512 99ea74a5a0620e739668e55d620a0370b72c4802983a8a4cf4d6c51c6f8f5573128f2d6869386cedadba66b3f741df2f18867a059facd94092ac95f6da3a600c WHIRLPOOL d77c3490b81a43dcb54c7d72c88a62f1d632f00bd37be6969aa16def98877c4761c35cba53672a3aec701b14931d2a4c20c2ed4e4fff4876b1c74d4ac03f4b8d
+DIST postfix-3.3-20170924.tar.gz 4397375 SHA256 b9b8a2dd43cf1ae0002d815946d1f765b775a983ccf3bfbe7c2cae43e3677032 SHA512 10a400fcf2aa8a64f6952e7f66a2076ff6c507d59be015e4e08c1a6d234adb2909ba13bb4323109e5e98a1deea6690b6a0aaba934f47233bccec56de372d484a WHIRLPOOL bb51197c3706061fbb88d8635003e8d37a4070ca2778c4b5a56c5d531a98ed2db837c9c05ee5318dfeee5372263732b30de3792b645a681840c7dd94a01ba023
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
--- a/mail-mta/postfix/postfix-3.2.3.ebuild
+++ b/mail-mta/postfix/postfix-3.2.3.ebuild
@ -0,0 +1,308 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic pam systemd toolchain-funcs user
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+	eapply -p0 "${FILESDIR}/${PN}-libressl.patch"
+	eapply -p0 "${FILESDIR}/${PN}-libressl-runtime.patch"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape and posttls-finger
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Keep config_dir clean
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
--- a/mail-mta/postfix/postfix-3.3_pre20170924.ebuild
+++ b/mail-mta/postfix/postfix-3.3_pre20170924.ebuild
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@ -1 +1 @@
-DIST kgraphviewer-2.4.0.tar.xz 1564876 SHA256 88c2fd6514e49404cfd76cdac8ae910511979768477f77095d2f53dca0f231b4 SHA512 5a5664f19ffef90299d2746600e5f4e37749539f243e7fe4041844ac792d056bb04ebbbd83fa67f06ad63501080dc9f7fed3e841c025527252620b69a2a0a188 WHIRLPOOL d3b5ba1a86db7ce24854c8773df1c52ba9051aa4ab702117be6edef2f3cacfb2bc98e102b74bb5460feb302b799d37c59b48cad3adb31e1cf8fd8f51e1bfa3df
+DIST kgraphviewer-2.4.2.tar.xz 1565692 SHA256 49438b4e6cca69d2e658de50059f045ede42cfe78ee97cece35959e29ffb85c9 SHA512 2a25f8493881ffa057602e7a141ea610b8db7c43da2db007aea118e2ec7b1f069fbfa6ca80b0e1048c9b20535764679c8d77027337c47a4c18e5240c3058d935 WHIRLPOOL 9cdf603f7c2f8611c4f65f5a885ff40d937fa5f87c52e9a8837da455c6d4b6305beef124f1f0017866d4d353cb79232edf9f038a36a7abc0d9aad23e2456c271
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.0-desktop.patch
+++ b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.0-desktop.patch
@ -1,25 +0,0 @@
-From 9e1f02b3fdb7d6f410ae7563349b7a07544dd3c6 Mon Sep 17 00:00:00 2001
-From: Jonathan Riddell <jr@jriddell.org>
-Date: Tue, 12 Sep 2017 16:46:43 +0100
-Subject: desktop-mime-but-no-exec-code
-
---
- src/org.kde.kgraphviewer.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/org.kde.kgraphviewer.desktop b/src/org.kde.kgraphviewer.desktop
-index 42c6cc2..6e4aa15 100644
--- a/src/org.kde.kgraphviewer.desktop
-+++ b/src/org.kde.kgraphviewer.desktop
-@@ -37,7 +37,7 @@ Name[uk]=KGraphViewer
- Name[x-test]=xxKGraphViewerxx
- Name[zh_TW]=KGraphViewer
- MimeType=text/vnd.graphviz
-Exec=kgraphviewer -qwindowtitle %c
-+Exec=kgraphviewer -qwindowtitle %c %u
- Icon=kgraphviewer
- Type=Application
- Categories=Qt;KDE;Graphics;Viewer;2DGraphics;DataVisualization;
-- 
-cgit v0.11.2
-
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.2.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.2.ebuild
@ -36,5 +36,3 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!media-gfx/kgraphviewer:4
 "
-
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@ -1,2 +1,2 @@
-DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c
 DIST sane-backends-1.0.25.tar.gz 5955016 SHA256 a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c SHA512 b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df WHIRLPOOL 557a3ac8785c0dd7f98aa55d5edaf76fb5b2b3c86a2431bb40b5b132ac05de3abcb250a8bcf8ed188868c4f124ce0a323a92a5a83c7b44a20908fe40ca323711
+DIST sane-backends-1.0.27.tar.gz 6430188 SHA256 293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5 WHIRLPOOL 62ac1f4d4601bb2189212f021c23a48067ebdb5d900c2259ae4acdb6f94292c20689d9889bb11861b78be5ea7c3f76e815154e032f4bda76efcf901a97895cdd
--- a/media-gfx/sane-backends/files/niash_array_index.patch
+++ b/media-gfx/sane-backends/files/niash_array_index.patch
@ -1,140 +0,0 @@
--- backend/niash.c	2010-12-02 00:49:58.000000000 +0100
-+++ backend/niash.c.new	2011-09-21 20:09:07.000000000 +0200
-@@ -82,14 +82,7 @@
-   optThreshold,
- 
- 
-  optLast,
-/* put temporarily disabled options here after optLast */
-
-  optGroupMisc,
-  optLamp,
-
-  optCalibrate,
-  optGamma                      /* analog gamma = single number */
-+  optLast
- } EOptionIndex;
- 
- 
-@@ -685,17 +678,6 @@
-           pDesc->size = 0;
-           break;
- 
-        case optGamma:
-          pDesc->name = SANE_NAME_ANALOG_GAMMA;
-          pDesc->title = SANE_TITLE_ANALOG_GAMMA;
-          pDesc->desc = SANE_DESC_ANALOG_GAMMA;
-          pDesc->type = SANE_TYPE_FIXED;
-          pDesc->constraint_type = SANE_CONSTRAINT_RANGE;
-          pDesc->constraint.range = &rangeGamma;
-          pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-          pVal->w = startUpGamma;
-          break;
-
-         case optGammaTable:
-           pDesc->name = SANE_NAME_GAMMA_VECTOR;
-           pDesc->title = SANE_TITLE_GAMMA_VECTOR;
-@@ -707,31 +689,6 @@
-           pVal->wa = s->aGammaTable;
-           break;
- 
-        case optGroupMisc:
-          pDesc->title = SANE_I18N ("Miscellaneous");
-          pDesc->type = SANE_TYPE_GROUP;
-          pDesc->size = 0;
-          break;
-
-        case optLamp:
-          pDesc->name = "lamp";
-          pDesc->title = SANE_I18N ("Lamp status");
-          pDesc->desc = SANE_I18N ("Switches the lamp on or off.");
-          pDesc->type = SANE_TYPE_BOOL;
-          pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-          /* switch the lamp on when starting for first the time */
-          pVal->w = SANE_TRUE;
-          break;
-
-        case optCalibrate:
-          pDesc->name = "calibrate";
-          pDesc->title = SANE_I18N ("Calibrate");
-          pDesc->desc = SANE_I18N ("Calibrates for black and white level.");
-          pDesc->type = SANE_TYPE_BUTTON;
-          pDesc->cap = SANE_CAP_SOFT_SELECT;
-          pDesc->size = 0;
-          break;
-
-         case optGroupMode:
-           pDesc->title = SANE_I18N ("Scan Mode");
-           pDesc->desc = "";
-@@ -1007,7 +964,6 @@
-           /* Get options of type SANE_Word */
-         case optCount:
-         case optDPI:
-        case optGamma:
-         case optTLX:
-         case optTLY:
-         case optBRX:
-@@ -1031,17 +987,6 @@
-           strcpy ((char *) pVal, modeList[s->aValues[optMode].w]);
-           break;
- 
-          /* Get options of type SANE_Bool */
-        case optLamp:
-          GetLamp (&s->HWParams, &fLampIsOn);
-          *(SANE_Bool *) pVal = fLampIsOn;
-          break;
-
-        case optCalibrate:
-          /*  although this option has nothing to read,
-             it's added here to avoid a warning when running scanimage --help */
-          break;
-
-         default:
-           DBG (DBG_MSG, "SANE_ACTION_GET_VALUE: Invalid option (%d)\n", n);
-         }
-@@ -1061,7 +1006,6 @@
-         case optCount:
-           return SANE_STATUS_INVAL;
- 
-        case optGamma:
-         case optThreshold:
-         case optDPI:
- 
-@@ -1089,15 +1033,7 @@
-           DBG (DBG_MSG,
-                "sane_control_option: SANE_ACTION_SET_VALUE %d = %d\n", n,
-                (int) s->aValues[n].w);
-          if (n == optGamma)
-            {
-              if (!fSame && optLast > optGammaTable)
-                {
-                  info |= SANE_INFO_RELOAD_OPTIONS;
-                }
-              _SetScalarGamma (s->aGammaTable, s->aValues[n].w);
-            }
-          break;
-+         break;
- 
-         case optGammaTable:
-           DBG (DBG_MSG, "Writing gamma table\n");
-@@ -1158,20 +1094,6 @@
-           break;
- 
- 
-
-        case optLamp:
-          fVal = *(SANE_Bool *) pVal;
-          DBG (DBG_MSG, "lamp %s\n", fVal ? "on" : "off");
-          if (fVal)
-            _WarmUpLamp (s, WARMUP_INSESSION);
-          else
-            SetLamp (&s->HWParams, SANE_FALSE);
-          break;
-
-        case optCalibrate:
-/*       SimpleCalib(&s->HWParams); */
-          break;
-
-         default:
-           DBG (DBG_ERR, "SANE_ACTION_SET_VALUE: Invalid option (%d)\n", n);
-         }
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch
@ -1,56 +0,0 @@
-sent upstream:
-https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033601.html
-
-From 867c8fcde5cf54afae7f9ae8f855605b891708a7 Mon Sep 17 00:00:00 2001
-From: Christopher Brannon <teiresias@gentoo.org>
-Date: Wed, 8 Jul 2015 06:37:14 -0400
-Subject: [PATCH] add a configure flag to control systemd support
-
-This way people can easily disable systemd support locally.
---
- configure.in | 29 ++++++++++++++++++-----------
- 1 file changed, 18 insertions(+), 11 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 059058b..b539cda 100644
--- a/configure.in
-+++ b/configure.in
-@@ -343,17 +343,24 @@ dnl 	$as_echo "in order to autodetect network scanners in kodakaio."
- dnl 	with_cups="no"
- dnl fi
- 
-dnl added by llagendijk 12/7/2012 to detect systemd for saned
-$as_echo_n "Checking for systemd..."
-if test -e /usr/include/systemd/sd-daemon.h ; then
-    AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-    with_systemd="yes"
-    SYSTEMD_LIBS=" -lsystemd-daemon"
-    AC_SUBST(SYSTEMD_LIBS)
-    $as_echo "yes"
-else
-    with_systemd="no"
-    $as_echo "no"
-+AC_ARG_WITH(systemd,
-+	AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
-+if test "x$with_systemd" != xno ; then
-+    dnl added by llagendijk 12/7/2012 to detect systemd for saned
-+    $as_echo_n "Checking for systemd..."
-+    if test -e /usr/include/systemd/sd-daemon.h ; then
-+	AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-+	have_systemd="yes"
-+	SYSTEMD_LIBS=" -lsystemd-daemon"
-+	AC_SUBST(SYSTEMD_LIBS)
-+	$as_echo "yes"
-+    else
-+	have_systemd="no"
-+	$as_echo "no"
-+	if test "x$with_systemd" = xyes; then
-+	    AC_MSG_ERROR([Systemd support was requested but systemd was not found])
-+	fi
-+    fi
- fi
- 
- dnl ***********
-- 
-2.4.4
-
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch
@ -1,30 +0,0 @@
-sent upstream:
-https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033600.html
-
-From c8df148e2b9784be1827e33224baa1cb5066a383 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Wed, 8 Jul 2015 06:31:12 -0400
-Subject: [PATCH] fix cross-compiling paths
-
-There's no reason to hardcode -I paths to /usr/local.  Doing so breaks
-cross-compiling when incompatible headers live in there or the toolchain
-is set up to throw errors with those flags.
---
- configure.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 48953d2..059058b 100644
--- a/configure.in
-+++ b/configure.in
-@@ -82,7 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
- dnl ***********************************************************************
- dnl set compiler/linker flags
- dnl ***********************************************************************
-INCLUDES="${INCLUDES} -I/usr/local/include"
- AC_SUBST(INCLUDES)
- SANE_SET_CFLAGS([$is_release])
- SANE_SET_LDFLAGS
-- 
-2.4.4
-
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch
@ -1,105 +0,0 @@
-taken from upstream
-
-From 37523b867d411c2f82d08128246be7e38bc9812c Mon Sep 17 00:00:00 2001
-From: Paul Newall <quandry@ntlworld.com>
-Date: Mon, 14 Oct 2013 22:22:53 +0100
-Subject: [PATCH] Bugfix in kodakaio.c to fix segfault when non kodak scanners
- return unexpected data via avahi auto discovery
-
---
- ChangeLog                      |  4 ++++
- backend/kodakaio.c             | 43 +++++++++++++++++++++++++++++++-----------
- doc/descriptions/kodakaio.desc |  2 +-
- 3 files changed, 37 insertions(+), 12 deletions(-)
-
-2013-10-14 Paul Newall <quandry@ntlworld.com>
-	* backend/kodakaio.c: fix bug #314301, 
-	Segfault when unexpected data returned by avahi auto discovery.
-
-diff --git a/backend/kodakaio.c b/backend/kodakaio.c
-index 8c4583a..b442e50 100644
--- a/backend/kodakaio.c
-+++ b/backend/kodakaio.c
-@@ -127,7 +127,7 @@ for ubuntu 12.10
- 
- #define KODAKAIO_VERSION	02
- #define KODAKAIO_REVISION	4
-#define KODAKAIO_BUILD		6
-+#define KODAKAIO_BUILD		7
- 
- /* for usb (but also used for net though it's not required). */
- #define MAX_BLOCK_SIZE		32768
-@@ -2184,6 +2184,7 @@ static void resolve_callback(
-     AvahiLookupResultFlags flags,
-     AVAHI_GCC_UNUSED void* userdata) {
- 
-+	AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL;
- 	char *pidkey, *pidvalue;
- 	char *vidkey, *vidvalue;
- 	size_t valuesize;
-@@ -2204,20 +2205,40 @@ static void resolve_callback(
-             avahi_address_snprint(a, sizeof(a), address);
- 
- /* Output short for Kodak ESP */
-	DBG(min(10,DBG_AUTO), "%s:%u  %s  ", a,port,host_name);
-	avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), 
-		&vidkey, &vidvalue, &valuesize);
-	DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
-	avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), 
-		&pidkey, &pidvalue, &valuesize);
-	DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+	DBG(min(10,DBG_AUTO), "%s:%u  %s\n", a,port,host_name);
- 
-+	vid_pair_list = avahi_string_list_find(txt, "vid");
-+	if(vid_pair_list != NULL) {
-+		avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize);
-+		DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
-+	}
-+	else	DBG(min(10,DBG_AUTO), "failed to find key vid\n");
-+
-+	pid_pair_list = avahi_string_list_find(txt, "pid");
-+	if(pid_pair_list != NULL) {
-+		avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize);
-+		DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+	}
-+	else	DBG(min(10,DBG_AUTO), "failed to find key pid\n");
-+
-+	if(pid_pair_list != NULL && vid_pair_list != NULL) {
- 		ProcessAvahiDevice(name, vidvalue, pidvalue, a);
-	avahi_free(vidkey); avahi_free(vidvalue);
-	avahi_free(pidkey); avahi_free(pidvalue);
-+	}
-+	else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n");
-+
-+	if(vid_pair_list != NULL) {
-+		avahi_free(vidkey); 
-+		avahi_free(vidvalue);
-+		DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n");
-+	}
-+	if(pid_pair_list != NULL) {
-+		avahi_free(pidkey); 
-+		avahi_free(pidvalue);
-+		DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n");
-+	}
-         }
-     }
-
-+    DBG(min(10,DBG_AUTO), "ending resolve_callback\n");
-     avahi_service_resolver_free(r);
- }
- 
-diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc
-index 7882513..5fb18ed 100644
--- a/doc/descriptions/kodakaio.desc
-+++ b/doc/descriptions/kodakaio.desc
-@@ -1,6 +1,6 @@
- :backend "kodakaio"
- :url "http://sourceforge.net/projects/cupsdriverkodak/" 
-:version "2.4.6"
-+:version "2.4.7"
- :manpage "sane-kodakaio"
- :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10"
- :devicetype :scanner
-- 
-2.4.4
-
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
@ -1,54 +0,0 @@
-sent upstream:
-https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033602.html
-
-From 1dcfb42608a27fbdebdaa721b4e48354850a7dcc Mon Sep 17 00:00:00 2001
-From: Christopher Brannon <teiresias@gentoo.org>
-Date: Wed, 8 Jul 2015 06:38:50 -0400
-Subject: [PATCH] use pkg-config to look up systemd paths
-
-Since systemd has always shipped pkg-config files, we should use them.
-This also fixes cross-compiling by not relying on hardcoded host paths.
---
- configure.in | 25 +++++++++++--------------
- 1 file changed, 11 insertions(+), 14 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index b539cda..5e703a8 100644
--- a/configure.in
-+++ b/configure.in
-@@ -346,21 +346,18 @@ dnl fi
- AC_ARG_WITH(systemd,
- 	AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
- if test "x$with_systemd" != xno ; then
-    dnl added by llagendijk 12/7/2012 to detect systemd for saned
-    $as_echo_n "Checking for systemd..."
-    if test -e /usr/include/systemd/sd-daemon.h ; then
-	AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-	have_systemd="yes"
-	SYSTEMD_LIBS=" -lsystemd-daemon"
-	AC_SUBST(SYSTEMD_LIBS)
-	$as_echo "yes"
-    else
-	have_systemd="no"
-	$as_echo "no"
-	if test "x$with_systemd" = xyes; then
-	    AC_MSG_ERROR([Systemd support was requested but systemd was not found])
-	fi
-+  PKG_CHECK_MODULES(SYSTEMD, [libsystemd], have_systemd=yes, have_systemd=no)
-+  if test "x$have_systemd" = xno; then
-+    PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon], have_systemd=yes, have_systemd=no)
-+  fi
-+  if test "x$have_systemd" = xyes; then
-+    AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-+    AC_SUBST(SYSTEMD_LIBS)
-+  else
-+    if test "x$with_systemd" = xyes; then
-+      AC_MSG_ERROR([Systemd support was requested but systemd was not found])
-     fi
-+  fi
- fi
- 
- dnl ***********
-- 
-2.4.4
-
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch
@ -1,62 +0,0 @@
-taken from upstream
-
-From efb04936b8ad3bf313c289a522ae5832e22c1b7e Mon Sep 17 00:00:00 2001
-From: Paul Newall <quandry@ntlworld.com>
-Date: Tue, 15 Oct 2013 22:20:15 +0100
-Subject: [PATCH] detection of cups commented out in configure.in it is no
- longer used by kodakaio.
-
---
- ChangeLog    |  4 ++++
- configure.in | 24 ++++++++++++------------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-2013-10-15 Paul Newall <quandry@ntlworld.com>
-	* configue.in: detection of cups was commented out. Avahi is now used
-	for autodetection in kodakaio so the detection of cups is no longer required.
-
-diff --git a/configure.in b/configure.in
-index e13888c..4365868 100644
--- a/configure.in
-+++ b/configure.in
-@@ -332,17 +332,17 @@ if test -c /dev/urandom ; then
-     AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?])
- fi
- 
-dnl added by PN 3/2/12 to detect cups
-$as_echo "checking for cups"
-if test -e /usr/include/cups/cups.h ; then
-    AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
-	with_cups="yes"
-	LIBS="-lcups  $LIBS"
-else
-	$as_echo "cups.h not found, you may want to install a cups development package"
-	$as_echo "in order to autodetect network scanners in kodakaio."
-	with_cups="no"
-fi
-+dnl added by PN 3/2/12 to detect cups commented out 15/10/13 since avahi is now used instead
-+dnl $as_echo "checking for cups"
-+dnl if test -e /usr/include/cups/cups.h ; then
-+dnl     AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
-+dnl 	with_cups="yes"
-+dnl 	LIBS="-lcups  $LIBS"
-+dnl else
-+dnl 	$as_echo "cups.h not found, you may want to install a cups development package"
-+dnl 	$as_echo "in order to autodetect network scanners in kodakaio."
-+dnl 	with_cups="no"
-+dnl fi
- 
- dnl added by llagendijk 12/7/2012 to detect systemd for saned
- $as_echo_n "Checking for systemd..."
-@@ -816,7 +816,7 @@ fi
- echo "IPv6 support:  `eval eval echo ${ipv6}`"
- echo "Avahi support: `eval eval echo ${enable_avahi}`"
- echo "SNMP support:  `eval eval echo ${with_snmp}`"
-echo "CUPS support:  `eval eval echo ${with_cups}`"
-+dnl echo "CUPS support:  `eval eval echo ${with_cups}`" commented out 15/10/13
- echo "-> The following backends will be built:"
- for backend in ${BACKENDS} ; do
-   echo $ECHO_N "${backend} " 
-- 
-2.4.4
-
--- a/media-gfx/sane-backends/files/sane-backends-1.0.27-disable-usb-tests.patch
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.27-disable-usb-tests.patch
@ -0,0 +1,11 @@
+--- a/testsuite/sanei/sanei_usb_test.c~	2017-05-15 03:19:11.000000000 +0200
+++ b/testsuite/sanei/sanei_usb_test.c	2017-09-27 12:13:57.402803737 +0200
+@@ -832,6 +832,8 @@
+   int detected, opened, i;
+   SANE_Int dn[MAX_DEVICES];
+ 
+  return 77;
+
+ #ifdef HAVE_LIBUSB_LEGACY
+   printf ("\n%s built with old libusb\n\n", argv[0]);
+ #endif
--- a/media-gfx/sane-backends/files/saned.socket
+++ b/media-gfx/sane-backends/files/saned.socket
@ -0,0 +1,10 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+MaxConnections=1
+
+[Install]
+WantedBy=sockets.target
--- a/Show more
+++ b/Show more