gentoo resync : 31.10.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-31 15:47:53 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-31 15:47:53 +0000
commit: d950fa39dbe16d164ed0cb8e3036fd5d0d896a4c (patch)
tree: 04f92d5d1070a7aedb970ce4539dc6d60253c4df /dev-lang
parent: bd7908c6630f38067350d396ac5d18c3cc2434a0 (diff)
35 files changed, 280 insertions, 886 deletions
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 255db0c5619d..7d3bd68a92c8 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -10,7 +10,9 @@ DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 SHA256 4e05b8830a473756cfee3fc2
 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 SHA256 70bb859e80268b3421587d85189a807b14449b8c5e7b23606b87dfab54189634 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a WHIRLPOOL d0475efcbc2c1cbb3c6db452dbeb2a5fe709fa56b65eba2fbbcce2296b6a04ba89b9e33579d6eab192cd63b45ad78a0d7afd458229e4b252e80bd2db260abf11
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 SHA256 83053f333d56d72ddbe9a8f293f8afeff31739806d49ebaa144811a5438b17bc SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d WHIRLPOOL 2d58085d88fa612a7dfb087df33d2c5ee6b6d4c0b0c0363d5dcef014a6e3e9703816e8a111d1348e1e1a4ebcdde58694a869a27ae42e0deec154529f1a794991
 DIST go1.9.1.src.tar.gz 16377700 SHA256 a84afc9dc7d64fe0fa84d4d735e2ece23831a22117b50dafc75c1484f1cb550e SHA512 3c5d11089a54c61acd1a4fad9618ddb2058cc783a54564407ee50e37c864deaadfd5effeab623080c136a599096f448aae091ef41d0afca1abfcdb98adf4a793 WHIRLPOOL 1cdfddfbe2b432a783d821bf6caf6615868de7eeb71667fd38d77a115b87c0d5321d6928f271bbe7edd6e05d56f5a0e05b6fceeec5dd025673c0a0ad9224ad3e
+DIST go1.9.2.src.tar.gz 16383591 SHA256 665f184bf8ac89986cfd5a4460736976f60b57df6b320ad71ad4cef53bb143dc SHA512 1034098575c317eeaf648629690a4dea0c479a69c3b80d9917f6b96c8781ce79c0f29859f667dc4e07d47a44972aa09bd0163a458f897cf45f9d09eb03e4abb5 WHIRLPOOL f9a009e1befa29ff93a2a1f942276b932f7d96a95f027b99c04f8d56317cfeebcfb779f36ddb46801a8e7646fdd0be57a39b2a3c04886c09f1799bc4e6752af0
 EBUILD go-1.9.1.ebuild 5581 SHA256 0f93c5167e263e8029621377972b4be9f94187d325d459bda30268935bff3b8d SHA512 f45cfc64b0671b7089cf6e802b4963598e3c47b338ebf8ee6f741ddc4979ba1fe3306d7ef02e7625af2b4b8c4108e8b6ec8f820a2ba75560d04a4c37960d4997 WHIRLPOOL 086b7c4b0ac20a17822d704451f258966921103a297d8038a71183895c6fb645a18edaaaf0d90c34ed0c0b7fcc74d069cfdb62d5d530b71d5967a2b7ddc59ae8
+EBUILD go-1.9.2.ebuild 5584 SHA256 3854f126a7b2d76ed3dfde8cff697d6c033d6d60e063b07239485a5410666504 SHA512 9b009525bda054f8451d1a202a7dfd7087de6e9d57633f7a8c9c74bdae6407e420237a0c80c58e5650c5beb9c01cef29052ec8e182129f23d2cbcbbdf2efbed7 WHIRLPOOL dcb1f48b08de50e1ba456c81676bc0c8b2817d73faaa5ce188d9508bb1376833d754cd3391f254fd353ca6100f8fdee5e18d20e0d6b223a7b09790d1e50f9ab0
 EBUILD go-9999.ebuild 5584 SHA256 3854f126a7b2d76ed3dfde8cff697d6c033d6d60e063b07239485a5410666504 SHA512 9b009525bda054f8451d1a202a7dfd7087de6e9d57633f7a8c9c74bdae6407e420237a0c80c58e5650c5beb9c01cef29052ec8e182129f23d2cbcbbdf2efbed7 WHIRLPOOL dcb1f48b08de50e1ba456c81676bc0c8b2817d73faaa5ce188d9508bb1376833d754cd3391f254fd353ca6100f8fdee5e18d20e0d6b223a7b09790d1e50f9ab0
 MISC ChangeLog 15550 SHA256 1e804542720fb0000c4ae8ed1d840415527ec25a16f77aafd7eceeefbe446377 SHA512 3e8c4083b1a7ee877c55283f3463aaec0144d090b5ffc5be7258a29de69d88ae3ecd2fe69f4ff118667796d8a79235870d47855f033d7e67e1da78fc466df638 WHIRLPOOL 8d80ee3abbf55b198e82d911983ed5155da45e72d2b4d2aa39f71837857c61a02797e5a3b9b776f2f93af5ad81babc8e2d5fc7e9a7405d07b069755333479b9f
 MISC ChangeLog-2015 9934 SHA256 5c5375109d9de6edbdf782c355e7f28a8ac4c97d84ca4257a65f12d112fd6a9b SHA512 879f50097cd760b2e96c8ad06ff092f51797181a241361c4897b48abffbad8224331a1bcc614d525e548f7001d3ad664a103ba557a819f0d1cb3c23d67b4019c WHIRLPOOL f11ad28c4f0e811ba70c3b6a8314622d7ab4b064151cb94e62f461fc24c9e62c821571ee771578a20da18ea143d06518a5835f9deedea2a3098a5e83bd6eb5be
diff --git a/dev-lang/go/go-1.9.2.ebuild b/dev-lang/go/go-1.9.2.ebuild
new file mode 100644
index 000000000000..2ac936f0164a
--- /dev/null
+++ b/dev-lang/go/go-1.9.2.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_URI="
+amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
+arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
+arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
+ppc64? (
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+)
+s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
+x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
+x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
+x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index b36e3f75392f..0770cb9db861 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -14,13 +14,13 @@ DIST perl-cross-1.1.4.tar.gz 94623 SHA256 c840a327d5464ca271cac40d52e2d199330875
 DIST perl-cross-1.1.5.tar.gz 95122 SHA256 0e719e75983b16c7726c2c9462f9498bb1fc4ad38c9f2513a65f3dd34e3decb3 SHA512 344ae0ff3ab8a2ce3fdb0de10972164c8cc14abd9c5c9bf55029bc8a6c2e62b3f9dda88892b1d8d0e30b76f94d42feea1dd5e5c55631f9eb53d1443285e2e3d1 WHIRLPOOL b194d4986511e3483921b11bd264586f1e185df8cd33e408b7f5702403b6dc9e20d0245a60e47e8ee03db8002effccdde48ab7ad1087a9f35ec703b558f699cc
 DIST perl-cross-1.1.6.tar.gz 96075 SHA256 2b3b88f54d85beb438bd2dddd948e2d89461db5ab6253f01b3c2c9ae3ddc30b4 SHA512 4d46ad55093d90da4b0589552d14390efdc6604532ad2b4a3b20a79c69ef3b3cfe0e171b439dfa464bbee2e1fbd92606af6e6584d9355a8476e5b4ada8733653 WHIRLPOOL 78254d35c462758c6fdcc7a0a30668919d2fc0034947900e8e7575deee4932d9659486fa32b938c5ca14332aef99bdf0ec198b301cc8cfb1225a322c8516192c
 DIST perl-cross-1.1.7.tar.gz 97622 SHA256 b79ce9d766b5f527ad7e73cb86d541da88ecbb69a443ee5f14658dd8f9e9415f SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0 WHIRLPOOL 92b4c77e9cefeab026c246fc82abbe20a98c7ba20a4cde2e6f32423dbc98777601b39ca147d4bfa03e42530ad5e1fe7e1d18ca10a407bfd258318934a4a93998
-EBUILD perl-5.24.1-r2.ebuild 17089 SHA256 81c1cce8e4c80c26fa7d176380ec0174265a9f35871d6e0d586dd246eaac7df1 SHA512 2b05056724d99216e116b8fce6fb7f935bce683454a004b85131a815a770d327d67dd762e5111396a34ad0d219a4b42fbb4108d8f52f17fbfd2aa34284ea963d WHIRLPOOL 4a025854d65d5a5a58728b17d53ab9fd18fc490d69d61a71d7ccfe63b97caa9893c0aa99740a1aadb06f88d6f739d881a38c664df913ee7f1b6febffa843b7ea
-EBUILD perl-5.24.2.ebuild 17084 SHA256 e81935c7bfe52f0e636e8ec290bb76b9da326d3ee401cfcf52574b0c9f4c6e93 SHA512 148573132f49a2f46853e3fe171b6d07a72dc50c3b80d2d5c54b7c87833089b366dd0137637160e053f26dfc39dd4b3564d08e0a3891a6822950688cd1844aa8 WHIRLPOOL 2afce33fb37ce2517cbeec1b29688300516c185ed5bc4da9ae7af9eff44ad976b8c1fe713e21eabe1bd7bea69ffcf21fbcb115aa2ef76ffb2877540346d5a7b9
-EBUILD perl-5.24.3.ebuild 17082 SHA256 b7393c3058b466dd250131925ca1fd3ee865fd4b177cd11dd2c9f37bda57f8ae SHA512 bff51a7b03afae6534d63a71622fb8c29624749434ad6abfe73bfd727a5f1f8d6a95ffac2a353000e7b8cf57d97b378c2d0272840b8685b825f5f605c7237900 WHIRLPOOL 7fbbfee8f1321b7ca2f17d2a2d49b27d0901ba0eeb4bba1adc52ae81b1e097da70782d3345b843c7683fa68c487176affb658495a6a54fd4fe6b1a9d0d0ca616
-EBUILD perl-5.26.0.ebuild 17993 SHA256 73c71a10fa481c983b3dc4d81bd3db8ed957901c3aac10e39064ec664015c2c1 SHA512 3a9d54c89c428ba1033228287a466e5ab4b3e4b3c8207885491c3f04d8608074609e18fff913def5eeead0a100a3b7ee1569b5c5b318c8f959bb36578eed1f4a WHIRLPOOL 02e2d21535e5f8e55b952c725398cb3ddcae7759a5b17ee953eceadf11ec77d04a67ed6948cbf23612e0c3d0fac84be42de6b6ec711fef982a09ee0944f1fda3
-EBUILD perl-5.26.1.ebuild 19098 SHA256 e9f7efce9624a3e103e0a1b637b28705993d73935a5dd723a95b1b5bbe7be769 SHA512 5e1ff08063a003a0dae392b1b6a7f0fb24838b658ebee2643e2c833ba8b05f1eec9a5bad4e1ba9f97dff542832b372b67104ff0a91044dd4fcf40711308898ea WHIRLPOOL 9f1e65828a2fe55c126750c69bcc7cb35bc17ca25c98b8a4dd97489a1b876a6e99af6d56111c9ba21d6149813bd31bdef480736a84f66d78fbcb9e1789a83073
-EBUILD perl-5.26.9999.ebuild 19091 SHA256 5817274e7388b5c76acfb6751611d50d32522486bb07863932254e0ecbfc2577 SHA512 1d432daec869ffddbf7dd9cd845a8a48a4e942b500ebaae80f80fbdfdf2cc5147fe58f305801688549f071ae1ec3126b828f1b6f95ba109f72bab1584afe3f56 WHIRLPOOL 90e3b0b41d5a48b607c1931a30a2270f61a568076f80d1884359ed1961897f20ceee44efe10408688c64f8bb3ced288ec6df7644e30d22a96a8f0a9c43ffa9d6
-EBUILD perl-5.28.9999.ebuild 19077 SHA256 b9bd74ccff68f224a779c3e27c6135f0086aabe1ba0fc5e99655ab2812b099f4 SHA512 0a66557c40eb7da939498995ce2c5832ef1ea498b44e03ee88f3239f961ab381e6d77c93b877fd65fa6189a4cd4c18e6e0f5fbdbb864584467b8e2ffd0f84bb7 WHIRLPOOL e18a1e405039dcea5a587344dfe193bf9abbbb54fa54bcb16f6bedc4193ae75e5a88305facd19f3a0dc1b1dd585043f70e63067ef9345217b7d2beed064409a7
+EBUILD perl-5.24.1-r2.ebuild 17081 SHA256 65031fd44a9009849ef7181b4a2e9c860a020dbcc4ee4ea248cd7793fe94d682 SHA512 7c46c1b392371db63a03d2174613cc008f50045f3a50693034853a2c809b59c8dbef7b36a00f2be20d5f09aae62760365c32d9268d770d49a20a9b191af0ecac WHIRLPOOL 8f75132dc43c3348654a296bc0dbc1ecd40d4b238e089b9969a183a1f319c604a4608900ac97f88e4aa5c74270c9c64032c1837831b769979a39ad4283481b76
+EBUILD perl-5.24.2.ebuild 17076 SHA256 04ab03a05f633a34a64eae317809ea6d84465d9c68fc3e0d88f23f3086afc087 SHA512 c6bafe77fe764ed6a318a731ee4240e31b1555afb45a416bf2e9eb650d680ea618f37b5dafdccdfd34e2676e5f1e3f1fbc8d4757d6694149a733b6f81f4251ea WHIRLPOOL 2746c2eeeb3f6ade4b72027d0e8d3e04276abe4f9495b3c3d106779367a31d21ad2ba128c74099c86a301cb81ab69d5d807e5f3dd78e27b5e1fc8625923d2694
+EBUILD perl-5.24.3.ebuild 17074 SHA256 afbc638fc2b96816d1b90eb6efc5d5778becf5e27f149b50ea88302ff8acd37c SHA512 729ece15a14c7ab5c01d950d370bbf2a299c7782e39fbac9a90e911f7cff4696049284670a679b18fd0f430ecefbcfc966dbc1ad8d79628321efb8ae4ed901aa WHIRLPOOL 48d272286ceb1d0ef5224bf816514a54f10be1da3a9b02bb3f2df96bf73749c946a3c60ef64ea64ac925d766832c7727ac6d9cd5a8aba9c11730cd4037e1640d
+EBUILD perl-5.26.0.ebuild 17985 SHA256 fc7d20774e02c3681595bfb53772a60765746053eeaeffd58a2753b7537c9b25 SHA512 f45357a04344573edcbe589d5da44b5a915a5db8262c7bdc34c73c163a184050d4f0223106696504b8f9f1fa2297b4534313a8513d45aa12240027eef833f6a4 WHIRLPOOL 09c8a57bf356e6000c40f751be446e6d04648bd42ba18b77430ca6f9eab8d6b79b3580eb304e6c630241b573309c729d97d88347a32629e908ab1c31f1412532
+EBUILD perl-5.26.1.ebuild 19090 SHA256 44ac70d043d05744910f1423fd5ac52b7577616b7fd802ddb081d178c5fa3052 SHA512 dcbca9dfd36210eef3d1b57419e711b592479079c10aa212971b9778b82a777f87bead09c907c713cdde7af6292bc29bc57e472f4969830e04d6f09ae10ea453 WHIRLPOOL 462bf0e095c1ca792bb377685d0c25417335c03aaeb67374cb5d6507ab19f4cfea60c97e88f29319e378370fc7a1c3436cc199f28fd0ca9a92575badacfac6d4
+EBUILD perl-5.26.9999.ebuild 19083 SHA256 69cca61a583bc18df4511257e2def3e21465d6f31283229d564a9b7463bc48af SHA512 64e71791bb96555c0fb5a7e05a8b864509c0637dfacff099792b319d843eacc6cfeef0c4c1cf2429a5f85d89ce4cda780a264015d5ce7b0d6a09c247532a33d5 WHIRLPOOL 8bd7f1ee84beb0efa9f72782f15a9b6be323538e65ec2d34ef354828026ec4e3ac343c43177f1bc067dc43f1dd80464d5b24e1b4176797ff3534dd12c4af6dac
+EBUILD perl-5.28.9999.ebuild 19069 SHA256 a32933dade9f1c05d22463edd3992f8c99af827e4e3b43301ec3a14cc54b84d8 SHA512 0558d67fe5a49080a7ecf88d5cf2f1472a63effb3952d4f65d6b719846120ee937edbb22d067e284319764e1680ddce8b49b45ab3eac2ba0646bd0d1f114ebf3 WHIRLPOOL de1f0e9067bac087852689e2c3fe3286350f4254a99798131c9ea28459b510bf6e131a22cb5a42c44f13d32bbc2b49bb53dc528e8c7da52df57070cc8bbd5bc0
 MISC ChangeLog 13780 SHA256 57a0f6f6bc7a816ca621af65126c42eb0fe19891e9cfe8ea0eb664607ea4749e SHA512 8bd6e0673b863e40e4f3309461049c95c261c95ffaafdf7bf9a8b801f29017994f152fa0dc5eb3f09b85be832e356a9c08ed1171f7e617a5597e6456ee9d11dd WHIRLPOOL 1bdf46f12430a2a84e66841a4b38e03bacc8f0649e38ba11d7ec23504ef254012c1dc9e1ef333b98619a6dcba6c183640f7b18080831cf37f425fd63d6810eee
 MISC ChangeLog-2014 86908 SHA256 36afb5e482f7c0faf3cb0491c694758752f81a8037fafbf69f33f82a535463dc SHA512 87a6b79f868b97ef1f1430d9616f4f47bc526add8eab73a40065f865a1097bc393001b3457cbfcf876a51cf710fd7d67183932fccdd0a658b9ae8c8cb2e30b52 WHIRLPOOL 536b71f37a08710b083d6df5ecf231ebb6debfaae56f12a5f78b46bf2c419b74eb9f53e35fda4f11c9c95a0a9089c3558b08f575f2c8137fa8fbcf4b19ed098f
 MISC ChangeLog-2015 3505 SHA256 ee4e406b267916f82010b5d51d78814d3ab074cfc720fc0a61e9fcadf45508bc SHA512 6b19ce6be009f9982f2b2d10f7afbc20d7ea46b43b33d906b4a6755df80fb95e0d4175999d8e47986b11d4346bed24b4465374fd3a783e693805df8b72142efd WHIRLPOOL 319a86c0471fcbbbaadebda3a219bc564c0134704a680c21ad0e28c1bba3cc591ffe7c4e331326accc97d1e1869481aa592c56a0b89ee9ae63be12086df172d7
diff --git a/dev-lang/perl/perl-5.24.1-r2.ebuild b/dev-lang/perl/perl-5.24.1-r2.ebuild
index 1250d4c71259..50935dc90f47 100644
--- a/dev-lang/perl/perl-5.24.1-r2.ebuild
+++ b/dev-lang/perl/perl-5.24.1-r2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 	https://dev.gentoo.org/~kentnl/distfiles/${MY_P}-patches-${PATCH_VER}.tar.xz
 	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
 "
-HOMEPAGE="http://www.perl.org/"
+HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
@@ -97,9 +97,9 @@ check_rebuild() {
 
 	# Reinstall w/ USE Change
 	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-	     ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-	     (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-	     ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
 		echo ""
 		ewarn "TOGGLED USE-FLAGS WARNING:"
 		ewarn "You changed one of the use-flags ithreads or debug."
diff --git a/dev-lang/perl/perl-5.24.2.ebuild b/dev-lang/perl/perl-5.24.2.ebuild
index 1bcccde79f5b..b6863bfb1779 100644
--- a/dev-lang/perl/perl-5.24.2.ebuild
+++ b/dev-lang/perl/perl-5.24.2.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 	https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz
 	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
 "
-HOMEPAGE="http://www.perl.org/"
+HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
@@ -98,9 +98,9 @@ check_rebuild() {
 
 	# Reinstall w/ USE Change
 	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-	     ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-	     (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-	     ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
 		echo ""
 		ewarn "TOGGLED USE-FLAGS WARNING:"
 		ewarn "You changed one of the use-flags ithreads or debug."
diff --git a/dev-lang/perl/perl-5.24.3.ebuild b/dev-lang/perl/perl-5.24.3.ebuild
index e36cec59f279..cc82a2885505 100644
--- a/dev-lang/perl/perl-5.24.3.ebuild
+++ b/dev-lang/perl/perl-5.24.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 	https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz
 	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
 "
-HOMEPAGE="http://www.perl.org/"
+HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
@@ -98,9 +98,9 @@ check_rebuild() {
 
 	# Reinstall w/ USE Change
 	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-	     ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-	     (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-	     ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
 		echo ""
 		ewarn "TOGGLED USE-FLAGS WARNING:"
 		ewarn "You changed one of the use-flags ithreads or debug."
diff --git a/dev-lang/perl/perl-5.26.0.ebuild b/dev-lang/perl/perl-5.26.0.ebuild
index 31f557b650c7..6a1ce9639e77 100644
--- a/dev-lang/perl/perl-5.26.0.ebuild
+++ b/dev-lang/perl/perl-5.26.0.ebuild
@@ -45,7 +45,7 @@ SRC_URI="
 	https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz
 	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
 "
-HOMEPAGE="http://www.perl.org/"
+HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
@@ -121,9 +121,9 @@ check_rebuild() {
 
 	# Reinstall w/ USE Change
 	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-	     ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-	     (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-	     ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
 		echo ""
 		ewarn "TOGGLED USE-FLAGS WARNING:"
 		ewarn "You changed one of the use-flags ithreads or debug."
diff --git a/dev-lang/perl/perl-5.26.1.ebuild b/dev-lang/perl/perl-5.26.1.ebuild
index e6464cb307d7..a7e2522f1e1d 100644
--- a/dev-lang/perl/perl-5.26.1.ebuild
+++ b/dev-lang/perl/perl-5.26.1.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 	https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz
 	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
 "
-HOMEPAGE="http://www.perl.org/"
+HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
@@ -118,9 +118,9 @@ check_rebuild() {
 
 	# Reinstall w/ USE Change
 	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-	     ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-	     (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-	     ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
 		echo ""
 		ewarn "TOGGLED USE-FLAGS WARNING:"
 		ewarn "You changed one of the use-flags ithreads or debug."
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index 3de2f8569190..e55363ce2b1a 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 	https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz
 	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
 "
-HOMEPAGE="http://www.perl.org/"
+HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
@@ -118,9 +118,9 @@ check_rebuild() {
 
 	# Reinstall w/ USE Change
 	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-	     ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-	     (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-	     ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
 		echo ""
 		ewarn "TOGGLED USE-FLAGS WARNING:"
 		ewarn "You changed one of the use-flags ithreads or debug."
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 823075efb2a6..e5595e4eead1 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 	https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz
 	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
 "
-HOMEPAGE="http://www.perl.org/"
+HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
@@ -118,9 +118,9 @@ check_rebuild() {
 
 	# Reinstall w/ USE Change
 	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-	     ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-	     (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-	     ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
 		echo ""
 		ewarn "TOGGLED USE-FLAGS WARNING:"
 		ewarn "You changed one of the use-flags ithreads or debug."
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 66e7b6853cd8..7d1679d35985 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -29,7 +29,7 @@ DIST python-gentoo-patches-3.6.0-0.tar.xz 10680 SHA256 ecf78d292f2fef1116b41c388
 DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 SHA256 56729f9848557c52361c71404e5583368f6a0e93b5b6c2e643b59cb079e253d9 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3 WHIRLPOOL 90d1f12bee812f350ca0330a97290ce0d5c5fa9ccd816441944f042ef561d9023f4b79239f6d559f38a486fea458e48bf11d33d5bd6fa605875b686a2a845bd1
 EBUILD python-2.7.12.ebuild 10750 SHA256 097322c05e8ce3e749f15eded01b7dbcc8b198995dae192d702b86ca95e488fa SHA512 31b6427107ceaa3309b29bba84819f2e1695b5911904de0138767be78a0ee7f02234d5956b1802259ebdbbc726c6ac7de0c11ffddcecd913c2607696528430db WHIRLPOOL 4a4b7420478cdc1738bc2150f3133eddb5a0ef338de33dcbcfad3f92fac354e1adb4ec12d8f32a6015c19e63d8270880a4befeab53ebccccc4714be79755cbd3
 EBUILD python-2.7.13.ebuild 10760 SHA256 737b7816424813dc152da2026473b3b7d0d9f37afce12f635b5617129b18e202 SHA512 03ab6787b81dbe52268e75971242230263db1cb6e5d6c01f9b4e96b917d4faeedd77e087a6b7e05682b0c08a9c840fd91ffc3523bc207f14c432910e2c1cfa88 WHIRLPOOL e375c651b9b7cba5914be1e88c3201fa6acf316a765822aeb577d7009bacb19c9de7b25f4a8f2aed57be00e92015d8b5f7ba2383bb896b8d406093e91cc67955
-EBUILD python-2.7.14.ebuild 10760 SHA256 5c3a40aa1102d2c8f1ba14700ff13065eed95d91835f4fd7688fd51e5bfb9e30 SHA512 84bfda31b4b6a43bad20afe889fa75b93df793f96a2bc13759355bf1d3f99b056546b98796300d549d9a34de4f54d1c6bf335fac2d4027fb94a79d9643792d66 WHIRLPOOL 4f87307352f5fab3b47a306bd0b9317437f09d2e7d9e689ecfe4896e5333144e3d6803007a560a9be79ea54414e059cff24f8c1fd16ff98315aebdf9d23054df
+EBUILD python-2.7.14.ebuild 10757 SHA256 b944342a184acb9f4bdb351425b064cfe258fa649404a3fa608ba802dea70ba5 SHA512 109a015e6ee6ac37baff09a9e7e12b34c8ee08673d10d6ee539cb37e129004da896f402628db219a2c3959b030d8cd8d285eb79eb18f5e7589faaa400261876b WHIRLPOOL ec3a98768af2ff9392f90b86da008a9280d37f7c7c4ee077538cfbaa1f1bc0e74abb52e16329a0c9284ef8f45ff086bcfbbfa4024ac24aa7bfbe26f310d7abfb
 EBUILD python-3.4.5.ebuild 10493 SHA256 5e4fd02ad09f1ef78176f8f897a81d65a3a375c4bdd47bf220663d97996c53e1 SHA512 77559e269f8995fc93ea68824931c07b4be566ffd4775d4d30afd48e66a5fb34191d252ad5426c6cd2fcfa3c5176f50faf370b416ded6b8f2ea3957947d69448 WHIRLPOOL f8b532976b40049a5d139f060d614f6ea7d63b3a93e6d701826fb9ce724d4a9f37f14e8695ac5493e3addfc772c94ac682caf4ff13c71f6cc0a569cb9a950349
 EBUILD python-3.4.6.ebuild 10506 SHA256 62bef130a04d9a236da5daed8815af7cf4029ef69b62b41509b550b332d2b3c3 SHA512 aa7fd91eb9f7ded16cca1704dd69c7f99ec047cf98b5f2f6d40440d3774c784fa325f0e23d293d7aa9c3cc1d2da1c4bda673e87df207511e430892cac79336b7 WHIRLPOOL 26da088583376ea9977a89fb03409a8a1692f39dcc9b2bdcf1a7a7f5545d51850461f2ab46ea045b2722e35a41e91b4b795160aaaf4b3090ad1665409708ca14
 EBUILD python-3.5.3.ebuild 10616 SHA256 845df029dde963bc6c775456a99228d3dc68274e2fc2f02db821476a61a4ec29 SHA512 5f1126b0c265bed49c154e93be42c7e9f9fa2f9f1dccec36a66563ebc04dcdd7fb1e13c97dce7abc6e8645cbb3d9a46bddf0e6c11ce02d1d6ed1ed22c7622f04 WHIRLPOOL c66db283c54d200f7e603dc2694d34d433ac98f49fd081f1eada45848d841797f5ce4dd2a614653169eeb6e5f8eec02e5bacc052eb238477815f3cdb92fd7af1
diff --git a/dev-lang/python/python-2.7.14.ebuild b/dev-lang/python/python-2.7.14.ebuild
index 935f0216254f..5e5cbbf19174 100644
--- a/dev-lang/python/python-2.7.14.ebuild
+++ b/dev-lang/python/python-2.7.14.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 72466f303f6e..2c450071ef24 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,23 +1,8 @@
 AUX qu-prolog-10.0-associated-item.patch 335 SHA256 27a6f727de28056bf8987ce013cd68fb461d7ad5748d3ce775ab0e04d56be625 SHA512 3b4cefaecacb1e1fb8df8804f198563e99ee69b2ffbdc421e56fb34faeb5ed1a87809b4acf917999ac5e25982e522c8b08775cf9bcf1c01675a77521d372913f WHIRLPOOL 683a51ad7f07b0898a477878cd568e445e77078cbe388586ec59547aeacae075b728394a36b1b2f6799cd6f7c96149e1e889fd51e526414787b292439acc3ed6
 AUX qu-prolog-10.0-configure.patch 518 SHA256 484b5fe687c16f5c701210869ff4c3d8c5240dfff3f9ff85e272a40ba022f499 SHA512 85e484b8086054166740dd757b95547179afa5c199c240b43dcef531aeedd812f4fcb35003a888708c90db5d7bb1ffd22cf9bef1fd31f339ec0894ddde365cd9 WHIRLPOOL 2de644b28673497e8717a239146ba54c57a1217f3f177abf5bc384f7de20adb324b63edd8843f6177abcb30a06b15860589af1981a9e9c4ec662fcfb2a724519
 AUX qu-prolog-10.0-gcc6.patch 906 SHA256 61201c18cad61ed803fd2635a12e0334f3a7c970fc512ee63a1c2a6325504e71 SHA512 bbf5a1d5749964bc5c0e8e530de3729bf1666e541f908ddc66debc696a6b6b4dc55373ef788348f02e33aa58afa5a350f7be866bfb1e4c31c917f334e9dc9ca6 WHIRLPOOL ce1a55eeef54338743bb40f725b251a3600d93f015d3a271a4a3333f7ae5f2fd4fc1498e4519bde3f5de948ea1d5a84f4e208e77e429172bef60fe0d888b4ac2
-AUX qu-prolog-9.1-cerr-ptr.patch 1379 SHA256 dd9ac54f97e84d256f044d7e2f8d5c7470d8e39ab472fd7f55c6007f996234c9 SHA512 b46bdef26c3bbdddb0ed3d463f7a75cbef644c80c78ecfe45ac1cc23771f9a70fa1217480f12f57ee2fcf28afdef1e7a6c9b23e0521c12d3cf151d0ff648f396 WHIRLPOOL 6ca724634ad4244eeba07c489640b245adef2640a919ad304d8501c9f51a2ee67aeca89de049a59b026f77e340cbbbe839d433e8d31d24cd5ba77cc9cf0b5f30
-AUX qu-prolog-9.1-cflags.patch 1089 SHA256 67b6cc6c4009b4bfd8578d5006d5d0fc1b6f7a50368ce078a4a97610a559521b SHA512 5502c6923d8f32e10fbc4dfb49ad3d34cde3e3f7fc68165b121a27c51934edd8cd963066d8cd15323a67854861f51508a5450a1a47867d857989b881a29d8ed9 WHIRLPOOL f51043fe57cc2ef83ece4cdda8dfc80ab14fef1a9a1b222c4b482d7c7a7502719d517164f87f561bd5962b58599ef0cfad60e6b6ed2d222b60b5fd3e300cc46c
-AUX qu-prolog-9.1-gcc.patch 1020 SHA256 b312300d23742dbfacbda0d09c5f8d8bdcd89a510c363db23d707e63bc5a5261 SHA512 6f7e56f060330df6863df22c409be6b8ad7deab5dd9ebd9173d33170d8eedf6367b9a624dd270d46dc45c1699c6c37c218093494cdba9559dab795d8da6f15d5 WHIRLPOOL ca2cbd6ce428731da1e74875337386c66a4238251e9da3f204c3c00e339354fea0c97d728541118da19c3534908ee73051236b52b90902556a7d04c1b4c06584
-AUX qu-prolog-9.1-portage.patch 910 SHA256 d1565bd511cec886a6858db156957388029854c28338bb3d76e494e0ef9c5a95 SHA512 90ab22c9a75254b4370905cf64cebdcb64f7130c2edc07cf3c79562352a9d07e839b24ebbca623587b22ab1cb19b97ae62bc2f5f068ef6380ac2cfc45ec29b8e WHIRLPOOL 4f59b3b3d6394b7645d13f8e9582a6f07ab85e71f2afa2b8bcdd50a0cafc9895c026a7803e6ded82fc31b7fd17aaeefd846b987b718c5e71a51f633f69b8fb84
-AUX qu-prolog-9.5-cflags.patch 1089 SHA256 c9b9ee740757def5833633194c8dead0994fe2b576dfd8aee28ce3e9e040d38f SHA512 cbe5681801f04cbbbd3502bcd5e471e13726e7d33453c7922ab63203db736c83acdf0a5e5325c9c9371d9a994e20d721e9a3d9eb118d5bbd8d762ba0bd52b81c WHIRLPOOL 2d027fd06c399a09a55f41924b23ec729b43d6b52c093d3d001b6b14cf3fbd6c8ad2ae6bb5b8d98da92ed9362179e55d81c10c2e75a05b20745a1bd4724243f7
-AUX qu-prolog-9.5-portage.patch 910 SHA256 bfd9bc50dd813f4be7ebcd1c21715775a874daeb1c76bfe7fe4797de369da44e SHA512 1a77a834c82fbee6b81f114535b22a9b135e0db017a03f3cbd874b166dbc86c6de61dae464ab0e70d00ee11dbce42ab7c0affee98ae895c75ac52af94820d980 WHIRLPOOL 577b0c74ec8564d1ed6166a81965541cbbca2ec0ae5d49ef197ec7b45914b754f3de691a6db10ffd99184b4580304979c07b97b632aef9201f59b56266c832df
 DIST qp10.0.tar.gz 1521469 SHA256 f3968e0ea5f9da80475b8298cbac0c70d3684fb8e68ddc0961a2d8c739aa9f07 SHA512 491ef9cc01f0d34163d47163b3103dcbd52cc5672f64057b898c2d234384ac2e3b64b4e59a1795765ff92de4c97ebdb11a82d394213685c387e4dd7d598c5c60 WHIRLPOOL 675a46d6ce428456e1055b8192c84e488ea1b6a3715f9f3e267d9df0637e304982f933e6078e5912c025eceb02dc79c08bd6744d181269b210ff3233ce69fa37
-DIST qp9.1.tar.gz 1460679 SHA256 1f3052f2700d537b33207943a3ade48b2b3aa5cd01cafc0475bcf26c645bc9af SHA512 44590be9d1ecec97fa6c82b657e9ecc3778f833644055ee87c9a6a36996663d139ffd7b583d72f8ac317648e0f22ccbc2a1da9c3a5eabd23381c668e5d073cbb WHIRLPOOL 37ec4e25c2284b267f72c016b4ea1e542d735c9da5f6532d1f6b439af2b91422ddc251d31e1a17b6366ee6af0e754acdbf8a0c44ef03f46a2515f14b1259b732
-DIST qp9.5.tar.gz 1537445 SHA256 7e4b9883fad00b16c919620033da48482b2eccc875b37f8170d674ce9f72aee2 SHA512 7a79090a6e3f0263e38cf5e5724a5c35c63c8cca2842fa8c07f9ff84011ef7ac9a22b195713aeb626a787c9391c612f3fea0ff38c084634a2f62258feb3eb6e2 WHIRLPOOL 3f589998f3480925fa3ad3c54f1f0ba4122cfa12c48d9bf1269e92a0fdf52d1823cd8dae8851e36d2c97ec2f869da10ff6ee7f2663b752d1d396e1b5a95ca982
-DIST qp9.6.tar.gz 1539483 SHA256 631ab73af271279d583c5ecf19e5542dd8dff097179e3bb34ac2624aeb029f7a SHA512 a15d3f2254d9ed9a2032f7e2902363f2ed2dbf0a7ba67a89aae79202d38954a195e93725aa828d19d50d7a891d8cea4f0d23af66ffd55984738db9b612467cd8 WHIRLPOOL 3dcc746da3283044267abd7aa00795b1bff79bffd206c1bf227087281d94f2dc4a390a5ccd85933641aea150313b2f62e0e9fbe491ef4fafa73e4fdd9b35d7d1
-DIST qp9.7.tar.gz 1539804 SHA256 9b77c97e0cb981669cf27df0f68875ba44958e67cc82ac71a4f5d2665b96708b SHA512 20a7a00eab2ec489489f95d78eb4dc8edf71d99fae2f23807158ca78d0bbd1b66d03460f0e06f91ac4ecafd9aab2bbdd109368ba8d3cc2c8452e17c634035c19 WHIRLPOOL 20a790902848790cfedefc6434eda01bb4b0ed2cfdf26c7d1a7914cef9916d161fcd397001a7f5a0aadf2d710112446bd99103f161ef22ad7b3567b45b33ac6d
 EBUILD qu-prolog-10.0.ebuild 1998 SHA256 3258396cb34058083e430e9be93bee94ae3949996df95f847344329ffe9d63aa SHA512 0df66e1f943662396070621cac0adbf8cd2f6e9109b5e1c231281708eead667da180e04a022dc8329bae408ec4862fa7a239c3478c0120d75d4dab66c59cd2cf WHIRLPOOL eddad8d2920cc866a6cfab192e0c2a4177602a39fac286cb272c9237acc9b29ace8b01e966f0b5434b43e625f697c02ce79c30e21edb43663504fcc8f3a9cfcd
-EBUILD qu-prolog-9.1-r1.ebuild 1930 SHA256 795140602a6b33def04f5d883ad46fd20ca0ed692b87501b0ee1e8b731502ad1 SHA512 30aaf2dd17655cc0b54467c51ec3603c753ec25de8c2f54b054f081dd67d3aa1df31bc5cc4135a5ccaf435a0c3b0dcc11756b29c8145e62a1bd17508dcb8c4eb WHIRLPOOL 8049fc87b6bb1cc999fcc5404d3629b5e1ec36bf061ed2c162cc24b2423499bac78ccb760456214b97f4d7f3999ea21ebad9457c2c495442166b6275283cb07b
-EBUILD qu-prolog-9.1.ebuild 2141 SHA256 6fec08cf89fdf190008f8b4d10014808125dae1371f6a4715bd9e2c30df4976c SHA512 bb4b3339c7c7201e9c263b4558904dc840ecbde25fecf9c93416f9fcdd503cfcc88253d589718ca5a78cb2ba174b50223f4afbadd2fd98f6be5b28364482b4bf WHIRLPOOL 9c77b9144220526f00b913bb5c0bc989a7830b0d5c4a4c7f8b38b457ece75591e8ba059b6e9f46b56847dac6509cacbb15e4ccb4050af9e0415981efa5ece9c9
-EBUILD qu-prolog-9.5.ebuild 1859 SHA256 754a40912a3f95d4c62b8a82a2e1fef3264cfee82404e2d054e63d16e3d1dedc SHA512 c0d40d94d70b6cdad89e12d2336a4b76c2aa17b5f7a117172a23ebb25080ad9159519b45e28af8574f8849b17820a3cdee431d89e8d1e673527998c7527e2bcc WHIRLPOOL caa6e93a4a9560797a44018ba2069a11617c3304ea3905f558f1db6bc6381d16770e10d89a6485c7af16ea6d7f69d70116b53dced7f93fea5d35625c7f025cbd
-EBUILD qu-prolog-9.6.ebuild 1831 SHA256 85b9a1097d36f45f99687596042735a0332432a5b27a825dcc1976185fc826e2 SHA512 51cf334a9d7bb652d5d55b680c06e65c5de3e0a0c2d3596d3d7719f410455fed42e40fc201f150cba7652cffb7143b1cb106d2dcaaa467b7f61e85df4b0f5033 WHIRLPOOL b5a4de9cde72335c791d8c8b24fe43e5ab3b589374ec2dc9b74df52b3cf6a48c9043390546562e9e6b6823fec352ab8ea7ca77a9a15ea7610b63eb2a1e4a2dd9
-EBUILD qu-prolog-9.7.ebuild 1831 SHA256 85b9a1097d36f45f99687596042735a0332432a5b27a825dcc1976185fc826e2 SHA512 51cf334a9d7bb652d5d55b680c06e65c5de3e0a0c2d3596d3d7719f410455fed42e40fc201f150cba7652cffb7143b1cb106d2dcaaa467b7f61e85df4b0f5033 WHIRLPOOL b5a4de9cde72335c791d8c8b24fe43e5ab3b589374ec2dc9b74df52b3cf6a48c9043390546562e9e6b6823fec352ab8ea7ca77a9a15ea7610b63eb2a1e4a2dd9
 MISC ChangeLog 3560 SHA256 2543cd91b2a23c903faed2a714837582c2bb2367ca07c28015aede51e83efad7 SHA512 4b315c4ed15b8a7e27b5afe2c7ac24874f74e3cc7c2353c617fac419443e1a62f5dee1433c10a89a45206a714fc4911740533cf07eca38f6cb14551448e5fe07 WHIRLPOOL 3223722677a8856fe5f2665b69f35643144be05909b191237e7d6da74b1df6200f3ad1baffca8e6b4c903e5b1aa6dddf38b530ac3fac5e71a7159df3db7be593
 MISC ChangeLog-2015 14668 SHA256 8e01daf09706375c12bb8225bc467341a3ab9a3c652831931e8a3d438e4f1dcd SHA512 c456535f83cb3894d985fc19fbd58fd92de15d59c2ce69c2c181f2b682080158d25eb196f453b19755972fa1e22b6a629e6c835eb6c1cd50e54ec2483df94a8d WHIRLPOOL 4c31ec8f07e838080a018830601c3a3c8f80eaf95b639982d2ca0c78e1052d62f93327d7ae12577cfe8afa01e0908b1ce640c09593b4fe50302f749eba259f43
 MISC metadata.xml 347 SHA256 24b0c949839c0d29cad8fdbb160eb7ec3f1f1ade8307795a3ce0ba3d48a19d86 SHA512 7a7bb3ccaa42fa120c3702d963719d5fdfcf0a413685cad98bd34a515a4cc83a213a71e7f3b6b0ce67947fa347229caecf699879192f0d930c9c6577e0ce59cc WHIRLPOOL cd38ec1759e73478bf05d5b00af1606d861f668254cbc6f11f686c75b9a4834865fc2cd3f7a83e0222055bacd9b34073aead1dfc31a71c0bc129b9da11f4df14
diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch
deleted file mode 100644
index 1fde09843e66..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur qp9.1.orig/src/gc.cc qp9.1/src/gc.cc
---- qp9.1.orig/src/gc.cc	2011-08-23 11:17:44.000000000 +1200
-+++ qp9.1/src/gc.cc	2011-11-20 07:14:14.000000000 +1300
-@@ -152,7 +152,7 @@
-     {
-       cerr << size << endl;
-       heapobject* ptr = reinterpret_cast<heapobject*>(term);
--      cerr << hex << (u_int)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl;
-+      cerr << hex << (wordptr)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl;
-       return false;
-     }
-   return true;
-diff -ur qp9.1.orig/src/objects.h qp9.1/src/objects.h
---- qp9.1.orig/src/objects.h	2011-08-23 11:17:44.000000000 +1200
-+++ qp9.1/src/objects.h	2011-11-20 07:14:14.000000000 +1300
-@@ -1242,18 +1242,12 @@
-        << this->getName() << "\" ";
-   
- #ifndef WIN32
--  switch (hasAssociatedItem())
--    {
--    case AssociatedNone:
--	    std::cerr << "(no info)";
--      break;
--    case AssociatedInteger:
--      std::cerr << "int: " << getAssociatedInteger();
--      break;
--    case AssociatedAtom:
--      std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]";
--      break;
--    }
-+  if (hasAssociatedInteger())
-+    std::cerr << "int: " << getAssociatedInteger();
-+  else if (hasAssociatedAtom())
-+    std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]";
-+  else
-+    std::cerr << "(no info)";
- #endif
- }
- #endif
diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch
deleted file mode 100644
index f53eb067b1fd..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur qp9.1.orig/Makefile.in qp9.1/Makefile.in
---- qp9.1.orig/Makefile.in	2011-08-23 11:17:54.000000000 +1200
-+++ qp9.1/Makefile.in	2012-01-14 12:57:16.000000000 +1300
-@@ -23,7 +23,7 @@
- 
- export PROLOG		= prolog
- 
--
-+export CXX=@CXX@
- 
- .PHONY: all
- all:	objects
-diff -ur qp9.1.orig/src/Makefile.in qp9.1/src/Makefile.in
---- qp9.1.orig/src/Makefile.in	2011-08-23 11:17:54.000000000 +1200
-+++ qp9.1/src/Makefile.in	2012-01-14 12:48:33.000000000 +1300
-@@ -40,7 +40,7 @@
- 
- #export DEBUGGING=
- 
--export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
-+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- 
- .PHONY: all
-@@ -79,6 +79,9 @@
- 
- # Targets
- 
-+.cc.o:
-+	$(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
-+
- .PHONY: commands
- commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
- 	@$(MAKE) $(ALL_COMMANDS)
diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch
deleted file mode 100644
index 82d5bc7f7ebb..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur qp9.1.orig/src/pile.h qp9.1/src/pile.h
---- qp9.1.orig/src/pile.h	2011-08-23 01:17:44.000000000 +0200
-+++ qp9.1/src/pile.h	2013-01-09 12:07:44.000000000 +0100
-@@ -75,7 +75,7 @@
- 	//
- 	// Push a StoredType onto the pile.
- 	//
--	void	push(const StoredType s){ pushElement(s); }
-+	void	push(const StoredType s){ this->pushElement(s); }
- 
- 	//
- 	// Pop a StoredType off the pile.
-@@ -85,7 +85,7 @@
- 	//
- 	// Pop n entries of StoredType off the pile.
- 	//
--	void	popNEntries(word32 n)	{ setTopOfStack(this->getTopOfStack() - n); }
-+	void	popNEntries(word32 n)	{ this->setTopOfStack(this->getTopOfStack() - n); }
- 
- 	//
- 	// Check whether the pile is empty or not.
-diff -ur qp9.1.orig/src/system_support.cc qp9.1/src/system_support.cc
---- qp9.1.orig/src/system_support.cc	2011-08-23 01:17:44.000000000 +0200
-+++ qp9.1/src/system_support.cc	2013-01-09 12:07:16.000000000 +0100
-@@ -61,6 +61,8 @@
- #include <iostream>
- #ifdef WIN32
- #include <direct.h>
-+#else
-+#include <unistd.h>
- #endif //WIN32
- 
- using namespace std;
diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch
deleted file mode 100644
index 4a1aa23607ac..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur qp9.1.orig/bin/qc.in qp9.1/bin/qc.in
---- qp9.1.orig/bin/qc.in	2011-08-23 11:17:28.000000000 +1200
-+++ qp9.1/bin/qc.in	2011-11-20 07:16:18.000000000 +1300
-@@ -27,13 +27,13 @@
- 
- ##############################
- 
--preprocess='@QPHOME@/bin/qppp'
--expand='@QPHOME@/bin/qg'
--qpcompile='@QPHOME@/bin/qc1'
-+preprocess='qppp'
-+expand='qg'
-+qpcompile='qc1'
- compversion='qup'
--assemble='@QPHOME@/bin/qa'
--link='@QPHOME@/bin/ql'
--execute='@QPHOME@/bin/qem'
-+assemble='qa'
-+link='ql'
-+execute='qem'
- libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
- 
- ##############################
-diff -ur qp9.1.orig/prolog/Makefile.in qp9.1/prolog/Makefile.in
---- qp9.1.orig/prolog/Makefile.in	2006-04-06 16:01:45.000000000 +1200
-+++ qp9.1/prolog/Makefile.in	2011-11-20 07:16:18.000000000 +1300
-@@ -1,3 +1,5 @@
-+PATH:=$(PATH):@QPHOME@/bin
-+
- .DEFAULT:
- 	@$(MAKE) -C compiler	$@
- 	@$(MAKE) -C library	$@
diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch
deleted file mode 100644
index 5bcce94d9b6b..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur qp9.5.orig/Makefile.in qp9.5/Makefile.in
---- qp9.5.orig/Makefile.in	2014-11-17 06:46:22.000000000 +0100
-+++ qp9.5/Makefile.in	2015-05-03 11:29:52.000000000 +0200
-@@ -23,7 +23,7 @@
- 
- export PROLOG		= prolog
- 
--
-+export CXX=@CXX@
- 
- .PHONY: all
- all:	objects
-diff -ur qp9.5.orig/src/Makefile.in qp9.5/src/Makefile.in
---- qp9.5.orig/src/Makefile.in	2014-11-17 06:46:22.000000000 +0100
-+++ qp9.5/src/Makefile.in	2015-05-03 11:29:52.000000000 +0200
-@@ -40,7 +40,7 @@
- 
- #export DEBUGGING=
- 
--export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
-+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- 
- .PHONY: all
-@@ -79,6 +79,9 @@
- 
- # Targets
- 
-+.cc.o:
-+	$(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
-+
- .PHONY: commands
- commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
- 	@$(MAKE) $(ALL_COMMANDS)
diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch
deleted file mode 100644
index 55dc08ffe474..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur qp9.5.orig/bin/qc.in qp9.5/bin/qc.in
---- qp9.5.orig/bin/qc.in	2014-11-17 06:45:59.000000000 +0100
-+++ qp9.5/bin/qc.in	2015-05-03 11:31:54.000000000 +0200
-@@ -27,13 +27,13 @@
- 
- ##############################
- 
--preprocess='@QPHOME@/bin/qppp'
--expand='@QPHOME@/bin/qg'
--qpcompile='@QPHOME@/bin/qc1'
-+preprocess='qppp'
-+expand='qg'
-+qpcompile='qc1'
- compversion='qup'
--assemble='@QPHOME@/bin/qa'
--link='@QPHOME@/bin/ql'
--execute='@QPHOME@/bin/qem'
-+assemble='qa'
-+link='ql'
-+execute='qem'
- libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
- 
- ##############################
-diff -ur qp9.5.orig/prolog/Makefile.in qp9.5/prolog/Makefile.in
---- qp9.5.orig/prolog/Makefile.in	2006-04-06 06:01:45.000000000 +0200
-+++ qp9.5/prolog/Makefile.in	2015-05-03 11:31:54.000000000 +0200
-@@ -1,3 +1,5 @@
-+PATH:=$(PATH):@QPHOME@/bin
-+
- .DEFAULT:
- 	@$(MAKE) -C compiler	$@
- 	@$(MAKE) -C library	$@
diff --git a/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild
deleted file mode 100644
index 3b0035ad4775..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-portage.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-cerr-ptr.patch \
-		"${FILESDIR}"/${P}-gcc.patch
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		emake
-	fi
-}
-
-src_install() {
-	sed \
-		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/{qa,qdeal,qem,ql,qc,qc1.qup,qecat,qg,qp,qppp,kq}
-
-	use qt4 && dobin src/xqp/xqp
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/{qc1.qup,qecat,qg,qp}.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.ql
-		docinto examples
-		newdoc examples/README README.examples
-	fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-9.1.ebuild b/dev-lang/qu-prolog/qu-prolog-9.1.ebuild
deleted file mode 100644
index cf59aef3bbe6..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-portage.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-cerr-ptr.patch \
-		"${FILESDIR}"/${P}-gcc.patch
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		emake || die "emake xqp failed"
-	fi
-}
-
-src_install() {
-	sed -i -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/qa bin/qdeal bin/qem bin/ql || die
-	dobin bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp bin/qppp || die
-	dobin bin/kq || die
-
-	if use qt4; then
-		dobin src/xqp/xqp || die
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/qc1.qup.qx \
-		bin/qecat.qx \
-		bin/qg.qx \
-		bin/qp.qx || die
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo || die
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo || die
-
-	doman doc/man/man1/*.1 || die
-
-	dodoc README || die
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html || die
-		docinto user-guide
-		dodoc doc/user/main.pdf || die
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.ql || die
-		docinto examples
-		dodoc examples/README || die
-	fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-9.5.ebuild b/dev-lang/qu-prolog/qu-prolog-9.5.ebuild
deleted file mode 100644
index b8b4cd271e0f..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-portage.patch \
-		"${FILESDIR}"/${P}-cflags.patch
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		emake
-	fi
-}
-
-src_install() {
-	sed \
-		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/{qa,qdeal,qem,ql,qc,qc1.qup,qecat,qg,qp,qppp,kq}
-
-	use qt4 && dobin src/xqp/xqp
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/{qc1.qup,qecat,qg,qp}.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.ql
-		docinto examples
-		newdoc examples/README README.examples
-	fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-9.6.ebuild b/dev-lang/qu-prolog/qu-prolog-9.6.ebuild
deleted file mode 100644
index 39c0124558d9..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake OPTIMISATION="${CXXFLAGS}"
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		emake
-	fi
-}
-
-src_install() {
-	sed \
-		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/{qc,qecat,qp,kq}
-
-	into /usr/$(get_libdir)/${PN}
-	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
-	use qt4 && dobin src/xqp/xqp
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/{qc1.qup,qecat,qg,qp}.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.ql
-		docinto examples
-		newdoc examples/README README.examples
-	fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-9.7.ebuild b/dev-lang/qu-prolog/qu-prolog-9.7.ebuild
deleted file mode 100644
index 39c0124558d9..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake OPTIMISATION="${CXXFLAGS}"
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		emake
-	fi
-}
-
-src_install() {
-	sed \
-		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/{qc,qecat,qp,kq}
-
-	into /usr/$(get_libdir)/${PN}
-	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
-	use qt4 && dobin src/xqp/xqp
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/{qc1.qup,qecat,qg,qp}.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.ql
-		docinto examples
-		newdoc examples/README README.examples
-	fi
-}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 58a2eec17003..b198e1e20934 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -4,9 +4,9 @@ DIST ruby-2.4.2.tar.xz 10046412 SHA256 748a8980d30141bd1a4124e11745bb105b436fb18
 DIST ruby-patches-2.2.8.tar.bz2 5764 SHA256 5c44fc38cb25d7dbdd8bef0fae49b5fc2f4f42da4e5b4b871655fd5e68faddbe SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd WHIRLPOOL 28889531d98b1bb96ceaa059f7fc641cc3db16eda0e3ad4cea031127c71897613d73cc3c8926dfd9ec978be79ca1201e7c90056ddcbec58d3e842c8af9a52389
 DIST ruby-patches-2.3.5.tar.bz2 3593 SHA256 0bdc378a9e3ea6ec1579cc99a3c8b983b492e49b9fc1e9432595d66d3a8013ae SHA512 eacb7f6787b36c7d848453b29152190a164ebc6882ab509eeb6584e49af4b66a665c4baff4ecf75e5831ae54d47dbc651d6f048918f3327500c429f1f419ed94 WHIRLPOOL 7f236988663c1082a988b836bf558b5c042c09257cdbad6931474ece7f19be2d37dfe559292182dfc6a9966f6aa3fd2bbbf0f3630bd792f84f61fd135cf7bcbe
 DIST ruby-patches-2.4.2.tar.bz2 3443 SHA256 621e92c4c14cec458100adf74e122df76663be4f75fc4ea86423a9ac6755ea3e SHA512 fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17 WHIRLPOOL 306a16b49037a669398fb9c1b7c2b5484860d8749bf4c12d0e5eec02e3a7f7760b48b4a3cd709e0fa2b54f3d8dddff36d7eeb8d53d2d647d59e099b0299b8ed1
-EBUILD ruby-2.2.8.ebuild 6915 SHA256 94f503d6ffd56752f19f7dadf2024b464bd9efe2d8ed2b4de37921a6ec0c84a2 SHA512 1c5b87f6ab1f5431a2b19a8faa5a0c65aa6c175c8834ffef038537b30976bb5345ea1ffe590dc7c39cb131c10c1642fda0126d8aa0d1e8cced7291085ee2672a WHIRLPOOL ae9f7608d04b263c09163e868cdb1a8b5fac21b33c9bb3b48e8e282754035118b8c9a87de9750efd054c0711a7fb8a1619540e952d4a1c0cd051d3cdf8344d9d
-EBUILD ruby-2.3.5.ebuild 6877 SHA256 606085306f6c2856331405a0f57a2936ed7b7f802628c552e3bbf310623c5991 SHA512 d2f77cccffdf41b8facd9a70d59e7bd61dd7fb25fc43691cde8561b4f1fac78fa7a45ea444c330de1f3fa8ab96a6bf5f741215baf5021b033642b5d53246b9be WHIRLPOOL e23292910b935ae5da21ca462d4051248c5194e96132b124b5f3318a3c60bb26791931bcf2e7c762a7ca22ca644f2243b3a7629f3bfd9d36e83bf305b07b4131
-EBUILD ruby-2.4.2.ebuild 6978 SHA256 9f4d3b867a2baaef2cab06e96ebf294146c168f2d6b7d9e509d3e7319e069905 SHA512 eb98eebcc132410ffe3f13230d11de593f3b9d41887472d9878d17f8983e492031581a23af8d9b6aa200573f2b60cc23b9922525714c7e78ef5dc1a841fc4ae8 WHIRLPOOL efa06520bbd459ea2317a6fe4563d20a3ad9279e4efe0005b8da1e7a13226f5b0ef29b2a916ca1536da4c5dd1272338b1bc862c4ce15bbf937c994fb61196d7f
+EBUILD ruby-2.2.8.ebuild 6915 SHA256 6419c0db96bf2e326b28e62f203b0b4e5de44af5ea592a4b4db8bc5de660eb6f SHA512 dd1516e8c202dfe5d96e2d0233ffd23669b9fd622f202ee68321261e96cd296c1a14a0ed71990e7c160c4977220a9c2f97016000470ea355779d65f5195be672 WHIRLPOOL 22e4cc31b6bfac9323cd37ce2c225c31c8ca3c99d60dbb8b3d707da9549ed8c4294d53bb3a9b45d754267cc4872b3ad6134e7b563318d0c86a2db77d8a39a51f
+EBUILD ruby-2.3.5.ebuild 6877 SHA256 a9cf627db9f51c8dd82abd990f93d5c5e49464b483a53ad99f17c86bc0c70b5a SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc WHIRLPOOL dc8a0ce45d8e4ceb22848a85dcf8791cb34a29347011b8e6e52f6aff09e3bcb0a017c723890faf933ac823a81de459d4f2bfbbca702c002a0a664c387d3be164
+EBUILD ruby-2.4.2.ebuild 6978 SHA256 76242c1d20c06cddf1575ae3b9f6ba6e40d26de9ce43683c5b5fa9e41bd3edc4 SHA512 c6f48c8357e5248046ec8e811d6e96c57c073d5494cefded64baf1b5c177bc9e7a4a5e545b3ca5e977bd648066b568b1f5c9df59387540f2a145159e75f09795 WHIRLPOOL c716b2787009fa1e8f874bee080d6267ebe0bb3da8b70217293c4d39e9a5856e56505bd9755e1a9884a0cda333be738a905c89d49a2a3244e8f8f51360cad54d
 MISC ChangeLog 14020 SHA256 f0339e6fd4cb9ef4a7b472031ac3c3ae21f60d574fa5db2e4e48577e73e53b7e SHA512 d7d9bc849624e4814b0b277924715d53479dbf15b087bec68ebca20c447ce9515993509efbc33d5f65c19268072d4f68ba2b7879ab91d1c12bd349445bdf3aa1 WHIRLPOOL 9c64ffb6004a17afcc4ea207698c233079026eef065cc7495de0f10af7a6ae62015b47be6e4a828a7d1d45d917be5b148fb6376a9deb9fe938048a58380fddb7
 MISC ChangeLog-2014 104250 SHA256 6587f8f101dc832a9f0c01b77a9d448b6a7b1c3c7befd1368e297bbe3dc41f1c SHA512 89ffec2164a619bbb418ecf43ecb0893a3f6a4846ff1ac403980e68d85efa7d502fa2f7338c80f8fcf12b56a1ed791c7d6d1bfc607f80fa88c1a88c3c6f93a85 WHIRLPOOL 47ced91b8df722e42d33773a243f89e57ca49f8942418d19321a1ed041fd9dabad747ff640fbb1f0de73220c23cd37778eedc44a14b8883b8220ee512089a823
 MISC ChangeLog-2015 5007 SHA256 daa966ac5d4e337b5ba0b9742196ad1e754936c4babb08c63443005cff904077 SHA512 2cc4ebfe1d1c0837d843d03ed7846b002bb89121c5849e1ceff9350b49a85933d397c45e356a567dcb3a7c36d1bd97002ab7d0f4a531bb9f8d0422b941ddc590 WHIRLPOOL 1324dfcd1444b05fd102f64e16678b7300ed8549e4e10a213c7cfab0692e7846ac4772624f6b5c787589908f1d5c884b443542a02f392c29d8532c84842e20f3
diff --git a/dev-lang/ruby/ruby-2.2.8.ebuild b/dev-lang/ruby/ruby-2.2.8.ebuild
index 638d3aefb1ce..91a966bec554 100644
--- a/dev-lang/ruby/ruby-2.2.8.ebuild
+++ b/dev-lang/ruby/ruby-2.2.8.ebuild
@@ -236,7 +236,7 @@ pkg_postinst() {
 
 	elog
 	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
+	elog "\teselect ruby set ruby(21|22|...)"
 	elog
 }
 
diff --git a/dev-lang/ruby/ruby-2.3.5.ebuild b/dev-lang/ruby/ruby-2.3.5.ebuild
index 26c5cd73704e..d41fd224c419 100644
--- a/dev-lang/ruby/ruby-2.3.5.ebuild
+++ b/dev-lang/ruby/ruby-2.3.5.ebuild
@@ -233,7 +233,7 @@ pkg_postinst() {
 
 	elog
 	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
+	elog "\teselect ruby set ruby(22|23|...)"
 	elog
 }
 
diff --git a/dev-lang/ruby/ruby-2.4.2.ebuild b/dev-lang/ruby/ruby-2.4.2.ebuild
index 40680044bd28..46a0abb33724 100644
--- a/dev-lang/ruby/ruby-2.4.2.ebuild
+++ b/dev-lang/ruby/ruby-2.4.2.ebuild
@@ -234,7 +234,7 @@ pkg_postinst() {
 
 	elog
 	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
+	elog "\teselect ruby set ruby(23|24|...)"
 	elog
 }
 
diff --git a/dev-lang/spark/Manifest b/dev-lang/spark/Manifest
index 99fdc97a636f..61ebb5f5a82f 100644
--- a/dev-lang/spark/Manifest
+++ b/dev-lang/spark/Manifest
@@ -1,5 +1,5 @@
 AUX spark-2017-gentoo.patch 379 SHA256 0dd01dd12276f067c0af66efdf3721f70eead41f35def194a12cb2626b0e31dc SHA512 b4db9b56ab003dff8aec28248ea32af6fb4067c1824b0f6d115d66d1f3c8d180a17a2fa52a5f2ebc3605b549e0b38aafa15e9f238b079d5366d5375d851d84d1 WHIRLPOOL 0476f61dc3179842ee23ba6fa9748d3160ea93cbcc8f44553431ee332184361f6dae2679c8bc994204eca77e63fc27c28cd05a39e88a7ed6d99417fbd0da6813
 DIST gnat-gpl-2017-src.tar.gz 8783473 SHA256 91c9733fb8f8ca4c42fbcab3bc8a54fc83083126f6e6b630c9a36f3654537c29 SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098 WHIRLPOOL cf98ed36553ddfb54502f10898016017e387920bea074395c3a84047c2ec707734a9299de8c5f2f1931a53e04c24e67f8ab017437fbee7b7a658a6c0bca46e35
 DIST spark-gpl-2017-src.tar.gz 19750595 SHA256 39f12849e0c537fe29b874ddc8f6949956894eb4b8e8f5451cbcea6bd3552622 SHA512 90e7644daa6a935c839da9799c6dc5fe0a566f29c5f5d0a964ef5c888581f18c11adf6aa0151ae72437b91430fae06604dab8c3f1fd3222d749cfd330293ff6e WHIRLPOOL f476fd03e1c30f2bc9e92719bf7b3724699586e3c030096dac5c4042e44b6f2cbf28e410bd918e2f4c25ac930229e7b42d6ed6a0b18be65d6a234b8cedd6f5c7
-EBUILD spark-2017.ebuild 1543 SHA256 37b4fdbb8d48b53051e159a61779b6e28ff98a1c1e8a29c551b4e99b7fc7e531 SHA512 092aeaef96e9c7e628ff482771727efb0608f7e57cc7edda91f2c60bd01cbb9210d0f8e7ca0df321eba96fbf2496e658de2ebb965bce37c6064a9f1b3d685ddf WHIRLPOOL fa3b0852458401bbbb043fcea3cda5f8b6a8770afae85ab767ee2a738b892daf5e36c7507683239461d0f77a26b706871a020b99189a016a150f890f695ad9a2
+EBUILD spark-2017.ebuild 1601 SHA256 e0d53826c85873563ea28acb7312f49bad46cc1a974b0b9fb4a83208c03897c7 SHA512 418479b9de11e9d7170e34e65b2472c4b089e9d15817d8d2aafc5bb4f89205e91ed38f810282e7705a91989373913a594a9d526a9acd2e4ec310b7b4a91955f4 WHIRLPOOL 8f5f5ba08e1cb03ddd4c342b934fe13c921186216b39ac8fbe0e7daa298e786f96ffc7d724aa381f74365d2850ea21c6570f8f12e097c7c47e188b1b968c12a3
 MISC metadata.xml 702 SHA256 c2bb42992d6ece451c260b0562dd7818e1e7c7dc3ab8fa80a721f77992baf432 SHA512 bd30717cad1bceeef722cf8a27cd3902ad636f088f64cc41f1be5d356a7def55e426bd62fd7a3e7d9272f61a6fad96bec423e7529660c8061650af72faeaeb57 WHIRLPOOL 302fc76df0571ec06e09765d5d3ba33ba69db52f17015fbabc81ae738c99f9c2bd7c39e9d614ea7efc7dcb6fbd2aad5238e352d193fed8111b8e188b652d04b1
diff --git a/dev-lang/spark/spark-2017.ebuild b/dev-lang/spark/spark-2017.ebuild
index 9f1b5646a0e7..e63d7069015f 100644
--- a/dev-lang/spark/spark-2017.ebuild
+++ b/dev-lang/spark/spark-2017.ebuild
@@ -21,6 +21,7 @@ IUSE=""
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0
 	>=dev-ada/gnatcoll-2017[gnat_2017,projects]
+	|| ( dev-ada/gnatcoll[shared] dev-ada/gnatcoll[static] )
 	sci-mathematics/alt-ergo
 	sci-mathematics/why3-for-spark"
 DEPEND="${RDEPEND}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 06fc6d8bd5c4..a531ba17f072 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -14,12 +14,11 @@ DIST spidermonkey-slot24-patches-01.tar.xz 3444 SHA256 6a16001d665443c5e40c3237f
 DIST spidermonkey-slot38-patches-01.tar.xz 7472 SHA256 ff4b66116b18b376630efa0ced0c0ce8c3a636c43b75e34e904c87f8d4cd4f6a SHA512 953acee985d192c6d0f18f14c70fdda33a7c8f784c6833ca8b75495044b40a8b3f29b281c40dbfcda0c8570c111a3dd1717c2ef0ffd651c1b50d1f2bff1f6d09 WHIRLPOOL b41f21c2b7434332c8bff351af7e030a94db7044995f88df74d7efcf2d196f5ddba6293230b42f528ca22ea2d7fdd58d0da935bb90b155f7c83fc5b3f9645ef5
 DIST spidermonkey-slot45-patches-01.tar.xz 5092 SHA256 713e03f4c95908d93003fa1ca776823cccaf8fdc27db09ea59176edc318504dc SHA512 d52f038a7b4f7b410b5a1f94a55962adafc5906e7d85f605f3fe45ad49417c2b9d58d853a81b5d2395a2842c9780992d5a2c1a0e67aa77fb09f21aff9aeb0f7a WHIRLPOOL 9e4119af5a09f155a8f8781448364a9262ab2fb8d085a7235498f555ffa64eb054706ada3548ac40f76e686ed80e2777d39c565a631bf58b0c2e45f6195ce47b
 EBUILD spidermonkey-1.7.0-r3.ebuild 1543 SHA256 9063521f6e069bff96a1972c188e75a9e0795fd5e732235c1cfe44e4ec07c30a SHA512 f4d5449e687e611dec445ece6de0841185a18ab1df8a248bad47c884054859f8e73caf6c9fe8b7c67587ac84244dcd7dfec4a953b119132ebe36551b204a59a4 WHIRLPOOL 7f075dbbd8592cc37949eb1b75ad7b5015007c949ed533395aeda259da5b5ec6ddcf893e0135d85d3719e21b7471a672605faf254e1d83ee0fe5ad9526e43055
-EBUILD spidermonkey-1.8.5-r4.ebuild 4182 SHA256 553d7f01d595a2c1ede9f998850d3d1ab9e56a19506b1e4aaf11497d9d5d764e SHA512 1fd10dcdd72d10bad6f91ba4c45a3368e8f07d15d27f37433773d630f38a953bac3b88a4af12b6bf40efe12850f082684a449b82a76c9773587c6b81b2506c47 WHIRLPOOL e24913445fb072624a1fc995666d07d19ae70d7b1ad3aa8d32208241f2f145bfa003b7b651a0dcee6d81c5711ce0f8b702d5aa409ff80e93ea4b581400ee576a
-EBUILD spidermonkey-1.8.5-r6.ebuild 4380 SHA256 9be340ecd5e8abde01f944cbe594f3cbbc2b770c27db416c52de2729a3a47772 SHA512 7ccbd24ebece87dcee4f1311758ff246dbe6531fd64e479382298e5f78c51f3b2e114c807308a3e52894b9e67a0441bb768d7a0023a96071766f971f1f7bb972 WHIRLPOOL de2cd7291c3ac241a276a0febed5caa6373add3dc965eae7bf26c1dd8e925877bf132ccf2da2aea6aa9f2844d7abdfb534bc7d5d40a77c7b488759bba5eff890
+EBUILD spidermonkey-1.8.5-r6.ebuild 4379 SHA256 be1298a5acaecca42a3bcb647035776621646cd0e32cf769213db39911794b01 SHA512 8082170f9c1cba7ad578dfa1ba583a0309c85de4e9465bd1b149aaf47a8445f5ee7757e2760ce3adb87ef198b7ecd2ff70bd4f67ab3153919b7052ed55d0fb8a WHIRLPOOL 9f0d95c2deec1289659b4419e71f428c686a059896df050db999358a630f984749db6b779e509ec59d5730b7e3f66350bb84f2fd9b561ea2d790299eb5a2e1a0
 EBUILD spidermonkey-17.0.0-r4.ebuild 3546 SHA256 c2ac4c27422f2ec41ca901f13749a71ba8505e9f17dbd53c6c1c501271ea5b09 SHA512 bdb32474452a0d7b5ab681c27a46de05cb61bc89fac3aaa00e1289a35676bddd7de9e51eb02bed992535a82f75e1dec74c014e900787f356ea8ada58d5b066d0 WHIRLPOOL 686fe55521c472a69152b518ec3ffcacdb0aaf5cfaf7499ca68bf5d921f8d20b644fd7e6c0c512a3e33cc1761d26016f23d8b72d6104ba4802f9857765ccb0c9
-EBUILD spidermonkey-17.0.0-r5.ebuild 3565 SHA256 fd5aa0e25a563fee6cceb5e1e831db39484929657af26def5a4e5e4e2028676b SHA512 6894f05e9e300ba8f121c034fb7ed00d5425c9d796e0c9997737766e18b88b7ffa342b85530136bcc57bb65d7abe1c3968770f1a1a47e6a87954c5b302e57102 WHIRLPOOL c95593f9582d6df15eaaae6d305c6bb574b826bf4fd46c4aa9293320234c441230a5cd04d0c33c9e4309dabc8cafff6bc6119debbd1e6d158d63d22def8d9eb2
+EBUILD spidermonkey-17.0.0-r5.ebuild 3564 SHA256 0e583313699e87bb63ebe9ce33ef5f6a8704961643ef55223d610f600261b75d SHA512 1032e8cb002b43ca41b585a9f20865dfeea6750056df6a468bec9f3f7c78b4c707654787f4a2bc9368b3ce4a81b3be72ab6d1fe7bdccb37048b73fadb8343f6c WHIRLPOOL 39ca11f98778e890a392601642dc2a4f6823dddd93551c22bf89c2d00eeb844eee2af6ff715d172686c9ec5dc47dc726270b67501a44254e3717e8feea8ec85f
 EBUILD spidermonkey-24.2.0-r3.ebuild 4015 SHA256 f27482f8101a3698168c06489012fea2817bf596810d4ca9ece007ae5a66bf8b SHA512 d715cf8f6ceb2139c14502ebe4c01a5a949fa59937737529dd9a5074444e1c25a2379018d740af2bb2cf99bbb3e35280bc88e68a44fa95d49d24e73f1843f003 WHIRLPOOL 2421fc40db3f21d7fc958b92e0f600bee4fa2daea0fd710fed284339cf8a191d15331b52ca5a20e6c5cd5c549a61c6e6538a70abf89ab25b6cd87e396671ad0f
-EBUILD spidermonkey-24.2.0-r4.ebuild 3992 SHA256 13a020bbfba603fcd12027f2c7d2199c31f3500890187d0819b5be39042fbd36 SHA512 6b687ab4d02139130076395dc17fee24c83766651ceaa6db758ac74c12a8bca64ea93ea4c74441e6265d652020fc18fd0d98e74afac8ec5d611b8927b1d2d929 WHIRLPOOL f9e926a21ad747d4fe81756c53abc0f1a7ef380afe4da6623b1de4b5011a91e5c0a0f3a959cc6844c8e0ca7a1cad4a4802952219b07b9783721f31d3eb9c7fdf
+EBUILD spidermonkey-24.2.0-r4.ebuild 3991 SHA256 a9cf38211dbf74dae2086cce0d3b48eaf6cbff263635a85f56307064a876c65b SHA512 679ca189b9d1fbb9c6a6a56fe1b0ad7ad754df37f69c5194c522bde089cc1a5863d21e35c9ef2651812fbaa1233944296a3fb59852274625d79dd94ccf27c653 WHIRLPOOL 9c1abf1d9ff11aa2ef28b03508c7abcc9882d10070bfbef5b9cd4096f9f3d4414ff5d26b71e266231bc0f9d9e7af790914b4216d35c7b3d2c9d10d31e9bd5f22
 EBUILD spidermonkey-38.2.1_rc0.ebuild 3814 SHA256 93db7bea9b303087714562b6fc4720ab6e4749c45e9311962581e62fb04f10f4 SHA512 48c711825885f17617ce60119b9421b8d4cefae43f95eb9b9be9363bdcdab7edd2196795e2b371e3b32ea4b2dc353f94b28cec58a6802f4951a821ebce386794 WHIRLPOOL da437527edc032efa52398c2c6ab89a93c58d17d0e9b587dd2b255f103694fe0009f9d1380a217d9639226d9da3216d8f0392451163eee2c77d87493d81d91b7
 EBUILD spidermonkey-45.0.2.ebuild 3905 SHA256 66063c7090222478796a6900f514f76d7d412c26f406c63c9781d01ebecf9976 SHA512 a9a39994674ecdf1a974fbcc20f8c94e1f1f168db4095ba8c21a9d2fd01a6dbd0a59c932419c6b5f6c42b9bd7cc8b2aeaeb81973663a44b23372ea331b65d5db WHIRLPOOL ecb3e2a37d411571c2887f6db428f00baa501c128a3c748a2f46dd35cac6a755452bc591cfbe511520b065ab10a0e16b18fd50f99d8ec85779ca772e7adab5bb
 EBUILD spidermonkey-52.4.0_pre20171003-r1.ebuild 3868 SHA256 c86c0bfb096cf57a287733d4f5f708e3ff6ab51a610341a53c7e2520452f7aed SHA512 5dcddaf5debdee01c4dab41b5088cf4f5375ba7c2f35f35c91f65dce0c3d1db74ce17955effc5002c8147e37fbb873b6a7d2242c0794ee98052e40e9c68b4f11 WHIRLPOOL bc0e7cd509197173849425bed16e450469a044ae4e136ad306c312f9d021bef7439a3a2d65da548b6505bd866cd7e13d6aea6c553d06cc3bb806d323912f3bd3
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
deleted file mode 100644
index a5e340c26864..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
-	https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-01.tar.xz"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs185"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE="debug minimal static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-	sys-libs/readline:0=
-	x64-macos? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	virtual/pkgconfig"
-
-pkg_setup(){
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		export LC_ALL="C"
-	fi
-}
-
-src_prepare() {
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-	epatch "${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
-	epatch "${WORKDIR}"/sm0/${P}-fix-ppc64.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	# https://bugs.gentoo.org/show_bug.cgi?id=420471
-	epatch "${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=438746
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=441928
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.5-perf_event-check.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=439260
-	epatch "${WORKDIR}"/sm0/${P}-symbol-versions.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=441934
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-fix.patch
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.5-ia64-static-strings.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=431560
-	epatch "${WORKDIR}"/sm0/${PN}-1.8.5-isfinite.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=552786
-	epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
-
-	epatch_user
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--disable-optimize \
-		--disable-profile-guided-optimization \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-cross_make() {
-	emake \
-		CFLAGS="${BUILD_CFLAGS}" \
-		CXXFLAGS="${BUILD_CXXFLAGS}" \
-		AR="${BUILD_AR}" \
-		CC="${BUILD_CC}" \
-		CXX="${BUILD_CXX}" \
-		RANLIB="${BUILD_RANLIB}" \
-		"$@"
-}
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		tc-export_build_env BUILD_{AR,CC,CXX,RANLIB}
-		cross_make jscpucfg host_jsoplengen host_jskwgen
-		cross_make -C config nsinstall
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -i \
-			-e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			Makefile || die
-		sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	# for bug 415791
-	pax-mark mr jsapi-tests
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	# bug 437520 , exclude js shell for small systems
-	if ! use minimal ; then
-		dobin shell/js
-		pax-mark m "${ED}/usr/bin/js"
-	fi
-	dodoc ../../README
-	dohtml README.html
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
index 7cb19fe5087f..b049a5711300 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
 
 LICENSE="NPL-1.1"
 SLOT="0/mozjs185"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="debug minimal static-libs test"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
index 243b4a12be64..a9bfe75fa7f2 100644
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://archive.mozilla.org/pub/js/${MY_PN}${PV}.tar.gz
 LICENSE="NPL-1.1"
 SLOT="17"
 # "MIPS, MacroAssembler is not supported" wrt #491294 for -mips
-KEYWORDS="alpha ~amd64 ~arm -hppa ia64 -mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm -hppa ia64 -mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug jit minimal static-libs test"
 
 REQUIRED_USE="debug? ( jit )"
diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild
index 86a134c79de6..90be61800d4a 100644
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${MY_P}.tar.bz2
 
 LICENSE="NPL-1.1"
 SLOT="24"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug icu jit minimal static-libs +system-icu test"
 
 RESTRICT="ia64? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-31 15:47:53 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-31 15:47:53 +0000
commit	d950fa39dbe16d164ed0cb8e3036fd5d0d896a4c (patch)
tree	04f92d5d1070a7aedb970ce4539dc6d60253c4df /dev-lang
parent	bd7908c6630f38067350d396ac5d18c3cc2434a0 (diff)