gentoo resync : 26.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-26 20:10:49 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-26 20:10:49 +0000
commit: c85a90f90521c7e11d618b527d6630cc64cecbd4 (patch)
tree: 27c1f04d8eab0e0140fb62887a6a5d4d87c32ad9 /dev-lang
parent: 2f51c9978dda4c6e8debca43e4235ecc86914032 (diff)
30 files changed, 1293 insertions, 576 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index eba3a967164e..ed1f6119ccc7 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 07a37456af2b..582c67455e07 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -38,6 +38,7 @@ DIST ghc-7.8.4-src.tar.bz2 10600755 BLAKE2B 6cf27f663178513b25032b648cf36b016e01
 DIST ghc-8.0.2-src.tar.xz 10687760 BLAKE2B 3b2a487c115680342ce308ff1a42d2b6fa6fb1f31e2670b27a305b4d44160056611b77273c9d47f2e37a1ef01b1aba59c36e76b65c83142a5f09812bf3b1ea02 SHA512 58ea3853cd93b556ecdc4abd0be079b2621171b8491f59004ea4e036a4cba4470aaafe6591b942e0a50a64bdc47540e01fe6900212a1ef7087850112d9bfc5ef
 DIST ghc-8.2.1-src.tar.xz 10736016 BLAKE2B 60993cfc9569e83b0c383591ef30a7280e0138fbb7bd696ad62d87e68dcbccf31c0b8ba211b6647922b8595c7aec2c783648f12c67da53e0766b71c7d7c923fc SHA512 d9aa2aa7f9414db8f4e51d6c275694b46df515e68331a1a2b6018256333a2c63ebd877b75ee90407ecce5be672ec9afc6bebd62aadbf8ae06b94f1760d1736be
 DIST ghc-8.2.2-src.tar.xz 10753272 BLAKE2B 6fd792390d3df20f84836466705c3f3c931ba2d594dcbe2b808ea0ae284460000b443df8aae74903eabf05ff9064d68a303086cf888ea68222eb1c60959c8f21 SHA512 6549416f470b599973d409fa45f59c25b07e6a94798cef1a19ad432547dc225338cf4dbc4a4793114b4a417798a3b59b122b92b020251074405c5302b7ffe799
+DIST ghc-8.4.0.20171214-src.tar.xz 11153936 BLAKE2B 12a64fc5cf63c137f0f37c6ccf0f8be65edccb120a1ed4d156fcc3e6b4171319b5806e05ab11def25635df664c275e5c89749fd2f4138f0c1a50676fda482f73 SHA512 e92aa4746cb14c538cb6fc86c818b354dbf1c36dc0f9ef79e6617196e8f2264d072346d8f93e27b167d09651458000987c5cddd3751ec4d74972ebfd71cc817b
 DIST ghc-bin-7.10.3-alpha.tbz2 183558856 BLAKE2B 2bb02aafa49c6a91bec016e8bec2d07257d602e53c9df55792ec6fbbf8e2e46de1d5f3f72c0ccf74d6bd7f7987f53412063ccb02ae85455fce11fa928cbf5291 SHA512 08709fe9b4036ab41715c9a637a2a160104e3ab9e0ed9efaaf73428e3cfe19619e50c42b72c60bbbd27be2b9c2ea68f63d72c1a27d4519756e7c0d909f724230
 DIST ghc-bin-7.10.3-amd64.tbz2 112040431 BLAKE2B 3e59b70ca309a1cd704266c54a7983f9a58362bf700ced89c5649c780c664c650ec091e14026a7b84e339d2ebff39eba1772eebcd9fb4b99b9c99d179453d5cc SHA512 e1554b3944edbe8e16537de5a29132dc6a22d780d9a700cdc9b76387b94191164398d6f2242bf8199527802572e2bb02545569d4f0930a0ee0dbfdeb25978558
 DIST ghc-bin-7.10.3-ia64.tbz2 238680956 BLAKE2B 08593718d376051edfb0c86131e54dafc5c15056757fbeef90c653a7d217e49ff34ffaf7cd4083144c9277e73a290b822a0f889aaf806341375708e4b92654b2 SHA512 3694011aec8a6dc37889418b318993cb82f9b46a5175dd837713f396c8f59a19a920e0b0669fe3b4ec37d5bd8837c115264c0a8fc97c5a4ce06a3bdd52fcfce5
@@ -70,4 +71,5 @@ EBUILD ghc-7.8.4.ebuild 19831 BLAKE2B a883d42fd0dcda56f9bfaa6da8ae316b4e6b2d40bc
 EBUILD ghc-8.0.2.ebuild 21394 BLAKE2B f47cb817eb26bcf9dcfe58bf2f8dddf7bd19f451ddf52620210802524e4f58557711f90d1ac459c4d411553bc7ab147f9d1b4fe5e06235c2296a4c40cf641c39 SHA512 386f9b7a4e128e676d98e426cab20d647629f6c11e7516229d34b624eaf3ff3898aacfe53814c9e7a0a3982f0ea8eb58cee99950f264caaafa12ff9dbb221e6a
 EBUILD ghc-8.2.1.ebuild 24769 BLAKE2B efcd5670929fe91f3b5a059644c8a4848943c6f7065c4b2b347d14af9745eb867bd217d81c9ef822ef816f05e10b6d2d466eb2d15c7f5b35bfe3e2388a976022 SHA512 efa3294d0f540d7a53b3a92fbc15a8a095e517a60a1d9b1ed36bd73551f9ad690afb24ac88b9c8db430b1506318b12abcf4eb077470ce111bc1db93f6212e6f8
 EBUILD ghc-8.2.2.ebuild 24681 BLAKE2B fa04dd32410a955f956863e738afb01e60fb568173404e7c067b0a615f48e28ed25d2ca1f4f8237042e9f25db3819d04488f2a327584fc457ace78fcb04b9d96 SHA512 e7b5686858076a15bcb14d6818c6616e2cc3197e0e241367d3cf38cedb7cdace091fb9b21ba978b05cb908a3c8a7723f84512f4b94abed797957c83cc147c1cf
+EBUILD ghc-8.4.1_alpha1.ebuild 24643 BLAKE2B e3c9c1483173e60dc709f1b95e0fdfb173f7f8a64f7816ee62c44dc1cfa989e5877d53a26e9b96d807a5803ba10b17f72bee7dc921f3d53da08083482d4a5e4b SHA512 43e1e6169cd2ded70d4fb4d86741b743a51cfcc55f48a3621cdea1ee9fd18bb0a455890d430f74236c692d630fabe0c0d90bc56bac36adb5828e77a4470e2d57
 MISC metadata.xml 562 BLAKE2B 98c9bbd3aff50f05f27fe1682524254728413e53820650c91dc0eab26beecb2b682032d4b2d9c99a339059a2d8c4d007711d0dfbd3e47e5306fa4b5304f6b01d SHA512 dff79157435350067f74ae396556346d087e8146e61afe2b9739217b5d0dce6a589dd87705c7626d0c1c16da29613d9f465d357c283fb6c6df2332fec2b269be
diff --git a/dev-lang/ghc/ghc-8.4.1_alpha1.ebuild b/dev-lang/ghc/ghc-8.4.1_alpha1.ebuild
new file mode 100644
index 000000000000..345c7f595398
--- /dev/null
+++ b/dev-lang/ghc/ghc-8.4.1_alpha1.ebuild
@@ -0,0 +1,758 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib pax-utils toolchain-funcs versionator prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="http://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#arch_binaries="$arch_binaries arm64? ( http://code.haskell.org/~slyfox/ghc-arm64/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
+#arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+	case "${ARCH}" in
+		#alpha) return 0 ;;
+		#arm64) return 0 ;;
+		#arm) return 0 ;;
+		#amd64) return 0 ;;
+		#ia64) return 0 ;;
+		#ppc) return 0 ;;
+		#ppc64) return 0 ;;
+		#sparc) return 0 ;;
+		#x86) return 0 ;;
+		*) return 1 ;;
+	esac
+}
+
+GHC_PV=${PV}
+GHC_PV=8.4.0.20171214 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? ( http://downloads.haskell.org/~ghc/${PV/_/-}/${GHC_P}-src.tar.xz )"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+	# "hackage-name          hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+#KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc ghcbootstrap ghcmakebinary +gmp profile"
+IUSE+=" binary"
+
+RDEPEND="
+	>=dev-lang/perl-5.6.1
+	dev-libs/gmp:0=
+	sys-libs/ncurses:0=[unicode]
+	!ghcmakebinary? ( virtual/libffi:= )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+	sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-python/sphinx
+		>=dev-libs/libxslt-1.1.2 )
+	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )"
+
+PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
+
+REQUIRED_USE="?? ( ghcbootstrap binary )"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+	if is_crosscompile; then
+		echo "${CTARGET}-"
+	else
+		echo ""
+	fi
+}
+
+append-ghc-cflags() {
+	local persistent compile assemble link
+	local flag ghcflag
+
+	for flag in $*; do
+		case ${flag} in
+			persistent)	persistent="yes";;
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				;;
+		esac
+	done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+	local pn=$1 pv=$2
+	local p=${pn}-${pv}
+	local f
+
+	einfo "Bumping ${pn} up to ${pv}"
+
+	for f in ghc.mk GNUmakefile; do
+		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+	done
+	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		SRC_URI+=" mirror://hackage/package/${pn}/${pn}-${pv}.tar.gz"
+	done
+}
+
+update_SRC_URI
+
+bump_libs() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		bump_lib "${pn}" "${pv}"
+	done
+}
+
+ghc_setup_cflags() {
+	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
+	if ! is_native; then
+		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+		einfo "Crosscompiling mode:"
+		einfo "   CHOST:   ${CHOST}"
+		einfo "   CTARGET: ${CTARGET}"
+		einfo "   CFLAGS:  ${CFLAGS}"
+		einfo "   LDFLAGS: ${LDFLAGS}"
+		einfo "   prefix: $(cross)"
+		return
+	fi
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+
+	# Cmm can't parse line numbers #482086
+	replace-flags -ggdb[3-9] -ggdb2
+
+	GHC_FLAGS=""
+	GHC_PERSISTENT_FLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Sometimes it's handy to see backtrace of RTS
+			# to get an idea what happens there
+			-g*) append-ghc-cflags compile ${flag};;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	for flag in ${LDFLAGS}; do
+		append-ghc-cflags link ${flag}
+	done
+
+	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
+	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
+	# options to gcc.
+	if is_native; then
+		# hardened-gcc needs to be disabled, because our prebuilt binaries/libraries
+		# are not built with fPIC, bug #606666
+		gcc-specs-pie && append-ghc-cflags persistent compile link -nopie
+		tc-is-gcc && version_is_at_least 6.3 $(gcc-version) && if ! use ghcbootstrap; then
+			# gcc-6.3 has support for -no-pie upstream, but spelling differs from
+			# gentoo-specific '-nopie'. We enable it in non-bootstrap to allow
+			# hardened users try '-pie' in USE=ghcbootstrap mode.
+			append-ghc-cflags compile link -no-pie
+		fi
+
+		# prevent from failing to build unregisterised ghc:
+		# http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+	fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+	local from=$1
+	local   to=$2
+	shift 2
+	local file=
+	for file in "$@"
+	do
+		sed -i -e "s|$from|$to|g" \
+			"$file" || die "path relocation failed for '$file'"
+	done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+	local to=$1
+
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+	# backup original script to use it later after relocation
+	local gp_back="${T}/ghc-pkg-${GHC_PV}-orig"
+	cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
+			"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
+	fi
+
+	# Relocate from /usr to ${EPREFIX}/usr
+	relocate_path "/usr" "${to}/usr" \
+		"${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
+		"${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
+		"${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
+		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
+		"${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
+
+	# this one we will use to regenerate cache
+	# so it should point to current tree location
+	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+	if use prefix; then
+		hprefixify "${bin_libpath}"/${PN}*/settings
+	fi
+
+	# regenerate the binary package cache
+	"$gp_back" recache || die "failed to update cache after relocation"
+	rm "$gp_back"
+}
+
+ghc-check-reqs() {
+	# These are pessimistic values (slightly bigger than worst-case)
+	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
+	# numbers on various arches.
+	CHECKREQS_DISK_BUILD=8G
+	CHECKREQS_DISK_USR=2G
+	# USE=binary roughly takes
+	use binary && CHECKREQS_DISK_BUILD=4G
+
+	"$@"
+}
+
+pkg_pretend() {
+	ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ghc-check-reqs check-reqs_pkg_setup
+
+	# quiet portage about prebuilt binaries
+	use binary && QA_PREBUILT="*"
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	else
+		if ! yet_binary; then
+			eerror "Please try emerging with USE=ghcbootstrap and report build"
+			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
+	# the Solaris and Darwin binaries from ghc (maeder) need to be
+	# unpacked separately, so prevent them from being unpacked
+	local ONLYA=${A}
+	case ${CHOST} in
+		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+	esac
+	unpack ${ONLYA}
+}
+
+src_prepare() {
+	ghc_setup_cflags
+
+	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+		# See bug #313635.
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${WORKDIR}/usr/bin/ghc-${GHC_PV}"
+
+		# allow hardened users use vanilla binary to bootstrap ghc
+		# ghci uses mmap with rwx protection at it implements dynamic
+		# linking on it's own (bug #299709)
+		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/bin/ghc"
+	fi
+
+	if use binary; then
+		if use prefix; then
+			relocate_ghc "${EPREFIX}"
+		fi
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+		eapply_user
+	else
+		if ! use ghcbootstrap; then
+			case ${CHOST} in
+				*-darwin* | *-solaris*)
+				# UPDATE ME for ghc-7
+				mkdir "${WORKDIR}"/ghc-bin-installer || die
+				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+				popd > /dev/null
+
+				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+				# fix the binaries so they run, on Solaris we need an
+				# LD_LIBRARY_PATH which has our prefix libdirs, on
+				# Darwin we need to replace the frameworks with our libs
+				# from the prefix fix before installation, because some
+				# of the tools are actually used during configure/make
+				if [[ ${CHOST} == *-solaris* ]] ; then
+					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+				elif [[ ${CHOST} == *-darwin* ]] ; then
+					local readline_framework=GNUreadline.framework/GNUreadline
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
+					local ncurses_file=/opt/local/lib/libncurses.5.dylib
+					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+						install_name_tool -change \
+							${readline_framework} \
+							"${EPREFIX}"/lib/libreadline.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${gmp_framework} \
+							"${EPREFIX}"/usr/lib/libgmp.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${ncurses_file} \
+							"${EPREFIX}"/usr/lib/libncurses.dylib \
+							${binary} || die
+					done
+					# we don't do frameworks!
+					sed -i \
+						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+						rts/package.conf.in || die
+				fi
+
+				# it is autoconf, but we really don't want to give it too
+				# much arguments, in fact we do the make in-place anyway
+				./configure --prefix="${WORKDIR}"/usr || die
+				make install || die
+				popd > /dev/null
+				;;
+				*)
+				relocate_ghc "${WORKDIR}"
+				;;
+			esac
+		fi
+
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${S}/ghc/ghc.wrapper"
+
+		cd "${S}" # otherwise eapply will break
+
+		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+
+		# a bunch of crosscompiler patches
+		# needs newer version:
+		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+		# needs a new libffi release
+		eapply "${FILESDIR}"/${PN}-8.0.2-libffi-alpha.patch
+
+		# mingw32 target
+		pushd "${S}/libraries/Win32"
+			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+		popd
+
+		bump_libs
+
+		eapply_user
+		# as we have changed the build system
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if ! use binary; then
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
+
+		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+
+		# We also need to use the GHC_FLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+		# Speed up initial Cabal bootstrap
+		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+		# We can't depend on haddock except when bootstrapping when we
+		# must build docs and include them into the binary .tbz2 package
+		# app-text/dblatex is not in portage, can not build PDF or PS
+		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+		# this controls presence on 'xhtml' and 'haddock' in final install
+		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+		# not used outside of ghc's test
+		if [[ -n ${GHC_BUILD_DPH} ]]; then
+				echo "BUILD_DPH = YES" >> mk/build.mk
+			else
+				echo "BUILD_DPH = NO" >> mk/build.mk
+		fi
+
+		# Any non-native build has to skip as it needs
+		# target haddock binary to be runnabine.
+		if ! is_native; then
+			# disable docs generation as it requires running stage2
+			echo "HADDOCK_DOCS=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+		fi
+
+		if is_crosscompile; then
+			# Install ghc-stage1 crosscompiler instead of
+			# ghc-stage2 cross-built compiler.
+			echo "Stage1Only=YES" >> mk/build.mk
+		fi
+
+		# allows overriding build flavours for libraries:
+		# v   - vanilla (static libs)
+		# p   - profiled
+		# dyn - shared libraries
+		# example: GHC_LIBRARY_WAYS="v dyn"
+		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+		fi
+		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		if ! use ghcbootstrap; then
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+		fi
+
+		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
+
+		# don't strip anything. Very useful when stage2 SIGSEGVs on you
+		echo "STRIP_CMD = :" >> mk/build.mk
+
+		local econf_args=()
+
+		# GHC embeds toolchain it was built by and uses it later.
+		# Don't allow things like ccache or versioned binary slip.
+		# We use stable thing across gcc upgrades.
+		# User can use EXTRA_ECONF=CC=... to override this default.
+		econf_args+=(
+			AR=${CTARGET}-ar
+			CC=${CTARGET}-gcc
+			# these should be inferred by GHC but ghc defaults
+			# to using bundled tools on windows.
+			Windres=${CTARGET}-windres
+			DllWrap=${CTARGET}-dllwrap
+			# we set the linker explicitly below
+			--disable-ld-override
+		)
+		case ${CTARGET} in
+			arm*)
+				# ld.bfd-2.28 does not work for ghc. Force ld.gold
+				# instead. This should be removed once gentoo gets
+				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+				econf_args+=(LD=${CTARGET}-ld.gold)
+			;;
+			sparc*)
+				# ld.gold-2.28 does not work for ghc. Force ld.bfd
+				# instead. This should be removed once gentoo gets
+				# a fix for missing --no-relax support bug:
+				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
+				econf_args+=(LD=${CTARGET}-ld.bfd)
+			;;
+			*)
+				econf_args+=(LD=${CTARGET}-ld)
+		esac
+
+		if [[ ${CBUILD} != ${CHOST} ]]; then
+			# GHC bug: ghc claims not to support cross-building.
+			# It does, but does not distinct --host= value
+			# for stage1 and stage2 compiler.
+			econf_args+=(--host=${CBUILD})
+		fi
+
+		if use ghcmakebinary; then
+			# When building booting libary we are trying to
+			# bundle or restrict most of external depends
+			# with unstable ABI:
+			#  - embed libffi (default GHC behaviour)
+			#  - disable ncurses support for ghci (via haskeline)
+			#    https://bugs.gentoo.org/557478
+			#  - disable ncurses support for ghc-pkg
+			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+		elif is_native; then
+			# using ${GTARGET}'s libffi is not supported yet:
+			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+			econf_args+=(--with-system-libffi)
+			econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+		fi
+
+		einfo "Final mk/build.mk:"
+		cat mk/build.mk || die
+
+		econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot
+
+		if [[ ${PV} == *9999* ]]; then
+			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+			GHC_P=${PN}-${GHC_PV}
+		fi
+	fi # ! use binary
+}
+
+src_compile() {
+	if ! use binary; then
+		# Stage1Only crosscompiler does not build stage2
+		if ! is_crosscompile; then
+			# 1. build/pax-mark compiler binary first
+			emake ghc/stage2/build/tmp/ghc-stage2
+			# 2. pax-mark (bug #516430)
+			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+			# 2. build/pax-mark haddock using ghc-stage2
+			if is_native; then
+				# non-native build does not build haddock
+				# due to HADDOCK_DOCS=NO, but it could.
+				emake utils/haddock/dist/build/tmp/haddock
+				pax-mark -m utils/haddock/dist/build/tmp/haddock
+			fi
+		fi
+		# 3. and then all the rest
+		emake all
+	fi # ! use binary
+}
+
+src_install() {
+	if use binary; then
+		use prefix && mkdir -p "${ED}"
+		mv "${S}/usr" "${ED}"
+	else
+		[[ -f VERSION ]] || emake VERSION
+
+		# -j1 due to a rare race in install script:
+		#    make --no-print-directory -f ghc.mk phase=final install
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
+		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+		#    /usr/bin/install: cannot create regular file \
+		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+		emake -j1 install DESTDIR="${D}"
+
+		# Skip for cross-targets as they all share target location:
+		# /usr/share/doc/ghc-9999/
+		if ! is_crosscompile; then
+			dodoc "distrib/README" "ANNOUNCE" "LICENSE" "VERSION"
+		fi
+
+		# rename ghc-shipped files to avoid collision
+		# of external packages. Motivating example:
+		#  user had installed:
+		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+		#      dev-haskell/transformers-0.4.2.0
+		#  then user tried to update to
+		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+		#  this will lead to single .conf file collision.
+		local shipped_conf renamed_conf
+		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+		for shipped_conf in "${package_confdir}"/*.conf; do
+			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+			mv "${shipped_conf}" "${renamed_conf}" || die
+		done
+
+		# remove link, but leave 'haddock-${GHC_P}'
+		rm -f "${ED}"/usr/bin/$(cross)haddock
+
+		if ! is_crosscompile; then
+			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+			newbashcomp utils/completion/ghc.bash         ghc
+		fi
+	fi
+
+	# path to the package.cache
+	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+	PKGCACHE="${package_confdir}"/package.cache
+	# copy the package.conf.d, including timestamp, save it so we can help
+	# users that have a broken package.conf.d
+	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+	# copy the package.conf, including timestamp, save it so we later can put it
+	# back before uninstalling, or when upgrading.
+	cp -p "${PKGCACHE}"{,.shipped} \
+		|| die "failed to copy package.conf.d/package.cache"
+}
+
+pkg_preinst() {
+	# have we got an earlier version of ghc installed?
+	if has_version "<${CATEGORY}/${PF}"; then
+		haskell_updater_warn="1"
+	fi
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	# path to the package.cache
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+	# give the cache a new timestamp, it must be as recent as
+	# the package.conf.d directory.
+	touch "${PKGCACHE}"
+
+	if [[ "${haskell_updater_warn}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of GHC."
+		ewarn "You may have to run"
+		ewarn "      'haskell-updater'"
+		ewarn "to rebuild all ghc-based Haskell libraries."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+	rm -rf "${PKGCACHE}"
+
+	cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+	ghc-package_pkg_postrm
+}
diff --git a/dev-lang/jimtcl/Manifest b/dev-lang/jimtcl/Manifest
index dced7de5edd7..21f2457b20d3 100644
--- a/dev-lang/jimtcl/Manifest
+++ b/dev-lang/jimtcl/Manifest
@@ -6,9 +6,9 @@ DIST jimtcl-0.75.zip 2319459 BLAKE2B 484c844ffbe972ac99d564c8a6ebb9f034c069d23f7
 DIST jimtcl-0.76.zip 2326715 BLAKE2B 50ea032cf46d2edeeecde1dc3b4deffcbd09b5dd3a6880963608b3f20616bf162fafc4ec2869bfe5de90231c4c9a29fb04710bd299cc5e8728ff20a86e46f32d SHA512 50763ea897fb5393083749cdd9e57a3f3d2d6dbebc40ee6371b1b86ebfc2f515e9775cd2acd6627f0f81b54bd72cd8c74be5aa9d0dbefc7c16372887e07f6ea4
 EBUILD jimtcl-0.70_pre20110317.ebuild 908 BLAKE2B 2e964bd4aa54b1a9e28389436ceae72a02ccfbb6f632e06636ba0653eaaab9d14fc3c3e8271754f19afb842bb5cccceab5fc7baf98daa0459b1de7cd8b0de9b6 SHA512 9e6840ad39bda0cdfc9027466f8fc16896b55dd6bbb1b2f7a94b06787c239416efb5dcbaf657ab2c7b0b3d1cd7b534d675f748a46269d07e78039fd2f1c46f44
 EBUILD jimtcl-0.73.ebuild 923 BLAKE2B adc284f298fcf979da7c7fbe1cc6b71c9df6523569b9c5305d8c2c4239ae3df99d30a4bbb6654e41a41ce58a8d468f4af86dffb007ee39746c70c38880bb83ee SHA512 1a3910166f49fda853bb5d116df969c64be37d36ca7a1e3c00b013e6b32effb34267aaf716382bf36728e73fdf1bf726cf5722fd881fd8f7d6163483cfaa8402
-EBUILD jimtcl-0.74-r1.ebuild 1032 BLAKE2B e163d2afc6bb318d7fe423d79fadb5edd26a9ed31957384680da5ad7831ac08bc070d4f117d4429c5cef638f9272c678c527ff096b790a7b11683441747a8717 SHA512 5f3ed029375213dea3a396736af2bb835e730250097d0010b284062be58e13a1578979d10e2cc1fb795891936790f38dbec22e167ce5e682e44cba8e9fcfa3c9
-EBUILD jimtcl-0.75-r1.ebuild 1569 BLAKE2B 43fc6b2b4152206e4a08d9bfafba6eaf16369a77ad813528893b74c42c8ce38c817ae401a1fec936190c38a83755a35b6b922666bb35a875e012e4b32f3c53c1 SHA512 e60ad25ea590ad971d7e0848907f368918ad45dca8425f0d51f95047268f27157c49c1763eb984223392c90c3430851e366e68ebbfe47b21d547a91fb0f1633d
-EBUILD jimtcl-0.75.ebuild 1038 BLAKE2B 413af677f1411a5bc8479cf3aa9097f78e8db6a46637a53b83210a726287cb1f37a2f1c20b0261d1f976a61f3a323ddcc4926573a1ebe36dbde2da18e761e39c SHA512 35e7fa6d3eb9d05c6e5ac2eb2d8e5dfff7fd09fbe2c17f614c35702afb3b6fb7eb0ecba559ee7d9b50ca6424e0e02064e5d54fff51f535c4ab0f85f07b4592c9
-EBUILD jimtcl-0.76.ebuild 1566 BLAKE2B 698df978a5d5789fc4807541dcf1e675ed75d4798eee8c61bbe8d17ed03d643cb0a248dfb53135881e902a46476a39112e13ea0d0ce718b2855e9accd9f5c9cc SHA512 d8f220bfa57e731ccaae01ab06b37d72c2df6fcc3382f0ddfee11bde71c6d368eb9eed474bd97277f5a81666629e4d519548cea4740d19cf71eab1593add07c9
-EBUILD jimtcl-9999.ebuild 1569 BLAKE2B 43fc6b2b4152206e4a08d9bfafba6eaf16369a77ad813528893b74c42c8ce38c817ae401a1fec936190c38a83755a35b6b922666bb35a875e012e4b32f3c53c1 SHA512 e60ad25ea590ad971d7e0848907f368918ad45dca8425f0d51f95047268f27157c49c1763eb984223392c90c3430851e366e68ebbfe47b21d547a91fb0f1633d
+EBUILD jimtcl-0.74-r1.ebuild 1013 BLAKE2B e7fc39d081bd88a7fdd586826f2b1360da578be1edba34f3b69ae4406de372fd9fb2cec4438c7744dfccf68bf8a22955390fb184e76499a42c6740da2126ae2b SHA512 669452b003b665298e8feb4a47350765da066bee559b2ba3ba9a73ef86dfaec691baf6f9a67a091d97c321c6e1f3a40fb4a9db59ce3680f21c3191ff6abfe9b2
+EBUILD jimtcl-0.75-r1.ebuild 1569 BLAKE2B abb81a66843783f94977c5328b7cc5a85bebe37c648341c403c94c88236511f55e8c2ae8df9a9159d8c6a07e0afa0da9fac16f4a3df64bf03f869fe138e457f4 SHA512 b3b618ce3efe6ef179edf002e76449e36a7eeb1e05139e4cbb9886e7dce7cf8440da089d72ccf6f3561f56392afaa74f1d9c68aa47cc27cd6d230aceb9fcb1a8
+EBUILD jimtcl-0.75.ebuild 1019 BLAKE2B 0afedc47940a7e62394feebeb157d54e331ed1359d6dbb1c07bac3bc30ae65ab0a1e413a6e68a23cbdfb43339a54a78351bb03991c11ddaa42c3dca3d4ff2688 SHA512 b4d14cccc3e291711ef03e70c86b845433f94624d75af877c29c25101d8cdbab7ea22b27dc213358e70c7bcd0c05c22431e00adb83c03ea1da26295aeabb12eb
+EBUILD jimtcl-0.76.ebuild 1566 BLAKE2B a7bb926fd5e32b6b18d393813c648d5aadacd18cac461eeb6386bd49f2b95f9cdf5a518feba859bee332738e08361199f894c0be45e3172ec5454e7ca51fec53 SHA512 8854c2a76afe6047e06fe313df89f2378c2ac8cce012c6698788e563195f5d550de2ff68be2830b224449dc39e79387865d94856a4d028f7a4dca59b8f96a0a3
+EBUILD jimtcl-9999.ebuild 1569 BLAKE2B abb81a66843783f94977c5328b7cc5a85bebe37c648341c403c94c88236511f55e8c2ae8df9a9159d8c6a07e0afa0da9fac16f4a3df64bf03f869fe138e457f4 SHA512 b3b618ce3efe6ef179edf002e76449e36a7eeb1e05139e4cbb9886e7dce7cf8440da089d72ccf6f3561f56392afaa74f1d9c68aa47cc27cd6d230aceb9fcb1a8
 MISC metadata.xml 339 BLAKE2B fea57339323dd5891a6cdd1cf9a4db64c1a8e3a8255643a8288c4a11dfd82e35831ae6a0f07cefb97521548e6ac1154c975aee177fe3bc9abd0710bea1279792 SHA512 84a6a6b15c451483e0f07742ba07af92678738a7e7e272090fc1786fdfe9c18565a62949c344c4383b905edcdf7db45808d0bf0a2e56a43df08795c9e6e81183
diff --git a/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild b/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild
index 56008de46ce6..bba26a59e81f 100644
--- a/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -31,13 +31,14 @@ src_compile() {
 
 src_install() {
 	dobin jimsh
-	use static-libs && {
+
+	if use static-libs; then
 		dolib.a libjim.a
-	} || {
+	else
 		dolib.so libjim.so.${PV}
-		dosym /usr/$(get_libdir)/libjim.so.${PV} \
-			/usr/$(get_libdir)/libjim.so
-	}
+		dosym libjim.so.${PV} /usr/$(get_libdir)/libjim.so
+	fi
+
 	insinto /usr/include
 	doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h
 	doins jim-win32compat.h jim-eventloop.h jim-config.h
diff --git a/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild b/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild
index d05b5040644f..3c79869f318e 100644
--- a/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit multiprocessing eutils
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git"
-	inherit git-2
+	inherit git-r3
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"
diff --git a/dev-lang/jimtcl/jimtcl-0.75.ebuild b/dev-lang/jimtcl/jimtcl-0.75.ebuild
index 59a5c92d1924..86af1bb8fb99 100644
--- a/dev-lang/jimtcl/jimtcl-0.75.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.75.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -31,13 +31,14 @@ src_compile() {
 
 src_install() {
 	dobin jimsh
-	use static-libs && {
+
+	if use static-libs; then
 		dolib.a libjim.a
-	} || {
+	else
 		dolib.so libjim.so.${PV}
-		dosym /usr/$(get_libdir)/libjim.so.${PV} \
-			/usr/$(get_libdir)/libjim.so
-	}
+		dosym libjim.so.${PV} /usr/$(get_libdir)/libjim.so
+	fi
+
 	insinto /usr/include
 	doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h
 	doins jim-win32compat.h jim-eventloop.h jim-config.h
diff --git a/dev-lang/jimtcl/jimtcl-0.76.ebuild b/dev-lang/jimtcl/jimtcl-0.76.ebuild
index a82e24c9b204..3d5515b2e63d 100644
--- a/dev-lang/jimtcl/jimtcl-0.76.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.76.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit multiprocessing eutils
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git"
-	inherit git-2
+	inherit git-r3
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"
diff --git a/dev-lang/jimtcl/jimtcl-9999.ebuild b/dev-lang/jimtcl/jimtcl-9999.ebuild
index d05b5040644f..3c79869f318e 100644
--- a/dev-lang/jimtcl/jimtcl-9999.ebuild
+++ b/dev-lang/jimtcl/jimtcl-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit multiprocessing eutils
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git"
-	inherit git-2
+	inherit git-r3
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"
diff --git a/dev-lang/opendylan/Manifest b/dev-lang/opendylan/Manifest
index ddc4bb7503b5..0307ade6579a 100644
--- a/dev-lang/opendylan/Manifest
+++ b/dev-lang/opendylan/Manifest
@@ -1,8 +1,8 @@
 DIST opendylan-2013.1-sources.tar.bz2 8441356 BLAKE2B 5dad47af5ccd5bb760c8fd0e83faf6442f43b47c985731cd3b2fae5644f5dbc96150050f3fa19110391ae36bbd1a68d0e51ae6d5ac95407c38a3fcfebf8425cf SHA512 f5168bb9a4d2bcd372667406f2f07ed5972f3e773a5766c5f74421d6ffd10901a43cf9d6604ad2ae14d80f1b84e856f4fdca3e1546a87053939f470005a87a2f
 DIST opendylan-2013.2-sources.tar.bz2 9174284 BLAKE2B 124af65a76c3f795a90f8220ca499fa822e329e33be2b322d63b77a82880e18b3b665968a726ecbfa1888c29b62b9a11f3a568b222ef18dfab38c3ae05bfdf23 SHA512 f846a1d80f78b887815d2f2983314dbf6b5f424164dba9bc6ac456b40f31ab02aeb073a447df8f02b3fad6bcf6401a889abaac400d58db8e0adebcdd4e177a4d
 DIST opendylan-2014.1-sources.tar.bz2 8232321 BLAKE2B 45535287a2d85617e0461da4dfcd93f1f95249a7c191732624129174c6696411b3cf2a3cd85bb9eaa26c3723689d1ebfbb812fabb3a8d3e2ac5cfd7f4ee284f9 SHA512 576616cad0eb6ff8606a394834ad325858a5f45a8427adb0eefc9ebf883ab1522ec66dff6e591a367390d49f53acd160becad62679edc610ccfe63c9a3795cfc
-EBUILD opendylan-2013.1-r1.ebuild 3138 BLAKE2B d2cd4b68055fff749d7f7ce51cab836e7729555febdce77012aa45781b2446c7197ef664d4adbc7d168746b91cbe503a1edae1182981f370180e53aeb49f7a04 SHA512 5b9b4fc48fb22480bb60283e496a43267080ec6c3b17a7fe3f0c56cbc5eb34bd8186bf65c7e23e41b7b09f28e1c2dccf18d023361f97cc4c21bdd2b7b7639e58
-EBUILD opendylan-2013.2.ebuild 3357 BLAKE2B c4aba2b20906c0a067fe33ce80d07526f9146a5b55a3d746f9f7bd055cfb12de5c427d106625a74ad7078d869c9f9eaa8f79255031e925157593f0663ddd33af SHA512 b9b021f579737fe55c1634398fa53b0c2b21e803ba971164cb0d04bc592f8d0fd7f66eecd779c18d9792e43c47f08fc8636d9e9632042236e7afc6ecf78c9385
-EBUILD opendylan-2014.1.ebuild 3240 BLAKE2B 54d278c0e2c2989ad6b626b3c4973bb4e5bb13e624d78d06a170f2f8eeb6d7c7255640835d0f940c1db7d1c4b19747f9472f5699f1881c3de33aa2bb101e709f SHA512 137a25acc3a9677175564bc4205b8c385dc56dbca5c7b7d3670931499d4b1e4ef4c61daaf5233b142cca4d9b1badb31d10dadf4e3fe0f1e278fb6a43f7450b90
-EBUILD opendylan-9999.ebuild 1763 BLAKE2B ae0537c16b8ac024873e4948a48660190f58d525165a4f89e3feacf146cb46647dfcc7e60d041749c56892e1f49f8f11e4e9ab060d3d058b04a4c059ede4e76f SHA512 9d429bb8aed23b944bf66fcab4c6d038740a279f39642c19cedb9c420fcaa5751b20d35a47f7830a0747bdd584abf2f3f9021a7e291d41bbd793193b6aa2dc99
+EBUILD opendylan-2013.1-r1.ebuild 3134 BLAKE2B daa16cbbb22298af7c147095211c1db8a895460148e9d8f66994cce0b2a1191f31b407add5393773c56b9dc2af4247eaf97c698677a9e4b3cc089df30b41acc9 SHA512 c5e8090a98c92f01dd1baabc595052b050776d1cbe4929fb57fbc4c078dc909490ebd8c453013f69a5fd9a26c23afdb39377d56926f8e7efbaf27fb4f4d84518
+EBUILD opendylan-2013.2.ebuild 3353 BLAKE2B c3c3538152e0f2f58b72de048a43c63c31858ee7d6846c0b9306ca8dd1a51a3c26181d4a7e4f8f569f8e3d394b2dc55861159f781a81d2750dd2700ee05b5ca9 SHA512 6035830ee8942c6fef5f108a8203a4c8f903649b6edf22d9fce89f098ee4b332028ea3ae6d7739c47c9dabdc260f3dcdba3efecc8e8277e9a1e8cd6fe79e51d9
+EBUILD opendylan-2014.1.ebuild 3236 BLAKE2B 3f6ee07317fb1b645622eaa4503d61e7282a5a4a3231bf70c22937bf0962f913c977b6c5cdd67540647e9fbb2ac43f2820c324f60558c679cec0ed0da93001a5 SHA512 1f49e3451149082ada499fbc6b80151fc274bc7e5d67d7d25873e49ded1f680ccb1c6801fee016cc4ebe7a3eab5f9cd0ec888d1833bd6c081f11bf2e39cc9133
+EBUILD opendylan-9999.ebuild 1762 BLAKE2B 92cef00a14283754455e654070b4cc4be0aff130eac8a8efb5eb0e7a0918162931894bc24740971a547e0814cd9b08d85d27c3b91c3594da0c3ea457a4cf583c SHA512 28a64050061d831746aae3a327ec1946fa05bd0cfb4345f79d14af677710f8768e3c683bc86c9057f38a18500e036cc266207e714cb44faf3cf423534bcf46f1
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-lang/opendylan/opendylan-2013.1-r1.ebuild b/dev-lang/opendylan/opendylan-2013.1-r1.ebuild
index 7fcf1bf9ed3c..a5a3a00fc97d 100644
--- a/dev-lang/opendylan/opendylan-2013.1-r1.ebuild
+++ b/dev-lang/opendylan/opendylan-2013.1-r1.ebuild
@@ -5,20 +5,16 @@ EAPI=4
 
 inherit autotools
 
-RESTRICT="test"
-
 DESCRIPTION="OpenDylan language runtime environment"
-
 HOMEPAGE="http://opendylan.org"
 SRC_URI="http://opendylan.org/downloads/${PN}/${PV}/${P}-sources.tar.bz2"
 
 LICENSE="Opendylan"
 SLOT="0"
-
 # not tested on x86
 KEYWORDS="~amd64 ~x86"
-
 IUSE=""
+RESTRICT="test"
 
 # the boehm-gc check is "wrong" and reported upstream
 # but for now static-libs useflag is needed
diff --git a/dev-lang/opendylan/opendylan-2013.2.ebuild b/dev-lang/opendylan/opendylan-2013.2.ebuild
index 6b3cea128a98..1d752a9bd300 100644
--- a/dev-lang/opendylan/opendylan-2013.2.ebuild
+++ b/dev-lang/opendylan/opendylan-2013.2.ebuild
@@ -5,20 +5,16 @@ EAPI=4
 
 inherit autotools toolchain-funcs
 
-RESTRICT="test"
-
 DESCRIPTION="OpenDylan language runtime environment"
-
 HOMEPAGE="http://opendylan.org"
 SRC_URI="http://opendylan.org/downloads/${PN}/${PV}/${P}-sources.tar.bz2"
 
 LICENSE="Opendylan"
 SLOT="0"
-
 # not tested on x86
 KEYWORDS="~amd64 ~x86"
-
 IUSE=""
+RESTRICT="test"
 
 # the boehm-gc check is "wrong" and reported upstream
 # but for now static-libs useflag is needed
diff --git a/dev-lang/opendylan/opendylan-2014.1.ebuild b/dev-lang/opendylan/opendylan-2014.1.ebuild
index b3508943a925..6bced74464e6 100644
--- a/dev-lang/opendylan/opendylan-2014.1.ebuild
+++ b/dev-lang/opendylan/opendylan-2014.1.ebuild
@@ -5,20 +5,16 @@ EAPI=4
 
 inherit autotools toolchain-funcs
 
-RESTRICT="test"
-
 DESCRIPTION="OpenDylan language runtime environment"
-
 HOMEPAGE="http://opendylan.org"
 SRC_URI="http://opendylan.org/downloads/${PN}/${PV}/${P}-sources.tar.bz2"
 
 LICENSE="Opendylan"
 SLOT="0"
-
 # not tested on x86
 KEYWORDS="~amd64 ~x86"
-
 IUSE=""
+RESTRICT="test"
 
 # the boehm-gc check is "wrong" and reported upstream
 # but for now static-libs useflag is needed
diff --git a/dev-lang/opendylan/opendylan-9999.ebuild b/dev-lang/opendylan/opendylan-9999.ebuild
index f77e1cf2bc28..6315b304da3b 100644
--- a/dev-lang/opendylan/opendylan-9999.ebuild
+++ b/dev-lang/opendylan/opendylan-9999.ebuild
@@ -3,20 +3,18 @@
 
 EAPI=4
 
-inherit autotools git-2
+EGIT_SUBMODULES=( '*' )
+EGIT_REPO_URI="https://github.com/dylan-lang/opendylan.git"
 
-RESTRICT="test"
+inherit autotools git-r3
 
 DESCRIPTION="OpenDylan language runtime environment"
-
 HOMEPAGE="http://opendylan.org"
-EGIT_HAS_SUBMODULES="1"
-EGIT_REPO_URI="https://github.com/dylan-lang/opendylan.git"
 
 LICENSE="Opendylan"
 SLOT="0"
-
 IUSE=""
+RESTRICT="test"
 
 DEPEND="dev-libs/boehm-gc[threads]
 	dev-lang/perl
diff --git a/dev-lang/rebol/Manifest b/dev-lang/rebol/Manifest
index 9d42cdc25738..0bc7e6e07b70 100644
--- a/dev-lang/rebol/Manifest
+++ b/dev-lang/rebol/Manifest
@@ -1,2 +1,2 @@
-EBUILD rebol-9999.ebuild 822 BLAKE2B d45958d2d36ea9aa764e29905fc9fd6bdc8776e300387108ad3caa241d535e10a621e38a08897eccd6efd2309cfef7c91d6476a9314b93c93b22be82abfe3049 SHA512 890c9f050175070afd9154566858397e4958eb37593fc5e2bb18dc95a372a68c20c2987dd49ed8b65b2eb22febcb0dc0b2e9df0282cd4108d0f7aa03138f6377
+EBUILD rebol-9999.ebuild 774 BLAKE2B 0d291b9bedcf28eaa146c196dd9c8955a9b2be3e4e2c2e961b888ae26219c43c51c06b032df6d6925e605ad2c26346384bd599e88a6419ecbb08e8c6a14fc67f SHA512 15aff56e1690dd59c3ec140bd759fe37888c174f0c09d88a35d199cbd127765f442d60ebe75917bee89a7d2dc7260624c403a1d0226f335f2512c47d5b718c8e
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-lang/rebol/rebol-9999.ebuild b/dev-lang/rebol/rebol-9999.ebuild
index 61a797190ae6..ed09d0bb04ef 100644
--- a/dev-lang/rebol/rebol-9999.ebuild
+++ b/dev-lang/rebol/rebol-9999.ebuild
@@ -2,19 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-DESCRIPTION="Relative Expression-Based Object Language"
-HOMEPAGE="http://rebol.com"
 
 MY_PR=${PVR/3_pre/}
-EGIT_REPO_URI="https://github.com/rebol/r3.git"
 
-inherit eutils git-2
+inherit eutils git-r3
+
+DESCRIPTION="Relative Expression-Based Object Language"
+HOMEPAGE="http://rebol.com"
+EGIT_REPO_URI="https://github.com/rebol/r3.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-# live ebuild
-KEYWORDS=""
 IUSE=""
 
 # usual bootstrap problems
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index ab2511832707..dd1786a67c77 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -4,16 +4,21 @@ DIST ruby-2.3.5.tar.xz 11437868 BLAKE2B db50d7b36b6a8fa5b0b030f56d5d7bfc3c43e21d
 DIST ruby-2.3.6.tar.xz 11445628 BLAKE2B 052f09fef806581824b14196abecde7def7c4ebc922c8af75281fe26ec2a7a2a325d1702a382b29e91b302064ab55972b63430248813b24b591fe74b7bc18e30 SHA512 a09c8715097d16190ee17ee39e7a74438cefc9013add350217b7e3fb4d60aa9dcb30595adf832b0d67a5c45b1fe9d4effb767c995af2759420859f8d763c693a
 DIST ruby-2.4.2.tar.xz 10046412 BLAKE2B 33af07ee102367fe811dd3248edc72238bddfc3332f64280b6b36497c7de70bce939127c1efcc965072451ddd60ede98c855fc1fd24be9b12eedc58a21faad5a SHA512 c1d42272fb0d94b693452e703b0ea4942bf59cbd4b08ba83bf039f54be97ebc88511632413da0164970b4cf97bc302bccb88aab48edfa8fa147498e7ee741595
 DIST ruby-2.4.3.tar.xz 10040072 BLAKE2B 87ad9700312a104a60b079f4ef95804d2a9e01109e9fef6e83e593464f1d2c5077af54cbbaff6e0d25a925d05f513cade6c76f05960d9bcc1817bdee51ad4a0f SHA512 8bcf60c994a96787da5d743c66f5609a5a6d834d6d61243cdea7fd059197c3b10da43c99e5649be85e2f2329eedcbb1dd76e89ce3ac586be9056348f7449ed09
+DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
 DIST ruby-patches-2.2.8.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd
 DIST ruby-patches-2.2.9.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd
 DIST ruby-patches-2.3.5.tar.bz2 3593 BLAKE2B 48aba5d68ad7b648065a3580cb7160470ad308659fa11249afab1efe6482edf3805087f4054762717a89b61da4fd7a50c84ab8e76ba00052fd95d937655dcdba SHA512 eacb7f6787b36c7d848453b29152190a164ebc6882ab509eeb6584e49af4b66a665c4baff4ecf75e5831ae54d47dbc651d6f048918f3327500c429f1f419ed94
 DIST ruby-patches-2.3.6.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1
 DIST ruby-patches-2.4.2.tar.bz2 3443 BLAKE2B d90cfb496ad8701fccb061fd314a7f2394b251c921f270f17c8335f617e71dacc8e4a2df4e76842b67eb34627e5f5291d8a2723f6dfed53a36ace3abad95a179 SHA512 fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17
 DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed
+DIST ruby-patches-2.5.0-r1.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
+DIST ruby-patches-2.5.0.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
 EBUILD ruby-2.2.8.ebuild 6914 BLAKE2B 7c2786f023183c10e863890e9fac82228985d67bdde66546df59079c8a5c7b053b02e909ea5f6c0efc86df37c1d5ba000caa0a1c49cb260ed41291764f556aaa SHA512 2b5ab88539f49a91f4876598a910bfd80eb1789e738aa5c25489e12d9f7acefece189681c4600dd378da79049ae3712b0e90e2ec414163ef99333e54a0b5da68
 EBUILD ruby-2.2.9.ebuild 6916 BLAKE2B 5134933905d8d9c46a9347ec8d19772399b2287c6a4455a32f7fe65903cd675034b131186f49c0523d505281527ae72f3079dcd6b1b072a54f8c57729186d7b2 SHA512 736f941e251f7569b1415cae2279dcd9fe0630ade1484c8da8a77747366d471687a96a99424f758945ac7af781907a36805b80d2bd994b0b4536f06360025036
 EBUILD ruby-2.3.5.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
 EBUILD ruby-2.3.6.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
 EBUILD ruby-2.4.2.ebuild 6978 BLAKE2B 0262a40a78def3c9a83931573282cd2da8aa3ebeff7cdd8d36c3064a75cac1ef2d4196c0e7dc814d3f33473af17bc343ed77ecb7e807aa1848d826dcc0a1b6d1 SHA512 c6f48c8357e5248046ec8e811d6e96c57c073d5494cefded64baf1b5c177bc9e7a4a5e545b3ca5e977bd648066b568b1f5c9df59387540f2a145159e75f09795
 EBUILD ruby-2.4.3.ebuild 6978 BLAKE2B 0262a40a78def3c9a83931573282cd2da8aa3ebeff7cdd8d36c3064a75cac1ef2d4196c0e7dc814d3f33473af17bc343ed77ecb7e807aa1848d826dcc0a1b6d1 SHA512 c6f48c8357e5248046ec8e811d6e96c57c073d5494cefded64baf1b5c177bc9e7a4a5e545b3ca5e977bd648066b568b1f5c9df59387540f2a145159e75f09795
+EBUILD ruby-2.5.0-r1.ebuild 6770 BLAKE2B f534d42b8f9029fc982a32bc92472ed53b905b3b6e6f81124ba95a74e42025298702c7bb019f30993aae2fc1e8169c16f6b91fee9f233a24b541da854ff31a86 SHA512 395cc8b422f05e3f54454c9a385eb1141fc0433cb78e35182a92bce4481c1f34bea25d4d8d6fd7e58d88227d0d8baa169f1f96e4bf25fd7d732c2d6887911444
+EBUILD ruby-2.5.0.ebuild 6770 BLAKE2B a4dd6ef37a11404c45fee2118f9baa3933833ae14e5a116c4bb3c3a325406f45cc51c4272609ef911a29420580ea47af7005e139e2fb339e816c68ec8ad60dec SHA512 9051627249d026f2954ad16f97eea9fde9b172a81c2f82737df6fb70ea41be3a5e3fbe97458edf62e001e7f568a54d2e70245002d6d4e381e87ead0385d10c9e
 MISC metadata.xml 911 BLAKE2B 7596a3d7a53742635e3262a0deac45eb6c37e51b473dde2b5da78742baba1ecab42a4a3e2f992cfa8f3765472df896ccff2e2936ba5dedba1aad05c2ab47d9dc SHA512 c5d9f15742132625061303ed71206e937933b402e183edbe0f37ee73ac7ba47b3f7ad54cbf12d1db3900a1f833ea2432790a10a02ba7e1e0c4bf128a716b9d72
diff --git a/dev-lang/ruby/ruby-2.5.0-r1.ebuild b/dev-lang/ruby/ruby-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..22de96c87ec1
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.5.0-r1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
+		 https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	virtual/libffi
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20171225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
+	>=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
+	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
+	>=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
+	>=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
+	>=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
+	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby25]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby25]
+	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-2.5.0.ebuild b/dev-lang/ruby/ruby-2.5.0.ebuild
new file mode 100644
index 000000000000..0149280e2408
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.5.0.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
+		 https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	virtual/libffi
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20171225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
+	>=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
+	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
+	>=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
+	>=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
+	>=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
+	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby24]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
+	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/sassc/Manifest b/dev-lang/sassc/Manifest
index 04145397935d..4bb94eb6fb10 100644
--- a/dev-lang/sassc/Manifest
+++ b/dev-lang/sassc/Manifest
@@ -1,6 +1,6 @@
 DIST sassc-3.4.5.tar.gz 24070 BLAKE2B bf783d55363326314806546877e442e5a8e9de19fd2d398c6a74fc4ff7ae014e413206abad353f4ded0298f80ac545d187fe4fdbf7f8b70c92cf749359fea67e SHA512 b317ac4bd776dbf688c3e7b763e8af7221a75e6bcc96fdf41f51682577ff88fbc63797619f5418bcc60287075b60bd3bc40dd29a1d83ab1553e7d5f82b11f463
 DIST sassc-3.4.7.tar.gz 25834 BLAKE2B 7eaeed2f3e454420c82e0f0b8b3877a3256835297d33e35b34517a8981d96e708de5e94364db97ffc6b702e4c136bc37db6e6d11347388b8dbecb75373bf1593 SHA512 f515241260557f17932ed2fc205375169c40d5b83c7a24577487426e33be607a5a8a90e58512a4e6d4ed3796f391b09ef6e148f9b293a76c73cea267dcf9440b
 EBUILD sassc-3.4.5.ebuild 680 BLAKE2B 4603142a4230c6598ec6f5db0c98f651e4bc81fc25c1fb43582c80e2bd435dbbc618834cd2a70b971e666c9efa92d622e2b5c3f7d2bed9b8c53746875f931600 SHA512 ed7d4bf1f5f774595a4104d98cae95b51826fcc48c40dd15e6de0d1dda2a3c56854d617f47a8f7c87c1ed41e6466873114600a45f88ba910d6240af1033849b5
-EBUILD sassc-3.4.7.ebuild 680 BLAKE2B 4603142a4230c6598ec6f5db0c98f651e4bc81fc25c1fb43582c80e2bd435dbbc618834cd2a70b971e666c9efa92d622e2b5c3f7d2bed9b8c53746875f931600 SHA512 ed7d4bf1f5f774595a4104d98cae95b51826fcc48c40dd15e6de0d1dda2a3c56854d617f47a8f7c87c1ed41e6466873114600a45f88ba910d6240af1033849b5
+EBUILD sassc-3.4.7.ebuild 679 BLAKE2B 4f0553d3cb28915c518bdc0dc4d28db122b4ee119db6ea0be2447cf6c4338fb6b2e1dd1478f069ab296c3c5d346dc0d1798452edbe3c52e0f5401292c94eab5d SHA512 5a2e93f49d4ead8551db1452767a10cc9486ccd1fd647e53b74b062f7ed2c555514b4052ec0cba6f2083fa2840c19d206bb6c5770b16fc2fd6ceaf38c49b1cc4
 EBUILD sassc-9999.ebuild 680 BLAKE2B 4603142a4230c6598ec6f5db0c98f651e4bc81fc25c1fb43582c80e2bd435dbbc618834cd2a70b971e666c9efa92d622e2b5c3f7d2bed9b8c53746875f931600 SHA512 ed7d4bf1f5f774595a4104d98cae95b51826fcc48c40dd15e6de0d1dda2a3c56854d617f47a8f7c87c1ed41e6466873114600a45f88ba910d6240af1033849b5
 MISC metadata.xml 558 BLAKE2B 9a9f78b0e8cae59592abf94d60a419e3e33f88669c4c15daf6a0d714f2e2fd2e671c75e6a1438909780ff98753e473a36fc46dd989df0a6be342b65fedf2e8fd SHA512 1773373127612aea252592885f6d9f9625d354681a6fde25bab76ee39bd1d6a65dccae87edaf55fe59a1b6d4bd7320d4fa80246a91c475af337eb69ea518f372
diff --git a/dev-lang/sassc/sassc-3.4.7.ebuild b/dev-lang/sassc/sassc-3.4.7.ebuild
index 986e5579b3d8..74b8163ff6a7 100644
--- a/dev-lang/sassc/sassc-3.4.7.ebuild
+++ b/dev-lang/sassc/sassc-3.4.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A libsass command line driver"
diff --git a/dev-lang/squirrel/Manifest b/dev-lang/squirrel/Manifest
index ce9d8b78ec46..2d4b2dbee3e5 100644
--- a/dev-lang/squirrel/Manifest
+++ b/dev-lang/squirrel/Manifest
@@ -1,9 +1,3 @@
-AUX squirrel-2.2.4-autotools.patch 7721 BLAKE2B 6fbedf9cc06609419039362d9e3ff338695dcb7ca4cbd41bc2524e16e58e647f178c373df9d5d6907351e3abfc661f344ec1c7158fc5ca05f77d15a9aea7333e SHA512 1e0993d3172a31c4c75631d28192f53a92113c75dc0ea4fb13db4a23bfbf3b5d8495fa2a51c5501c8fa939c2a5072fd6975b3b4e991bd48d8c5ade2862682f1b
-AUX squirrel-2.2.4-gcc47.patch 2371 BLAKE2B f1b23e8024881213c1a3730cf07ffbd7b6df7efd476ab291655b8f4e233c828233bb072822b6d8c9c31aa3fe3bc4ab7eec198a055647970c96630f89da34c891 SHA512 65f96e53fc44f69b9e86fc74081a95388f8b06dbd908c6197d1cd481d8f7f86c9ca6ce20bf35c425f0aa65d0ff16517c197ff5ab4d1a97955566dc085ea7a39d
-AUX squirrel-2.2.4-stdint.h.patch 2081 BLAKE2B 7c5309dd10e75384fa7245bdf0fda558049607f721b40c84856b93f2f37b2a6fcf1cdc53d8a381503247aaf44dde28c116eb08d26a8273bf5233b7e71e882755 SHA512 9a1c4b5184b7534c0e0384bd6221e57f9c640ad7b8593139c89fbd12e74755a661f9d19f726251aef8b1b814d0dc5be49ead47c7ca1d73ea4128e602f8c6b159
-AUX squirrel-2.2.4-supertux-const.patch 1285 BLAKE2B 12b87d21d574369c8c52d1a9e729b6e1d8c51f696b289eb6a6c08fb981b7bad03ebc7e6fad09974f518eb804c73526a03b727a22eb39a827bb6227ba79f6a02f SHA512 a57bfd23b4ef024f827edfb7e07e2840e2e90bddafa0e6d52c2ab0a71554aa6cd80db35f974200fd603046053bfda187295be458d887ef016cae8ca1cb4373ff
 DIST squirrel-3.1.tar.gz 175612 BLAKE2B 48a21b0ecd881dc3bea104e86013c3f3d5a4bc1e590cd67ef7e679e01383b7454aad4ea9b8ecec9b836a0ee44e8c9e470309f9c71050ed6d8deb76caac726aea SHA512 8aec059c801a8f6a1ddb9585cebd51457cfd43743cb0b03494e022fd47392e7b4b88e4703f184f4dcba2be8c0fb756e9b260e2f230e1bd92b37cdcb86d4f1141
-DIST squirrel_2.2.4_stable.tar.gz 419567 BLAKE2B 5f4cba9b3aed4efaf12577a86d8945c6d3d1dd92e0b6008bd88943b36c694888144d203aa2e9decd6750da9bf680472a304eaab9375e42325a6d1ed4fc5a353b SHA512 91fe260b362d682eb5d21334c0ffa532120550c1c49a40412ac87118bee5f045e79c260f42247bd2c897d33b7a593dd2bc2e5c8e78e219553682f8b6cd79201d
-EBUILD squirrel-2.2.4-r2.ebuild 1037 BLAKE2B bcde33bae78f2c7a579404d021560949c29bee31b04b928747aa508bf95db0d0a58127a250c3e191ee692cfa14f868d1e89ef3b17cd51b508731f5a19fc30d8b SHA512 c5c04b45afb4453891869d43430f0867066c6c8ebbd2e8d823b6867d1745bd7c19fea0fe466fb805eb052d238f099b67d71af129d292356c6306cab0408b3381
-EBUILD squirrel-3.1.ebuild 901 BLAKE2B f9803a2c110c3a3f63074792112a7e40440d26f3ad4e65cc16bdf48652d473ca8a38d8e2b55c46c515b3f8232683e2ed866732e677ecbb3598c0bba91f896353 SHA512 2e65c05bb5c46cf5aa46b158a9435882bf49bb85cdeb131d30b942d95afbaee96f2173ae3b430c3fa15d44edc2d6caad71ef9c6126be59510e9e1361629dc09c
+EBUILD squirrel-3.1.ebuild 899 BLAKE2B 8dc403fc9d1832106979b38f63baf4541fc6ac556ec568f42134f8d24d3dc2c59e98b126be88510bba63412fbf9a8ad103cf1055e01477671488737f17015231 SHA512 fb77b462774dd26126e9683e48ead56ed05582e49b4f5ac31fae870010f5c89f038cd51263b137fe16e8196ff3c994bcfacb40cad147f6eae068fae34da4e5c8
 MISC metadata.xml 395 BLAKE2B 3e9c28568b3d5d1af34d28e3d0da4f765247e2b0b52e9f833ef4c6c9060de915cfff3c8f8d429098a2d49a2bf9ded44d34460de6eaba5799dcf516854094e0f6 SHA512 e7332967d7ada57304e4e9036a61fd27d9fac11dd62a3c4b3627515d4f69cea1b1182132388d480648c469e193fee85bf09220679eb180a9d10c57f78bcb48b4
diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch b/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch
deleted file mode 100644
index e39ddedc9eb3..000000000000
--- a/dev-lang/squirrel/files/squirrel-2.2.4-autotools.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Purpose: Makes squirrel buildable and installable using autotools, a buildsystem everybody is comfortable with.
-Source: http://ohnopub.net/hg/SQUIRREL2
-Generate with: hg diff -r 0 -r -1 -I '**Makefile*' -I configure.ac -I '**.in'
-
-diff -r d6d89bbc08e5 -r c89309f5be40 Makefile
---- a/Makefile	Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,18 +0,0 @@
--
--SQUIRREL=.
--MAKE=make
--
--sq32:
--	cd squirrel; $(MAKE) 
--	cd sqstdlib; $(MAKE) 
--	cd sq; $(MAKE) 
--
--sqprof:
--	cd squirrel; $(MAKE) sqprof
--	cd sqstdlib; $(MAKE) sqprof
--	cd sq; $(MAKE) sqprof
--
--sq64:
--	cd squirrel; $(MAKE) sq64
--	cd sqstdlib; $(MAKE) sq64
--	cd sq; $(MAKE) sq64
-diff -r d6d89bbc08e5 -r c89309f5be40 Makefile.am
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/Makefile.am	Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,89 @@
-+# autoreconf variables, recommended by libtoolize
-+ACLOCAL_FLAGS = -I m4
-+
-+AM_CPPFLAGS = -I$(top_srcdir)/include
-+
-+# custom installation directories
-+examplesdir = $(docdir)/examples
-+pkgconfigdir = $(libdir)/pkgconfig
-+
-+# installed things
-+if ENABLE_DOC
-+dist_doc_DATA = doc/sqstdlib2.pdf \
-+	doc/squirrel2.pdf
-+endif
-+if ENABLE_EXAMPLES
-+dist_examples_DATA = samples/ackermann.nut \
-+	samples/array.nut \
-+	samples/class.nut \
-+	samples/classattributes.nut \
-+	samples/coroutines.nut \
-+	samples/delegation.nut \
-+	samples/fibonacci.nut \
-+	samples/flow.nut \
-+	samples/generators.nut \
-+	samples/hello.nut \
-+	samples/list.nut \
-+	samples/loops.nut \
-+	samples/matrix.nut \
-+	samples/metamethods.nut \
-+	samples/methcall.nut \
-+	samples/tailstate.nut
-+endif
-+
-+nodist_pkgconfig_DATA = libsqstdlib.pc \
-+	libsquirrel.pc
-+bin_PROGRAMS = sq/sq
-+lib_LTLIBRARIES = libsquirrel.la \
-+	libsqstdlib.la
-+include_HEADERS = include/sqstdaux.h \
-+	include/sqstdblob.h \
-+	include/sqstdio.h \
-+	include/sqstdmath.h \
-+	include/sqstdstring.h \
-+	include/sqstdsystem.h \
-+	include/squirrel.h
-+
-+
-+# sources for installed things
-+
-+libsqstdlib_la_SOURCES = sqstdlib/sqstdaux.cpp \
-+	sqstdlib/sqstdblob.cpp sqstdlib/sqstdblobimpl.h \
-+	sqstdlib/sqstdio.cpp \
-+	sqstdlib/sqstdmath.cpp \
-+	sqstdlib/sqstdrex.cpp \
-+	sqstdlib/sqstdstream.cpp sqstdlib/sqstdstream.h \
-+	sqstdlib/sqstdstring.cpp \
-+	sqstdlib/sqstdsystem.cpp
-+libsqstdlib_la_LDFLAGS = -version-info 0:0:0
-+libsqstdlib_la_LIBADD = libsquirrel.la
-+
-+libsquirrel_la_SOURCES = squirrel/sqapi.cpp \
-+	squirrel/sqarray.h \
-+	squirrel/sqbaselib.cpp \
-+	squirrel/sqclass.cpp squirrel/sqclass.h \
-+	squirrel/sqclosure.h \
-+	squirrel/sqcompiler.cpp squirrel/sqcompiler.h \
-+	squirrel/sqdebug.cpp \
-+	squirrel/sqfuncproto.h \
-+	squirrel/sqfuncstate.cpp squirrel/sqfuncstate.h \
-+	squirrel/sqlexer.cpp squirrel/sqlexer.h \
-+	squirrel/sqmem.cpp \
-+	squirrel/sqobject.cpp squirrel/sqobject.h \
-+	squirrel/sqopcodes.h \
-+	squirrel/sqpcheader.h \
-+	squirrel/sqstate.cpp squirrel/sqstate.h \
-+	squirrel/sqstring.h \
-+	squirrel/sqtable.cpp squirrel/sqtable.h \
-+	squirrel/squserdata.h \
-+	squirrel/squtils.h \
-+	squirrel/sqvm.cpp squirrel/sqvm.h
-+libsquirrel_la_LDFLAGS = -version-info 0:0:0
-+
-+sq_sq_SOURCES = sq/sq.c
-+sq_sq_LDADD = libsqstdlib.la
-+
-+EXTRA_DIST = COMPILE COPYRIGHT HISTORY README \
-+	doc/sqstdlib2.chm doc/squirrel2.chm \
-+	squirrel.dsw sq/sq.dsp squirrel/squirrel.dsp sqstdlib/sqstdlib.dsp \
-+	etc/minimal.c etc/test.nut
-diff -r d6d89bbc08e5 -r c89309f5be40 configure.ac
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/configure.ac	Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,29 @@
-+AC_INIT([squirrel],[2.2.4],[http://squirrel-lang.org/])
-+
-+# recommended by libtoolize:
-+AC_CONFIG_MACRO_DIR([m4])
-+
-+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
-+
-+AC_PROG_LIBTOOL
-+AC_PROG_CC_C_O
-+AC_PROG_CXX
-+
-+AC_ARG_ENABLE([doc],
-+	[AS_HELP_STRING([--disable-doc], [Control whether or not the API docs (pdfs) are installed.])],
-+	[enable_docs=$enableval],
-+	[enable_docs=yes])
-+AM_CONDITIONAL([ENABLE_DOC],
-+	[test "x$enable_docs" = "xyes"])
-+
-+AC_ARG_ENABLE([examples],
-+	[AS_HELP_STRING([--disable-exampels], [Control whether or not examples of libsquirrel use are installed.])],
-+	[enable_examples=$enableval],
-+	[enable_examples=yes])
-+AM_CONDITIONAL([ENABLE_EXAMPLES],
-+	[test "x$enable_examples" = "xyes"])
-+
-+AC_CONFIG_FILES([Makefile
-+libsquirrel.pc
-+libsqstdlib.pc])
-+AC_OUTPUT
-diff -r d6d89bbc08e5 -r c89309f5be40 libsqstdlib.pc.in
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/libsqstdlib.pc.in	Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,14 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: A library for libsquirrel users
-+Version: @VERSION@
-+URL: @PACKAGE_BUGREPORT@
-+Libs: -L${libdir} -lsqstdlib
-+# I don't like hard-coding this here, but it's an internal
-+# dependency so it's justified.
-+Libs.private: -lsquirrel
-+Cflags: -I${includedir}
-diff -r d6d89bbc08e5 -r c89309f5be40 libsquirrel.pc.in
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/libsquirrel.pc.in	Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: A dynamic scripting language for games
-+Version: @VERSION@
-+URL: @PACKAGE_BUGREPORT@
-+Libs: -L${libdir} -lsquirrel
-+Cflags: -I${includedir}
-diff -r d6d89bbc08e5 -r c89309f5be40 sq/Makefile
---- a/sq/Makefile	Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,21 +0,0 @@
--SQUIRREL= ..
--
--
--OUT= $(SQUIRREL)/bin/sq
--INCZ= -I$(SQUIRREL)/include -I. -I$(SQUIRREL)/sqlibs
--LIBZ= -L$(SQUIRREL)/lib 
--LIB= -lsquirrel -lsqstdlib
--
--OBJS= sq.o
--	
--SRCS= sq.c
--	
--	
--sq32:
--	g++ -O2 -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
--
--sqprof:
--	g++ -O2 -pg -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
--	
--sq64:
--	g++ -O2 -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
-\ No newline at end of file
-diff -r d6d89bbc08e5 -r c89309f5be40 sqstdlib/Makefile
---- a/sqstdlib/Makefile	Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,30 +0,0 @@
--SQUIRREL= ..
--
--
--OUT= $(SQUIRREL)/lib/libsqstdlib.a
--INCZ= -I$(SQUIRREL)/include -I. -Iinclude
--
--SRCS= \
--	sqstdblob.cpp \
--	sqstdio.cpp \
--	sqstdstream.cpp \
--	sqstdmath.cpp \
--	sqstdsystem.cpp \
--	sqstdstring.cpp \
--	sqstdaux.cpp \
--	sqstdrex.cpp
--	
--	
--sq32:
--	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ)
--	ar rc $(OUT) *.o
--	rm *.o
--
--sqprof:
--	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ)
--	ar rc $(OUT) *.o
--	rm *.o
--sq64:
--	gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ)
--	ar rc $(OUT) *.o
--	rm *.o
-diff -r d6d89bbc08e5 -r c89309f5be40 squirrel/Makefile
---- a/squirrel/Makefile	Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,52 +0,0 @@
--SQUIRREL= ..
--
--
--OUT= $(SQUIRREL)/lib/libsquirrel.a
--INCZ= -I$(SQUIRREL)/include -I. -Iinclude
--DEFS= 
--LIB=	
--
--OBJS= \
--	sqapi.o \
--	sqbaselib.o \
--	sqcompiler.o \
--	sqdebug.o \
--	sqlexer.o \
--	sqobject.o \
--	sqparser.o \
--	sqstate.o \
--	sqtable.o \
--	sqvm.o \
--	sqmem.o \
--	sqclass.o
--	
--SRCS= \
--	sqapi.cpp \
--	sqbaselib.cpp \
--	sqfuncstate.cpp \
--	sqdebug.cpp \
--	sqlexer.cpp \
--	sqobject.cpp \
--	sqcompiler.cpp \
--	sqstate.cpp \
--	sqtable.cpp \
--	sqmem.cpp \
--	sqvm.cpp \
--	sqclass.cpp
--
--	
--	
--sq32:
--	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
--	ar rc $(OUT) *.o
--	rm *.o
--
--sqprof:
--	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ) $(DEFS)
--	ar rc $(OUT) *.o
--	rm *.o
--
--sq64:
--	gcc -O2  -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
--	ar rc $(OUT) *.o
--	rm *.o
diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-gcc47.patch b/dev-lang/squirrel/files/squirrel-2.2.4-gcc47.patch
deleted file mode 100644
index 032a4eb914a6..000000000000
--- a/dev-lang/squirrel/files/squirrel-2.2.4-gcc47.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From fd2d422f16ca1134f3be8d693290e6b1c536bf71 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 7 Jun 2012 10:10:28 +0300
-Subject: [squirrel: PATCH] fix build breakage on gcc-4.7 and clang++
-
-gcc 4.7 got proper support for argument dependent lookup
-for builtin types:
-    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46075
-
-It exposed old problem:
-> gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c sqapi.cpp sqbaselib.cpp sqfuncstate.cpp sqdebug.cpp \
-  sqlexer.cpp sqobject.cpp sqcompiler.cpp sqstate.cpp sqtable.cpp sqmem.cpp sqvm.cpp sqclass.cpp -I../include -I. -Iinclude
-  In file included from sqobject.h:5:0,
-                 from sqpcheader.h:16,
-                 from sqapi.cpp:4:
-  squtils.h: In instantiation of 'sqvector<T>::~sqvector() [with T = long long int]':
-  sqclosure.h:142:52:   required from here
-  squtils.h:46:4: error: 'sq_vm_free' was not declared in this scope, and no declarations were found by argument-dependent
-  lookup at the point of instantiation [-fpermissive]
-  In file included from sqpcheader.h:17:0,
-                 from sqapi.cpp:4:
-  sqstate.h:143:6: note: 'void sq_vm_free(void*, SQUnsignedInteger)' declared here, later in the translation unit
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- squirrel/sqstate.h |    3 ---
- squirrel/squtils.h |    4 ++++
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/squirrel/sqstate.h b/squirrel/sqstate.h
-index 3ed3307..e931404 100755
---- a/squirrel/sqstate.h
-+++ b/squirrel/sqstate.h
-@@ -138,7 +138,4 @@ private:
- 
- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
- 
--void *sq_vm_malloc(SQUnsignedInteger size);
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
--void sq_vm_free(void *p,SQUnsignedInteger size);
- #endif //_SQSTATE_H_
-diff --git a/squirrel/squtils.h b/squirrel/squtils.h
-index bff7d24..ac3aef9 100755
---- a/squirrel/squtils.h
-+++ b/squirrel/squtils.h
-@@ -10,6 +10,10 @@
- 
- #define sq_aligning(v) (((size_t)(v) + (SQ_ALIGNMENT-1)) & (~(SQ_ALIGNMENT-1)))
- 
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
- //sqvector mini vector class, supports objects by value
- template<typename T> class sqvector
- {
--- 
-1.7.8.6
-
diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-stdint.h.patch b/dev-lang/squirrel/files/squirrel-2.2.4-stdint.h.patch
deleted file mode 100644
index 911edcc79d34..000000000000
--- a/dev-lang/squirrel/files/squirrel-2.2.4-stdint.h.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -r d6d89bbc08e5 -r 692b7872324b include/squirrel.h
---- a/include/squirrel.h	Thu Feb 11 15:08:35 2010 -0500
-+++ b/include/squirrel.h	Sat Feb 13 01:04:21 2010 -0500
-@@ -39,28 +39,22 @@
- #define SQUIRREL_API extern
- #endif
- 
--#if (defined(_WIN64) || defined(_LP64))
--#define _SQ64
--#endif
-+/* Get uintptr_t from a non standard or standard location */
-+#ifdef _MSC_VER
-+#include <stddef.h>
- 
--#ifdef _SQ64
--#ifdef _MSC_VER
--typedef __int64 SQInteger;
--typedef unsigned __int64 SQUnsignedInteger;
--typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/
--#else
--typedef long SQInteger;
--typedef unsigned long SQUnsignedInteger;
--typedef unsigned long SQHash; /*should be the same size of a pointer*/
--#endif
--typedef int SQInt32; 
--#else 
--typedef int SQInteger;
--typedef int SQInt32; /*must be 32 bits(also on 64bits processors)*/
--typedef unsigned int SQUnsignedInteger;
--typedef unsigned int SQHash; /*should be the same size of a pointer*/
--#endif
-+typedef __int32 SQInt32;
-+typedef __int64 SQInt64;
-+#else /* _MSC_VER */
-+#include <stdint.h>
- 
-+typedef int32_t SQInt32;
-+typedef int64_t SQInt64;
-+#endif /* _MSC_VER */
-+
-+typedef intptr_t SQInteger;
-+typedef uintptr_t SQUnsignedInteger;
-+typedef uintptr_t SQHash;
- 
- #ifdef SQUSEDOUBLE
- typedef double SQFloat;
-@@ -68,12 +62,8 @@
- typedef float SQFloat;
- #endif
- 
--#if defined(SQUSEDOUBLE) && !defined(_SQ64)
--#ifdef _MSC_VER
--typedef __int64 SQRawObjectVal; //must be 64bits
--#else
--typedef long SQRawObjectVal; //must be 64bits
--#endif
-+#if defined(SQUSEDOUBLE)
-+typedef SQInt64 SQRawObjectVal; /* must be 64 bits */
- #define SQ_OBJECT_RAWINIT() { _unVal.raw = 0; }
- #else
- typedef SQUnsignedInteger SQRawObjectVal; //is 32 bits on 32 bits builds and 64 bits otherwise
-@@ -453,4 +443,13 @@
- } /*extern "C"*/
- #endif
- 
-+/*
-+  Define for code which depends on squirrel to
-+  determine bitiness. IMO, this should be discouraged.
-+  --ohnobinki
-+*/
-+#if (defined(_WIN64) || defined(_LP64))
-+#define _SQ64
-+#endif
-+
- #endif /*_SQUIRREL_H_*/
diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-supertux-const.patch b/dev-lang/squirrel/files/squirrel-2.2.4-supertux-const.patch
deleted file mode 100644
index e31eca5c1f96..000000000000
--- a/dev-lang/squirrel/files/squirrel-2.2.4-supertux-const.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r 3e8a1ff66c3c -r bd1cfd3e3cdd sqstdlib/sqstdstream.cpp
---- a/sqstdlib/sqstdstream.cpp	Fri Feb 12 20:35:23 2010 -0500
-+++ b/sqstdlib/sqstdstream.cpp	Fri Feb 12 23:58:35 2010 -0500
-@@ -277,7 +277,7 @@
- 	sq_pop(v,1);
- }
- 
--SQRESULT declare_stream(HSQUIRRELVM v,SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals)
-+SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals)
- {
- 	if(sq_gettype(v,-1) != OT_TABLE)
- 		return sq_throwerror(v,_SC("table expected"));
-diff -r 3e8a1ff66c3c -r bd1cfd3e3cdd sqstdlib/sqstdstream.h
---- a/sqstdlib/sqstdstream.h	Fri Feb 12 20:35:23 2010 -0500
-+++ b/sqstdlib/sqstdstream.h	Fri Feb 12 23:58:35 2010 -0500
-@@ -14,5 +14,5 @@
- SQInteger _stream_flush(HSQUIRRELVM v);
- 
- #define _DECL_STREAM_FUNC(name,nparams,typecheck) {_SC(#name),_stream_##name,nparams,typecheck}
--SQRESULT declare_stream(HSQUIRRELVM v,SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals);
-+SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals);
- #endif /*_SQSTD_STREAM_H_*/
diff --git a/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild b/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild
deleted file mode 100644
index cf2c0636a257..000000000000
--- a/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit autotools eutils multilib
-
-MY_P="${PN}_${PV}_stable"
-DESCRIPTION="A interpreted language mainly used for games"
-HOMEPAGE="http://squirrel-lang.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${PV:0:1}/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples static-libs"
-
-# /usr/bin/sq conflicts
-RDEPEND="!app-text/ispell"
-
-S="${WORKDIR}/SQUIRREL${PV:0:1}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	epatch "${FILESDIR}"/${P}-supertux-const.patch
-	epatch "${FILESDIR}"/${P}-stdint.h.patch
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable doc) \
-		$(use_enable examples) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if ! use static-libs; then
-		rm -v "${ED}"/usr/$(get_libdir)/*.la || die
-	fi
-
-	dodoc HISTORY README || die
-}
diff --git a/dev-lang/squirrel/squirrel-3.1.ebuild b/dev-lang/squirrel/squirrel-3.1.ebuild
index 0b304c06c11b..4a149398eb44 100644
--- a/dev-lang/squirrel/squirrel-3.1.ebuild
+++ b/dev-lang/squirrel/squirrel-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/albertodemichelis/squirrel/archive/v${PV}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples static-libs"
 
 RDEPEND=""
diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index 2e02dfbfe6b8..01583d2d7b58 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -4,5 +4,5 @@ DIST yasm-1.2.0.tar.gz 1436502 BLAKE2B 7be4f0cb5bd687868451fa6051ce9a621847c4ec8
 DIST yasm-1.3.0.tar.gz 1492156 BLAKE2B e419a4f9912eb244e9503462dbf0c5e5c95bdfa49583ee205dc4708b42710df8dd2056b2e36e04de04474f4af900916cb64c14a623db1346c3e1cb46a8cc34a5 SHA512 572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645
 EBUILD yasm-1.2.0-r1.ebuild 1325 BLAKE2B f9ed79c51ce0ce88b90b38d5971c325836f0de762e9930da5ab1f65239760f6c32e8a12b6e7f281a5225848d51a4bff46e604b911319a99a247ec5ce08d54e3e SHA512 a73339713257e8e8b05ae7eda671a0a7ec8a83ff284d03102f383f829f40f7aa81836aab19b71e5f3a4dafce0453b20c4f64350d8701b9e853c20a6b0c4fde18
 EBUILD yasm-1.3.0.ebuild 946 BLAKE2B c630f4395bae5c78214d5b91d765e7a0a891999ef38a551630447533cdf7eb66609b77843eac1669a33dad81455e78ae640ee92f409e2f803a39dbafe51d868e SHA512 9fbb8eaaa15e1e45750cb2f0c4031370fa391d405f17066583f86791b568b145e09c066ccc5c418db63b2a39a6d577dca4348417aee2cf48b88bf9747551f891
-EBUILD yasm-9999.ebuild 1560 BLAKE2B c1a6ab2e5ad2ef1f34fa0bc720858943e2fbf9074b6322ab968065fe80a264d5738c2ece3fc46b196928f3d8b7572f97a3411e7b6c4a67c79bbbecf71d9f61fb SHA512 cfd81d37cda502612f278818c09f2a7958aa2fd3fa4dfa9e37761f12ce7f5da7db5fad01abbc87d9eb6b6bf6a09be776d5f27142b4271bf200b77d26255879a3
+EBUILD yasm-9999.ebuild 1561 BLAKE2B 5ff52a01570720e5489e350d456f99297a2414222a75f64affa567318a305477691d26452f523c95c483b1c1c5100afc3c6c098867a333a6e73dd0187fea3b04 SHA512 4449eee53c652bb6f57912e0d3b42a80b3055a9a8cb5e7889c724ce1dad80029bc8cee26bf78351c1669ba0eb8cee096f4645b5eb79aa5848b43971490717830
 MISC metadata.xml 261 BLAKE2B c5880d50c9def415b65cade7de2e9f4d5f46c98e4d60cde4c85b45cd0c2b1c65b695b85c6533fb018dc545fbc562284485818cf0b2db3109b088310dc7be53f7 SHA512 d37f5f4f82ac36f200f1df58e8caf7e8bcad7f4d479ad37e0c059d657c50984f44463e765e9cb867c04a2081928f3d603d362930de1f9d326ed4c237a1b0bb0c
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
index 2192b7f076ef..19cd65988740 100644
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ b/dev-lang/yasm/yasm-9999.ebuild
@@ -9,7 +9,7 @@ inherit autotools eutils python-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/yasm/yasm.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
 	KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-26 20:10:49 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-26 20:10:49 +0000
commit	c85a90f90521c7e11d618b527d6630cc64cecbd4 (patch)
tree	27c1f04d8eab0e0140fb62887a6a5d4d87c32ad9 /dev-lang
parent	2f51c9978dda4c6e8debca43e4235ecc86914032 (diff)