Merge remote-tracking branch 'github/pr/548'.

65 files changed, 1059 insertions, 563 deletions

diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
new file mode 100644
index 00000000000..b83a73bed1a
--- /dev/null
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
+
+DEPEND=""
+RDEPEND=">=app-admin/eselect-1.2.3
+		 >=media-libs/fontconfig-2.4"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${S}"/fontconfig.eselect-${PV} fontconfig.eselect
+}
diff --git a/app-eselect/eselect-opencl/Manifest b/app-eselect/eselect-opencl/Manifest
index c4ba2e13a7d..0c3a3b675fc 100644
--- a/app-eselect/eselect-opencl/Manifest
+++ b/app-eselect/eselect-opencl/Manifest
@@ -5,6 +5,5 @@ DIST cl_gl.h.1.1.xz 1856 SHA256 eeddf3403c13776b3d13a25c9e47a01eee750c0120f74d40
 DIST cl_gl_ext.h.1.1.xz 1356 SHA256 594e463e3a24e62870c5c1914b05e796aeda8892bf6830ee8db3f722993fdf02 SHA512 23fbc933e0beb2748152fa058d8ed413351fcfce167b9788c8a3529323b89e57eb1bf84d998fc262081410985f476bbf56fdd0bffe73f08135f5c90b7d09bb8d WHIRLPOOL 94301285dd567d8c7c9145d49801ea5c7e0ae4f5c01a9f93bcea667df925ea9d55a5ec978c3c05337306bdd0d53b829a9c03cbe8131982b2eddae23fc2eb1e5c
 DIST cl_platform.h.1.1.xz 5584 SHA256 2f70eb47285fd46f75d48476e90ee3b7e9ba62166bc573bbb35cb0f9d7a2ea53 SHA512 8265cd3b3630d367fe494a60911564e57169d03948827a0e2ca0669678b4a5b595b22ae2786a7c42c0b96fd6fbfb7d326c63759cfd1b7888b8cd35588b5f7544 WHIRLPOOL aa5e12ec2eb49323f9812ae51d5b45db2919488bd36fd58bb40eb6538020e8de732aa60a4fc1b8bf913cdfbdf35c0ebe63fd8cd0b8f415d34cbdce4d54207ff7
 DIST eselect-opencl-1.1.0-r1.tar.xz 3276 SHA256 86a2f5f152e543046899989b3a12a065dfc357a2276ce06d69d19bdbf175fdea SHA512 b2be1e2035fda4e119f03e9ef84fbf1f09fc0bd5475d3fe30d2330dac76180930451d78dbb9e158c34dee9ce524076434254757b594e84dea96341e52ef13c14 WHIRLPOOL 4df96b5f97b6071c27c613addd0b579deb800012ba2640814dcb107ec6ab9f3fac6384c4c3313bd245d62eb2a376e378e0820ef891bed6b41b778721b325f667
-DIST eselect-opencl-1.1.0.tar.xz 3272 SHA256 0b49d847d4475119f969fc7bbcdc4ceb1905e37e102b10d0bdad4f8e6010bbbe SHA512 ffa026fe7569dbd9833fd246a494048965c183d877216e3e436cbde11ed26c1f5ba9139b15d25801dc066d957d13f1b6332de7d104951c511f6554ebe5bd6ddb WHIRLPOOL bf0bd8810b133e1d78ed222814a0366a2689dfe3c8f7b308efab4248e7cd4def9a158e0fa12a15f21e5e74ec38d0fc56a875770f2f01a17823c1c750f73305d3
 DIST opencl-headers-1.2.tar.gz 122068 SHA256 c35c1aada9984b24784d6b6a5752e22b9c70646043344e0f45830c9dc5ae28c4 SHA512 0780c96d47a7ad41f6b31d46d41be77651d27d5decd1a4248c452d8bf763b6fc3b76597352bd259778c5846c62c17f077ff8db5504da39844c8e6e07c7d9a264 WHIRLPOOL 4f5c1058d23f91d806dba861fefd5cf3685a12a78217136adc0ac2f630995c82fa6d537e3cd67b6b2e2d01b6de12c30dc7e039b9aaa057661deb7f10a466f48d
 DIST opencl.h.1.1.xz 944 SHA256 c076e410eaffd9fbb056528f31a59fe1908481f0fd38981c13970727a0c4d096 SHA512 62b5ae61f2d9a44e9f8b6a7e3421cacfe5291bc9b5430845d469ea5a6404d71d3ab49d78c6da2588eab2bcd5f9b0d86c53f3aa74bd7c43c960ad86f0eab9595c WHIRLPOOL bd3d946b6c361187d9d7c4337287c24161fc0f291cfc810c0bcf05d9fe120192a853fe7b69500783b7ec1994e9b265d84eb82b8fc681df060c16aa3d038c8374
diff --git a/app-eselect/eselect-opencl/eselect-opencl-1.1.0.ebuild b/app-eselect/eselect-opencl/eselect-opencl-1.1.0.ebuild
deleted file mode 100644
index 02397fce580..00000000000
--- a/app-eselect/eselect-opencl/eselect-opencl-1.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-CL_ABI=1.1
-
-inherit multilib
-
-DESCRIPTION="Utility to change the OpenCL implementation being used"
-HOMEPAGE="https://www.gentoo.org/"
-
-# Source:
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
-
-MIRROR="https://dev.gentoo.org/~xarthisius/distfiles/"
-SRC_URI="${MIRROR}/opencl.h.${CL_ABI}.xz
-	${MIRROR}/cl_platform.h.${CL_ABI}.xz
-	${MIRROR}/cl.h.${CL_ABI}.xz
-	${MIRROR}/cl_ext.h.${CL_ABI}.xz
-	${MIRROR}/cl_gl.h.${CL_ABI}.xz
-	${MIRROR}/cl_gl_ext.h.${CL_ABI}.xz
-	${MIRROR}/cl.hpp.${CL_ABI}.xz
-	${MIRROR}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=">=app-admin/eselect-1.2.4"
-
-pkg_postinst() {
-	local impl="$(eselect opencl show)"
-	if [[ -n "${impl}"  && "${impl}" != '(none)' ]] ; then
-		eselect opencl set "${impl}"
-	fi
-}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins opencl.eselect
-	#doman opencl.eselect.5
-
-	local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl.hpp )
-	insinto /usr/$(get_libdir)/OpenCL/global/include/CL
-	cd "${WORKDIR}"
-	for f in ${headers[@]}; do
-		newins ${f}.${CL_ABI} ${f}
-	done
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.1.ebuild b/app-text/jabref-bin/jabref-bin-3.1.ebuild
index 0bb35a2712c..862601ec7b4 100644
--- a/app-text/jabref-bin/jabref-bin-3.1.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=virtual/jre-1.6"
+RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
 
 S="${WORKDIR}"
 
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index b8141c67aa4..5d59b6859dc 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,3 +1,4 @@
 DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d
 DIST sword-1.7.2.tar.gz 2127944 SHA256 ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871 SHA512 1ee9565f36d113c9b21883a78004e895ab2f74d9c9f1909058c204e38647a96938de2e544a68858d2c4b048b67ba868049c1c09f0067bc9819a5a85f75285ebe WHIRLPOOL 894e4d96b2ff61ac19de853ff6b17aa2279fb7b5b571c1030ba18daefbea8997bd61d386ff3a1dff49d997c69d6acf2a83094ad6ec5c593acca3dc7fb1d488a0
 DIST sword-1.7.3.tar.gz 2149459 SHA256 5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea SHA512 4805215954211584ed6b00869a31e1d317d9fa460db2d2e8c5c396f0154979949ec8b770ac8c6ff20106d8beea75d2a824c7e6b6ce5138fc3e558ab4b5614f2a WHIRLPOOL a0ccc912f72835cc30045c21da9aff6209cac8d356f6c71031761e7e884916a4707712d0d22df01281f5ea5e29759d01951d5e9908c85332fc569c1a9543abe6
+DIST sword-1.7.4.tar.gz 2157882 SHA256 995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9d6666c9b313edd9d213d SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75 WHIRLPOOL a998552c18b5913d88f091d7dfec307e409401a01eb6011b62c7b4d3ea81355f816f013d7a3165ada2fa54454fdea980574091d8006d05f161cf55438f1df14b
diff --git a/app-text/sword/sword-1.7.4.ebuild b/app-text/sword/sword-1.7.4.ebuild
new file mode 100644
index 00000000000..1567283b4ed
--- /dev/null
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
+IUSE="curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS CODINGSTYLE ChangeLog README"
+
+RESTRICT="test"	#Restricting for now, see bug 313207
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
+		-e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
+		configure || die
+
+	sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
+	sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
+
+	cat <<-EOF > "${T}"/${PN}.conf
+	[Install]
+	DataPath=${EPREFIX}/usr/share/${PN}/
+	EOF
+}
+
+src_configure() {
+	# TODO: Why is this here and can we remove it?
+	strip-flags
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		--with-zlib \
+		$(use_with icu) \
+		--with-conf \
+		$(use_with curl)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use doc; then
+		rm -rf examples/.cvsignore
+		rm -rf examples/cmdline/.cvsignore
+		rm -rf examples/cmdline/.deps
+		cp -R samples examples "${ED}"/usr/share/doc/${PF}/
+	fi
+
+	insinto /etc
+	doins "${T}"/${PN}.conf
+}
+
+pkg_postinst() {
+	elog "Check out http://www.crosswire.org/sword/modules/"
+	elog "to download modules that you would like to use with SWORD."
+	elog "Follow module installation instructions found on"
+	elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index d6b56738344..7828585e9e2 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -2,3 +2,4 @@ DIST appstream-glib-0.3.4.tar.xz 1814472 SHA256 97b948ad992cb985e5bed533446fb5d2
 DIST appstream-glib-0.4.0.tar.xz 1837552 SHA256 f4dee0e86549009f248d38eb643061e82ff0d542f06e1f4af6b36af2f97c2e13 SHA512 54769b47f11f8792ee85ab0922d8a256800c00558ca9e2fcaab30845e3fbd9f4a08d311608f0b600f8ad070d79d5227cd9ac4b644ef6d94e1772e4695c4f1afe WHIRLPOOL da036564be55acc4c0b3d5320f165ac98d6f4754ed74dda8b06d31c7bfd91b10ff3f4ff0d85b141bfa804391befcadecd714a9b110d422cf9286c899714ad58d
 DIST appstream-glib-0.5.0.tar.xz 1818388 SHA256 35d63ca31664918905c3de634766766d98dadcd99d7271fb319f6279b846bf36 SHA512 1c1a1f41d6911c73a25a83396fb183d99ee139378766235b8885ee68c2b738137d55c108e7ea3ec2853e5ac5f17936b87df554bea45a1c19db3caea5bcee5d0d WHIRLPOOL 2a26ce1685ed3c78242c0ef29b4e5dea95ba070e531503f00f378f36974a8e1aa858b66640fe48ccc7c1ace9619671ff3c6d71aaf78e81a6ef5b55ab2be64090
 DIST appstream-glib-0.5.3.tar.xz 1853508 SHA256 842688933d182c4789843f0d7b288622a9fd3f75fbe645849cacc6195bdfceab SHA512 18ff35dcaed26072c0c3f84dc7310f1838e0626f733d2bf7cb8aeb7e36a963fa07a9b2c917e7cb423a5fab1b329977ff9ec8836be9c3a988724a624d4d77f4a8 WHIRLPOOL d8c10c5e669cb2d52c55217fe97e08f6b29119a57254d63df9187ea82fb98b174345b8a4e314b548e8f40cf2066a3d42ae189a3e89199e14d60f5f8a6f0f2c54
+DIST appstream-glib-0.5.5.tar.xz 1855288 SHA256 c539b261678b152554cd0548f973c371188403dfdb88e6ca979cc378ff50bbff SHA512 529cfcca989c501ab5666c98ce85fa085afe08df72de8217802d8baa6b606c5f6e1038adb57b29351a40ec2de71cf99c1dbf4b18289286d1b7ebb5a7f15be5de WHIRLPOOL b29fc6825cb4906e8951d81301e97bb41f2c79cdb6e78475a5a1b8daa8d15bfab531903f802c2036f2065d18245f609819f72018711d0d71a0b59348752893b7
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.5.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.5.ebuild
new file mode 100644
index 00000000000..d207a6c8183
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="http://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection nls"
+
+# FIXME: yaml is optional with --enable-dep11 but not
+# properly handled in autofoo bug#????
+RDEPEND="
+	app-arch/gcab
+	app-arch/libarchive
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/libyaml
+	>=media-libs/fontconfig-2.11
+	>=media-libs/freetype-2.4:2
+	>=net-libs/libsoup-2.51.92:2.4
+	sys-apps/util-linux
+	>=x11-libs/gdk-pixbuf-2.31.5:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+"
+# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
+# are migrated to appstream-glib
+RDEPEND="${RDEPEND}
+	!<dev-util/appdata-tools-0.1.8-r1
+"
+PDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-builder \
+		--enable-firmware \
+		--disable-ostree \
+		--disable-rpm \
+		--disable-static \
+		--enable-dep11 \
+		--enable-man \
+		$(use_enable nls) \
+		$(use_enable introspection) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
diff --git a/dev-libs/cloog/cloog-0.18.1.ebuild b/dev-libs/cloog/cloog-0.18.1.ebuild
index 0076b1dc0de..d3276d184bf 100644
--- a/dev-libs/cloog/cloog-0.18.1.ebuild
+++ b/dev-libs/cloog/cloog-0.18.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
index 2ed3bba10cd..58d9d225450 100644
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ b/dev-libs/cloog/cloog-0.18.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
 	inherit autotools git-2
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 fi
 
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild
index 10fab6deb1a..3972324ef27 100644
--- a/dev-libs/efl/efl-9999.ebuild
+++ b/dev-libs/efl/efl-9999.ebuild
@@ -168,9 +168,11 @@ src_prepare() {
 
 	# Remove stupid sleep command.
 	# Also back out gnu make hack that causes regen of Makefiles.
+	# Delete var setting that causes the build to abort.
 	sed -i \
 		-e '/sleep 10/d' \
 		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
+		-e '/BARF_OK=/s:=.*:=:' \
 		configure || die
 }
 
@@ -191,7 +193,7 @@ src_configure() {
 		$(use_with X x)
 		--with-opengl=$(usex opengl full $(usex gles es none))
 		--with-glib=$(usex glib)
-		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
+		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
 
 		$(use_enable bmp image-loader-bmp)
 		$(use_enable bmp image-loader-wbmp)
diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index 8671591f711..823a38ad1bb 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -1,2 +1,3 @@
 DIST gom-0.3.0.tar.xz 382924 SHA256 352a8bee8dc47e7bd5d08af35b0d67e1f3c54bca23a058a00004cb56ede6f4fd SHA512 ab26dbbb4cbeaa637ca835eff96caf647428505129652d0229808951b3ba5ec2225e2d37054a6b61ccad59954fda7d95bb04d61f75c1ec1ebbc1abea7025b627 WHIRLPOOL 98b7fc358635e17c1c878f2439f667cecd9304a8b5d10023d2e084d01e2950201404156add20da5e05f2a1e09bd42811a31f0765fa9e196e58d4c09496ba7664
 DIST gom-0.3.1.tar.xz 385836 SHA256 7951eb46ee784cbdbee6e3f2da084ffbf776c11ca1c904404b05feafe37e38f5 SHA512 7596b7be0de6f10ef1fbe8a278d917c07ecc714e9af24f2b61a7d871c6a1b1cf19ea92d5b4fbf7802c9c097dc2ae7a65ac47b8ca8f6689b49a3e4930cff6d54c WHIRLPOOL 9fa3a42411e3892a3648f31614462d43b5a4f52a166e5edd80e97741427a9444c39d2200a4ce1ac3e1e87d3b3e974b9dad6f11ee252ba3d10fa1d63b00a09bde
+DIST gom-0.3.2.tar.xz 410300 SHA256 bce8f0f94af6ff7847b853580ba6baebbab8ae531cedb0c78a5c473f39c758fd SHA512 a7bfb263e5ff6f89768d8fcbdcc949d4ec9b82ecbb80952becd357a3d5781a60e52a327e865e39e46d542b2a2c5e5c861e5302d7ae3c3a2258d3c3f698263675 WHIRLPOOL b676f4117c66fbe47b4216b3f5e4259e0569bcf355ca2f474498c29218d42093ac66e3afb0eb1cd946837e813f4e7c3ff981e99a726458150c00c89653d06559
diff --git a/dev-libs/gom/gom-0.3.2.ebuild b/dev-libs/gom/gom-0.3.2.ebuild
new file mode 100644
index 00000000000..5c7c94b4284
--- /dev/null
+++ b/dev-libs/gom/gom-0.3.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="GObject to SQLite object mapper library"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection python"
+REQUIRED_IUSE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
+
+RDEPEND="
+	>=dev-db/sqlite-3.7:3
+	>=dev-libs/glib-2.36:2
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.16:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-libs/gdk-pixbuf:2
+"
+# TODO: make gdk-pixbuf properly optional with USE=test
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	# glibtest is a relic from AM_PATH_GLIB macro
+	local myconf=(
+		--disable-static
+		--disable-glibtest
+	)
+
+	gnome2_src_configure \
+		${myconf[@]} \
+		--disable-python \
+		$(use_enable introspection) \
+
+	if use python ; then
+		python_foreach_impl run_in_build_dir \
+		gnome2_src_configure \
+			${myconf[@]} \
+			--enable-python
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python ; then
+		docinto examples
+		dodoc examples/*.py
+
+		python_foreach_impl run_in_build_dir \
+		emake DESTDIR="${D}" install-overridesPYTHON
+	fi
+}
diff --git a/dev-libs/isl/isl-0.12.2.ebuild b/dev-libs/isl/isl-0.12.2.ebuild
index cab71a2a1a7..85432505f12 100644
--- a/dev-libs/isl/isl-0.12.2.ebuild
+++ b/dev-libs/isl/isl-0.12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.15.ebuild b/dev-libs/isl/isl-0.15.ebuild
index da9172bd5e4..cc2f08c7c3a 100644
--- a/dev-libs/isl/isl-0.15.ebuild
+++ b/dev-libs/isl/isl-0.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 169e77d9946..54098398adb 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1 +1,2 @@
 DIST libgusb-0.2.7.tar.xz 275492 SHA256 0be9578f7875cecb6c163ad47eb39bc6bf497e501b08986c0d384748a054c3ee SHA512 9210ddc95458c452fa32c8e11849c6f44e24680485aafe93887a52266c8253e495e5f0584f25e3e67051bb00247d6b658cd2ff3f6a4da167a113974d8fefd5ac WHIRLPOOL 7ce8652167f3bf553d33d2b2504e1b1a8fdbdd0844b9fa8f2b54ad5d91b0db505cdedb3d1b6827212bde36bea39c28160f51f0253c921db4f33dae1e9368c07d
+DIST libgusb-0.2.8.tar.xz 289744 SHA256 a9c269ef21145b228e59fdcb533ef9c4ae214a6f4748d17ecd2e022f79389eed SHA512 83dce9704276f5edbe893b417a569bd62f2d14d8de1730d6e7e48c72170593c471c8354b813668d0736e31ecf48d2efe76a81c5dc485c1fa6ba62c5f8ceff3b4 WHIRLPOOL 878d07f37f79ef59506e76fa995b58b9e00fe75ae9424b86ea47bd5fb6c14868bc95e85e0744ff4d3c6a2f4aecdbf86f6c584c40c8febddd1c754cbc8386f261
diff --git a/dev-libs/libgusb/libgusb-0.2.8.ebuild b/dev-libs/libgusb/libgusb-0.2.8.ebuild
new file mode 100644
index 00000000000..2e5cef78f76
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.2.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 multilib-minimal vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+introspection static-libs vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# Yes, we really need API from dev-libs/libusb-1.0.19, not virtual/libusb
+RDEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+
+# Tests try to access usb devices in /dev
+RESTRICT="test"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable vala)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/api/html docs/api/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-perl/Bio-Graphics/Bio-Graphics-2.370.0-r1.ebuild b/dev-perl/Bio-Graphics/Bio-Graphics-2.370.0-r1.ebuild
deleted file mode 100644
index 7f9a4a3c999..00000000000
--- a/dev-perl/Bio-Graphics/Bio-Graphics-2.370.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=LDS
-MODULE_VERSION=2.37
-inherit perl-module
-
-DESCRIPTION="Generate images from Bio::Seq objects for visualization purposes"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/GD
-	dev-perl/Statistics-Descriptive"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-
-SRC_TEST=no
diff --git a/dev-perl/Bio-Graphics/Manifest b/dev-perl/Bio-Graphics/Manifest
index d2bd441d724..babc791fbd0 100644
--- a/dev-perl/Bio-Graphics/Manifest
+++ b/dev-perl/Bio-Graphics/Manifest
@@ -1,2 +1 @@
-DIST Bio-Graphics-2.37.tar.gz 1081671 SHA256 d85716b3e773cc899b9cb5733203fa0fbb4ce7b1ac3ae36fef1bbb9000968c0f SHA512 f8858f018ece0cf174d6803f0fe1110099ba5b2b6f0a1452db361949320aeccb7738f588fe2ac5c642d2b9b5e449a0c7822c0da1ceda91e5f1ffbac07ce3fcbe WHIRLPOOL 4dda3d65472c5863820a88082daf5da05624067f4c518cf53918574c88c89e0610df94f33d1db004542290a1bedaa78ef4159c6810e6de9c4401bdecfafd7ca8
 DIST Bio-Graphics-2.39.tar.gz 1139511 SHA256 5602e56c469fba8be024d72bff7ec1502392d82ac0fde4d1399e02488d6bfd85 SHA512 4119c56a125df67a613833c06d7db94be7f19c39fcf908eb52c403e70652c04d91a3b7de768e2465423bff69dd900cb45f1044ed673eb6228a8ad7516a35471f WHIRLPOOL 30877d7f6c264b833ebcf69dfebc037fdaff66200a80cd7b9bf964b2f435d6d23db7a8f1228c010675955b7528f95fb1d9a018c48fa8a5456e4813d10d7ce76f
diff --git a/dev-perl/Bio-SamTools/Bio-SamTools-1.390.0-r1.ebuild b/dev-perl/Bio-SamTools/Bio-SamTools-1.420.0.ebuild
index 1ad7fbe64dc..68d73836cb3 100644
--- a/dev-perl/Bio-SamTools/Bio-SamTools-1.390.0-r1.ebuild
+++ b/dev-perl/Bio-SamTools/Bio-SamTools-1.420.0.ebuild
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-
-MODULE_AUTHOR=LDS
-MODULE_VERSION=1.39
+EAPI=6
 
+DIST_AUTHOR=LDS
+DIST_VERSION=1.42
 inherit perl-module toolchain-funcs
 
 DESCRIPTION="Read SAM/BAM database files"
@@ -14,20 +13,22 @@ DESCRIPTION="Read SAM/BAM database files"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+LICENSE="|| ( Apache-2.0 Artistic-2 GPL-1+ )"
 
 RDEPEND="
-	sci-biology/bioperl
+	>=sci-biology/bioperl-1.6.9
 	>=sci-biology/samtools-1
 "
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-CBuilder
-	dev-perl/Module-Build
+	>=dev-perl/Module-Build-0.420.0
 "
 
-SRC_TEST=do
+DIST_TEST=skip
+# cannot load its own library, fundamentally b0rken
 
 PATCHES=(
-	"${FILESDIR}"/${P}-samtools-1.patch
+	"${FILESDIR}"/${PN}-1.390.0-samtools-1.patch
 )
 
 src_prepare() {
diff --git a/dev-perl/Bio-SamTools/Manifest b/dev-perl/Bio-SamTools/Manifest
index bf52deb7945..9143d805af7 100644
--- a/dev-perl/Bio-SamTools/Manifest
+++ b/dev-perl/Bio-SamTools/Manifest
@@ -1,2 +1,2 @@
-DIST Bio-SamTools-1.39.tar.gz 331515 SHA256 a2baaa0f569c2b49e988978a121fb210fcb35200dcb2f183aa58bb03d711ef4f SHA512 aff502af24239cd64dec3a5a9cb6ab7280661f277cef066f79c87f608112d5870f46ffcc81f3bc2382f48d5247c7ab5de35e4afaa7ca4e286b0323978368d668 WHIRLPOOL db069d76fe386354b8cec60527de6612fc501428e9775e02574955cead3eba55db169697aaacc22c3b4df6475c6ecb72486b94c9b577da1deb42dc5c3791b04f
 DIST Bio-SamTools-1.41.tar.gz 338745 SHA256 b5d7ca16c96cc9fbee5daceb3268f36011740fe4de92074c17a729bac57c3077 SHA512 6f822cd219ecf86e95bc3a6bde1aebbe5eb8284b21b07ca919618c1422c37e6d182285d1a5e77848c6d5cea0dc74a51705f6bc1a27d44aeeaaa69f1cea58f147 WHIRLPOOL b651ea5059ea46ab5e31d237d3e52d7936921470bbd04133be70f935a47b913dc7f3b154c14d1af52f0ba2f5afc6878a27d88e4bbf9d39023cf786bca70f6696
+DIST Bio-SamTools-1.42.tar.gz 337821 SHA256 ef4b736e86442ce61f56ddd94befc302ccc4646cae3c45407e107400c703584c SHA512 6a1f95104ce91a800a314c304915af9d6e1cc477c7d5f42b640d0a27b18cd32c4ad9e261cac5556f4863652570a3c573d34245963fc4b9ade067981b2a329271 WHIRLPOOL 5a216e51173ee5a9a930013718452bcbfbcffe1aa1663f50d567daf17378a50135b1b0b6d750c9aece05de268e730faf6c54963823c037559fb50ed95dda32c7
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.300.0.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.300.0.ebuild
deleted file mode 100644
index 428f367411a..00000000000
--- a/dev-perl/Bit-Vector/Bit-Vector-7.300.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=STBEY
-MODULE_VERSION=7.3
-inherit perl-module
-
-DESCRIPTION="Efficient bit vector, set of integers and big int math library"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-perl/Carp-Clan
-	>=virtual/perl-Storable-2.20"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Bit-Vector/Manifest b/dev-perl/Bit-Vector/Manifest
index 61dbbf1f48f..8baa87970e3 100644
--- a/dev-perl/Bit-Vector/Manifest
+++ b/dev-perl/Bit-Vector/Manifest
@@ -1,3 +1,2 @@
 DIST Bit-Vector-7.2.tar.gz 137817 SHA256 6339f9e4376c623b411934cdfb52d7553c6c38457bfa376b953d40ca007807c2 SHA512 0344c2572e4a16259a4bb4b5f668c8f0ab32dc5a4eb0ab9e7da15ae86c1845036851095aa6353dcc9b1f9bf72ec5bd204e349c286ff5896869c36a4b7ff55955 WHIRLPOOL 219338151a816d055930878efe9c127f35ff3976c9e4c8a374bb821daace297fc6fee760d02b16225b5e7ceee45323a9b6ace0ef07a82ffb88d4f91e6d8bbd56
-DIST Bit-Vector-7.3.tar.gz 130395 SHA256 5a76330bfb9b9083371484c960d01ac0ad0e129fe770bfb1e87a85384e088f3d SHA512 e6baa2385d366ee00449abe52c20c49dbd41d2396d7c8f0fd6222262b6c4399d75eb081f46c5d1e524d12dafe0e5e78249f273e7705d04bd03033703fd2e86c8 WHIRLPOOL f583160f314e9d1ef0715711620ae5037e9cd196550c5f7ff2397ea4770a2d85b288d1d948619b2c724cb9bb8004a452493b340fcb1e491d7d67b649811e7503
 DIST Bit-Vector-7.4.tar.gz 135965 SHA256 3c6daa671fecfbc35f92a9385b563d65f50dfc6bdc8b4805f9ef46c0d035a926 SHA512 80aa49aea8c31c60c14161198eab9d620d738530c3c209104b8ad8f1144822f80c3effb3303c569fc556b2457328659ae5d1aaf511d714c835618b84c722abc5 WHIRLPOOL 2953d658f769e511522d11322793dd60f71b95e3ce6b4cc1ef0ff154f5889d53c8c4bb2ca66533398b400010da426292fbf69d6b1f2da7b50ce3ce5fa204a998
diff --git a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20120719.1.0-r1.ebuild b/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20120719.1.0-r1.ebuild
deleted file mode 100644
index 6671ad66cad..00000000000
--- a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20120719.1.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BDFOY
-MODULE_VERSION=20120719.001
-inherit perl-module
-
-DESCRIPTION="Data pack for Business::ISBN"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		>=virtual/perl-Test-Simple-0.950.0
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Business-ISBN-Data/Manifest b/dev-perl/Business-ISBN-Data/Manifest
index 7d733f29d1d..c92c62e6db6 100644
--- a/dev-perl/Business-ISBN-Data/Manifest
+++ b/dev-perl/Business-ISBN-Data/Manifest
@@ -1,2 +1 @@
-DIST Business-ISBN-Data-20120719.001.tar.gz 14745 SHA256 745f6bf8f7bd912c0a1865aa5f7e49343804de27783f544b2e2c714e14a704a3 SHA512 b688694bf99c65e072cbf5575de477dff607d1f66376f20b147f49896f4a2dd82a9a4b8dc1843c9d363ca93840df6683d989f794dcc7625e4f9b2c78ede2ded0 WHIRLPOOL e57618e9454b6e9ec212bc724961a945e73b7436b5f8758e73ddafcf494db01ae21e612aae2bc9654beec9fa2fb810052732e277b8b369a636581ea3387a92e1
 DIST Business-ISBN-Data-20140910.002.tar.gz 16522 SHA256 3e2413d6672f6cbbfad61caa2d6eb315382bb5bc09db5157c8107cbdc98ecbae SHA512 bbfa483490ac3037fba33ae6d038ce2fb9b537d67cd3d2cd1b91edd06306cee38badb6ca6da38983c9b16d98e57b855fef19a5addd21f31ea58eb0d24181c9b1 WHIRLPOOL e29dc6011a23c7874113af1fed680de55908c726f8607c168991ece2318acc50d699e3a60efc00e9b41ba963e317d675e422d8cac62c077ba7e4010d8a3775e6
diff --git a/dev-perl/Business-ISMN/Business-ISMN-1.110.0-r1.ebuild b/dev-perl/Business-ISMN/Business-ISMN-1.110.0-r1.ebuild
deleted file mode 100644
index cad919d5ff3..00000000000
--- a/dev-perl/Business-ISMN/Business-ISMN-1.110.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BDFOY
-MODULE_VERSION=1.11
-inherit perl-module
-
-DESCRIPTION="International Standard Music Numbers"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Tie-Cycle
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)
-"
-
-SRC_TEST=do
-
-src_install() {
-	perl-module_src_install
-	rm -rf "${ED}"/usr/share/man || die
-}
diff --git a/dev-perl/Business-ISMN/Manifest b/dev-perl/Business-ISMN/Manifest
index 664ab950915..6abe0cfd4f4 100644
--- a/dev-perl/Business-ISMN/Manifest
+++ b/dev-perl/Business-ISMN/Manifest
@@ -1,2 +1 @@
-DIST Business-ISMN-1.11.tar.gz 9053 SHA256 76d5240a5672c7a8b1ba9e9ea8238a5c8882139911acbb67b7059b5ee3da342d SHA512 e5bbaf048b06ee133a95443227fe2bf0e49abbb2164330105f7ccd4360503ca97848e4ff6b663064ceb36a34d4e5f7b47209f0153e5fa6e88d8ae8a0c90bd41a WHIRLPOOL f780112fddb09ece0bd784e29cf23fca31ee135f582eabe0bbc3192efdf554bfa610d94c8d222b2eac766c0615b2ca8806e4f1f1707d9f6c6624c9bec4bae1a3
 DIST Business-ISMN-1.13.tar.gz 9703 SHA256 89b598dcde116732f8621b18660fec9a6989b1ad5bf96599b98fbcaecad9a132 SHA512 bad9fdfe16a6b62c823019af4162e0cb2f97dbda8cc5cad01ff3a6e80d22e5fa1d260ef410ad1393d03fc750f7976f06932ac948390cdeb995cc458e1d3cd984 WHIRLPOOL fe1bf9401fa4b973388028451d5cd06df8ac3ccc8887b6ef714b4a1f4e9c0e38a2c65ba8a5a500b55b59ffaa37067ad97e5724e47778a3642138cd6085c7cf55
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
index 9359a4076a4..9ba675f3b2f 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
@@ -23,3 +23,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index da0b60197ca..dbb8835a49b 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,4 +1,3 @@
 DIST hg-git-0.7.0.tar.gz 42956 SHA256 9db9cd87b9b173c192b29336b4029122a4fe2858c369dc8c5a59228515bc61a9 SHA512 732dbd12184a5346310b6d14bb0b24c2255ff607ef54d064387b7cadd64aa84dd2d6909e6dde36f9fa8ac8131c1adc315c2bae2e068066864c086b239524d5d4 WHIRLPOOL 0c8216da9fdaebc2fcb56d7bec12e9a087570cf032d253e77833cbf8f31a2d581d85b820c51e37cd519ce720bd49fec5be27211b58b64fb9c18b1fff1c24d26e
-DIST hg-git-0.8.0.tar.gz 46004 SHA256 91a16e34612595eca8c4e23d847c6ab697267b68008594926123c6c0064298dc SHA512 6281ef070b110d0449f5667888f9f97c3c310a840890283d14f7b0d35a397bdc995af0726acc28737aa35ff99631406b575dad141a1bd16dab88eac7fb855199 WHIRLPOOL 99dac4e75cb322b68a3b7990f0130acb0ef8245583e612432f0f4af06d8ce411d7f211291683bb1adcd1866d2125796c64b37d690738bb5f4a3efd2e114934fe
-DIST hg-git-0.8.1.tar.gz 46817 SHA256 ceeddfb48dc160e4c6be8c15a722a44b8554b7f68e1838f6af1018ed78b9451d SHA512 58ed927bf843f2d9ce25b17b43866bc1cfeba0361ebba3a276967a82b7f1a0fbc9e5eed673248f1812f97c8924176a54b5df5e4a349d6f58faaaf4d28df61f57 WHIRLPOOL 8082755ad1889059071b821019bd695be920f3b3361cdde02f74e2d099fa4e5f6b36ee410956b205b7ffd1b971c366c9374e810a984f91cc6d8bb56f60b5c897
 DIST hg-git-0.8.2.tar.gz 48461 SHA256 fea6f48da28cef3fc30a51b1cfec0a52df405b35c85b2d92607158f6b089e043 SHA512 7315e60d494b73862e6c3a90624f5ba0698c885f9b66e4bfe636bb74cd178a0d5a23614c647b6d16db7f78c06516e9a8415c443effb6cc1a102cf87ac76aa041 WHIRLPOOL 1437bfa6a0ccf2e15cc3eef195a6b176606f2be74d2b1381524a1fef3431e1f8b8e0c537325daa5a11d1b709630cc282acebdffddbf602144f115e76aea61270
+DIST hg-git-0.8.3.tar.gz 48198 SHA256 5c624af512c969ac3628fd658670e9170812f570eb02d2a6c76c216b80341179 SHA512 857961004103ccdabb7d15d778ef7044a5f17dd0dd045f402269b5cbf8faf1a9a4f56d2d0d5b9d24a2d6c54a0d791ad079598d5f930f4d12d3290ad3f9b90207 WHIRLPOOL 657d5cb85fe003596919db44bd53eba60e88b56fd7ca6ef8f8833c37a9b5088cceea180e83e8edde9e2a8ccd3a356722d6d01d7980819aac6460ea789fdb4406
diff --git a/dev-vcs/hg-git/hg-git-0.8.0.ebuild b/dev-vcs/hg-git/hg-git-0.8.0.ebuild
deleted file mode 100644
index 2dbdf94eac1..00000000000
--- a/dev-vcs/hg-git/hg-git-0.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
-	<dev-vcs/mercurial-3.3.3[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/hg-git/hg-git-0.8.1.ebuild b/dev-vcs/hg-git/hg-git-0.8.3.ebuild
index e2c3fb37b85..e2c3fb37b85 100644
--- a/dev-vcs/hg-git/hg-git-0.8.1.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.3.ebuild
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index 6f79ddc69a2..f4f8e16fae4 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,2 +1,2 @@
 DIST df_40_24_linux.tar.bz2 12921246 SHA256 da37c6263a679123e6ac57fe0dd6def11f1d61efee3c5913de09495c88ce9234 SHA512 2242e471b7dbc996e819e2f74b2bbfda30a9a301755bc025ddcccdffdd3afe2e48bbedca31a332283ef829d023069398e57d6a87e26c582ddbce4a67ff7fd755 WHIRLPOOL 03cb652a2564d2b0c809be8252f7754d893f69ac1b95124ea108ed0fde9ac742c498d9e369339775695861e430a2ded0741b018f85551d48731730f98303dc69
-DIST df_42_03_linux.tar.bz2 13759711 SHA256 6bc36b3562da0a8d6e1f14d269e2a4ce04b8f2f6ffc516b542bc7ac8ae50b3cc SHA512 1f32c932b55a85fd25fb3b0dd0621bc7228befdeb03ff12cd4c8a1008c05daabd3c181dc618d9d866dd14ebf7ea3e872bfa744ceb9671d024778087cc4f34406 WHIRLPOOL a13a28290702f768e4fa0bb7236f1db267cf091f8ab678ac5fb636ae0b0b4b3fa075759429fabb48e05eba333e6fdbc20fdf0afb3474347f6c6c294d52703ad7
+DIST df_42_04_linux.tar.bz2 13776171 SHA256 f281f7e8b477abe37cc1423258be2ea56b5c1d12b0843ed3a66994ce0e7924ce SHA512 d0b3bf0311e70c6f823d216e002d2acc62ebdeb540cfd79c5cf91d53612f6acee802321c65b3926db688b055f5b865aa1256f29a82ef769c5fab65bd42c383b5 WHIRLPOOL 859a2fddf9a72ac2c05d64cff01fdd3c9658ce57eecb34991fbd9cbd51ae007c56bc61e9aac76ec837734593c89d822868c15c641416a82f142af40425ef666b
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.03.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.04.ebuild
index b0b9b37e911..b0b9b37e911 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.03.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.04.ebuild
diff --git a/net-libs/biblesync/Manifest b/net-libs/biblesync/Manifest
new file mode 100644
index 00000000000..9b7fc1c7b6e
--- /dev/null
+++ b/net-libs/biblesync/Manifest
@@ -0,0 +1 @@
+DIST biblesync-1.1.2.tar.gz 86620 SHA256 886e1ac165b8900254c00a182fa34e3680ef3aa25051418470f15ea09ac02005 SHA512 7725c8228e2dff79edaf065ff4d4816a6cf214d1d874817345cc4154142144bce479ca1ae871053886bff4f6610715a27bce81c25c2a636444d5873e93bfdc62 WHIRLPOOL ae89ac316cc70415ec4e0e458e7d8173b5a59741475bf1638f90c1614618058a664118bbb22d931e936fb7c4a1e8b4897f75a1d9cb7538ab0d8b8b7b96c81da6
diff --git a/net-libs/biblesync/biblesync-1.1.2.ebuild b/net-libs/biblesync/biblesync-1.1.2.ebuild
new file mode 100644
index 00000000000..4f94c30a91b
--- /dev/null
+++ b/net-libs/biblesync/biblesync-1.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="A multicast protocol to support Bible software shared co-navigation"
+HOMEPAGE="http://www.crosswire.org/wiki/BibleSync"
+SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-util/cmake"
+RDEPEND=""
diff --git a/net-libs/biblesync/metadata.xml b/net-libs/biblesync/metadata.xml
new file mode 100644
index 00000000000..d68839c9277
--- /dev/null
+++ b/net-libs/biblesync/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>theology</herd>
+	<maintainer>
+		<email>theology@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gnomesword</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index 9dbb71c30de..9a4d897765d 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,2 +1,3 @@
+DIST avogadro-1.0.3.tar.bz2 4971989 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468 SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210 WHIRLPOOL c835ac24b317a1fa310bf3ea75bae4002d01f364d4754e6a7d841594dcce321435c827d60e125d9410f05670a94c887cc250bf49759d02cde34a5839d2324c92
 DIST avogadro-1.1.0.tar.bz2 10741835 SHA256 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a WHIRLPOOL c81e866e60b3383a58de515317c754e3982e716c27974ce43ca0c1209d24544949361a7f2f93a4a940d73fd7a18b184f68c7a1856fea89ae5eba75db74b1012d
 DIST avogadro-1.1.1.tar.bz2 11118046 SHA256 fe6f7bdea17a27a20be25b70d975145999aae9d90ef320217af2bc4d6e7a0a14 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827 WHIRLPOOL 6bea2c25675ba29729785b561cbaed33929aeb4638180454b1aed8913160cd6d0315bb09e6ee4033a8d27ce84fd7a4573851fd02c76b64b6aa86e615a19b8c38
diff --git a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
new file mode 100644
index 00000000000..ae73ee50ac4
--- /dev/null
+++ b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils python-single-r1
+
+DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
+HOMEPAGE="http://avogadro.openmolecules.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+glsl python cpu_flags_x86_sse2"
+
+RDEPEND="
+	>=sci-chemistry/openbabel-2.2.3
+	>=dev-qt/qtgui-4.5.3:4
+	>=dev-qt/qtopengl-4.5.3:4
+	x11-libs/gl2ps
+	glsl? ( >=media-libs/glew-1.5.0 )
+	python? (
+		>=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:2"
+
+PATCHES=(
+	"${FILESDIR}"/1.0.1-gl2ps.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_THREADGL=OFF
+		-DENABLE_RPATH=OFF
+		-DENABLE_UPDATE_CHECKER=OFF
+		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
+		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
+		$(cmake-utils_use_enable glsl)
+		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
+		$(cmake-utils_use_enable python)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
new file mode 100644
index 00000000000..d8a0c0f758e
--- /dev/null
+++ b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
@@ -0,0 +1,39 @@
+diff --git a/avogadro/src/CMakeLists.txt b/avogadro/src/CMakeLists.txt
+index 75b6dfb..d87ac2c 100644
+--- a/avogadro/src/CMakeLists.txt
++++ b/avogadro/src/CMakeLists.txt
+@@ -45,7 +45,7 @@ endif(ENABLE_UPDATE_CHECKER)
+ FILE(GLOB projectDelegates_SRCS "projectdelegates/*.cpp")
+ set(avogadro_SRCS ${avogadro_SRCS} ${projectDelegates_SRCS})
+ # Add GL2PS to the executable
+-set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
++#set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
+ 
+ if( WIN32 )
+   set(avogadro_SRCS ${avogadro_SRCS} windows/avogadro.rc)
+diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp
+index 66785fd..2933953 100644
+--- a/avogadro/src/mainwindow.cpp
++++ b/avogadro/src/mainwindow.cpp
+@@ -51,7 +51,7 @@
+ //#endif
+ 
+ // Include the GL2PS header
+-#include "../gl2ps/gl2ps.h"
++#include <gl2ps.h>
+ 
+ #include <avogadro/pluginmanager.h>
+ 
+diff --git a/libavogadro/src/CMakeLists.txt b/libavogadro/src/CMakeLists.txt
+index cce8ece..cc084fb 100644
+--- a/libavogadro/src/CMakeLists.txt
++++ b/libavogadro/src/CMakeLists.txt
+@@ -152,7 +152,7 @@ endforeach(headerFile ${libavogadro_HDRS})
+ add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
+ set_target_properties(avogadro
+   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
+-target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
++target_link_libraries(avogadro ${AVO_LINK_LIBRARIES} gl2ps)
+ 
+ install(TARGETS avogadro DESTINATION ${LIB_INSTALL_DIR})
+ install(FILES ${libavogadro_HDRS}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 80f4f570b88..c354b3e937b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
+DIST qgis-2.12.1.tar.bz2 69088412 SHA256 96b9bb6ef62ec042b938e4b3112cc8e2e96caad36d6615b484ad757a65e80429 SHA512 647ad827f6b139a301a5fd1387333842d0187390db1906a37713b41a24bd97e37624ba2b1b500b473132d17e0d856efd0a033b2159930d005c9f74845547958e WHIRLPOOL 05895935df656937b3a1848a07eee8ee96692a8a34d30515d143b2f08cd652640b5116a81025e822497cc26d0e6f6347a6344657272a4c6c6de5d128792b98ad
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 2d8595802e0..c7d2ce32745 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -13,5 +13,7 @@
   <use>
     <flag name="bundled-libs">Use internal copy of <pkg>x11-libs/qwtpolar</pkg></flag>
     <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
+    <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+    <flag name="mapserver">Determines whether mapserver should be built</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-geosciences/qgis/qgis-2.12.1.ebuild b/sci-geosciences/qgis/qgis-2.12.1.ebuild
new file mode 100644
index 00000000000..119b1cd1a41
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.12.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils multilib gnome2-utils cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+	http://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples grass gsl mapserver postgres python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+		mapserver? ( python )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/expat
+	sci-geosciences/gpsbabel
+	>=sci-libs/gdal-1.6.1[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	gsl? ( sci-libs/gsl )
+	sci-libs/libspatialindex
+	sci-libs/proj
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	dev-qt/designer:4
+	x11-libs/qscintilla
+	|| (
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+	)
+	grass? ( || ( >=sci-geosciences/grass-7.0.0 ) )
+	mapserver? ( dev-libs/fcgi )
+	postgres? ( dev-db/postgresql:* )
+	python? (
+		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		${PYTHON_DEPS}
+	)
+	dev-db/sqlite:3
+	dev-db/spatialite
+	app-crypt/qca:2[qt4,openssl]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DQGIS_MANUAL_SUBDIR=/share/man/"
+		"-DBUILD_SHARED_LIBS=ON"
+		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
+		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
+		"-DWITH_INTERNAL_QWTPOLAR=OFF"
+		"-DPEDANTIC=OFF"
+		"-DWITH_APIDOC=OFF"
+		"-DWITH_SPATIALITE=ON"
+		"-DWITH_INTERNAL_SPATIALITE=OFF"
+		$(cmake-utils_use_with postgres POSTGRESQL)
+		$(cmake-utils_use_with grass GRASS)
+		$(cmake-utils_use_with mapserver SERVER)
+		$(cmake-utils_use_with python BINDINGS)
+		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
+		$(cmake-utils_use_with python PYSPATIALITE)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_enable test TESTS)
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
+	)
+
+	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
+		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+		if has_version '>=x11-libs/qwt-6.1.2' ; then
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
+			)
+		else
+			mycmakeargs+=(
+				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
+			)
+		fi
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc BUGS ChangeLog CODING
+
+	newicon -s 128 images/icons/qgis-icon.png qgis.png
+	make_desktop_entry qgis "QGIS " qgis
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${WORKDIR}"/qgis_sample_data/*
+	fi
+
+	python_optimize "${D}"/usr/share/qgis/python/plugins \
+		"${D}"/$(python_get_sitedir)/qgis
+
+	if use grass; then
+		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+		python_optimize "${D}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use postgres; then
+		elog "If you don't intend to use an external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	else
+		if use python ; then
+			elog "Support of PostgreSQL is disabled."
+			elog "But some installed python-plugins needs import psycopg2 module."
+			elog "If you do not need this modules just disable them in main menu."
+			elog "Or you need to set USE=postgres"
+		fi
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
new file mode 100644
index 00000000000..ef362bcf4aa
--- /dev/null
+++ b/sci-libs/blas-reference/blas-reference-20070226-r4.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 fortran-2 autotools multilib flag-o-matic toolchain-funcs
+
+LAPACKPV="3.1.1"
+LAPACKPN="lapack-lite"
+
+DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
+HOMEPAGE="http://www.netlib.org/blas/"
+SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND="app-eselect/eselect-blas"
+RDEPEND="${DEPEND}
+	doc? ( app-doc/blas-docs )"
+
+S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
+
+src_prepare() {
+	ESELECT_PROF=reference
+	epatch \
+		"${FILESDIR}"/${P}-autotool.patch \
+		"${FILESDIR}"/${P}-pkg-config.patch
+	eautoreconf
+
+	cp "${FILESDIR}"/eselect.blas.reference-ng "${T}"/eselect.blas.reference || die
+	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.blas.reference || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	default
+	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=blas
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
new file mode 100644
index 00000000000..33fa88130de
--- /dev/null
+++ b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils fortran-2 multilib toolchain-funcs
+
+MyPN="${PN/-reference/}"
+
+DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
+HOMEPAGE="http://www.netlib.org/blas/"
+SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
+
+SLOT="0"
+LICENSE="public-domain"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	virtual/blas
+	app-eselect/eselect-cblas"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+ESELECT_PROF=reference
+S="${WORKDIR}/CBLAS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotool.patch
+	eautoreconf
+
+	cp "${FILESDIR}"/eselect.cblas.reference "${T}"/ || die
+	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.cblas.reference || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+}
+
+src_install() {
+	default
+	dodoc cblas_example*c
+	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=cblas
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
new file mode 100644
index 00000000000..6f7fb7d73bb
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils fortran-2 flag-o-matic multilib toolchain-funcs
+
+MyPN="${PN/-reference/}"
+PATCH_V="3.2.1"
+
+DESCRIPTION="FORTRAN reference implementation of LAPACK Linear Algebra PACKage"
+HOMEPAGE="http://www.netlib.org/lapack/index.html"
+SRC_URI="
+	mirror://gentoo/${MyPN}-${PV}.tgz
+	mirror://gentoo/${PN}-${PATCH_V}-autotools.patch.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+RDEPEND="
+	app-eselect/eselect-lapack
+	virtual/blas"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/lapack-docs )"
+
+S="${WORKDIR}/${MyPN}-${PV}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	if  [[ $(tc-getFC) =~ if ]]; then
+		ewarn "Using Intel Fortran at your own risk"
+		export LDFLAGS="$(raw-ldflags)"
+		export NOOPT_FFLAGS=-O
+	fi
+	ESELECT_PROF=reference
+}
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${PN}-${PATCH_V}-autotools.patch \
+		"${FILESDIR}"/${P}-parallel-make.patch
+	eautoreconf
+
+	# set up the testing routines
+	sed \
+		-e "s:g77:$(tc-getFC):" \
+		-e "s:-funroll-all-loops -O3:${FFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
+		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
+		-e "s:../../blas\$(PLAT).a:$($(tc-getPKG_CONFIG) --libs blas):" \
+		-e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.a:" \
+		make.inc.example > make.inc \
+		|| die "Failed to set up make.inc"
+
+	cp "${FILESDIR}"/eselect.lapack.reference-ng "${T}"/eselect.lapack.reference || die
+	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.lapack.reference || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.lapack.reference || die
+	fi
+	sed \
+		-e '/Libs:/s|: |: -L${libdir} |g' \
+		-i lapack.pc.in || die
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)/lapack/reference" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+}
+
+src_install() {
+	default
+	eselect lapack add $(get_libdir) "${T}"/eselect.lapack.reference ${ESELECT_PROF}
+}
+
+src_test() {
+	MAKEOPTS+=" -j1"
+	cd "${S}"/TESTING/MATGEN && emake || die
+	cd "${S}"/TESTING && emake || die
+}
+
+pkg_postinst() {
+	local p=lapack
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}
diff --git a/sci-misc/repsnapper/files/std-c11.patch b/sci-misc/repsnapper/files/std-c11.patch
new file mode 100644
index 00000000000..a8ff67ae387
--- /dev/null
+++ b/sci-misc/repsnapper/files/std-c11.patch
@@ -0,0 +1,31 @@
+--- src/slicer/poly.cpp.orig	2015-12-28 07:54:32.774722105 +0100
++++ src/slicer/poly.cpp	2015-12-28 07:54:41.188055896 +0100
+@@ -225,7 +225,7 @@
+   // Start with first vertex as closest
+   uint nindex = 0;
+   mindist = (vertices[0]-p).squared_length();
+-  if (isnan(mindist)) { // for infinity point p return point 0 and distance 0
++  if (std::isnan(mindist)) { // for infinity point p return point 0 and distance 0
+     mindist = 0.;
+     return 0;
+   }
+--- src/slicer/printlines.cpp.orig	2015-12-28 07:54:05.814720635 +0100
++++ src/slicer/printlines.cpp	2015-12-28 07:54:19.821388065 +0100
+@@ -240,7 +240,7 @@
+   if (abs(absolute_extrusion) < 0.00001)
+     travel_speed = max(minspeed, speed); // in case speed is too low
+ 
+-  if (!isnan(absolute_extrusion))
++  if (!std::isnan(absolute_extrusion))
+     // allowed to push/pull at arbitrary speed
+     extrudedMaterial += absolute_extrusion;
+   else
+@@ -335,7 +335,7 @@
+     else
+       factor = 1./newlines.size();
+     newlines[i].absolute_extrusion *= factor;
+-    assert(!isnan(newlines[i].absolute_extrusion));
++    assert(!std::isnan(newlines[i].absolute_extrusion));
+ 
+   }
+   return newlines;
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 941cf8b6fad..5566c882b0c 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,6 +1,8 @@
 DIST elilo-3.10.tar.gz 210896 SHA256 65d0d7cc31bd0ef6824b9394dbf8991eb850aa4ba2dde1f9302e3da3cb2a4399 SHA512 4ec104f2d6a36745689619976e9811b5f5cd0d25be0f613d649ca2ff379e0514ab77c03bb474b32da87d73bd687d3d9faa9f2d07859e4c208b5d5a5a50d47e24 WHIRLPOOL f2d70ab94f1b82aac9ad8409557f2b0fb5d25f124e546f1e457e20a4da2b68baf1749377fb7a45b3bb6203bf9c54309adf9b9e072d7871e9d1a6b1d17b3c2fdb
 DIST elilo-3.12-source.tar.gz 215125 SHA256 5005534ae972603c65caa8debb2bf3c4a22b895588323bc1b0a7a9f114e030ee SHA512 a9dceb1e03ec1cabcaef696e4d1b8fe8683b0feeef2171781536bc469f8bcd0b3ab9b4460b149bb1bf68c651bce8c7abec5ef4f47e78113a611594a69e91239c WHIRLPOOL 9e874b4512721c75b12f9c635e7bbdf63b0d0427bbcf880c38d9c53b54c53c15cf15a9ddfae788d7068a9d8ae615d1492f2af4f9046d6c7c48e3507ba13bbb7e
+DIST elilo-3.16-all.tar.gz 485844 SHA256 69e361d95c01ea2657200b2215464fc0235b01d3e317d2f2276284259b06d392 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842 WHIRLPOOL 5cf749f7120cc1789afc856dc8e0ad7fd4a34885caac7ab96da838ea35eec2d09356d602e0e8a9f28ce5fd021f977d4d17b7c16e03c8e54dcfe658f5c9b42c4e
 DIST elilo-nightly_2006-03-14.tgz 168991 SHA256 b5174f1d921212b65f708869ea374e7c3e4e1b0771738b03ae6a1830cb4fe65c SHA512 8f4bab99c9e823e1755a299e04a5d89b09d74e06a986b9732b2f48bd96c389c54d5af1fb59c4e06fe55dbe80340cfcdf63a9b0c1de1a1ed5cd0a3dd2df5f5fc2 WHIRLPOOL d389ae56432d45ed96d156fb982f9f961e774ca41e6c8dc8cc3a1cc4290436b944b945a14954e9ca7eff4de67dd7fa9bd53960d8c92edc2e9de8c87bf47f3967
 DIST elilo_3.10-1.diff.gz 26456 SHA256 de81eb071d4c7a3f02c629911cfd95f0fdc8705575df7a596e5630788bbb3643 SHA512 87e5bea09e66c65f048fab99ca9dfc5f0e61dd48b4ee012b7139d66af92291a79b33e2577139bfa529fd3c303b247a344384614927dfc3c2cff894bb032a3bc6 WHIRLPOOL d8c33bd0b5310206c89bf9b8d02443b9414adb2754651a412ff05a0727ae70e7d97a5d26817295dea0b37d71662f016ec58d95f0d33d6dba828d61e962dabcaf
 DIST elilo_3.12-1.diff.gz 28806 SHA256 26532bdf9a8c3455d12f22c59d1d5d9656dcb432dabd1a80cdbcd010e93305b5 SHA512 ed3394880ae0dae63a3e6b92ccb2a8251b6fa6bbfda7e45a53fa45a06a899a89b9a760dafd44425b424b0455b7d37d6e8738da2477fae42ebf67a3b038a7e944 WHIRLPOOL 0167eb79a8fdb9d6f0417abd75c1f325ddab2f451126955a7542045f42febd6188c03e3f7dd5a0020c67bba489dbb8afb4585687a53d2c026f03a49104c0c032
+DIST elilo_3.14-3.debian.tar.gz 32179 SHA256 30d4e5eabfcdea8bc6c3ae3af05cff9e182847d388a83016c85a1f3fbb42296f SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f WHIRLPOOL c5ffda521ee6e4253bc45160e712371d2a561841198152289d84971430a17a973e93382cec460efa9f7a09053b910748352ce97dde7e45d2ea737b14ddc5078e
 DIST elilo_3.6-1.diff.gz 14944 SHA256 cc9e3d753823ad1bc50f935017e8b5cdc5d76cac2a37c498c862ef021e0e0073 SHA512 962672f516de48f88bd453248d6469a4962fb7551214de9f73125deb64121ab08d123746b2cf8c1c202177f7272aad4cb63e6970f1860c772930bae580817bee WHIRLPOOL 23f1c3b6fd8cfb7356cc165765b724ab10278b35ad36427c018b2931a9723e887f2cbecaa21bd3cd13fa5784035683e40a8cfc6df4cf65acaeb3fac1d6488dc9
diff --git a/sys-boot/elilo/elilo-3.16.ebuild b/sys-boot/elilo/elilo-3.16.ebuild
new file mode 100644
index 00000000000..472488d9ce1
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="http://elilo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+	mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+	dev-util/patchutils"
+RDEPEND="sys-boot/efibootmgr
+	sys-fs/dosfstools"
+
+S="${WORKDIR}/${P}-source"
+
+src_unpack() {
+	unpack ${A} ./${P}-source.tar.gz
+	mv debian "${S}"/ || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+
+	# The patches Debian had were merged upstream.
+	#epatch debian/patches/*.diff
+
+	case $(tc-arch) in
+	ia64)  iarch=ia64 ;;
+	x86)   iarch=ia32 ;;
+	amd64) iarch=x86_64 ;;
+	*)     die "unknown architecture: $(tc-arch)" ;;
+	esac
+
+	# Now Gentooize it.
+	sed -i \
+		-e '1s:/bin/sh:/bin/bash:' \
+		-e "s:##VERSION##:${PV}:" \
+		-e 's:Debian GNU/:Gentoo :g' \
+		-e 's:Debian:Gentoo:g' \
+		-e 's:debian:gentoo:g' \
+		-e "s:dpkg --print-architecture:echo ${iarch}:" \
+		debian/elilo.sh || die
+}
+
+src_compile() {
+	# "prefix" on the next line specifies where to find gcc, as, ld,
+	# etc.  It's not the usual meaning of "prefix".  By blanking it we
+	# allow PATH to be searched.
+	local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+	emake -j1 \
+		prefix= \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		HOSTARCH=${iarch} \
+		ARCH=${iarch} \
+		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+		GNUEFILIB="${libdir}" \
+		EFILIB="${libdir}" \
+		EFICRT0="${libdir}"
+}
+
+src_install() {
+	exeinto /usr/lib/elilo
+	doexe elilo.efi
+
+	newsbin debian/elilo.sh elilo
+	dosbin tools/eliloalt
+
+	insinto /etc
+	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+	doman debian/*.[0-9]
+}
diff --git a/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch
new file mode 100644
index 00000000000..b574c29f220
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/299665
+
+patch by Dennis Schridde <devurandom@gmx.net>
+
+--- a/debian/elilo.sh
++++ b/debian/elilo.sh
+@@ -321,6 +321,8 @@
+ 
+ mnt()
+ {
++    local loop
++
+     ## we can even create bootstrap filesystem images directly if you
+     ## ever wanted too.
+     if [ -f "$boot" ] ; then
diff --git a/sys-devel/gcc/gcc-4.8.3.ebuild b/sys-devel/gcc/gcc-4.8.3.ebuild
index 40fb333bb19..3b9c0b6dc90 100644
--- a/sys-devel/gcc/gcc-4.8.3.ebuild
+++ b/sys-devel/gcc/gcc-4.8.3.ebuild
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.4.ebuild b/sys-devel/gcc/gcc-4.8.4.ebuild
index e99481871e4..468bba8ed81 100644
--- a/sys-devel/gcc/gcc-4.8.4.ebuild
+++ b/sys-devel/gcc/gcc-4.8.4.ebuild
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.5.ebuild b/sys-devel/gcc/gcc-4.8.5.ebuild
index f1da2545fba..00154dc14c3 100644
--- a/sys-devel/gcc/gcc-4.8.5.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5.ebuild
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.9.3.ebuild b/sys-devel/gcc/gcc-4.9.3.ebuild
index e9624868e16..5868123f46c 100644
--- a/sys-devel/gcc/gcc-4.9.3.ebuild
+++ b/sys-devel/gcc/gcc-4.9.3.ebuild
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index b343363fe10..72f21e0ad2f 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,4 +1,3 @@
 DIST gettext-0.19.4.tar.gz 17717034 SHA256 8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97 WHIRLPOOL 2eb56c47d76f63b6557ae825538a35ae59f3f77da35321688547d9c420f47879c79ca1ab8ebd6bc6b4a3a8ce59ed620648884cd46455f6218213587f76967918
-DIST gettext-0.19.5.1.tar.gz 18353792 SHA256 a198d53b0c1fb11421ead197b7e76b144e887c9ef5a685323e92cbc950227731 SHA512 c2c1dc51d9c24c92b86619ec613b87266eae08a21280855e5b0d44c09e7efc8390341ded85dd85270c5a933ee21a6179373cc5cf275b6bc80cb510c7830d0ef4 WHIRLPOOL 2a2143edc4f3fdb37109aeb762072aa49f88045d55913ae282d203d5a7b3e848df5318c9e4f5e44f63a9f9a7c61c6018900df55b3bdfe06fa975a709322656d6
-DIST gettext-0.19.5.tar.gz 18352722 SHA256 1258814ba174e4783194be2dc93648bd630d4dda166eae034e4ad54489dcf73a SHA512 10b435bba4fcdcf15be3182b3c9756eef5b6ef6ec1416c1b12af35345fc1668c26dce81081e2616b7e2b0d174051fddd6fe6266e4709652a751a91fcf241e610 WHIRLPOOL 94db59cc7a1f3bf833e23a9c9aa25524c571b9585928d083438e7357d034236493584c0137f0c2bb58120f2e55f35055bc36731736162d9ad3e01aa6a1cf270e
 DIST gettext-0.19.6.tar.gz 18619659 SHA256 ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db WHIRLPOOL 1988f9ddfd603734b4a632291925c8e5b31e7384eea1c6641d52aa58cb6b8f892e7664dd145a53435b7d2a4540ac65aeae1cb528a004c35832087c2820dafbcb
+DIST gettext-0.19.7.tar.gz 19235781 SHA256 5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d WHIRLPOOL eb51c4be7c0a92c5c33c16329003e21947e0b9d1583c4a785ae6836f81273ea7ec2823a0a28ae81c3b977f2148c0f3bd524949484383ff87510e1d2bc642a786
diff --git a/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch b/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch
deleted file mode 100644
index 1a9eaea8413..00000000000
--- a/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-the gettext tooling does not quite understand 4 version components.
-hack it so the output in the configure script sticks to 3 parts.
-this is a horrible hack that really needs an upstream fix.
-
-https://lists.gnu.org/archive/html/bug-gettext/2015-07/msg00027.html
-https://bugs.gentoo.org/556024
-
---- a/gettext-tools/misc/gettextize.in
-+++ b/gettext-tools/misc/gettextize.in
-@@ -1235,7 +1235,7 @@
- func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile."
- sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
- func_modify_configure_in "(AC_LINK_FILES): Remove invocation."
--sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-+sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"${version%.?}"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
- func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $version."
- $do_changelog && func_ChangeLog_finish
- 
diff --git a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
deleted file mode 100644
index b6fb8a8ac2c..00000000000
--- a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	dev-libs/libxml2
-	dev-libs/expat
-	acl? ( virtual/acl )
-	ncurses? ( sys-libs/ncurses )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
-	!git? ( cvs? ( dev-vcs/cvs ) )
-	git? ( dev-vcs/git )
-	java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# only installed for native ABI
-	/usr/include/gettext-po.h
-)
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	# This patch should not be included in version bumps (at least to 0.19.2).
-	# Perhaps 0.19.5.2 will be broken in the same way. #556024
-	[[ ${PV} != 0.19.5.1 ]] && die
-	epatch "${FILESDIR}"/${P}-version-hack.patch #556024
-
-	epunt_cxx
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# switches common to runtime and top-level
-		--cache-file="${BUILD_DIR}"/config.cache
-		--docdir="/usr/share/doc/${PF}"
-
-		$(use_enable cxx libasprintf)
-		$(use_enable java)
-		$(use_enable static-libs static)
-	)
-
-	# Build with --without-included-gettext (on glibc systems)
-	if use elibc_glibc || use elibc_musl ; then
-		myconf+=(
-			--without-included-gettext
-			$(use_enable nls)
-		)
-	else
-		myconf+=(
-			--with-included-gettext
-			--enable-nls
-		)
-	fi
-	use cxx || export CXX=$(tc-getCC)
-
-	local ECONF_SOURCE=${S}
-	if ! multilib_is_native_abi ; then
-		# for non-native ABIs, we build runtime only
-		ECONF_SOURCE+=/gettext-runtime
-	else
-		# remaining switches
-		myconf+=(
-			# Emacs support is now in a separate package
-			--without-emacs
-			--without-lispdir
-			# glib depends on us so avoid circular deps
-			--with-included-glib
-			# libcroco depends on glib which ... ^^^
-			--with-included-libcroco
-			# this will _disable_ libunistring (since it is not bundled),
-			# see bug #326477
-			--with-included-libunistring
-
-			$(use_enable acl)
-			$(use_enable ncurses curses)
-			$(use_enable openmp)
-			$(use_with git)
-			$(usex git --without-cvs $(use_with cvs))
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		dosym msgfmt /usr/bin/gmsgfmt #43435
-		dobin gettext-tools/misc/gettextize
-
-		[[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
-	fi
-}
-
-multilib_src_install_all() {
-	use nls || rm -r "${D}"/usr/share/locale
-	use static-libs || prune_libtool_files --all
-
-	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-
-	if use java ; then
-		java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.class
-		if use doc ; then
-			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
-			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
-		fi
-	fi
-
-	if use doc ; then
-		dohtml "${D}"/usr/share/doc/${PF}/*.html
-	else
-		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
-	fi
-	rm -f "${D}"/usr/share/doc/${PF}/*.html
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/gettext-0.19.6.ebuild b/sys-devel/gettext/gettext-0.19.6.ebuild
deleted file mode 100644
index 0f921c07273..00000000000
--- a/sys-devel/gettext/gettext-0.19.6.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	dev-libs/libxml2
-	dev-libs/expat
-	acl? ( virtual/acl )
-	ncurses? ( sys-libs/ncurses )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
-	!git? ( cvs? ( dev-vcs/cvs ) )
-	git? ( dev-vcs/git )
-	java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# only installed for native ABI
-	/usr/include/gettext-po.h
-)
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	epunt_cxx
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# switches common to runtime and top-level
-		--cache-file="${BUILD_DIR}"/config.cache
-		--docdir="/usr/share/doc/${PF}"
-
-		$(use_enable cxx libasprintf)
-		$(use_enable java)
-		$(use_enable static-libs static)
-	)
-
-	# Build with --without-included-gettext (on glibc systems)
-	if use elibc_glibc || use elibc_musl ; then
-		myconf+=(
-			--without-included-gettext
-			$(use_enable nls)
-		)
-	else
-		myconf+=(
-			--with-included-gettext
-			--enable-nls
-		)
-	fi
-	use cxx || export CXX=$(tc-getCC)
-
-	local ECONF_SOURCE=${S}
-	if ! multilib_is_native_abi ; then
-		# for non-native ABIs, we build runtime only
-		ECONF_SOURCE+=/gettext-runtime
-	else
-		# remaining switches
-		myconf+=(
-			# Emacs support is now in a separate package
-			--without-emacs
-			--without-lispdir
-			# glib depends on us so avoid circular deps
-			--with-included-glib
-			# libcroco depends on glib which ... ^^^
-			--with-included-libcroco
-			# this will _disable_ libunistring (since it is not bundled),
-			# see bug #326477
-			--with-included-libunistring
-
-			$(use_enable acl)
-			$(use_enable ncurses curses)
-			$(use_enable openmp)
-			$(use_with git)
-			$(usex git --without-cvs $(use_with cvs))
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		dosym msgfmt /usr/bin/gmsgfmt #43435
-		dobin gettext-tools/misc/gettextize
-
-		[[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
-	fi
-}
-
-multilib_src_install_all() {
-	use nls || rm -r "${D}"/usr/share/locale
-	use static-libs || prune_libtool_files --all
-
-	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-
-	if use java ; then
-		java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.class
-		if use doc ; then
-			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
-			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
-		fi
-	fi
-
-	if use doc ; then
-		dohtml "${D}"/usr/share/doc/${PF}/*.html
-	else
-		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
-	fi
-	rm -f "${D}"/usr/share/doc/${PF}/*.html
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/gettext-0.19.5.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild
index 0b284dd905d..7677f88eb8d 100644
--- a/sys-devel/gettext/gettext-0.19.5.ebuild
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild
@@ -2,25 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+# Note: Keep version bumps in sync with dev-libs/libintl.
 
-inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+EAPI="5"
+
+inherit eutils mono-env libtool java-pkg-opt-2 multilib-minimal
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="https://www.gnu.org/software/gettext/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-3+ LGPL-2.1+"
+# Only libasprintf is under the LGPL (and libintl is in a sep package),
+# so put that license behind USE=cxx.
+LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib
+# Note: expat lacks a subslot because it is dynamically loaded at runtime.  We
+# would depend on older subslots if they were available (based on the ABIs that
+# are explicitly handled), but expat doesn't currently use subslots.
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	dev-libs/libxml2
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
 	dev-libs/expat
 	acl? ( virtual/acl )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:0= )
 	java? ( >=virtual/jdk-1.4 )"
 RDEPEND="${DEPEND}
 	!git? ( cvs? ( dev-vcs/cvs ) )
@@ -40,6 +48,7 @@ pkg_setup() {
 
 src_prepare() {
 	java-pkg-opt-2_src_prepare
+
 	epunt_cxx
 	elibtoolize
 }
@@ -50,49 +59,35 @@ multilib_src_configure() {
 		--cache-file="${BUILD_DIR}"/config.cache
 		--docdir="/usr/share/doc/${PF}"
 
+		# Emacs support is now in a separate package
+		--without-emacs
+		--without-lispdir
+		# glib depends on us so avoid circular deps
+		--with-included-glib
+		# libcroco depends on glib which ... ^^^
+		--with-included-libcroco
+		# this will _disable_ libunistring (since it is not bundled),
+		# see bug #326477
+		--with-included-libunistring
+		# Never build libintl since it's in dev-libs/libintl now.
+		--without-included-gettext
+
+		$(use_enable acl)
+		$(use_enable cxx c++)
 		$(use_enable cxx libasprintf)
+		$(use_with git)
+		$(usex git --without-cvs $(use_with cvs))
 		$(use_enable java)
+		$(use_enable ncurses curses)
+		$(use_enable nls)
+		$(use_enable openmp)
 		$(use_enable static-libs static)
 	)
 
-	# Build with --without-included-gettext (on glibc systems)
-	if use elibc_glibc || use elibc_musl ; then
-		myconf+=(
-			--without-included-gettext
-			$(use_enable nls)
-		)
-	else
-		myconf+=(
-			--with-included-gettext
-			--enable-nls
-		)
-	fi
-	use cxx || export CXX=$(tc-getCC)
-
 	local ECONF_SOURCE=${S}
 	if ! multilib_is_native_abi ; then
 		# for non-native ABIs, we build runtime only
 		ECONF_SOURCE+=/gettext-runtime
-	else
-		# remaining switches
-		myconf+=(
-			# Emacs support is now in a separate package
-			--without-emacs
-			--without-lispdir
-			# glib depends on us so avoid circular deps
-			--with-included-glib
-			# libcroco depends on glib which ... ^^^
-			--with-included-libcroco
-			# this will _disable_ libunistring (since it is not bundled),
-			# see bug #326477
-			--with-included-libunistring
-
-			$(use_enable acl)
-			$(use_enable ncurses curses)
-			$(use_enable openmp)
-			$(use_with git)
-			$(usex git --without-cvs $(use_with cvs))
-		)
 	fi
 
 	econf "${myconf[@]}"
@@ -104,8 +99,6 @@ multilib_src_install() {
 	if multilib_is_native_abi ; then
 		dosym msgfmt /usr/bin/gmsgfmt #43435
 		dobin gettext-tools/misc/gettextize
-
-		[[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
 	fi
 }
 
diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
new file mode 100644
index 00000000000..72a616a046a
--- /dev/null
+++ b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/503838
+http://gcc.gnu.org/PR60465
+https://sourceware.org/ml/libc-alpha/2015-12/msg00556.html
+https://trofi.github.io/posts/189-glibc-on-ia64-or-how-relocations-bootstrap.html
+
+newer versions of gcc generate relocations in the elf_get_dynamic_info func
+which glibc relies on to populate some info structs.  those structs are then
+used by ldso to process relocations in itself.  glibc requires that there are
+no relocations until that point (*after* elf_get_dynamic_info), so we end up
+crashing during elf_get_dynamic_info because the relocation has not yet been
+processed.
+
+this hack shuffles the code in a way that tricks gcc into not generating the
+relocation.  we need to figure out something better for upstream.
+
+--- a/elf/get-dynamic-info.h
++++ b/elf/get-dynamic-info.h
+@@ -66,8 +66,12 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
+ 	info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+ 	     + DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn;
+       else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM)
+-	info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+-	     + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn;
++	{
++	  d_tag_utype i =
++	      DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
++	      + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM;
++	  info[i] = dyn;
++	}
+       ++dyn;
+     }
+ 
diff --git a/sys-libs/glibc/glibc-2.19-r1.ebuild b/sys-libs/glibc/glibc-2.19-r1.ebuild
index a683fa59060..998b7fda0c9 100644
--- a/sys-libs/glibc/glibc-2.19-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r1.ebuild
@@ -157,8 +157,11 @@ eblit-src_unpack-pre() {
 }
 
 eblit-src_unpack-post() {
+	cd "${S}"
+
+	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
 	if use hardened ; then
-		cd "${S}"
 		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
 		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
 		epatch "${FILESDIR}"/2.19/glibc-2.19-hardened-configure-picdefault.patch
diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild
index 8280980a416..0ea96b27052 100644
--- a/sys-libs/glibc/glibc-2.20-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r2.ebuild
@@ -160,6 +160,8 @@ eblit-src_unpack-pre() {
 eblit-src_prepare-post() {
 	cd "${S}"
 
+	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
 	if use hardened ; then
 		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
 		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
diff --git a/sys-libs/glibc/glibc-2.21-r1.ebuild b/sys-libs/glibc/glibc-2.21-r1.ebuild
index 9963ae3152d..3dcbb52c367 100644
--- a/sys-libs/glibc/glibc-2.21-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.21-r1.ebuild
@@ -160,6 +160,8 @@ eblit-src_unpack-pre() {
 eblit-src_prepare-post() {
 	cd "${S}"
 
+	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
 	if use hardened ; then
 		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
 		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
diff --git a/sys-libs/glibc/glibc-2.22-r1.ebuild b/sys-libs/glibc/glibc-2.22-r1.ebuild
index d6f6033f0d0..6e41fa91e66 100644
--- a/sys-libs/glibc/glibc-2.22-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.22-r1.ebuild
@@ -163,6 +163,8 @@ eblit-src_unpack-pre() {
 eblit-src_prepare-post() {
 	cd "${S}"
 
+	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
 	if use hardened ; then
 		# We don't enable these for non-hardened as the output is very terse --
 		# it only states that a crash happened.  The default upstream behavior
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 743950428d5..7bdb75686aa 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -1,3 +1,3 @@
-DIST mod_wsgi-4.4.10.tar.gz 633173 SHA256 150091d399d37360108b5e75ec1872251706d75e6c24c9c5e06b4e6d90ecb2c4 SHA512 30c36fab69d50815df18f7323dcc71a2788e58031ea70fd0c9a8fc411527d3532cdecd3a619cf5f70a58991a6e120cbffe8f16a3eb9ee13457956f2afdc07776 WHIRLPOOL 70f61c16457af06c730866c66414c303b60ffd89f9c39eb10b264a019fd9eabb1343424c995eafae3de7d6e8b0c6533a3b2e5060122cd39ba06556e657744277
 DIST mod_wsgi-4.4.13.tar.gz 631708 SHA256 e7a84e4af0da953070ab993268118791c7d3c7383d99e8b1c2e0ff88eb29c286 SHA512 e3a057534a6bfbc974d8159df7e926ac47a4ac58f691a2e23dbe98d07a7f82244ef3554386766a0d7b0ad8592bcea15e9570edd793de0031a04e2fd081144a56 WHIRLPOOL 4c0c7c38454771ddd9a22e84053d9cb31fc74252cb029b4cfbb7654e615589b0848609d2b63e06584f5bf778758349a1448f452e8db38148ded869a2fe59eae9
+DIST mod_wsgi-4.4.21.tar.gz 541367 SHA256 69e0b83e6735d04e4b0b75472d178eaf3b935f4f83788f138a2610b67b635187 SHA512 b77523839e6d57b4d6920d8093d2f042c8de1fc965c64dfef425a1c909f7d08e6cce8e2c30cfc7b9956127bfc57233583ecf51a0cbd2c56c540e67c2e408480c WHIRLPOOL e19f5cae4608f8d481d9bb607fa667b0d8686f5f21275265a9ec0a48f16f9624e81ba0c59dc4b420c1afd9848c46a907c926bccbfeba30cb3967689e0922a6c6
 DIST mod_wsgi-4.4.9.tar.gz 623831 SHA256 6d62cc584ca3a06e5d27799db594728d66735fdfd1930e50b9853e82019a388a SHA512 346ba680bdac59695258849594f109f9a7886ac863944895978610a3ff33c78b687842beb32fc5e4a044893c5b7f43bc08ac60b7d481ae1a46866071794de7c0 WHIRLPOOL 1aaa80e1f6b321674cfd91bfa0056ba135f849fbb374309f4be96e1664d70b923525bf8b7396574757e8b5c7e5a2eb9f54c2f553e32b25e81f98ec675c021ea1
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.4.10.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild
index f934d33de90..f934d33de90 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.4.10.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild