Sync with portage [Sun Apr 10 20:32:52 MSK 2016].

app-admin/apache-tools/Manifest

@@ -1,2 +1,3 @@
 DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
 DIST httpd-2.4.18.tar.bz2 5181291 SHA256 0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c SHA512 8e342cc447313c07275869381c2d6f2314a96547f0c86ee1c617975d0f7ad8efb47113ab5995c733108ae4dec31ad79847e397ecea859b60414ffe1680617a31 WHIRLPOOL e0ae6b8581e2993e0f873d8928e3b54f1df750f29e82d2f1308376af440308c56e89dfb3ec051cdf164a271580ccac71ebc5b038e23ca65a9221fdfc08b47b41
+DIST httpd-2.4.20.tar.bz2 6331344 SHA256 0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da SHA512 8591e0ca8f1c4755d670f1a8780bb656c62b30635cff1f7d4434f7c5017b99f1b14bbb296da5cdb63cd3bcfa4908b8b5f99a0c036e9e0f0c9514acd2a3cb7e53 WHIRLPOOL cc61fa5a2344268cdba69ba1662d555d492b40468a81b1d67fce55f85e178f63ef218a303e51e494c91a26dcec259e3912ca640192dbbe42d2b02ee4fac19a1d

app-admin/apache-tools/apache-tools-2.4.20.ebuild

@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1
+	dev-libs/apr-util:1
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/sh
+	[ "${flag}" = "--version" ] && set -- --modversion
+	exec ${PKG_CONFIG} libpcre "$@"
+	EOF
+	chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	append-ldflags $(no-as-needed)
+
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+		--sbindir="${EPREFIX}"/usr/sbin \
+		--with-perl="${EPREFIX}"/usr/bin/perl \
+		--with-expat="${EPREFIX}"/usr \
+		--with-z="${EPREFIX}"/usr \
+		--with-apr="${SYSROOT}${EPREFIX}"/usr \
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
+		--with-pcre="${T}"/pcre-config \
+		$(use_enable ssl) \
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}

app-admin/cli53/Manifest

@@ -0,0 +1 @@
+DIST cli53-0.7.2.tar.gz 3268419 SHA256 ca038ffef15c31faab524c7fa8eb2136932e9380fa63e7f3e0710a902085769e SHA512 93db6cc237724492d4ad04f35b1485cc286ec5353809315a9db0c4df475d3a647934d92ba23a0d9bb0146ccac20b17c7fc60b8fe4e253b1051cb7ea5f243167b WHIRLPOOL d6e6ba9defc2f4c047b99413ab57d497fcb51537fdf84299ff60ae585e1c1e4f2ed90522de682d1dd7f128bf6edf1e6fb4698f5da0bd2e9637dfc4a7588c3f40

app-admin/cli53/cli53-0.7.2.ebuild

@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" emake version=${PV} build
+}
+
+src_install() {
+	dobin cli53
+	dodoc {CHANGELOG,README}.md
+}

app-admin/cli53/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+</pkgmetadata>

app-admin/puppet-lint/puppet-lint-0.3.2.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="4"
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README*"

app-admin/puppet-lint/puppet-lint-1.1.0.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 

app-admin/r10k/r10k-1.1.3-r1.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""

app-admin/r10k/r10k-1.5.1.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""

app-arch/p7zip/Manifest

@@ -1,4 +1,5 @@
 DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd WHIRLPOOL 71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
+DIST p7zip_15.14.1_src_all.tar.bz2 4147911 SHA256 699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4 SHA512 30d0ef47bd6938cdd5d9d80ec6e7aed972655686a43adb0ae34bb9856ec7cd5a68a05c580352021055cefd6eeceb134ff6402f93686ce46e57f9757798e76abd WHIRLPOOL ace6204d3ab08002b6d5657ae280e22b7e26cdfe0af8099024ad8562a68aa5097a8f09d9d49904a06b9a6942d30fbf3d7a3872661433dd4f76c33dea03ccfb6a
 DIST p7zip_15.14_src_all.tar.bz2 4147609 SHA256 b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8 SHA512 3053647cbcb3b8efd7f41b6bc122e984b999d31720f9b22387c52ccfe8a71d73899b1fb3a269854fd43bc1ca656c7d53457aca1cb5e2c90a2d0fb8f084bdebc5 WHIRLPOOL 52a397e4ea15cdd4c68156a0c32d449be78469d5704e0d4bb644a813b583422b3d7b0741284974ca22d9ea99a303dfadeccc23d74a77cac0c9b51153bd61e24b
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24

app-arch/p7zip/files/p7zip-15.14.1-darwin.patch

@@ -0,0 +1,11 @@
+--- p7zip_15.14.1/CPP/myWindows/StdAfx.h
++++ p7zip_15.14.1/CPP/myWindows/StdAfx.h
+@@ -32,7 +32,7 @@
+ #include <errno.h>
+ #include <math.h>
+ 
+-#ifdef __NETWARE__
++#if defined(__NETWARE__) || defined(__MACH__)
+ #include <sys/types.h>
+ #endif
+ 

app-arch/p7zip/p7zip-15.14.1.ebuild

@@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/yasm )
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-darwin.patch
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's:-m32 ::g' \
+		-e 's:-m64 ::g' \
+		-e 's:-pipe::g' \
+		-e '/ALLFLAGS/s:-s ::' \
+		-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU
+		# linker, it doesn't matter so much for bitwidth, for it doesn't
+		# do anything with it
+		cp -f makefile.macosx_llvm_64bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile.list \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		need-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake depend
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+	if use kde || use wxwidgets; then
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
+#		emake -- 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+#		doexe bin/7z{G,FM}
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/{Lang,help}
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kde4/services/ServiceMenus
+			doins GUI/kde4/*.desktop
+			dodir /usr/share/kservices5/ServiceMenus
+			for item in "${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do
+				item="$(basename ${item})"
+				dosym "/usr/share/kde4/services/ServiceMenus/${item}" "/usr/share/kservices5/ServiceMenus/${item}"
+			done
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+	dodoc ChangeLog README TODO
+
+	if use doc; then
+		dodoc DOC/*.txt
+		dohtml -r DOC/MANUAL/*
+	fi
+}

app-backup/borgbackup/Manifest

@@ -1 +1,2 @@
 DIST borgbackup-1.0.0.tar.gz 424089 SHA256 500b9e311331aa88ec07df94d9f3280a79ca207bf1a997b92dd1e6a1f1664671 SHA512 5a94f1b0dfe17d383bcc917db69ed272b9b752b96912a21ac62886972cdbd718b58fe3f9529af455ab325ba418cfc05b89985e32a23fed5e946c5f7e53e6e3b1 WHIRLPOOL c0a5c40aff70c9872e62861a0e971f659191f3a99112dfe940db2440666def3a04af284f5f31ccaef410c7028a49377df96fb38fd462917ad11cd095e33b12e9
+DIST borgbackup-1.0.1.tar.gz 413316 SHA256 58a2c2e649207c8e15223f6380d238124b0f1b45fd83990a40df5b678cd41fba SHA512 1cb0ceb0d4fcf844220947000b51bbd1156244dd4394285e51b82da9f6e23c866d97246aed3c13fdd62534788daf5efde9a049a51db36b22db2674892d95b1d9 WHIRLPOOL 964c173a22b524c7426c74421856e96a17cd8a583cc271829a5e069186b607186919a373ae9c7a7ae71132b26a4c495837a15536ed280e7daa5b984703c46aad

app-backup/borgbackup/borgbackup-1.0.1.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/borgbackup/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/b/borgbackup/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption."
+HOMEPAGE="https://borgbackup.github.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl +fuse"
+
+RDEPEND="
+	app-arch/lz4
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	fuse? ( dev-python/llfuse[${PYTHON_USEDEP}] )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"

app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild

@@ -43,6 +43,12 @@ cdrtools_os() {
 src_prepare() {
 	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
 

app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch

@@ -0,0 +1,69 @@
+diff -Naur cdrtools-3.02.orig/readcd/readcd.c cdrtools-3.02/readcd/readcd.c
+--- cdrtools-3.02.orig/readcd/readcd.c	2016-01-24 11:15:19.000000000 -0500
++++ cdrtools-3.02/readcd/readcd.c	2016-04-09 12:29:54.727635502 -0400
+@@ -257,7 +257,7 @@
+ BOOL	pifscan;
+ BOOL	plot;
+ BOOL	fulltoc;
+-BOOL	clone;
++BOOL	clonetoc;
+ BOOL	edc_corr;
+ BOOL	noerror;
+ BOOL	nocorr;
+@@ -294,7 +294,7 @@
+ 	error(_("\t-plot		Print data suitable for gnuplot\n"));
+ #ifdef	CLONE_WRITE
+ 	error(_("\t-fulltoc	Retrieve the full TOC\n"));
+-	error(_("\t-clone		Retrieve the full TOC and all data\n"));
++	error(_("\t-clonetoc		Retrieve the full TOC and all data\n"));
+ 	error(_("\t-edc-corr	Try to do user level Reed Solomon repair (experimental)\n"));
+ #endif
+ 	error(_("\ttimeout=#	set the default SCSI command timeout to #.\n"));
+@@ -320,7 +320,7 @@
+ }
+ 
+ /* CSTYLED */
+-char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clone,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
++char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
+ 
+ EXPORT int
+ main(ac, av)
+@@ -397,7 +397,7 @@
+ 			&scanbus, &dev, &scgopts, &sectors, &do_write,
+ 			&c2scan, &cxscan, &pi8scan, &pifscan,
+ 			&plot,
+-			&fulltoc, &clone,
++			&fulltoc, &clonetoc,
+ 			&edc_corr,
+ 			&noerror, &nocorr,
+ 			&notrunc, &retries, &do_factor, &filename,
+@@ -679,7 +679,7 @@
+ 
+ 	if (filename || sectors || c2scan || cxscan || pi8scan || pifscan ||
+ 	    meshpoints || fulltoc ||
+-	    clone || edc_corr) {
++	    clonetoc || edc_corr) {
+ 		dorw(scgp, filename, sectors);
+ 	} else {
+ 		doit(scgp);
+@@ -894,9 +894,9 @@
+ 		if (params.name == NULL)
+ 			params.name = "/dev/null";
+ 		read_ftoc(scgp, &params, FALSE);
+-	} else if (clone || edc_corr) {
++	} else if (clonetoc || edc_corr) {
+ 		if (!is_mmc(scgp, NULL, NULL))
+-			comerrno(EX_BAD, _("Unsupported device for clone mode.\n"));
++			comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n"));
+ 		if (!edc_corr)
+ 			noerror = TRUE;
+ 		if (retries == MAX_RETRY)
+@@ -904,7 +904,7 @@
+ 		if (params.name == NULL)
+ 			params.name = "/dev/null";
+ 
+-		if (clone)
++		if (clonetoc)
+ 		if (read_ftoc(scgp, &params, TRUE) < 0)
+ 			comerrno(EX_BAD, _("Read fulltoc problems.\n"));
+ 		readcd_disk(scgp, &params);

app-dicts/prime-dict/prime-dict-1.0.0-r2.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 inherit ruby-ng
 

app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 inherit ruby-ng
 

app-editors/nedit/nedit-5.5_p20110116-r3.ebuild

@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=x11-libs/motif-2.3:0
 	x11-libs/libXp

app-editors/retext/Manifest

@@ -1,3 +1,3 @@
 DIST ReText-4.1.3.tar.gz 129283 SHA256 bb4409982d27ac62cab01b0748fe41d9c6660853668b350f3369e76d155edd6c SHA512 d2b3fa901afa9870f6cecc7ab3126b91f1420ca1b14ddd4f609c2ada7121388840b5be679914694664f3bbf876ee8522aa6b0c82a23f837844f788fa10a46323 WHIRLPOOL 3be71e5d7ec612ae4e4fec17ca544f6d0e7cb7421fcdeb517d3c13156ed07f5e5e7c3e352cf604bfb5f2287964fdc173a1bac0eeab41ee1cda8b265ad0f57686
-DIST ReText-5.2.1.tar.gz 157119 SHA256 02164ae2bba6f47a2ec5e11aa06aefbcd96bea1b84a96c5673dbe18d8ccb2a69 SHA512 1d11f6824b64a082425ac2e8b67da15d4df5352539b66a8297dba0cd4f4236b7328966e97104c3fd7a641067a84023f65ba856f932d8489ff4e80722471835d8 WHIRLPOOL 24e7c756f61c210320b0ab9a67c99f43ccf5739310a01d9ee98d779e8b45b27dbc828b0c573973b2e4d2b8e07f2edd56660de685930a7a2ed8ceb50ab6fb6f91
 DIST ReText-5.3.0.tar.gz 160163 SHA256 9ec0cee93e6731fbf00b86574cb47c3132f62291e762f5e47258a3171bfdd21d SHA512 d6ff8e61b1e13de72c5d1741795fddb3a1ba443b2aa6aba6ca933ae38e09c8dac38085bfd73e0c1773dec9a72df1f08d64ef22d2396694530bade6ff8a485223 WHIRLPOOL 98537b5244a583c04604a6b1626a3813b6506dfefda6d40c85aaae076b30c7e14a0b8a363e431d9bd5ceea41a31f07785663a018bbdae1dc897a29eec22c99c1
+DIST ReText-5.3.1.tar.gz 159669 SHA256 515b1aaa57615453f8933f997753072a5c4691793da2280e70d1b333b53904c6 SHA512 76c6f78c10129e4845de819fa6db3deff5441a25331fd3dadbdfeb766caa453f21214f82e6625c919cc8be2fcfdfada970cae32837bb8904c3702dda19890628 WHIRLPOOL 5c2db75c2b2f23419bc2803849f6b7a69f3540911c6e53f46a46baffd150a9a0db75d0343361963a53bcc1a6da4534eb72d99068a26c13c1551b6188ab81f67a

app-editors/retext/retext-5.3.1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -44,9 +44,6 @@ python_test() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
 	l10n_for_each_disabled_locale_do remove_locale
 
 	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"

app-editors/scite/Manifest

@@ -1,3 +1,3 @@
 DIST scite355.tgz 2302137 SHA256 20515597ac986f1727c97bda2c27d88487ddb79cfe330b0b890b5e25330b7d9f SHA512 cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d WHIRLPOOL c901804481042b859be68f44ab728544e97975d61219a4bb576ba3da00bd663c8877e9b23b981a0295d759cae3e9afd037d981923086c6850ff29f01c43ec9f6
-DIST scite361.tgz 2347061 SHA256 bdffdc28c501dbb5e3dc6cbfe3808da2d574df983790c6ddfc2643040023a010 SHA512 5ead063ba98798ec5aa188735f219a19e788fbfaf12c84bce61a08c356e85e73cbbac412731cfdec02266bb8fa94d2a461239ffaba14b99ea65c31eb770dfcc3 WHIRLPOOL 8279b3fea54d2ef266dc5d5cb2b16896731e75d20bcdedaa59570e49d8b201fe7085ecac8f63cb06f2511ebd817d137b5189834d19ee7d4ffae43eaf06d465a7
 DIST scite362.tgz 2368491 SHA256 6530d0d86c72485b815663e3b2c2987d59779340a71632ed8bb97a43530737a3 SHA512 cb9618e962a16db7484e16a494b3da39f210250277e9772b112af5e16649b38f27ead0ec61664b1211c9263880cb7f3c34b5b32d94a4e70087fb1503805740c1 WHIRLPOOL 52a31f0e1518a9d8f6107aa22eead7da89e1d1ea6523a2aae57fbd7a3a8ecbd192c124c3d2550acea6383457763d6e501b14791ec6490a54379c5d13356e42da
+DIST scite364.tgz 2386959 SHA256 6a27a1062b838e0fe914fb045f265935e5d39e34d69ae894b55f971437192baa SHA512 eaba353edac23902a8f446fb8877f3e5dd43221e5289bc38941d76068a3f7c87602e9eb5828e6caafec56657d05b5268aad2a1bb36356a14154de3c22602c76d WHIRLPOOL f1b4c64eb4a5c6d6e73ffb3f457a5b5ddf8d31cf5f5778b204c05a093bcfb8e78e7a8cab634cf369ce29f200c11b933492f01c30afb268f581d465ed31157c88

app-editors/scite/scite-3.6.4.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,12 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
-RDEPEND="dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:0= )"
+RDEPEND="dev-libs/glib:=
+	x11-libs/cairo:*
+	>=x11-libs/gtk+-2.0:*
+	x11-libs/gdk-pixbuf:*
+	x11-libs/pango:*
+	lua? ( >=dev-lang/lua-5:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-apps/sed-4"
@@ -43,6 +43,13 @@ src_prepare() {
 		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 		|| die "error patching makefile"
 
+	# repair and enhance the .desktop file
+	sed -i SciTE.desktop \
+		-e "s/^Encoding/#Encoding/" \
+		-e "s#text/plain#text/\*;application/xhtml+xml#" \
+		-e "s#^Categories=\(.*\)#Categories=Development;#" \
+		|| die "error patching SciTe.desktop"
+
 	cd "${S}"
 	sed -i makefile \
 		-e 's#usr/local#usr#g' \
@@ -55,6 +62,9 @@ src_prepare() {
 		-e 's#-g root#-g 0#' \
 		-e "s#-Os##" \
 		|| die "error patching makefile"
+
+	cd "${WORKDIR}"
+
 }
 
 src_compile() {
@@ -76,10 +86,6 @@ src_install() {
 	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
 	dosym /usr/bin/scite /usr/bin/SciTE
 
-	# replace .desktop file with our own working version
-	rm -f "${ED}/usr/share/applications/SciTE.desktop" || die
-	domenu "${FILESDIR}/scite.desktop"
-
 	doman ../doc/scite.1
 	dodoc ../README
 }

app-emulation/wine/wine-1.8.1.ebuild

@@ -182,8 +182,8 @@ wine_build_environment_check() {
 		# Compile in subshell to prevent "Aborted" message
 		if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
 			eerror "Wine cannot be built with this version of gcc-5.3"
-			eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-			eerror "or use gcc-config to select a different compiler version."
+			eerror "due to compiler bugs; please use gcc-config to select a"
+			eerror "different compiler version."
 			eerror "See https://bugs.gentoo.org/574044"
 			eerror
 			return 1
@@ -269,8 +269,9 @@ src_prepare() {
 		eend $?
 
 		# To differentiate unofficial staging releases
-		[[ ! -z ${SUFFIX} ]] && \
+		if [[ ! -z ${SUFFIX} ]]; then
 			sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
+		fi
 	fi
 
 	default

app-emulation/wine/wine-1.8.ebuild

@@ -177,6 +177,19 @@ wine_build_environment_check() {
 			return 1
 		fi
 	fi
+	# bug #574044
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+		einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
+		# Compile in subshell to prevent "Aborted" message
+		if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
+			eerror "Wine cannot be built with this version of gcc-5.3"
+			eerror "due to compiler bugs; please use gcc-config to select a"
+			eerror "different compiler version."
+			eerror "See https://bugs.gentoo.org/574044"
+			eerror
+			return 1
+		fi
+	fi
 
 	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
 		eerror "You need gcc-4.4+ to build 64-bit wine"

app-emulation/wine/wine-1.9.4.ebuild

@@ -177,12 +177,11 @@ wine_build_environment_check() {
 	# bug #574044
 	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
 		einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
-		$(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die
-		# Run in subshell to prevent "Aborted" message
-		if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then
+		# Compile in subshell to prevent "Aborted" message
+		if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
 			eerror "Wine cannot be built with this version of gcc-5.3"
-			eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-			eerror "or use gcc-config to select a different compiler version."
+			eerror "due to compiler bugs; please use gcc-config to select a"
+			eerror "different compiler version."
 			eerror "See https://bugs.gentoo.org/574044"
 			eerror
 			return 1

app-emulation/wine/wine-1.9.5.ebuild

@@ -179,8 +179,8 @@ wine_build_environment_check() {
 		# Compile in subshell to prevent "Aborted" message
 		if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
 			eerror "Wine cannot be built with this version of gcc-5.3"
-			eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-			eerror "or use gcc-config to select a different compiler version."
+			eerror "due to compiler bugs; please use gcc-config to select a"
+			eerror "different compiler version."
 			eerror "See https://bugs.gentoo.org/574044"
 			eerror
 			return 1

app-emulation/wine/wine-1.9.6.ebuild

@@ -180,8 +180,8 @@ wine_build_environment_check() {
 		# Compile in subshell to prevent "Aborted" message
 		if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
 			eerror "Wine cannot be built with this version of gcc-5.3"
-			eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-			eerror "or use gcc-config to select a different compiler version."
+			eerror "due to compiler bugs; please use gcc-config to select a"
+			eerror "different compiler version."
 			eerror "See https://bugs.gentoo.org/574044"
 			eerror
 			return 1
@@ -265,8 +265,9 @@ src_prepare() {
 		eend $?
 
 		# To differentiate unofficial staging releases
-		[[ ! -z ${SUFFIX} ]] && \
+		if [[ ! -z ${SUFFIX} ]]; then
 			sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
+		fi
 	fi
 
 	autotools-utils_src_prepare

app-emulation/wine/wine-1.9.7.ebuild

@@ -265,8 +265,9 @@ src_prepare() {
 		eend $?
 
 		# To differentiate unofficial staging releases
-		[[ ! -z ${SUFFIX} ]] && \
+		if [[ ! -z ${SUFFIX} ]]; then
 			sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
+		fi
 	fi
 
 	autotools-utils_src_prepare

app-emulation/wine/wine-9999.ebuild

@@ -180,8 +180,8 @@ wine_build_environment_check() {
 		# Compile in subshell to prevent "Aborted" message
 		if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
 			eerror "Wine cannot be built with this version of gcc-5.3"
-			eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-			eerror "or use gcc-config to select a different compiler version."
+			eerror "due to compiler bugs; please use gcc-config to select a"
+			eerror "different compiler version."
 			eerror "See https://bugs.gentoo.org/574044"
 			eerror
 			return 1
@@ -265,8 +265,9 @@ src_prepare() {
 		eend $?
 
 		# To differentiate unofficial staging releases
-		[[ ! -z ${SUFFIX} ]] && \
+		if [[ ! -z ${SUFFIX} ]]; then
 			sed -i "s/(Staging)/(Staging [Unofficial])/" libs/wine/Makefile.in || die
+		fi
 	fi
 
 	autotools-utils_src_prepare

app-misc/ckb/Manifest

@@ -1 +1,2 @@
 DIST ckb-0.2.4.tar.gz 522149 SHA256 7c2c5cbf84cbde52b4310012e92278a05d53e7e56fc81ea04306df2131f39bc9 SHA512 fe55c8dc28728cc68baa754ed7e0f1296bcb1828bdbc9bc35ef7863b2a49e03e4533c919384494b88122559a88b3dd7c1040927c1ccdb90871d08f36b98e07f4 WHIRLPOOL c70a1d917b65106f611a0d2608efe24f81a38c13141049fa9d71c819bd078121b5f9db8f0b0cf25ddccfb2e2172f500ce05f8d5488abd3c8203d88f3727dbe8c
+DIST ckb-0.2.5.tar.gz 526703 SHA256 633ffaefcea14d1ec1cbf5cd28b8de364cbac601b7f4658a1e37f3d817241996 SHA512 169952991b259564372235e12ca0b03befdc013d3ee024c77799a40980b33d0990e6e56e3656a20285f0b6e1d00433ed710f705997797a2d004634c1c60c1e30 WHIRLPOOL 7b76e177cc2a82ba998494646f0f348f9b770b808d8d3fca3dcf0512f37850f5fbeb32de11543db5409df1644414fd35c6d4ee172b8b493fa14abe9acbcc3cb5

app-misc/ckb/ckb-0.2.5.ebuild

@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils systemd
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ccMSC/ckb"
+SRC_URI="https://github.com/ccMSC/ckb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-libs/quazip[qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md BUILD.md DAEMON.md )
+
+src_prepare() {
+	sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
+	sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip/" src/ckb/ckb.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dobin bin/ckb bin/ckb-daemon
+	dodir /usr/bin/ckb-animations
+	exeinto /usr/bin/ckb-animations
+	doexe bin/ckb-animations/*
+
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+	domenu usr/ckb.desktop
+	doicon usr/ckb.png
+	systemd_dounit service/systemd/ckb-daemon.service
+}

app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch

@@ -0,0 +1,44 @@
+This has been edited to fit geoclue that import the code from geocode-glib.
+--Anthony G. Basile
+
+From 3ce317a218c255b8a8025f8f2a6010ce500dc0ee Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Tue, 22 Mar 2016 09:48:00 +0000
+Subject: [PATCH] Use __UCLIBC__ when checking for GLIBC features
+
+Commit f0f85d8d introduces __GLIBC__ to check for glibc only features.
+However this is not sufficient for uClibc because it shares code with
+glibc.  To select for features in glibc but not uClibc, we need
+defined(__GLIBC__) && !defined(__UCLIBC__).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764021
+---
+ geocode-glib/geocode-glib.c | 4 ++--
+ geocode-glib/test-gcglib.c  | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/geocode-glib/geocode-glib.c b/src/geocode-glib/geocode-glib.c
+index 4e3b3fd..6215fd1 100644
+--- a/src/geocode-glib/geocode-glib.c
++++ b/src/geocode-glib/geocode-glib.c
+@@ -213,7 +213,7 @@ _geocode_object_get_lang (void)
+ 	return geocode_object_get_lang_for_locale (setlocale (LC_MESSAGES, NULL));
+ }
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ static gpointer
+ is_number_after_street (gpointer data)
+ {
+@@ -246,7 +246,7 @@ is_number_after_street (gpointer data)
+ gboolean
+ _geocode_object_is_number_after_street (void)
+ {
+-#ifndef __GLIBC__
++#if !defined(__GLIBC__) || defined(__UCLIBC__)
+ 	return FALSE;
+ #else
+ 	static GOnce once = G_ONCE_INIT;
+-- 
+2.7.3
+

app-misc/geoclue/geoclue-2.4.1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-GLIBC-features.patch
+}
+
 src_configure() {
 	# debug only affects CFLAGS
 	gnome2_src_configure \

app-misc/geoclue/geoclue-2.4.3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
+}
+
 src_configure() {
 	# debug only affects CFLAGS
 	gnome2_src_configure \

app-misc/media-player-info/media-player-info-22.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 # http://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b

app-office/calligra-l10n/calligra-l10n-2.9.11.ebuild

@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 DEPEND="sys-devel/gettext"
 RDEPEND="!app-office/koffice-l10n"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc"
 
 MY_LANGS="bs ca ca@valencia cs da de el en_GB es et fi fr gl hu it ja kk nb nl

app-office/calligra/calligra-2.9.11.ebuild

@@ -36,7 +36,7 @@ LICENSE="GPL-2"
 SLOT="4"
 
 if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds

app-shells/bash-completion/Manifest

@@ -2,5 +2,6 @@ DIST bash-completion-1.3.tar.bz2 211899 SHA256 8ebe30579f0f3e1a521013bcdd1831936
 DIST bash-completion-2.1.tar.bz2 265329 SHA256 2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f SHA512 0bc71039ef136b1ccb72527eb40f2ed4068a58dc31b1ac1ee52a40e7c950ea4cfbb4f1bee2f0da6774e56062578fa3653096e6d306eea7f028dd55ff737e92fe WHIRLPOOL 0275d8ac99a0ac5b12637bf2b13561d656b239ba7c166071cb283a481df2fdd904ad1c18608ea35b9af4f0f4db3b034f833f0fd586a0096626d1b268bcd8fc00
 DIST bash-completion-2.1_p20141224.tar.xz 257964 SHA256 a76ffdbc9f49f48e290f0e6f3d46060d51c770f91e25b35b014bc16fec76f517 SHA512 94649aad8dbf0f170422605a5f36c5cab61e45ce402a92f89a6eba3bd5d2e976087b35cd0a9b6d4d29ba608cee3bb27b692088c884b766447ee9eafa99c2814a WHIRLPOOL 0ea12dfc8f432ffed598aee65c7080de570ebe9783415c7ebe4bd5d152fc645a132fae3a28986c029d13a4b939e15053204d73ae9b207f4ad62b9c117bf59cba
 DIST bash-completion-2.2.tar.xz 271260 SHA256 4d47531b59e7bd3723b356a3977f85a088666de693d3af86fa0e6909166cdfac SHA512 58121bb281b41d6e353ba1e96c8b1890e34fc59375fffc15161d9222f33bbeb0d8c61feb2b6c027eeb44143f4c8e97dd7ffd8012671027980055ef2caeddf150 WHIRLPOOL b03f0cec12cce3e153307e197aadbb37ed02131bc9d26ece8cf22e9ee37b2fa26e723cbd44534b16b33b9fc3f055029546493d8550a839eacd38ba3fc379b2f5
+DIST bash-completion-2.3.tar.xz 272252 SHA256 b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9 SHA512 396c060fa39aa05866d26b573d6b9eebdb96e41a17ef723e95f8b01bbda32b0b83bf9e4d978a4f0a1c0590787ae797bb3b6417b95b877f8447037cb873ccf38a WHIRLPOOL fe5ebae1c77dfba504e8f79b130ba0bc80d882a045b980a23f4642e77dfb7bb79b529c1573b13fc0986f486c41696bb94fadef677e0cabfdffe7aeea6e8ff5c0
 DIST bashcomp-2.0.1.tar.bz2 4078 SHA256 142348b61b32fb3f1580ac90b684b1014d6d177f371baadb503340c507f9a992 SHA512 8ac8982f418a2d71dffcf027ffe0b7eefa3ee49413a726a8ee9e758975d8f86c687a64b55cd94e09b7936d1c6990285ddc90a3c2b1989af44322937c5c4fb8d7 WHIRLPOOL b6daa0a93282e9df73635cbdddde97c473fd22aa3baf035c3ffcb5966152e20b26d85979fe8a5ecf9128157422f3f60dc27c82c843b9a0e6e80b7de7da596250
 DIST bashcomp-2.0.2.tar.gz 3625 SHA256 6ede58bfbe99f0dca1eb9236492aa20a6755e5731526de56e15d1e2b220165c9 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce WHIRLPOOL 4b6cb989235d5fed8fd9986c1419ab337df38384fe2b307fd78f08f8696f4a2328845ed4f27913a36e9a544e973690bc0dd2af73816e272c3faf27ff2eafa585

app-shells/bash-completion/bash-completion-2.3.ebuild

@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+BASHCOMP_P=bashcomp-2.0.2
+inherit versionator
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+RDEPEND=">=app-shells/bash-4.3_p30-r1
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp"
+DEPEND="app-arch/xz-utils"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+# Remove unwanted completions.
+STRIP_COMPLETIONS=(
+	# Slackware package stuff, quite generic names cause collisions
+	# (e.g. with sys-apps/pacman)
+	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+	# Debian/Red Hat network stuff
+	ifdown ifup ifstatus
+
+	# Installed in app-editors/vim-core
+	xxd
+
+	# Now-dead symlinks to deprecated completions
+	hd ncal
+)
+
+src_prepare() {
+	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
+	# Bug 543100
+	eapply "${FILESDIR}/${PN}-2.1-escape-characters.patch"
+	eapply_user
+}
+
+src_test() { :; } # Skip testsuite because of interactive shell wrt #477066
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	local file
+	for file in "${STRIP_COMPLETIONS[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+	done
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	insinto /usr/share/eselect/modules
+	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.1-r90 ${v}; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}

app-text/glark/glark-1.10.5-r1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"

app-text/glark/glark-1.10.5.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"

app-text/jist/jist-1.5.1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""

app-text/kchmviewer/kchmviewer-7.5.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="qt5"
 
 RDEPEND="

app-text/mupdf/mupdf-1.8.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=179403598244f069b5
 LICENSE="AGPL-3"
 MY_SOVER=1.8
 SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X vanilla +curl javascript libressl opengl +openssl static static-libs"
 
 LIB_DEPEND="

app-text/ronn/ronn-0.7.3-r2.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"

app-vim/errsign/errsign-0.1-r1.ebuild

@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display marks on lines with errors"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1027"
+
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+'To use this plugin, simply type \\\\es in normal mode and any lines which
+have been marked as errors (for example, via :make) will be indicated with
+a >> mark on the left of the window.'

app-vim/greputils/greputils-2.8-r1.ebuild

@@ -20,7 +20,3 @@ RDEPEND="
 	>=app-vim/genutils-1.18
 	>=app-vim/multvals-3.6.1
 	>=app-vim/cmdalias-1.0"
-
-src_compile() {
-	default
-}

app-vim/merginal/Manifest

@@ -1 +1,2 @@
 DIST merginal-1.6.0.tar.gz 13882 SHA256 c2badc8a95fe0706465faedddbc08ca4bc83aa412fe226d7032171e8fc39a23a SHA512 9b3de15429160b4a2983f80c23483f7dee207586c89bbc70793b08639abff670762b54a4fac8f1bf907a0688ae4323876adcba29e3468f57ab0da57f5ce4105b WHIRLPOOL ff21e8228565707eb3cd794f48f68186f0da4a7f0412c61a762878718a617d6cb2de0b1beb769fe90162e50a80ac2feb494001e300d471bf78fe876c2185629f
+DIST merginal-2.0.0.tar.gz 14746 SHA256 43648f6e7fc8b9ac2a4dc727fc87d53db5565f823c1323e99a4fbf7574b2ce07 SHA512 9274749378981368c9afd6629b7b5bc0bd0e3153dda1a6828f43da31acd6e253637dd5703609a708b8b69dfe0d5a217d2414c36e947b985d97d341361fd4928e WHIRLPOOL 591c0c1466e79f8c210fe6f0c347a66eb1ef7ae92c42e8928cf44c036a0f05150c03f3cb83969fe3faa2fa80290a79bea5298be0c13d0aac23667def7895cc87

app-vim/merginal/merginal-2.0.0.ebuild

@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="fugitive extension to manage and merge git branches"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
+SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm README.md || die
+}

app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild

@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=830"
+LICENSE="vim"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for perl module Template-Toolkit"

app-vim/uptime/uptime-1.3-r1.ebuild

@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display vim uptimes"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=965"
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="uptime"

app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild

@@ -11,7 +11,3 @@ inherit vim-spell
 LICENSE="CC-BY-SA-2.0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
-
-src_compile() {
-	default
-}

dev-db/etcdctl/Manifest

@@ -1 +0,0 @@
-DIST etcdctl-0.4.6.zip 62437 SHA256 b57c463bfc65114b3f78406409edf693af6f79fa3d2937470081355d629121a7 SHA512 b47c3a0e2071e0352226e91f344839f1dfcd75dc8d11ca6b73c33a0570aabe94f557c3ed79ec9da9e0005656d8da49468c3df4a82df61c823cb1902b6e09bddd WHIRLPOOL a630d2d21956221363c292c37dd996a6fc0986eced0a58ec0703eabcd10b36106dd53f5a708b4aedb8158330f70e853c1228d611564d56b56838aa9d4a9342b4

dev-db/etcdctl/etcdctl-0.4.6-r1.ebuild

@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-KEYWORDS="~amd64"
-DESCRIPTION="A simple command line client for etcd"
-HOMEPAGE="https://github.com/coreos/etcdctl/"
-SRC_URI="https://github.com/coreos/etcdctl/archive/v${PV}.zip -> ${P}.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="examples"
-
-DEPEND=">=dev-lang/go-1.2:="
-RDEPEND=""
-
-src_prepare() {
-	sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
-		-i build || die
-}
-
-src_compile() {
-	CGO_CFLAGS="${CFLAGS}" ./build || die
-}
-
-src_test() {
-	./test || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-	use examples && dodoc -r examples
-}

dev-db/etcdctl/etcdctl-0.4.6.ebuild

@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-KEYWORDS="~amd64"
-DESCRIPTION="A simple command line client for etcd"
-HOMEPAGE="https://github.com/coreos/etcdctl/"
-SRC_URI="https://github.com/coreos/etcdctl/archive/v${PV}.zip -> ${P}.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="examples"
-
-DEPEND=">=dev-lang/go-1.2"
-RDEPEND=""
-
-src_prepare() {
-	sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
-		-i build || die
-}
-
-src_compile() {
-	CGO_CFLAGS="${CFLAGS}" ./build || die
-}
-
-src_test() {
-	./test || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-	use examples && dodoc -r examples
-}

dev-db/etcdctl/metadata.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <bugs-to>https://github.com/coreos/etcdctl/issues</bugs-to>
-    <changelog>https://github.com/coreos/etcdctl/commits/master</changelog>
-    <doc>https://github.com/coreos/etcdctl/blob/master/README.md</doc>
-    <remote-id type="github">coreos/etcdctl</remote-id>
-  </upstream>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>

dev-db/sqlite/Manifest

@@ -8,6 +8,7 @@ DIST sqlite-autoconf-3100200.tar.gz 2332013 SHA256 a2b3b4bd1291ea7d6c8252f7edff3
 DIST sqlite-autoconf-3110000.tar.gz 2359347 SHA256 508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb SHA512 208bb41e9b2a67ba5efdefe5393161996b7741a153647bd28b680a41a7d3c23f6c916bf6eede5325f507697fa92571c4982522ba9396a58e7a675564dec73865 WHIRLPOOL 9096de033729f27ccbdea0753b27a5170b1c1d7c6b016d00ad27c1a4b29dc8eabf15a1b8afcf97682f33b064552db3ceac5eb9d9612c8fd17d3602d3a592eb3d
 DIST sqlite-autoconf-3110100.tar.gz 2359545 SHA256 533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377 SHA512 c3efd2693e6a9526a2901d9879982a421e81e7e979aef65a160e71b255339344079a1943395480d5c37a1acc6243a8d45f45fa688f7e996774da38a3a99e71a1 WHIRLPOOL b8062e2030dffd8b44cc0eba32c93312b8ae20064004c460321a4251806037fe62ec5ef83499e491cb248786b9302f0495de0c0624128d0063cbff71b77b8864
 DIST sqlite-autoconf-3120000.tar.gz 2374101 SHA256 53ecdbb5287af673eca3710c5f6c2305e73bb2d034f2a28770bea2be92ed269e SHA512 84a9107ca9045ddc724d7e37dfe2b1dc00a106769260c7bd429a95beedc46a906985b65e0b2bf597de23dd56d132b9ef6888a8c4e5f8a731c8a5c026b971d89e WHIRLPOOL 4ec76b383670f2ee9c50870587696a3c86357161344851b487f54a03c668dac8c4272738b44e5a4048dd00bf2b3122904c53b6d2195f9b48aef3ad928f34b85b
+DIST sqlite-autoconf-3120100.tar.gz 2374576 SHA256 1c038519862b3983b0475f3ed3143ce4bbfcd21bfbd0741192f415838c831a7c SHA512 eb0b892bb6a1783df9b712d5f78c9f5fb5aa8ff1b1735fd2806e96b1c04e2a5f87b2e47469185195611a5cf6c446ec32935e9ae0b01734383a8fefc1bcaf5842 WHIRLPOOL 0284241a3fd6dbee16ba5fe4c1a0dc15b1b3134bd39ba8a2219c2da4e426e3572809459bbdc8bbf3fa4ea055406b85c547d8e7f05afcb57baa712653ce0d6f64
 DIST sqlite-doc-3081001.zip 5060040 SHA256 0b6c186a2da8b7d7397eb3942e97fd85b88734beb300702ace0dca4a3db729a6 SHA512 76caf476c98d8a0f5da55c4608bfc31235289e3ab2286089195fab86da6b5d98b2d5eb0fe7b81e3aff8f04939c9bcbfded6be22f0eeb21103478bf519e9ff78b WHIRLPOOL 5edd1d06babf19d54e326f6262d45851d43a0907adad66b130c93cf63efbfadcad6dbc98330bd4d2f80d1d528cd9088ada0727475b42005de6bcdbc4914e5d7c
 DIST sqlite-doc-3081002.zip 5068441 SHA256 e355ec10989829d485d2df08f076f6c3f598f7fc1d45d307b4fd70d5e609e6c4 SHA512 c222b250de6c8e182da1b534f459600a81b300c87578f9484b7d6f1fbbfaad9e8be70c306d0200b163850f48c974c55ce25782fefd55672ef72f03dc0b5f8d19 WHIRLPOOL 148bbce9bc3ffb1f9101e45936ce060aa49dbc88647effabf5418fa95ccdb91a4971d171d940de3307a2d59144e73250c43f8d8d79927ac36a1e02784f143061
 DIST sqlite-doc-3081101.zip 5108061 SHA256 89e3fc4bce7463885da3b03602b4260fe07240f9ea674ba4ac7ce2ee4987357f SHA512 8a39e05b1647f4769126234b9759552138f3e3874bc008686ef2f9136833ddc30b3b0696222a736d604e8910a436acedc4954e46894f4adc085eb5f2b6ab9280 WHIRLPOOL f47308753f8df2c497e1bf3cd941b862d69d4f6bbabb2f0606d144966cbb186c5e1513022a5adc122939180fc6cfaa7c83a9537481cce455a83b7bf68deec9cd
@@ -18,6 +19,7 @@ DIST sqlite-doc-3100200.zip 5374707 SHA256 21637344807efb9b6c6f615fd98b72620d074
 DIST sqlite-doc-3110000.zip 5382519 SHA256 4a942d89d5bf0aa70c0a01267a52961632b27512c293eb6452f6efe909dcec50 SHA512 1c9a17c1461bae78d34a89a7c2bc7e7108d95ece40c909835fc08a7f332823a152a7a357f83755d66307336ce116d9539ef67be44c5e11ec742721ac819fd708 WHIRLPOOL 742df247b6930062cf0904d03a9e543c1affc8f592f8675a99a95acf34501cc14b47ca9eb7ee8062f83960cfdb62b2a05656989e2438d45fe70c90c2c5ce518a
 DIST sqlite-doc-3110100.zip 5386958 SHA256 3f127c51c7936d13de96255b00a6be3862693ff025f61a1d3d17d3d57ee295d0 SHA512 b8fe71a852ce2fa3d7da27c09e3a1e8d019a9c55eb7e5516425754148f8d8a6cc88571d006768d5fd5b2c72aa513544bfc0ce4208f376099f8f08b7fee480d06 WHIRLPOOL 8cf7b3495ff184622dbf2842931d6b77061dc166c9d66e6bb6e400525c59ccc5b689b22cea45dad0fa7a7117692a1c16fea46aa4789084ce8c4de3655e973812
 DIST sqlite-doc-3120000.zip 5402611 SHA256 346d9d56a0193d9396948192b7eca9e45c2adfeea6bbf71df62502830da510f3 SHA512 7879d006e528d692ea5718f27d03e2dfe2a5e54aa135be983b992836102720df4dc690d84795115a25ed19a663e895a3f3f8a59d0de079c451d215e07081281e WHIRLPOOL 00f5bc4b82af1ba8d43ae4d0761dacd2e608009812a12fee9aedd333baec9b36f74542c60de4acacd19f5ef898d3bd57dfb705f3b21219ba3862ca91c2f76402
+DIST sqlite-doc-3120100.zip 5410493 SHA256 dbe53c076922c711a467dde57432583fbf9a12eac57cb75f6116a310880eb088 SHA512 d0117618d97744255248b9160816203147ba2afdb0bea5fe02d5e464541e09bc9147189317c6f849cc56059d6ae96e3e4b2a30cd8d0bc7b0e1ecacb573cfcdd4 WHIRLPOOL e3f054eda83301b9e4b5170bf9c56895756e4ac78a1c6256467c990fafccaeadec5f7ca54f1bf118bcb950f25db63df6c0972a138d36a10a0a9cfdf688eb207b
 DIST sqlite-src-3081001.zip 7648823 SHA256 def6e2401c8da91b489de19d1a1734f722b4e629148ab804776d27b49ba49e7b SHA512 7604ac35eddd4aca53c02b0ab7ae7682856aec2eb4e6a9627da041ea19d464bb6080a70d84070a94abf77eb14ae616a0a8c5fe2f2a6c19fc899d1b21535d3e1a WHIRLPOOL c44e4f446d12af1f4df49e171276d853381784e979d3521cafbfdd5b5359c792586d298f3573bbda8a260b9008a4b7fcdc4ce0382fdda18574287018a2cb4f4c
 DIST sqlite-src-3081002.zip 7648737 SHA256 fda379bc4590761838d02ac8008433b7c3eae6e120e45d639d24b09d0004b42d SHA512 99661c709ffe8d5776c3ed2c1a64c70f541b68f0c7745e3e769528273966f71eeb29e8911d42ede9420f179b7fcbda63c4d0980a9d7bc05e937d0a6deb7b814f WHIRLPOOL 4e13138a5f92f5c5fe65c8b670097b57ea778244a37a5bcabf75f86f4ac3f0bc17860f3e55833adc9adcc335b6aece396c685421b58ccb0ddca66f37edfda7fc
 DIST sqlite-src-3081101.zip 9057103 SHA256 261ad454663f66fda6101b278bb7b3931cf01884deefbf4ea6b152f83a624662 SHA512 e84048a4a7f9c51219698b59d45c0c533ffe46ba6a20b96ca40f8066fd3825f80f963283d61dc22b2eb5bbca35db3ed4a6e13b1ab3c8b70b0af83469d2760f16 WHIRLPOOL c1add1e5a269546883e58c1666b8acdc58b16b6ad37ea546c99c8ece3348196d5ba33effb17fc773f4d49b1ee45583de7fec3fbe2f6d48e95fdfe4a802c6a824
@@ -28,3 +30,4 @@ DIST sqlite-src-3100200.zip 9223036 SHA256 a45e1574e77951116cef6ad7eb79a683385a3
 DIST sqlite-src-3110000.zip 9293025 SHA256 ac670e151222f5deee88d7883d8d509a874fe0e5df288659ada011ca8b435db0 SHA512 c83c1449e4f39f3aa22522a0ae8afa875259a7e1db7af129a7d185246567337435093d1f3a21a5038bbc97e35bb582b240ecffbe24d9fd6b60012016b9ebeecc WHIRLPOOL bcee84e44827a2a051b7d7b99e6e636373d656cf682eb12dae33bb884f4596f5223007a0e4f13993edb8da13551acb2d0957e6c53260d1ff056ac44c3fecb7d8
 DIST sqlite-src-3110100.zip 9294249 SHA256 ade6aa93fd1d52dec0d8712f9ba4df59ecc6ec442f32ef28631c3b9341aadf97 SHA512 350c3019922a6adc1b7372f5e27c810a08f4bf576ea4e07d46bc59e1939a919d1bda1a29581f4df258f577202d79253292f719ca56ba30d1e7a1a2d801b65a48 WHIRLPOOL 3f7cc7baa7c59930e2e676d859478a68fddd392ccc4747630aa68c3909eb0b633d6031e9a998c1a741054594935dd52b3143ce05b574ff1b14f20f6ededc0a6e
 DIST sqlite-src-3120000.zip 9367749 SHA256 d891e7ffd56cd97d069a6ed99d7e85cbe655b0a97ca6b5398c7806e888642df1 SHA512 9669e33e328b826f4692725ec09e21d85f4f2c386c624a81b0535f41ca7d2f996ebf5018db8ecdfdac18cff39a881a953111801499705dfb599f00e3bb5d10e4 WHIRLPOOL 865aaecbe331ec93b1a8c5b965c3edc43d35994c2db79d336febb27860ee91d68753d3ea274b4639f3e05d3f0a589fb21aedac33bc2120a4de8d094383d7b923
+DIST sqlite-src-3120100.zip 9368459 SHA256 49b9819683f8f7329a78d2008e3f7c4e02126b556b95e5dfe3be102b9e741cff SHA512 6d0d7230343ca460215b5764d4a546631ddc2bcfc0777051379fb4632ccf9c36a53d26eda6811823156be166643c001c994a0f52498c6196ed13b34e931d55e1 WHIRLPOOL e41fd7a1ba870efb5421657975990c1d7e1ecc27023882771474a62e82b2ae305bc3d0b8556e0627de886d35e1b375fec223b3f70582d64fc5345c525b293131

dev-db/sqlite/sqlite-3.12.1.ebuild

@@ -0,0 +1,238 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_tarball() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_tarball; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_tarball; then
+		epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
+	else
+		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_tarball; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool rbu sqlite3-rbu
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+	fi
+}

dev-db/unixODBC/Manifest

@@ -1,2 +1,2 @@
-DIST unixODBC-2.3.1.tar.gz 1813380 SHA256 1f5be3edecff9e31072ef738ea1d8019594c4f0c2e3ab427e6eef153491db6a2 SHA512 682a4c58febb923491aba4cad8d07228330e5dccb7b8969e0a9d99f92cd90757bd931441f3391c8562ade89f3cfc82416bad8c63d6c0e60b55d0101829e8b872 WHIRLPOOL c3bae729f8af2d4a2680768f00e91044ea32fedc4e677230db3c6a321e8e41964b57b3f850aef6d8213c611f3d0b62822d3c68b8f1b9a11877403891d310e32a
 DIST unixODBC-2.3.2.tar.gz 1849173 SHA256 9c3459742f25df5aa3c10a61429bde51a6d4f11552c03095f1d33d7eb02b5c9a SHA512 31d705bf3dcaff6707d5680235b34e4d265a084b1de9e1b2ed3bbee1e1dfefdb4437fe3e1736b84e446d1927ec7622296d9e9b129052cb35f4b63b0bd79ccd13 WHIRLPOOL 05b8fe927a148a0b7ec7abecbac6f5370e904c669b5b0cc58840f7c2302e1df62901a1a627221057be6d4b8b90772854fe3db6e5fda2a5df02970073416ef5f0
+DIST unixODBC-2.3.4.tar.gz 1830660 SHA256 2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39 SHA512 34799777c95539905d4bbe60ad2b83631a31a68483b6be96dba25f80fa2fff4624ba170078097c942f2206873776d179d7d02a340598c4627f8723eb6f083a26 WHIRLPOOL 11fc01160a220d35dbf54ffc88ecb8bb41fc447c2a55e32adc27e5c909251017add3089d1517b0ca3bc1ba0f68055f3eb6a28dfc686706bc58f69258bfdb326a

dev-db/unixODBC/unixODBC-2.3.1-r1.ebuild

@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit libtool
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="http://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
-	>=sys-libs/readline-6.1
-	>=sys-libs/ncurses-5.7-r7
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--enable-iconv \
-		$(use_enable static-libs static) \
-		$(use_enable !minimal drivers) \
-		$(use_enable !minimal driverc) \
-		$(use_with unicode iconv-char-enc UTF8) \
-		$(use_with unicode iconv-ucode-enc UTF16LE)
-}
-
-src_install() {
-	default
-
-	use prefix && dodoc README*
-	use odbcmanual && dohtml -a css,gif,html,sql,vsd -r doc/*
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}

dev-db/unixODBC/unixODBC-2.3.1.ebuild

@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit libtool
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="http://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+minimal odbcmanual static-libs"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
-	>=sys-libs/readline-6.1
-	>=sys-libs/ncurses-5.7-r7
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		$(use_enable static-libs static) \
-		$(use_enable !minimal drivers) \
-		$(use_enable !minimal driverc)
-}
-
-src_install() {
-	default
-
-	use prefix && dodoc README*
-	use odbcmanual && dohtml -a css,gif,html,sql,vsd -r doc/*
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}

dev-db/unixODBC/unixODBC-2.3.4.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit libtool multilib-minimal
+
+DESCRIPTION="A complete ODBC driver manager"
+HOMEPAGE="http://www.unixodbc.org/"
+SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+minimal odbcmanual static-libs unicode"
+
+RDEPEND="|| (
+		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
+	)
+	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
+
+multilib_src_configure() {
+	# --enable-driver-conf is --enable-driverc as per configure.in
+	myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+		--enable-iconv
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable !minimal drivers)
+		$(use_enable !minimal driverc)
+		$(use_with unicode iconv-char-enc UTF8)
+		$(use_with unicode iconv-ucode-enc UTF16LE)
+	)
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	use prefix && dodoc README*
+	use odbcmanual && dohtml -a css,gif,html,sql,vsd -r doc/*
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}

dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch

@@ -0,0 +1,22 @@
+diff --git a/src/ParseLib2.hs b/src/ParseLib2.hs
+index 730e4be..a7406fa 100644
+--- a/src/ParseLib2.hs
++++ b/src/ParseLib2.hs
+@@ -34,2 +34,3 @@ module ParseLib2
+ import Data.Char
++import Control.Applicative hiding ( many )
+ import Control.Monad
+@@ -49,2 +50,6 @@ instance Functor Parser where
+ 
++instance Applicative Parser where
++    pure  = return
++    (<*>) = ap  -- defined in Control.Monad
++
+ instance Monad Parser where
+@@ -58,2 +63,6 @@ instance Monad Parser where
+ 
++instance Alternative Parser where
++    (<|>) = mplus
++    empty = mzero
++
+ instance MonadPlus Parser where

dev-lang/ekopath/Manifest

@@ -5,3 +5,4 @@ DIST ekopath-2016-03-03-installer.run 57856781 SHA256 0db16cf44f38e170e80230e08c
 DIST ekopath-2016-03-11-installer.run 57858541 SHA256 ff4dc9eca6c877a5a28e4249b783b742f2038d9e01fd1ad795bcbd5ad0059fa2 SHA512 339dd9cd2048629c4f1ef95e062b7029094b563cba9d078bebbd2b0d584da4840e3d824203767ee820da5dbd64b31dc1297529fe59ecdd028b1bad2dd602b3ed WHIRLPOOL ea7492fac3fffd611633d8b975fe73e2dcc3869d575de2fc5f9fc0e1694400e393f04728a63f372d2fd3f18a80ccb8d23ef518627e7d9474f4859b7d181af5ea
 DIST ekopath-2016-03-16-installer.run 57139166 SHA256 051f93cbb809471abc611cabc670b2d91ab2944a8f09e19ba2a64a1c99b76074 SHA512 356ffc628078e5e524ac5962b3c23c22f8d81fc5c7916ab5707755b853a27a89b7e6677b832a8cc6568499b2852c5c7916b57bad70ee3c027a595eacb4074c96 WHIRLPOOL c7d85d9c5b99b9527b6ed2aa434dac8aa90c8aaff73fa8300d67ba573b1fd0570d7ff33494a89ea20a9075557c6a1f7030efaa2b3ed86f0b70b919000177cfa1
 DIST ekopath-2016-03-24-installer.run 57140247 SHA256 4a1139432cd0eba1490bab6b18cb3d227e6b6ad9eb354be22a55b6914e436220 SHA512 314fb763972d53b9e0b95e02ff542deb663743185643a20845cca3d7098a264d857c6738e59c63490d1bbe7653d7fdd3e8463087c7755c8d0ae6bd73b53c308f WHIRLPOOL 83013389230b8cf1d5254822074e0bbdcf0de48e309900153fa5f58e2ab35d1f0577e1003d3f12ae34cbfe96ad77fa1d0b0d95f94c9d16b07381a49abb7ff6ac
+DIST ekopath-2016-04-09-installer.run 57165340 SHA256 ccdfe4aca6063d8cf885b3878b0ab12505aa765db081f4a0278e392f883dee46 SHA512 cdb8647d36ea8ca411cc2378d87c0a2edf34c834206905350a6cdde5ae0ed14f56f716ebb7ad28129b634088f94e0304c1cef3df1beaac38c3ccc87d5387dce0 WHIRLPOOL 299ac5494f17dc680a794f4cda3417e232c2fe6768df2ee5ba48356be0d929f7ed821b32b5e179c9fd0334081bcca61dddac577b6b8a63201723b1172f94a005

dev-lang/ekopath/ekopath-6.0.756_p20160409-r1.ebuild

@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit pax-utils versionator
+
+MY_PV=$(get_version_component_range 1-3)
+MY_P=${PN}-${MY_PV}
+DATE=$(get_version_component_range 4)
+DATE=${DATE#p}
+DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
+INSTALLER=${PN}-${DATE}-installer.run
+
+DESCRIPTION="PathScale EKOPath Compiler Suite"
+HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
+SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
+
+LICENSE="all-rights-reserved"
+SLOT="${MY_PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="!!app-arch/rpm"
+RDEPEND="!dev-lang/ekopath:0/${MY_PV}"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${MY_P}/*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
+	chmod +x "${S}/${INSTALLER}" || die
+}
+
+src_install() {
+	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
+	# We must use XT_PAX to run the installer.
+	if [[ ${PAX_MARKINGS} == "XT" ]]; then
+		pax-mark m "${INSTALLER}"
+	fi
+
+	./"${INSTALLER}" \
+		--prefix "${ED%/}/opt/${MY_P}" \
+		--mode unattended || die
+
+	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
+		local guess
+		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
+
+		if [[ ${guess[@]} ]]; then
+			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
+		else
+			die "No libdir installed"
+		fi
+	fi
+	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
+
+	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
+}

dev-lang/ekopath/ekopath-6.0.756_p20160409-r100.ebuild

@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit pax-utils versionator
+
+MY_PV=$(get_version_component_range 1-3)
+MY_P=${PN}-${MY_PV}
+DATE=$(get_version_component_range 4)
+DATE=${DATE#p}
+DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
+INSTALLER=${PN}-${DATE}-installer.run
+
+DESCRIPTION="PathScale EKOPath Compiler Suite"
+HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
+SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
+
+LICENSE="all-rights-reserved"
+SLOT="0/${MY_PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="!!app-arch/rpm"
+RDEPEND="!dev-lang/ekopath:${MY_PV}"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${MY_P}/*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
+	chmod +x "${S}/${INSTALLER}" || die
+}
+
+src_configure() {
+	cat > 99${PN} <<-EOF || die
+		PATH=${EROOT%/}/opt/${PN}/bin
+		ROOTPATH=${EROOT%/}/opt/${PN}/bin
+		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
+		MANPATH=${EROOT%/}/opt/${PN}/docs/man
+	EOF
+}
+
+src_install() {
+	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
+	# We must use XT_PAX to run the installer.
+	if [[ ${PAX_MARKINGS} == "XT" ]]; then
+		pax-mark m "${INSTALLER}"
+	fi
+
+	./"${INSTALLER}" \
+		--prefix "${ED%/}/opt/${MY_P}" \
+		--mode unattended || die
+
+	if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then
+		local guess
+		cd "${ED%/}/opt/${MY_P}/lib" && guess=( * )
+
+		if [[ ${guess[@]} ]]; then
+			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
+		else
+			die "No libdir installed"
+		fi
+	fi
+	[[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
+
+	rm -r "${ED}/opt/${MY_P}"/uninstall* || die
+	dosym ${MY_P} /opt/${PN}
+	doenvd 99${PN}
+}

dev-lang/go/go-1.6-r2.ebuild

@@ -60,6 +60,9 @@ RDEPEND="!<dev-go/go-tools-0_pre20150902"
 # These test data objects have writable/executable stacks.
 QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
 
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
 REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
 
 # The tools in /usr/lib/go should not cause the multilib-strict check to fail.

dev-lang/go/go-9999.ebuild

@@ -12,7 +12,7 @@ MY_PV=${PV/_/}
 inherit toolchain-funcs
 
 BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-SRC_URI="
+SRC_URI="!gccgo? (
 kernel_Darwin? (
 	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
 )
@@ -30,6 +30,7 @@ kernel_linux? (
 kernel_SunOS? (
 	x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap.tbz )
 )
+)
 "
 
 if [[ ${PV} = 9999 ]]; then
@@ -52,14 +53,17 @@ HOMEPAGE="http://www.golang.org"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-IUSE=""
+IUSE="gccgo"
 
-DEPEND=""
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
 RDEPEND="!<dev-go/go-tools-0_pre20150902"
 
 # These test data objects have writable/executable stacks.
 QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
 
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
 REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
 
 # The tools in /usr/lib/go should not cause the multilib-strict check to fail.
@@ -146,6 +150,14 @@ src_unpack()
 src_compile()
 {
 	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(type -P go-5 2>/dev/null)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-5 | sort -V | tail -n1)
+		[[ -x ${go_binary} ]] || die "go-5: command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
 	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
 	export GOROOT="$(pwd)"
 	export GOBIN="${GOROOT}/bin"

dev-lang/go/metadata.xml

@@ -10,4 +10,7 @@
 		Rob Pike. It has garbage collection, coroutines, communication
 		channels and a clean syntax.  
 	</longdescription>
+	<use>
+		<flag name="gccgo">Enable bootstrapping using gccgo</flag>
+	</use>
 </pkgmetadata>

dev-lang/mujs/mujs-0_p20150202.ebuild

@@ -12,7 +12,7 @@ SRC_URI="http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=c1ad1ba1e482e7d0174
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""

dev-lang/php/php-5.5.34.ebuild

@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {

dev-lang/php/php-5.6.20.ebuild

@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {

dev-libs/boost/boost-1.60.0.ebuild

@@ -171,7 +171,7 @@ src_configure() {
 	use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
 	mpi_needed || OPTIONS+=" --without-mpi"
 	use nls || OPTIONS+=" --without-locale"
-	use context || OPTIONS+=" --without-context --without-coroutine"
+	use context || OPTIONS+=" --without-context --without-coroutine --without-coroutine2"
 
 	OPTIONS+=" pch=off"
 	OPTIONS+=" --boost-build=\"${EPREFIX}\"/usr/share/boost-build --prefix=\"${ED}usr\""

dev-libs/libwacom/libwacom-0.18.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="

dev-ml/lambda-term/Manifest

@@ -1 +1,2 @@
+DIST lambda-term-1.10.tar.gz 161835 SHA256 152d1712655d7b61b0fe90abe43fcdead00945aa6ab636fef0b587a21bd697cf SHA512 112422775a5a3495d70059385ece2788244782b7f588ec5b5c35018658f52cab43cf0bdb829c359c503dba0a85eb104dced49d7bc071e61baf9d3f84cf8f9f18 WHIRLPOOL f78104a0debd91c038e45f28b8ffaadd8e4eb456ba39b5e68f2f5a1472a18749ec3d11c9a3f473453f30b406dad31c71d0b956586392acc9fb683bd4476b55d2
 DIST lambda-term-1.9.tar.gz 157782 SHA256 d21bd941cfaa98e5c08343fcb4c50fdb6e34600d8bff217c3356a4652e53f506 SHA512 f36aeac2693796c8e6058e13655b459523e2ce4e4fbd6662a2b135b65850421021b5ae3d7f370d64037e66fe8c8efe7d3ad953c280f200dbcb9ff75b6a6ca72a WHIRLPOOL 1850c99953c465ed2a3fa9d6d0bf9cb3c45aa16aa5a54cb00037cec3ef9395cde0e7aa367eb8e2987ad37f749c8e11033bb8ebbada02ccf903b52886998f0a3b

dev-ml/lambda-term/lambda-term-1.10.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A cross-platform library for manipulating the terminal"
+HOMEPAGE="https://github.com/diml/lambda-term"
+SRC_URI="https://github.com/diml/lambda-term/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-ml/lwt-2.4.0:=[react]
+	>=dev-ml/zed-1.2:=
+	>=dev-ml/camomile-0.8:=
+	dev-ml/react:=
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( "CHANGES.md" "README.md" )

dev-perl/Net-SSLeay/Net-SSLeay-1.720.0-r1.ebuild

@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl test minimal examples"
 
 RDEPEND="

dev-perl/Net-Telnet/Manifest

@@ -1,2 +1 @@
-DIST Net-Telnet-3.03.tar.gz 35641 SHA256 1604911947a283a8df2bde57a9adfe71e2717f6e0f915fcc73fc47a37130a16b SHA512 ef943616fb4f4272a658de27afa11b19b5010ab110451fc1661e22e60dbf4025a9cd86509a9742c980b46c8fb2f3e52c88e137295d2d35b76b18ff3fdf7d2331 WHIRLPOOL b76604564b8dacdb749fd47191b4f5b432bcaf91d3047ed63774a60167d9077a7e4593a180e5c7a50c2288adfe7da6daf79a1ec0a641a718c5a8326524c37072
 DIST Net-Telnet-3.04.tar.gz 40731 SHA256 e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a SHA512 1df68f55ad94d42e5e2be5e0669c2ecd0bc916f4ed929453ee2d136141ce413ff84b883d488c2f815c2c43132f7c3b36178177072fc5172c292e7bc39351dbdc WHIRLPOOL 3d2ec8669e485a603b2aa02768feb7adf500b75e14bf31c3de0087a3c3d88d846f6bfdf3098a133693945ae709363f8697c6c121b10eecdf771b2fad90bb3242

dev-perl/Net-Telnet/Net-Telnet-3.30.0-r1.ebuild

@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=JROGERS
-MODULE_VERSION=3.03
-inherit perl-module
-
-DESCRIPTION="A Telnet Perl Module"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=virtual/perl-libnet-1.0703"
-DEPEND="${RDEPEND}"

dev-perl/Net-Telnet/Net-Telnet-3.40.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="interact with TELNET port or other TCP ports in Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=virtual/perl-libnet-1.70.300"

dev-perl/Net-UPnP/Manifest

@@ -1,2 +1 @@
-DIST Net-UPnP-1.4.2.tar.gz 18910 SHA256 10595ff3e716fd3d0aa609c1304777e3a4acbc1ead983222ba8b6888ac5042f8 SHA512 ab03922b665c9d6df0b8ed28899865cd0e6cdbada8313b951378fcd464c56883503f65ef5b69a72948da4fbc35c09e3aba3e68804ca6313a70c864f4ac8e3932 WHIRLPOOL aa64ec1bacd279cad9505bfd34d5364a6eb7c9a25109626ce12b118bed7eae02c007ee18c324413b1f0c4d1d192ef8d71edd8b33c8ff2d8e2a7df53e7632560e
 DIST Net-UPnP-1.4.3.tar.gz 19169 SHA256 cf323b34adb07c4cf79443bbebbafca11e213f1c7a50b5fac5e572909598821b SHA512 72c8733402a7fec1ca24523dbf4b9d7baf0c1bcae44a36bc8ba2193cb40396f6285584c6fc11a961003477a9abbf0a4e2da9e1876e341ddc52da7850540fff8f WHIRLPOOL 049373a56bbacebb3cc38c5e5cbe9b0d942f296af804a7108618faa88d7aa1e66250f058c5a09bd087e9f2a8a0af6f0f26e23856687dae6a531d5e39a2a53960

dev-perl/Net-UPnP/Net-UPnP-1.4.2-r1.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SKONNO
-inherit perl-module
-
-DESCRIPTION="Perl extension for UPnP"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-solaris"
-# Package warrants IUSE examples
-IUSE=""
-
-RDEPEND="virtual/perl-version"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
-
-src_install() {
-	perl-module_src_install
-	dodir usr/share/doc/${PF}/examples
-	docompress -x usr/share/doc/${PF}/examples
-	insinto usr/share/doc/${PF}/
-	doins -r examples/
-}

dev-perl/Net-UPnP/Net-UPnP-1.4.3.ebuild

@@ -11,7 +11,7 @@ DESCRIPTION="Perl extension for UPnP"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~x86-solaris"
 # Package warrants IUSE examples
 IUSE="examples test"
 

dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild

@@ -12,7 +12,7 @@ DESCRIPTION="Manipulation and operations on IP addresses"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6"
 
 RDEPEND="ipv6? ( dev-perl/Socket6 )"

dev-perl/NetPacket/Manifest

@@ -1,2 +1 @@
-DIST NetPacket-1.4.1.tar.gz 30478 SHA256 44954d23446130f52152f3462dfd272ca1c9130afd3fd8dbb490a34ac3f7ae78 SHA512 c3cae0f9cd0d36896c986398ebb169457995d043af5bd32b25c8a359fb527e2ec1a4279dd9f9747d39d977e2581acaa18f74d95d58cbc3ad3468bbf159d16da8 WHIRLPOOL 3d9406cda96d5f3f1d43578424707c6843f166640daebdb90dcbdcede968384d28f0a4a2a6029aa42af5a8410e814e34bd2a37cc8190c1e282edd60496a67b7d
 DIST NetPacket-1.6.0.tar.gz 36685 SHA256 51938ebc26a55f366feeb041206694fef36a0d4f90fd511c56e06e031c2f0636 SHA512 9482b35294177fbf0c67474f0b14c87b3d8fb61497cef2c65fb942ff9472dc527d24a68fa8656ca71a0ddd73edb4a02240341177a36c4ed0e9b832b20b120349 WHIRLPOOL 09f82441a69ab49bd32ed90f79617b81e1b292b8cd96a036eee3985c2120edb6fef30ac6e9d657848021d352340d79873914f8324ccf60bd22d2214ccfbe2c61

dev-perl/NetPacket/NetPacket-1.4.1.ebuild

@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=YANICK
-MODULE_VERSION=1.4.1
-inherit perl-module
-
-DESCRIPTION="Perl NetPacket - network packets assembly/disassembly"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( >=virtual/perl-Test-Simple-0.94 )"
-
-SRC_TEST="do"

dev-perl/NetPacket/NetPacket-1.6.0.ebuild

@@ -11,7 +11,7 @@ DESCRIPTION="Assemble / disassemble network packets at the protocol level"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 
 RDEPEND="

dev-perl/News-Newsrc/Manifest

@@ -1,2 +1 @@
-DIST News-Newsrc-1.09.tar.gz 10696 SHA256 6938bdc6c8f9e37814dec1ce89492b6630313a670b6e7d6fc030265eb8bd8dfe SHA512 c46bc5e9a7ca368e2970386bc287f0e663cb26dbfb2193d88167dbdc7d5f6798af4ad03ec6e5756244cbe21b048d427a8198d0eb4e0116026bab7c0e9e75da10 WHIRLPOOL 0b40b9fd834761bf9aeb67f73e32f372357df24df778649d0b09c0d2880fabd96087c93421b901e3590f50e90baf10968680e4c75152533d7dbc4ef4ab08b0cf
 DIST News-Newsrc-1.11.tar.gz 11603 SHA256 11fb5b284bc690fa9bcb5f7d16575b4e6f0553fada8fcc5a087cd1b39d471051 SHA512 f5df8bc14f9793e0cb670a99feab065e7a392ba84c8b5f93cc14d7c1587f20603a77ee1bc06177737cf8a756fff276ba050d5c27e594d6b6e673c616e4234727 WHIRLPOOL a65169d8b1253ba569414eb96385cb068717e6bc221b3e08b10183b1a2a101067752c0339c2ebc5dd3a7d8b89cb438e333ba565a0b076129229c16290afc2881

dev-perl/News-Newsrc/News-Newsrc-1.110.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manage newsrc files"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="alpha amd64 hppa ~ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/Set-IntSpan-1.70.0"

dev-perl/News-Newsrc/News-Newsrc-1.90.0-r1.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SWMCD
-MODULE_VERSION=1.09
-inherit perl-module
-
-DESCRIPTION="Manage newsrc files"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/Set-IntSpan-1.07"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"

dev-perl/Number-Format/Manifest

@@ -1,2 +1 @@
-DIST Number-Format-1.73.tar.gz 22742 SHA256 84a2b722ef21ab92bd09ee8de9ecf9969cd95a0655815e8c9b0720669986e46c SHA512 52af1a595d9a62c9aabd57407c1807e71c7f2bfc591a835f73428848162fc0ab5aee7e78a8269304d44fceeb2654b8db40686eed8c6ff83e821b905905c75047 WHIRLPOOL 83dbd189322c74fcb3920ebcbf7da9cdb9e7632716e7965f5525ea433e3afa92c6d6fa17e59e906025f65b3caf643a139a8e19fbc9b2d9c04b60fcd9dff34724
 DIST Number-Format-1.75.tar.gz 24526 SHA256 82d659cb16461764fd44d11a9ce9e6a4f5e8767dc1069eb03467c6e55de257f3 SHA512 fa712a82b33ba062308e6bf29a4d99e73245f95495206e2c4252d8735d1851136553ec719a00683163aea0d3dddaa6bcc1261ef643439b870605df8ab17a40ef WHIRLPOOL ac725a90c75fcc31470eac247c26fdaba42a2988f6f04f39ff997c37807e66247826147f5ca695520e267aede42d22282a65b1b40fc30b6c420dfdad735cce34

dev-perl/Number-Format/Number-Format-1.730.0-r1.ebuild

@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=WRW
-MODULE_VERSION=1.73
-inherit perl-module
-
-DESCRIPTION="Package for formatting numbers for display"
-
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE=""
-
-SRC_TEST="do"

dev-perl/Number-Format/Number-Format-1.750.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Package for formatting numbers for display"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ia64 ppc x86"
 IUSE=""
 
 SRC_TEST="do"

dev-perl/OpenGL/OpenGL-0.670.400.ebuild

@@ -12,7 +12,7 @@ inherit perl-module eutils
 DESCRIPTION="Perl interface providing graphics display using OpenGL"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="

dev-perl/Package-DeprecationManager/Manifest

@@ -1,2 +1,3 @@
 DIST Package-DeprecationManager-0.13.tar.gz 10961 SHA256 d1e12143c9a6e9d4f101e43142622ab4894087d42937621e2c7430defbc07b3a SHA512 393841bc8a6a96dfc3ce9e2787d532f0e5ba45ef07a8d95be4450ad399b0ae3c4929f8abf07892194fca85c7de75c118a5b611a816b565a7945e34ebca36c4a8 WHIRLPOOL c6f5958b41333fd37006f94a727b4ae0adf65b4e3f43af738395e419bb9e789c2cf331d99025b8e69da4397cff54d922cf71df1460f4bcd1f40587434a181daf
 DIST Package-DeprecationManager-0.15.tar.gz 23626 SHA256 65c871f00849ba6a3369b3e4a5f206504e51bfb8eb2d2631fe2e18483fc29d61 SHA512 644aae95e7124f91dab9ab71e20679a310df869dc970ee3b180d8274657226d9ad91c79d56222f6b30ad026e92f4d86609b8933ce3fc1298247da15f4a5c542b WHIRLPOOL 0ef1e18212c6a85b5c13aafdba78a01a77f25705fe2830add4d13fc4d47acae516e08099d9b06fe8e32072079b04583e5be9e966a9d9b9b0f0e3f3e3c1a05f0e
+DIST Package-DeprecationManager-0.16.tar.gz 26872 SHA256 4018a06f7a3ba252c9eccc3fdcad9490cd003dfa6baf261545e96b5a82e784a7 SHA512 30723fd738907b68a2f2a2c09111ef6e2d01b3ec74b4805ce50b9464ed2e192e1d1604ad389e77cac963faf5fc299815735742207babf92c6a44d36120c4af27 WHIRLPOOL e229faa2cb5b9e5ee057e0db3a348c6434b330840910dff6c8c48f8b4fd4d148fd33c969e3d3c3c44e24b33f34fe2209c60a388da1afb7e9298e40031f0c55d9

dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.160.0.ebuild

@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=0.16
+inherit perl-module
+
+DESCRIPTION="Manage deprecation warnings for your distribution"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+	dev-perl/Package-Stash
+	dev-perl/Params-Util
+	dev-perl/Sub-Install
+	dev-perl/Sub-Name
+	dev-perl/namespace-autoclean
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/Test-Warnings
+	)
+"

dev-perl/Package-Stash-XS/Manifest

@@ -1,2 +1 @@
-DIST Package-Stash-XS-0.26.tar.gz 73481 SHA256 291f88803662dc4670e6a3703e981393939f774f0ddc596ea3c501d2c7bacddd SHA512 c63209b99bdeaf7ad0746901caaab8f9df4ad0f8daf12ac6ba0054c8f8b7250176c0cdbb93251021123d2d369fa5cb7272491764761dd6c21f0161ddc7879536 WHIRLPOOL 9dd36b40e16ee2327f0af954050e37d36896cd6c7d1ac40831b2cea5ed105d7255d99268713101a8e29f275c82e4f89ac449fe39e41c68891f0651b70d43c3c7
 DIST Package-Stash-XS-0.28.tar.gz 74161 SHA256 23d8c5c25768ef1dc0ce53b975796762df0d6e244445d06e48d794886c32d486 SHA512 409e884998bf063f438335067ff8f702aa1f12fc686c1912ad532f6536a711273e52c140d9c407c47b7ba4ccacedec480c1542437a90dd76367dc0f732c0db38 WHIRLPOOL 7dfebba59a312b4caefccc3b45ebd2824cfc03a12f8e0d80a8ca810bbd33ed43de96efc75a92d8ae81b60d483cdff8aa32fd7615b5a02a1f6ea64192d1fa982c

dev-perl/Package-Stash-XS/Package-Stash-XS-0.260.0.ebuild

@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DOY
-MODULE_VERSION=0.26
-inherit perl-module
-
-DESCRIPTION="Faster and more correct implementation of the Package::Stash API"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
-	test? (
-		dev-perl/Test-Fatal
-		dev-perl/Test-Requires
-		>=virtual/perl-Test-Simple-0.880.0
-	)"
-
-SRC_TEST="do"

dev-perl/Package-Variant/Manifest

@@ -1,2 +1 @@
-DIST Package-Variant-1.001002.tar.gz 8069 SHA256 594f21f721884a90582c9132552598ff8adcccae15ad0a971497bdd3f4ba7b66 SHA512 edbfb203f9fdd9962e2eea11f2c58aa12ad5547e73530ec550132045eaf3b547277696b7857540e9cf278792bab736285f69f2aa66c2a8f537d58c897112674e WHIRLPOOL 61fedc57f165c2347f3d4d413256b78f50e70ec01f4ffe4727b9461cb94b9760ce8ea85b3d640d4a53cef62065d2563f34e86f2b5e81f02c4797b5062fd8d604
 DIST Package-Variant-1.003002.tar.gz 10518 SHA256 b2ed849d2f4cdd66467512daa3f143266d6df810c5fae9175b252c57bc1536dc SHA512 0f311e73049df9a7a43a3e9eb3e4ba48120d119ab92161a4c0da532625d5705c6ee5b50f57d6b40ded30df82ce13b9dcced28894ddc7ee0068787b782fd33a4a WHIRLPOOL b48e510d68f1f715fac9349504635acbed98542185512d80c15c3cb750ea40424ef59d5e0d02bbe66d3d44d10ed50d17aca9152590922459b0eec228e514dd63