Merge remote-tracking branch 'remotes/sbraz/jaraco-classes'

Pull request: https://github.com/gentoo/gentoo/pull/554

42 files changed, 655 insertions, 184 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index f8bcc9c853d4..5dee812999b2 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,4 +1,5 @@
 DIST gnupg-1.4.19.tar.bz2 3713811 SHA256 7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86 SHA512 cce2a83efb05f963ad0f8afd04999cc852889d46b4cad4cf399a37fd6e69f0911a5ccaa0192cb891a941cfa93125349b481efa789a127e3c0aa2c5ba53672741 WHIRLPOOL 14eaddca0981f05757aa0751b9563837efd3f5943a422d5f29e0de94eb6233b85b8848a1f4816ab7e897d6e656c7c08705115d53ed89f554604ffd2009c3c39f
+DIST gnupg-1.4.20.tar.bz2 3692881 SHA256 04988b1030fa28ddf961ca8ff6f0f8984e0cddcb1eb02859d5d8fe0fe237edcc SHA512 8a66d5a45dcf0508601452061eb1965c3c56c56f0e5ded00b7f54c6104de0a305c1d526abd37be2f55cd9bde79600d9cfaf60536af77ff733d778ace5fcd9dad WHIRLPOOL 26344b6ba0e5f0f11fa411f5af265c922b3b1d62ff030433eb8dc6fef00dbf2ec3370ecb081dd5c6cf85a4a37e7f12aacc83e07b803cc80adda29a11a4a3c715
 DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
 DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
 DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
diff --git a/app-crypt/gnupg/gnupg-1.4.20.ebuild b/app-crypt/gnupg/gnupg-1.4.20.ebuild
new file mode 100644
index 000000000000..2691b18636a6
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.20.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+ECCVER="0.2.0"
+ECCVER_GNUPG="1.4.9"
+ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
+MY_P=${P/_/}
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib"
+
+COMMON_DEPEND="
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	curl? ( net-misc/curl )
+	mta? ( virtual/mta )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( =virtual/libusb-0* )
+	usb? ( =virtual/libusb-0* )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND} )
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# bug#469388
+	sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in
+
+	# Fix PIC definitions
+	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
+		|| die "sed PIC failed"
+	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
+		die "sed PIC failed"
+}
+
+src_configure() {
+	# Certain sparc32 machines seem to have trouble building correctly with
+	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
+	# fix until the gcc problem can be tracked down.
+	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
+	fi
+
+	# 'USE=static' support was requested in #29299
+	use static && append-ldflags -static
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable ldap) \
+		$(use_enable mta mailto) \
+		--enable-hkp \
+		--enable-finger \
+		$(use_with !zlib included-zlib) \
+		$(use_with curl libcurl /usr) \
+		$(use_enable nls) \
+		$(use_enable bzip2) \
+		$(use_enable smartcard card-support) \
+		$(use_enable selinux selinux-support) \
+		--without-capabilities \
+		$(use_with readline) \
+		$(use_with usb libusb /usr) \
+		--enable-static-rnd=linux \
+		--libexecdir="${EPREFIX}/usr/libexec" \
+		--enable-noexecstack \
+		CC_FOR_BUILD=$(tc-getBUILD_CC) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	# keep the documentation in /usr/share/doc/...
+	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
+
+	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
+
+	exeinto /usr/libexec/gnupg
+	doexe tools/make-dns-cert
+}
+
+pkg_postinst() {
+	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
+	ewarn "you MUST make the gpg binary setuid."
+	echo
+#	if use !bindist && use ecc; then
+#		ewarn
+#		ewarn "The elliptical curves patch is experimental"
+#		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
+#	fi
+	elog
+	elog "See https://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	elog
+	elog "If you wish to view images emerge:"
+	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+	elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
+}
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index ac8ed7b336c6..95750cb5dd9c 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -1,2 +1,3 @@
 DIST ruby.eselect-20131227.bz2 1920 SHA256 b425962f9898ceb8bcdbb55d9648f3d98b82a916c4afa95b2fb1ddcd39cc3689 SHA512 9f13d4a6dc45923f88b145984f9c537846d4cb937b73c2be916792c70ff3c751f1e12b76f33686e35053bf6af1392e6c7e276f06dfb728e6a20f6335f739b784 WHIRLPOOL 38135af69952aff7cf874608365029947733733d33a3c586367ccf6fceb1bf2236781c9fe554a5654f720c19ef0fb0bd3dd5773a108386c6185a2fc2d94ac37b
 DIST ruby.eselect-20141227.bz2 1926 SHA256 eef9af23d4990f6a1b8b0b921ec7de9087143486b6a0faf076bdc90e093dd83a SHA512 f8fb92c171cf653da22402785d80a671e4b4c7eeea9f41c33a70475264aa2d7e5f62c998e5f63ff011f9f4e1953d75022c23e1dfc3ef81041168167fa301560c WHIRLPOOL 5f6be4dcba75fd7f252b9037417be707f0528c14075f01ad644f9ebcac7032ae96278ba1bcbd79b6d9b265699f9cfaf532fe58ae10e057ebfeb89de34c6be3be
+DIST ruby.eselect-20151229.xz 1900 SHA256 29d6ae00efc58c0a60b0b3d429b4933a059cd25063b9e6f07aa6113a9d2f2b81 SHA512 a11b0d0694278b231fa07aa0dc2f1cb252faed7a70c26f8ded51ee922ce0c50076f748f9acd38e02394ccdbeaf2722d2f53ed335cab539faa19d943548c2d89b WHIRLPOOL 227d279c95e15d741c8347ec9abf652680a528998c7800599db9c7bb31a16f97733b110baa96bcf94c6d4910288af36e62e400787f3a3f3ab6661b42198db1b2
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20151229.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20151229.ebuild
new file mode 100644
index 000000000000..61ac3c7f299a
--- /dev/null
+++ b/app-eselect/eselect-ruby/eselect-ruby-20151229.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Manages multiple Ruby versions"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="https://dev.gentoo.org/~flameeyes/ruby-team/ruby.eselect-${PVR}.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.2"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die
+}
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch
new file mode 100644
index 000000000000..e8ed54a8c705
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch
@@ -0,0 +1,39 @@
+Last-Update: 2015-10-24
+Forwarded: not-needed
+Bug-Upstream: https://bugs.mysql.com/bug.php?id=78668
+From: Marcin Szalowicz
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Description: fix FTBFS
+ ~~~~
+ library/forms/view.cpp:515:32: error: cannot convert 'boost::signals2::signal<bool()>::result_type {aka boost::optional<bool>}' to 'bool' in return
+      return _signal_mouse_leave();
+                                 ^
+ library/forms/CMakeFiles/mforms.dir/build.make:1865: recipe for target 'library/forms/CMakeFiles/mforms.dir/view.cpp.o' failed
+ ~~~~
+
+--- a/library/forms/swig/mforms.i
++++ b/library/forms/swig/mforms.i
+@@ -532,9 +532,9 @@
+ 	void add_##method(PyObject *callback) { signal->connect(pycall_void_toolbaritem_fun(callback)); }
+ 
+ #define SWIG_ADD_SIGNAL_BOOL_INT_CALLBACK(method, signal)\
+         void add_##method(PyObject *callback) { signal->connect(pycall_bool_int_fun(callback)); }\
+-        bool call_##method(int i) { return (*signal)(i); }
++        bool call_##method(int i) { return *( (*signal)(i) ); }
+ 
+ #define SWIG_ADD_SIGNAL_VOID_ENTRYACTION_CALLBACK(method, signal)\
+ 	void add_##method(PyObject *callback) { signal->connect(pycall_void_entryaction_fun(callback)); }
+ 
+--- a/library/forms/view.cpp
++++ b/library/forms/view.cpp
+@@ -511,9 +511,9 @@
+ 
+ bool View::mouse_leave()
+ {
+   if (_signal_mouse_leave.num_slots() > 0)
+-    return _signal_mouse_leave();
++    return *_signal_mouse_leave();
+   return false;
+ }
+ 
+ //--------------------------------------------------------------------------------------------------
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
new file mode 100644
index 000000000000..6635b1b2f81b
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+CMAKE_MIN_VERSION="2.8.11.1"
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="http://dev.mysql.com/workbench/"
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+		dev-libs/glib:2
+		dev-cpp/atkmm
+		dev-cpp/pangomm
+		>=dev-cpp/glibmm-2.14:2
+		>=dev-cpp/gtkmm-2.14:2.4
+		dev-libs/atk
+		x11-libs/pango
+		>=x11-libs/gtk+-2.20:2
+		gnome-base/libglade:2.0
+		>=x11-libs/cairo-1.5.12[glib,svg]
+		dev-libs/libsigc++:2
+		>=dev-libs/boost-1.55.0[nls]
+		>=dev-cpp/ctemplate-0.95
+		>=dev-libs/libxml2-2.6.2:2
+		dev-libs/libzip
+		>=virtual/mysql-5.1
+		dev-libs/libpcre
+		>=sci-libs/gdal-1.11.1-r1[-mdb]
+		virtual/opengl
+		>=dev-lang/lua-5.1:0[deprecated]
+		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+		dev-libs/tinyxml[stl]
+		dev-db/mysql-connector-c++
+		dev-db/vsqlite++
+		|| ( dev-db/libiodbc dev-db/unixODBC )
+		gnome-keyring? ( gnome-base/libgnome-keyring )
+			dev-python/pexpect
+			>=dev-python/paramiko-1.7.4
+	"
+
+# lua perhaps no longer needed? Was used via libgrt only
+
+RDEPEND="${CDEPEND}
+		app-admin/sudo
+		>=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+		dev-lang/swig
+		virtual/jre
+		virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+src_unpack() {
+	unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+	## Patch CMakeLists.txt
+	epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
+		"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
+		"${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \
+		"${FILESDIR}/${PN}-6.3.4-cxx11.patch"
+
+	sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \
+		modules/db.mysql.sqlparser/CMakeLists.txt
+
+	## remove hardcoded CXXFLAGS
+	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+
+	## package is very fragile...
+	strip-flags
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	local mycmakeargs=(
+		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure
+}
+
+src_compile() {
+	# Work around parallel build issues, bug 507838
+	cmake-utils_src_compile -j1
+}
diff --git a/dev-libs/fampp2/fampp2-7.0.1-r1.ebuild b/dev-libs/fampp2/fampp2-7.0.1-r1.ebuild
new file mode 100644
index 000000000000..665bb038be7d
--- /dev/null
+++ b/dev-libs/fampp2/fampp2-7.0.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="C++ wrapper for fam"
+HOMEPAGE="https://sourceforge.net/projects/fampp/"
+SRC_URI="mirror://sourceforge/fampp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples stlport"
+
+RDEPEND="virtual/fam
+	stlport? ( dev-libs/STLport )
+	>=dev-libs/ferrisloki-2.0.3[stlport?]
+	>=dev-libs/libsigc++-2.6:2
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Fix compat with libsigc++-2.6
+	find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die
+	find -name '*.hh' -exec sed -i '/sigc++\/object.h/d' {} + || die
+	find -name '*.cpp' -exec sed -i '/sigc++\/object.h/d' {} + || die
+	find -name '*.cpp' -exec sed -i '/sigc++\/object_slot.h/d' {} + || die
+	append-cxxflags -std=c++11
+
+	sed -ri \
+		-e '/^C(XX)?FLAGS/s:-O0 -g::' \
+		-e '/^LDFLAGS/s:-Wl,-O1 -Wl,--hash-style=both::' \
+		configure || die "sed failed"
+}
+
+src_configure() {
+	# glib and gtk+ are only required for some examples
+	econf \
+		--disable-glibtest \
+		--disable-gtktest \
+		--with-stlport=/usr/include/stlport \
+		$(use_enable stlport)
+
+	if ! use examples ; then
+		sed -i -e '/^SUBDIRS/ s/examples//' Makefile.in || die "sed failed"
+	fi
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-perl/CDB_File/CDB_File-0.970.0-r1.ebuild b/dev-perl/CDB_File/CDB_File-0.970.0-r1.ebuild
deleted file mode 100644
index 5c848cc0a99d..000000000000
--- a/dev-perl/CDB_File/CDB_File-0.970.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=TODDR
-MODULE_VERSION=0.97
-inherit perl-module
-
-DESCRIPTION="Tie to CDB (Bernstein's constant DB) files"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-perl/CDB_File/Manifest b/dev-perl/CDB_File/Manifest
index afe0b3c57b4e..0013a525dbb8 100644
--- a/dev-perl/CDB_File/Manifest
+++ b/dev-perl/CDB_File/Manifest
@@ -1,2 +1 @@
-DIST CDB_File-0.97.tar.gz 16516 SHA256 9602f924f257627578455a2c695af52e09b44481e14993ee8c5e86510c946d6b SHA512 14717bd982b089cb24e439079dc3f057c9ee72ce70f8650bdfb9e2e733e8c133ba9d3bb145d278ae220b6b35d242a4a6b62cb9edd19248d98138ae24ccafac40 WHIRLPOOL fa4060868a757f3139d07adc0c223fbebbdd5792815180566a266ea6f028e30203d8b6de0e954b0ac7fe92c76ea980f2e502908d91b69c9fbca4d16f8f3cdaa9
 DIST CDB_File-0.98.tar.gz 59965 SHA256 576a5617040f39d26ace6693d921d7b31e91212f718ab4e852694c7bc6d1b990 SHA512 ae49e97c2bf6ef5d9eba04490f473c88d6ccfe13081b4cb6bb588c0b6eb0019eca7cadf5db324f8846ef6cba6ac039d4afc885571e7eaa8e48888058bf48b6e9 WHIRLPOOL 769d595f82ace72dbe3fd6c13f9c5e200faa3096a00d0c8e418e8ed3ef2675c3cfc863f22cce8ef2a9f57a3b2bd3b324c1637942791edd04e782f0d304bf6ce9
diff --git a/dev-perl/CDDB/CDDB-1.220.0-r1.ebuild b/dev-perl/CDDB/CDDB-1.220.0-r1.ebuild
deleted file mode 100644
index 765409bb4027..000000000000
--- a/dev-perl/CDDB/CDDB-1.220.0-r1.ebuild
+++ /dev/null
@@ -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=RCAPUTO
-MODULE_VERSION=1.220
-inherit perl-module
-
-DESCRIPTION="high-level interface to cddb/freedb protocol"
-
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE=""
-
-SRC_TEST=no
diff --git a/dev-perl/CDDB/Manifest b/dev-perl/CDDB/Manifest
index e4c9f3894d03..8ba2f945774d 100644
--- a/dev-perl/CDDB/Manifest
+++ b/dev-perl/CDDB/Manifest
@@ -1,2 +1 @@
-DIST CDDB-1.220.tar.gz 23760 SHA256 210ba032bbcf3a6c3ff0508c5b4fcfd5a649cad17aeb4ca7f5e444c73f84022f SHA512 47165194ec310ff7e8df3b7ac3192bdf7f5b55f795457434ba28e50094db21d8702b678f5baa269045fcb7e4a2a1430699decc2c061620dcb1d3f25cd8939957 WHIRLPOOL e2891faa24a747dedf07e8984f6dfb636dae1a9b3cd4ef75cba35068a352dd40c58e5262670b2f1b72b2bca9452ef05e4e24f0097c923ca7337be669fa803252
 DIST CDDB-1.222.tar.gz 45771 SHA256 29aa34bb7dc358382a675324df2b537177a136ebf2111bb353f1d978b5198393 SHA512 addd0f4f3fecab7d599eb7ead93828d6a9c74a779a344f190a629e666c95af47b5eea05f885564a90bfa1fa6c128dc3e60e510f295f6f35b3eae2d8939109d98 WHIRLPOOL 27a81a0b9ae4bde56df1ea713e2fd987909e9d50cdfa3a386f992b15ef92f3446dd49c72f8d0ec03a13cf7df2d85c5b5d7698bb18dab25d46c0ffebc47d8eb92
diff --git a/dev-perl/CDDB_get/CDDB_get-2.270.0-r1.ebuild b/dev-perl/CDDB_get/CDDB_get-2.270.0-r1.ebuild
deleted file mode 100644
index b8cb633df156..000000000000
--- a/dev-perl/CDDB_get/CDDB_get-2.270.0-r1.ebuild
+++ /dev/null
@@ -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=FONKIE
-MODULE_VERSION=2.27
-inherit perl-module
-
-DESCRIPTION="Read the CDDB entry for an audio CD in your drive"
-SRC_URI+=" http://armin.emx.at/cddb/${PN}-${MODULE_VERSION}.tar.gz"
-HOMEPAGE="http://armin.emx.at/cddb/ ${HOMEPAGE}"
-
-LICENSE="|| ( Artistic GPL-2 )" # "as perl, either GPL-2 or Artistic"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/CDDB_get/Manifest b/dev-perl/CDDB_get/Manifest
index d83f63808d01..3a7d8678aa5c 100644
--- a/dev-perl/CDDB_get/Manifest
+++ b/dev-perl/CDDB_get/Manifest
@@ -1,2 +1 @@
-DIST CDDB_get-2.27.tar.gz 21820 SHA256 bab3b34efb33b86604440fdcdc2a00e27313055af7bb8f0d9cef0ccfe2ba6122 SHA512 21260b7e9ed1bd559cbe112062b9f72a5517ac48bf4abcf449e0b90fc35228e0406cbb58a79a4d8024b2e5a6327f41b92fe29358404750a2e97cbcfb01e7f3b9 WHIRLPOOL a1429e270f29d8e31b39d76137083986efe355f4c4a02acccec864bae8f42425473b5f3a59db445a10991871a47f95ed33249398df3fdb0951be81cbde902fbf
 DIST CDDB_get-2.28.tar.gz 22052 SHA256 bdccba1fa8e4c1cf3189c5e5a3529a6693a648aa5282b597538c7aaddce6d9c9 SHA512 436156971a9c52c364ef86b670b212973566b9b77a4411edada144eff370d166ed105a13488650c7092ea90bc2754bb203684396fce648b132e379945ca5f1f9 WHIRLPOOL 76de3be49e300d7989d2c333479b6d7c43b72258c457c502ce49d1f4bde6e38d37b84646d26e0906e5cf1b27e3250fa1afb4c64faa785d12f64bb2f7786648e6
diff --git a/dev-perl/CGI-Emulate-PSGI/CGI-Emulate-PSGI-0.200.0.ebuild b/dev-perl/CGI-Emulate-PSGI/CGI-Emulate-PSGI-0.200.0.ebuild
deleted file mode 100644
index 5ad0f5daed64..000000000000
--- a/dev-perl/CGI-Emulate-PSGI/CGI-Emulate-PSGI-0.200.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=0.20
-inherit perl-module
-
-DESCRIPTION="PSGI adapter for CGI"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/CGI-3.630.0
-	dev-perl/HTTP-Message
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		>=dev-perl/Test-Requires-0.80.0
-	)
-"
-
-SRC_TEST=do
diff --git a/dev-perl/CGI-Emulate-PSGI/Manifest b/dev-perl/CGI-Emulate-PSGI/Manifest
index 61b4edc64c20..b74eaa2fda09 100644
--- a/dev-perl/CGI-Emulate-PSGI/Manifest
+++ b/dev-perl/CGI-Emulate-PSGI/Manifest
@@ -1,2 +1 @@
-DIST CGI-Emulate-PSGI-0.20.tar.gz 14321 SHA256 3865106b22b88a0fa55821c84625acdbfa4758b1d341c6abe62613d363e2d3c2 SHA512 34f2d5e0a93e3b63a9409274d5a93f6718314e55a80c87c707ad846d7542fe64c7660786801e005402051871b9a1d9dc311d78854e5e7daddc33a9a276b031e3 WHIRLPOOL 911dd7e30219b5e1dd05f0e47f44ebc01df3d2053df45193b9498fada6438114b113123c356a6d9922597a426e3025ae4e6e99371aa710d233006b4c1f103ebc
 DIST CGI-Emulate-PSGI-0.21.tar.gz 14429 SHA256 06b8f1864101de69b2264ad3c3a2b15333e428cf9f5d17a777cfc61f8c64093f SHA512 598355fe77f3fa2b71d713809fd73909bbb74b317dc34fb0febed851fc25cfb56ac622d070551f8bdb582ba0ab0bbd69b0e9185d059d5351f02faffe75ea2be8 WHIRLPOOL b4f64077d2b5c967666e7e1a54a7e5127bebd02779ad15c2f71d9e585d9cfbbbb3f89ec9defea17d377c6fabc1a20bd82ee9393f3409e87378bea17f7ecf47f4
diff --git a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.80.0-r1.ebuild b/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.80.0-r1.ebuild
deleted file mode 100644
index d6c414f10aee..000000000000
--- a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.80.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=NWIGER
-MODULE_VERSION=3.08
-MODULE_A_EXT=tgz
-inherit perl-module
-
-DESCRIPTION="Extremely fast, reliable form generation and processing module"
-HOMEPAGE="http://www.formbuilder.org/ ${HOMEPAGE}"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Templates that can be used - but they are optional
-#	>=dev-perl/HTML-Template-2.60.0
-#	>=dev-perl/text-template-1.430.0
-#	>=dev-perl/CGI-FastTemplate-1.90.0
-#	>=dev-perl/Template-Toolkit-2.80.0
-#	>=dev-perl/CGI-SSI-0.920.0
-
-RDEPEND="dev-perl/CGI"
-
-SRC_TEST=do
diff --git a/dev-perl/CGI-FormBuilder/Manifest b/dev-perl/CGI-FormBuilder/Manifest
index 859060cae381..55ff407af8fb 100644
--- a/dev-perl/CGI-FormBuilder/Manifest
+++ b/dev-perl/CGI-FormBuilder/Manifest
@@ -1,2 +1 @@
-DIST CGI-FormBuilder-3.08.tgz 155393 SHA256 f7af79df9af541d1ed12dc41a8d3e61b9a1037710308bd29213020d4e3ab074c SHA512 6e184b9cd87b70012004a3893e11904629eb7e7f2770b51930d18d164970e11c2119b5dd8279a85129867802a5fd61741bd652f7180b60e0f4ce4e47df2c3918 WHIRLPOOL a13adb45b8c686dccaa8f3d3a9f749759531e048d040d5cb278b2195fbd3c4299e83ad2a7fba78de13ae517191c8b5c751a0d41a3b9e4a5cda48c1ce7f84c129
 DIST CGI-FormBuilder-3.09.tgz 163526 SHA256 654907527717c3bbb169c739a9a817f14552054619ab3c93d6a5f808649fa863 SHA512 6907131de95ac0188a4a80e380fd81554bd9fb8d2566e961e5ff05a30e4498bccb157ecfdc77bdcd05427ebc5882caaea47b044aaaddae85f48231c0b7eef240 WHIRLPOOL 1424607dc1d931e9fc71717ccb05c8b42d12b9d65cecf3b36ace4e5b5bb79db9075abae6110ed59ee3f169c853a450c2c8f065e038f49dbb4b4386799db42a51
diff --git a/dev-perl/CGI/CGI-4.220.0-r1.ebuild b/dev-perl/CGI/CGI-4.220.0-r1.ebuild
index 9d2500eac0ae..b41f77634eb2 100644
--- a/dev-perl/CGI/CGI-4.220.0-r1.ebuild
+++ b/dev-perl/CGI/CGI-4.220.0-r1.ebuild
@@ -29,5 +29,6 @@ DEPEND="${RDEPEND}
 	test? (
 		>=virtual/perl-Test-Simple-0.980.0
 		dev-perl/Test-Warn
+		dev-perl/Test-NoWarnings
 	)
 "
diff --git a/dev-perl/CGI/CGI-4.220.0.ebuild b/dev-perl/CGI/CGI-4.220.0.ebuild
index 583eed9deb47..9b7bd69699e7 100644
--- a/dev-perl/CGI/CGI-4.220.0.ebuild
+++ b/dev-perl/CGI/CGI-4.220.0.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 	test? (
 		>=virtual/perl-Test-Simple-0.980.0
 		dev-perl/Test-Warn
+		dev-perl/Test-NoWarnings
 	)
 "
 
diff --git a/dev-perl/CGI/CGI-4.210.0.ebuild b/dev-perl/CGI/CGI-4.250.0.ebuild
index 7b7de7827459..6e45b8747c82 100644
--- a/dev-perl/CGI/CGI-4.210.0.ebuild
+++ b/dev-perl/CGI/CGI-4.250.0.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-MODULE_AUTHOR=LEEJO
-MODULE_VERSION=4.21
+DIST_AUTHOR=LEEJO
+DIST_VERSION=4.25
 inherit perl-module
 
 DESCRIPTION="Simple Common Gateway Interface Class"
@@ -29,7 +29,6 @@ DEPEND="${RDEPEND}
 	test? (
 		>=virtual/perl-Test-Simple-0.980.0
 		dev-perl/Test-Warn
+		dev-perl/Test-NoWarnings
 	)
 "
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/CGI/Manifest b/dev-perl/CGI/Manifest
index b61b77170767..f32f05187ca4 100644
--- a/dev-perl/CGI/Manifest
+++ b/dev-perl/CGI/Manifest
@@ -1,3 +1,3 @@
-DIST CGI-4.21.tar.gz 194539 SHA256 340d20a2b67211752d7c270c589e463d71aea8b8d75d9417250618219d3cf884 SHA512 cc208b452f59b6fed51442c75ac1634115cbb25a6dfafcdb3e3dbad49a259a450de8abe8abcc66763976f54ae207fbaada5cede550056b5351e0b21a4af707a2 WHIRLPOOL 2656c9ac28eacf16962c0cf9c1efdd8b2988ad72130b3a4a88d60f5dacc112a9df9df018fef1d1fa137203aa4047c0983fd6bb95773d1d40fdef2d200968cb36
 DIST CGI-4.22.tar.gz 194314 SHA256 8cd695f032b630fc4b5cf6c0a39912ff30cae0f7da03d01965ca2ac28b4dcca8 SHA512 becd37e56ca3fe8a6ab6069d99ddc65838d4aa00b57b6e30a5e2bcf73e84dff9a3f5f2841549f6627fe29d46607254197f3a03f308dc5fb6add3ece60719871d WHIRLPOOL 003483d2852493ad2b4be0bbd018e590d264592dcd3e37da6adfaa004c3818c9c4cbf631635ede5b3cf0150429f7b4ce0e8ce647969ed6fff66fc905e918c849
+DIST CGI-4.25.tar.gz 194815 SHA256 efb3e5235ada6a91f97ca2905399a686bedea60f6b525e52f4a147baff4f131a SHA512 2f9befda944867d751a100024732de71073a47c2e63fdbbf86291422258da47adfe9677b7c39451958cf6e936a015c1b9c7f8338563f2548b7446128f9cb6b8b WHIRLPOOL 295a7fe94d6d7b4a6c01ce3aa41b356bb278ae9004c278b75c512094db5919860bf2d089f884d9bc77d9be4aea728f3fb964fa1f0cba45702b6a1dee1d6b153c
 DIST CGI.pm-3.65.tar.gz 247466 SHA256 556d0f9047affa6873da996d8cc077bff797c13f95be89eb771d7247b8f0828a SHA512 b2022b5bf8244be65c1e25394570043585af909947f28a9b0505c0eabca642bd96f58ed90ab2e5c82146192530030cf6b88d4115851dddf3523836c8178ccb8e WHIRLPOOL c6f9251513bd09c78b0785a478047906c47fea82604aa0a64e7943a554e061563d4386fd22a5ba8a83ba98000d19ec82e582fa292c5774443fcefe9b8d98c7bc
diff --git a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.210.0-r1.ebuild b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.210.0-r1.ebuild
deleted file mode 100644
index af2292d8c9a8..000000000000
--- a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.210.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=KROKI
-MODULE_VERSION=0.21
-inherit perl-module
-
-DESCRIPTION="Perl client for memcached, in C language"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SRC_TEST="do"
-
-MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/dev-perl/Cache-Memcached-Fast/Manifest b/dev-perl/Cache-Memcached-Fast/Manifest
index c2a081187796..b3cdfeeaa4e5 100644
--- a/dev-perl/Cache-Memcached-Fast/Manifest
+++ b/dev-perl/Cache-Memcached-Fast/Manifest
@@ -1,2 +1 @@
-DIST Cache-Memcached-Fast-0.21.tar.gz 95139 SHA256 b17c2bc65f886dcd3a8b822d76a50de2f8addfd0b5a857988967adaffc9c7c53 SHA512 e81c2c0dc57e0823dc2df4f6ee5fc62bb53af248def15d8e7693631b615ebb896950cf5d12b22aa34132ff9e12a8f53727849522b839aca4f7dd080addc90202 WHIRLPOOL cd17f8fd029cc0ccf1bee2b49591367faef827f47cf0f09ca08969edfec8f63838082d5a47ac3482534ee6c9c2fa6757c490fddc5c6df338295ec3cc12035520
 DIST Cache-Memcached-Fast-0.23.tar.gz 102205 SHA256 df20beaebf85180154be5a99886686793cf1beee9081ed7de0ae66c4573d200f SHA512 2023eaec65da3ad8ac48907f86dd2f6a679939659a0047c46654aafaf3aceefcd0e03aee340214aa4300a0f4469da74b646a7a1f2c99ea9dcc6e3438f5d7899e WHIRLPOOL 34a54ed1c27524631849fca7720dad5b866c777e7c6776e7e2463add63a4af535eb4519b72db325f1c9a85af14165350c0d7c2739c2dd75b290a0a2f312da411
diff --git a/dev-perl/Cairo/Cairo-1.105.0.ebuild b/dev-perl/Cairo/Cairo-1.105.0.ebuild
deleted file mode 100644
index 3000242b6570..000000000000
--- a/dev-perl/Cairo/Cairo-1.105.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=XAOC
-MODULE_VERSION=1.105
-inherit perl-module
-
-DESCRIPTION="Perl interface to the cairo library"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=x11-libs/cairo-1.0.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/ExtUtils-Depends-0.200.0
-	>=dev-perl/extutils-pkgconfig-1.0.0
-	test? (
-		dev-perl/Test-Number-Delta
-	)
-"
-
-SRC_TEST="do"
-
-src_prepare() {
-	perl-module_src_prepare
-	sed -i -e 's,exit 0,exit 1,' "${S}"/Makefile.PL || die
-}
diff --git a/dev-perl/Cairo/Manifest b/dev-perl/Cairo/Manifest
index 51da8a9e9183..f2fdfbc49e72 100644
--- a/dev-perl/Cairo/Manifest
+++ b/dev-perl/Cairo/Manifest
@@ -1,3 +1,2 @@
 DIST Cairo-1.103.tar.gz 108254 SHA256 eaebd9c3b9d66b4c41533ec7c736a2a4b73e0bf6ad207132a970d83a85827872 SHA512 d7e7488af7e52834762f0baef48687989fc64c44518c1b5c4312299bba4a3a0f69e5af05fac02440ae70fb1dd474fae9974f8913809c1b17fcabf7527bc68b46 WHIRLPOOL 79ff6d205be88167adac29303aac6c2219d9637671f4d4d707841bdac09803891861f37a46451eeef96746ffe1f22791af60146711a1eee8b5690faa66e5774f
-DIST Cairo-1.105.tar.gz 108695 SHA256 98201dea8f31a369bbf9b276065425dd58b710a8d14478d6e1868ce07911a046 SHA512 45e2712aca89eedc68b205f6aa6baa7b4c44c8f09da91aef02b08f1b148594c4332a6f81976c53f561ba94b8d63de6ce227dadb25e11e0796ac77bf1a310fbbf WHIRLPOOL 65807dbb4e015ecff4600f8593b01cc20ba2cc120f1e99bb669ba7303a47a3e0b62cca1bbd6f1338f8631589c7656d5ce20715648382742682c9b6b167496528
 DIST Cairo-1.106.tar.gz 108779 SHA256 e64803018bc7cba49e73e258547f5378cc4249797beafec524852140f49c45c4 SHA512 190435f99e4c7a8f5e8d48834639b9e12c6bc4d5dfe721a2820de3479dd3f2144e1fc1ea74e7796fd7b219a45591b55c7648488e6dd276106bc5e51b0467fee7 WHIRLPOOL 8672355f074c75fd1562525e848f5ef186de44bbe46e43b1ba47d8e42e0c2c95dbe33c0dd92171480546ba314879351cf71fb2b60ff3c61c9fa60d8d33f7bd8e
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
new file mode 100644
index 000000000000..740eaa44f878
--- /dev/null
+++ b/dev-python/jaraco-classes/Manifest
@@ -0,0 +1 @@
+DIST jaraco.classes-1.2.zip 7366 SHA256 656ae3efdf65405fdafff2efd913ef7aece61701271ebfe145d8c1a3b5bf5777 SHA512 7f4ec185c55fda7604146b0891de84e7ed433f1ea52f0b381c91ee36be6ae8ee44ebcb709ecd453481a28db99694f6807cd310aa64de3fddbfe495449772b08b WHIRLPOOL c44131060a1fc39aba5000751e3e9d6ea4a747e4e9d2a8bbeb79402adccc13770649705eb032b63b4ed336330dc7a22dc1dbd2d358162be0285e2a9ca4349ca9
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.2.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.2.ebuild
new file mode 100644
index 000000000000..41336f17a2a7
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="https://bitbucket.org/jaraco/jaraco.classes"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip
+	dev-python/hgtools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	if use test && has_version "${CATEGORY}/${PN}"; then
+		die "Ensure $PN is not already installed or the test suite will fail"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-classes/metadata.xml b/dev-python/jaraco-classes/metadata.xml
new file mode 100644
index 000000000000..93370f5a39ad
--- /dev/null
+++ b/dev-python/jaraco-classes/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.classes</remote-id>
+		<remote-id type="bitbucket">jaraco/jaraco.classes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/eclass/clutter.eclass b/eclass/clutter.eclass
index 7451c173b6b5..9d049fde2ae7 100644
--- a/eclass/clutter.eclass
+++ b/eclass/clutter.eclass
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# @DEAD
+
 # @ECLASS: clutter.eclass
 # @MAINTAINER:
 # GNOME Herd <gnome@gentoo.org>
@@ -16,6 +18,8 @@ HOMEPAGE="http://www.clutter-project.org/"
 RV=($(get_version_components))
 SRC_URI="http://www.clutter-project.org/sources/${PN}/${RV[0]}.${RV[1]}/${P}.tar.bz2"
 
+eqawarn "emul-linux-x86.eclass is last rited and will be removed on 2016-01-29."
+
 # All official clutter packages use LGPL-2.1 or later
 LICENSE="${LICENSE:-LGPL-2.1+}"
 
diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
index cdd7bb9a6a02..03208c8adccb 100644
--- a/media-libs/libyami/Manifest
+++ b/media-libs/libyami/Manifest
@@ -1 +1,2 @@
 DIST libyami-0.3.0.tar.gz 484586 SHA256 67064558999d63185025a6d63d08458375003bb86369abca50aca97fd2c63acb SHA512 691cbe90840d8cb30da958bb6621434c9962ae6cbfc75b016454570c303a01e7a465baa8622368cf1ef1c670dbc861fb1d49e0c414d684feae04ea742e8e0599 WHIRLPOOL d842f1ce57d40894b80f868934d687603014b6460bdbd274b64893d8f290f8a6a779239f931beb759a7fb8e5ed1649b90fb545391c1d9c8395bb05f6600218d2
+DIST libyami-0.3.1.tar.gz 492223 SHA256 7ab680138a1d34eb306bc941198f0715631bc8e5b0ee5717b3171f6672ca3bcb SHA512 eb58a6925de8379e40b2482780340becdb8c9295041bba11bf439cc2ff19c25f10ce4b1fc2b6c421342855946ddd471745bdfb364a227499658867911325b375 WHIRLPOOL ce44614aa04127c828761319dd96ee35956daea9cf7577e7631083e10db744c76596da7135f8f6c16952639c601ee065afe8c0097bf6d23829dc9893c4aa414f
diff --git a/media-libs/libyami/libyami-0.3.1.ebuild b/media-libs/libyami/libyami-0.3.1.ebuild
new file mode 100644
index 000000000000..3951d2f79326
--- /dev/null
+++ b/media-libs/libyami/libyami-0.3.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM=git-r3
+	EGIT_REPO_URI="https://github.com/01org/libyami"
+fi
+
+inherit ${SCM} autotools multilib-minimal
+
+DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
+HOMEPAGE="https://github.com/01org/libyami"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+capi debug dmabuf doc ffmpeg gles +glx libav md5 tools v4l X"
+
+RDEPEND="
+	>=x11-libs/libva-1.6[drm,X?,${MULTILIB_USEDEP}]
+	v4l? (
+		glx? (
+			>=x11-libs/libva-1.6[X,${MULTILIB_USEDEP}]
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=virtual/opengl-7[${MULTILIB_USEDEP}]
+		)
+		!glx? ( >=media-libs/mesa-10[egl,${MULTILIB_USEDEP}] )
+		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
+	)
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+		libav? ( media-video/libav:=[${MULTILIB_USEDEP}] )
+	)
+	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	tools? (
+		gles? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] )
+		v4l? ( !glx? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] ) )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(multilib_native_use_enable tools tests) \
+		$(use gles && multilib_native_use_enable tools tests-gles) \
+		$(use_enable v4l v4l2) \
+		$(usex v4l $(use_enable glx v4l2-glx) "--disable-v4l2-glx") \
+		$(use_enable capi) \
+		$(use_enable X x11) \
+		$(use_enable dmabuf) \
+		$(use_enable ffmpeg avformat) \
+		$(use_enable md5) \
+		$(multilib_native_use_enable doc docs) \
+		--enable-vp8dec \
+		--enable-vp9dec \
+		--enable-jpegdec \
+		--enable-h264dec \
+		--disable-h265dec \
+		--enable-h264enc \
+		--enable-jpegenc \
+		--enable-vp8enc \
+		--enable-h265enc
+
+	# h265 decoder doesnt build here with gcc 5.2
+}
+
+multilib_src_compile() {
+	emake
+	multilib_is_native_abi && use doc && emake -C doc
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dohtml -r doc/html/*
+}
+
+src_install() {
+	multilib-minimal_src_install
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r5.ebuild
index 18ae08915982..b973c8a4e723 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r5.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
 	>=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
 
-	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[${MULTILIB_USEDEP}] )
+	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[postproc,${MULTILIB_USEDEP}] )
 	libav? (
 		>=media-video/libav-11.3:0=[${MULTILIB_USEDEP}]
 		>=media-libs/libpostproc-10.20140517-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.2-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..921d54a95307
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+# XXX: bzip2/lzma are automagic
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# Upstream dropped support for system libav and won't work
+	# for preserving its compat anymore, forcing us to rely on internal
+	# ffmpeg copy if we don't want to cause unresolvable blockers for
+	# libav setups.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
+	# Prefer system ffmpeg for -libav
+	local myconf
+
+	if use libav; then
+		ewarn "Using internal ffmpeg copy as upstream dropped the"
+		ewarn "the support for compiling against system libav"
+		ewarn "http://bugzilla.gnome.org/show_bug.cgi?id=758183"
+	else
+		myconf="--with-system-libav"
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="https://www.gentoo.org" \
+		--disable-fatal-warnings \
+		$(use_enable orc) \
+		${myconf}
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index fd0de24966c8..7891d839203c 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1 +1,2 @@
 DIST gstreamer-vaapi-0.6.1.tar.bz2 1403160 SHA256 36fc8afeb7ec679ea8df34671a34dba57dcc0b66255fb0991acb485e3efd67b3 SHA512 94dab46414da2b43b9f0fc119c8d901848ad637b1161644888072a733423c60c2b858a37467fc26a4341133c88940304fc70fd328dde9ac0bfba129722771ea8 WHIRLPOOL 49efe4f708810bc786c78f0950ed8249bcbb44113f8a3ce3518ef26eb5168397053314030d324b45346cf50c539d92c0aca5993e949b572a74772da025c4a7af
+DIST gstreamer-vaapi-0.7.0.tar.bz2 2362818 SHA256 abe8ea4dfb3177d038b38610537c651b943707ed110882782a19b95a9ea04a92 SHA512 8594b97320b34c586fde0ab76f44cd6b8ee2404101259a65d2a457a89d75f158368c35471d85d82cd47beb5163fb075142fc2aeb0364566e1da7971a98a92357 WHIRLPOOL 4624d59a88482896da43da940c203181dcf66cd1ede82faa45efe200d30e1efda6872f08b758df2deadbce1fee476815ef0653f45234da81c1590c953ca613d5
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
new file mode 100644
index 000000000000..c2d0d53f2f8b
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib-minimal
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin"
+HOMEPAGE="https://github.com/01org/gstreamer-vaapi"
+SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+drm opengl wayland +X"
+REQUIRED_USE="|| ( drm opengl wayland X )"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.6:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.6:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-1.6:1.0[opengl?,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-1.4.0[drm?,X?,opengl?,wayland?,${MULTILIB_USEDEP}]
+	drm? (
+		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-builtin-libvpx=no \
+		--disable-static \
+		--enable-egl \
+		$(use_enable drm) \
+		$(use_enable opengl glx) \
+		$(use_enable wayland) \
+		$(use_enable X x11)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
index 074441b2a546..45af29fc7813 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-libs/gstreamer:1.0[introspection]
 	media-libs/gst-plugins-base:1.0[introspection]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.26
 	virtual/pkgconfig
 "
diff --git a/net-misc/sparkleshare/metadata.xml b/net-misc/sparkleshare/metadata.xml
index f58e21d0ebfb..e9f16675f8e9 100644
--- a/net-misc/sparkleshare/metadata.xml
+++ b/net-misc/sparkleshare/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 	<upstream>
 		<remote-id type="bitbucket">hbons/sparkleshare</remote-id>
 	</upstream>
diff --git a/sci-biology/allpathslg/allpathslg-52488.ebuild b/sci-biology/allpathslg/allpathslg-52488.ebuild
index effa25cc9a32..4518cacee1ff 100644
--- a/sci-biology/allpathslg/allpathslg-52488.ebuild
+++ b/sci-biology/allpathslg/allpathslg-52488.ebuild
@@ -19,7 +19,7 @@ IUSE="openmp"
 DEPEND="
 	dev-libs/boost
 	!sci-biology/allpaths
-	sci-biology/vaal"
+	!sci-biology/vaal"
 RDEPEND=""
 
 PATCHES=("${FILESDIR}/${P}_fix-buildsystem.patch" "${FILESDIR}/${P}_remove-namespace-std.patch")
diff --git a/sys-libs/ldb/ldb-1.1.24.ebuild b/sys-libs/ldb/ldb-1.1.24.ebuild
index 650024c84f93..3624f4a99679 100644
--- a/sys-libs/ldb/ldb-1.1.24.ebuild
+++ b/sys-libs/ldb/ldb-1.1.24.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="dev-libs/popt
diff --git a/sys-libs/talloc/talloc-2.1.5.ebuild b/sys-libs/talloc/talloc-2.1.5.ebuild
index 6efd84bc132e..fc66def84bde 100644
--- a/sys-libs/talloc/talloc-2.1.5.ebuild
+++ b/sys-libs/talloc/talloc-2.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.3.8.ebuild b/sys-libs/tdb/tdb-1.3.8.ebuild
index 884d02974449..e291b6ad40f3 100644
--- a/sys-libs/tdb/tdb-1.3.8.ebuild
+++ b/sys-libs/tdb/tdb-1.3.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tevent/tevent-0.9.26.ebuild b/sys-libs/tevent/tevent-0.9.26.ebuild
index 4563290a66f2..c65b39c922b5 100644
--- a/sys-libs/tevent/tevent-0.9.26.ebuild
+++ b/sys-libs/tevent/tevent-0.9.26.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="python"
 
 RDEPEND=">=sys-libs/talloc-2.1.5[${MULTILIB_USEDEP}]