Sync with portage [Wed Feb 17 17:58:18 MSK 2016].

8 years ago · 7a4ca0624f
parent d8d476b248
commit 7a4ca0624f
380 changed files with 3121 additions and 4286 deletions
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5
-inherit eutils autotools readme.gentoo systemd
+
+inherit eutils autotools readme.gentoo-r1 systemd

 MY_P=${P/_beta/-beta}
 DBV=20080531
@ -37,13 +38,17 @@ If hddtemp complains but finds your HDD temperature sensor, use the
 --quiet option to suppress the warning.
 "

+PATCHES=(
+	"${FILESDIR}"/${P}-satacmds.patch
+	"${FILESDIR}"/${P}-byteswap.patch
+	"${FILESDIR}"/${P}-execinfo.patch
+	"${FILESDIR}"/${P}-nls.patch
+	"${FILESDIR}"/${P}-iconv.patch
+	"${FILESDIR}"/${P}-dontwake.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-satacmds.patch
-	epatch "${FILESDIR}"/${P}-byteswap.patch
-	epatch "${FILESDIR}"/${P}-execinfo.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	epatch "${FILESDIR}"/${P}-iconv.patch
-	epatch "${FILESDIR}"/${P}-dontwake.patch
+	epatch "${PATCHES[@]}"
 	AT_M4DIR="m4" eautoreconf
 }

@ -79,6 +84,10 @@ src_install() {
 	fi
 }

+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
 update_db() {
 	local src=$1
 	local dst=$2
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>aidecoe@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="network-cron">
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="network-cron">
 		Monthly cronjob to update hddtemp.db.
 	</flag>
-</use>
+	</use>
 </pkgmetadata>
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@ -1,5 +1,6 @@
 DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598
 DIST vim-7.4.1229.tar.gz 12576784 SHA256 8a782e97916d57c44dcd84d38002884e05f335311600d73500cee47908e1822d SHA512 ac139e828f95319d668091e79295f7be88011c9fe0417736d051c844ec49a50ebdcec6c655f839025ee78349c36891ce1ed27467ff31ec5d1b7fc1c3a70bf5dd WHIRLPOOL 8da7059a35fbebd3fc9a360c861c2fcde197b807fe0a0ed9864b7f5ed0419488a6308a520fd97d0690e9fd10a3974fcdf228dd5d81d5848679ca74f4554d784d
+DIST vim-7.4.1342.tar.gz 12608839 SHA256 af2776a7bdc87748734391ab05d2f8280829f837b8e520d1372dcf52176bbc4c SHA512 ec288aae83b0f98a62366781940b82b10871adeab91ca2596584caaedd7eb29696e4fa0aa6fcb71c144959be700836a765e8c4fea3038f50f8f6a3abe340091a WHIRLPOOL fc51a1adc36d036cdfae81ef8ddccf086bcfb2680fa32158cbe3b0c7d171b713e7f7fdf66eb5b9fd61cc1fb102a5d76d9aba00296089b1602c17f0fffe187adf
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
--- a/app-editors/gvim/gvim-7.4.1342.ebuild
+++ b/app-editors/gvim/gvim-7.4.1342.ebuild
@ -0,0 +1,401 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? (
+		|| ( $(python_gen_useflags '*') )
+		?? ( $(python_gen_useflags 'python2*') )
+		?? ( $(python_gen_useflags 'python3*') )
+	)
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			>=x11-libs/gtk+-2.6:2
+			x11-libs/libXft
+			gnome? ( >=gnome-base/libgnomeui-2.6 )
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				neXt? ( x11-libs/neXtaw )
+				!neXt? ( x11-libs/libXaw )
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	if use python ; then
+		py_add_interp() {
+			local v
+
+			[[ ${EPYTHON} == python3* ]] && v=3
+			myconf+=(
+				--enable-python${v}interp
+				vi_cv_path_python${v}="${PYTHON}"
+			)
+		}
+
+		python_foreach_impl py_add_interp
+	else
+		myconf+=(
+			--disable-pythoninterp
+			--disable-python3interp
+		)
+	fi
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope ; then
+		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+			die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk gnome               GNOME2
+	# -aqua gtk -gnome              GTK2
+	# -aqua -gtk  motif             MOTIF
+	# -aqua -gtk -motif neXt        NEXTAW
+	# -aqua -gtk -motif -neXt       ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk ; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd "${S}"/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
+
+	# Make gvim not try to connect to X. See :help gui-x11-start
+	# in vim for how this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../testvim nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@ -1,2 +1,3 @@
 DIST neovim-0.1.0.tar.gz 7644722 SHA256 e8659558103b8f5a65aac84007a12e3581b32736321778028017fd07365cfff8 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a WHIRLPOOL 33d7b88588c214ddc670a7b3cffcfd855699e90b15c5e327ac0c17972fddb73bd519b1a8eb609f8454d6c463f18764f17bc1314b6b27448c5ac4607cdbce1551
 DIST neovim-0.1.1.tar.gz 7584560 SHA256 f39bcab23457c66ce0d67dcf8029743703f860413db0070f75d4f0ffad27c6c1 SHA512 7098bef9b81862f009789cff49a063d56d52d2f5c74e2fe68ad65c952c61c07eabeb6be150b369a5a179957f20187de3051caaa30b1e0cb4ec1e9e49b4e77333 WHIRLPOOL 9df0d6d59bdda2def2d8a393eec579f341256aff18c485cbb08c96637c597ee4df73a68a09105e776605194412274df2c82b78f7ca0e0bc1e20d4780fcdfa57f
+DIST neovim-0.1.2.tar.gz 7610804 SHA256 549881465eff82454660ae92d857d6ffa22383d45c94c46f3753fd1b0e699247 SHA512 dc03d92ff296f3ff55225d514479f1ac201a5a65eb8a6c02e71935ca44feb8ab15897b26a2ea46e53771f902c57b027d07e02f95673268ee060c6b77c4aa90e4 WHIRLPOOL ef1253249120c89c6efc15520263c889a9972df0c11e9353dedeee112c46ee9b92355fa3dabdf2d15cb7d0416681d1c8b55a9c02266048154f3afe104fdf4ff9
--- a/app-editors/neovim/neovim-0.1.2.ebuild
+++ b/app-editors/neovim/neovim-0.1.2.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager perl python +jemalloc"
+
+CDEPEND="dev-lang/luajit:2
+	>=dev-libs/libtermkey-0.17
+	>=dev-libs/libuv-1.2.0
+	>=dev-libs/msgpack-1.0.0
+	>=dev-libs/unibilium-1.1.1
+	dev-libs/libvterm
+	dev-lua/lpeg
+	dev-lua/messagepack
+	jemalloc? ( dev-libs/jemalloc )
+"
+DEPEND="${CDEPEND}
+	virtual/libiconv
+	virtual/libintl"
+RDEPEND="${CDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-python/neovim-python-client )"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	# use our system vim dir
+	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+		-i src/nvim/globals.h || die
+
+	# add eclass to bash filetypes
+	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+	# make less.sh macro actually work with neovim
+	sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	export USE_BUNDLED_DEPS=OFF
+	append-cflags "-Wno-error"
+	local mycmakeargs=(
+		$(cmake-utils_use_enable jemalloc JEMALLOC)
+		-DLIBUNIBILIUM_USE_STATIC=OFF
+		-DLIBTERMKEY_USE_STATIC=OFF
+		-DLIBVTERM_USE_STATIC=OFF
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@ -1,5 +1,6 @@
 DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598
 DIST vim-7.4.1229.tar.gz 12576784 SHA256 8a782e97916d57c44dcd84d38002884e05f335311600d73500cee47908e1822d SHA512 ac139e828f95319d668091e79295f7be88011c9fe0417736d051c844ec49a50ebdcec6c655f839025ee78349c36891ce1ed27467ff31ec5d1b7fc1c3a70bf5dd WHIRLPOOL 8da7059a35fbebd3fc9a360c861c2fcde197b807fe0a0ed9864b7f5ed0419488a6308a520fd97d0690e9fd10a3974fcdf228dd5d81d5848679ca74f4554d784d
+DIST vim-7.4.1342.tar.gz 12608839 SHA256 af2776a7bdc87748734391ab05d2f8280829f837b8e520d1372dcf52176bbc4c SHA512 ec288aae83b0f98a62366781940b82b10871adeab91ca2596584caaedd7eb29696e4fa0aa6fcb71c144959be700836a765e8c4fea3038f50f8f6a3abe340091a WHIRLPOOL fc51a1adc36d036cdfae81ef8ddccf086bcfb2680fa32158cbe3b0c7d171b713e7f7fdf66eb5b9fd61cc1fb102a5d76d9aba00296089b1602c17f0fffe187adf
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
--- a/app-editors/vim-core/vim-core-7.4.1342.ebuild
+++ b/app-editors/vim-core/vim-core-7.4.1342.ebuild
@ -0,0 +1,223 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIM_VERSION="7.4"
+inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	cd src || die "cd src failed"
+	emake \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		install-icons \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r4 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal ; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
+		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
+		rm "${ED}"/usr/bin/vimtutor
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	# These files might have slight security issues, so we won't
+	# install them. See bug #77841. We don't mind if these don't
+	# exist.
+	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@ -1,5 +1,6 @@
 DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598
 DIST vim-7.4.1229.tar.gz 12576784 SHA256 8a782e97916d57c44dcd84d38002884e05f335311600d73500cee47908e1822d SHA512 ac139e828f95319d668091e79295f7be88011c9fe0417736d051c844ec49a50ebdcec6c655f839025ee78349c36891ce1ed27467ff31ec5d1b7fc1c3a70bf5dd WHIRLPOOL 8da7059a35fbebd3fc9a360c861c2fcde197b807fe0a0ed9864b7f5ed0419488a6308a520fd97d0690e9fd10a3974fcdf228dd5d81d5848679ca74f4554d784d
+DIST vim-7.4.1342.tar.gz 12608839 SHA256 af2776a7bdc87748734391ab05d2f8280829f837b8e520d1372dcf52176bbc4c SHA512 ec288aae83b0f98a62366781940b82b10871adeab91ca2596584caaedd7eb29696e4fa0aa6fcb71c144959be700836a765e8c4fea3038f50f8f6a3abe340091a WHIRLPOOL fc51a1adc36d036cdfae81ef8ddccf086bcfb2680fa32158cbe3b0c7d171b713e7f7fdf66eb5b9fd61cc1fb102a5d76d9aba00296089b1602c17f0fffe187adf
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
--- a/app-editors/vim/vim-7.4.1342.ebuild
+++ b/app-editors/vim/vim-7.4.1342.ebuild
@ -0,0 +1,364 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? (
+		|| ( $(python_gen_useflags '*') )
+		?? ( $(python_gen_useflags 'python2*') )
+		?? ( $(python_gen_useflags 'python3*') )
+	)
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	if use minimal ; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+		)
+
+		if use python ; then
+			py_add_interp() {
+				local v
+
+				[[ ${EPYTHON} == python3* ]] && v=3
+				myconf+=(
+					--enable-python${v}interp
+					vi_cv_path_python${v}="${PYTHON}"
+				)
+			}
+
+			python_foreach_impl py_add_interp
+		else
+			myconf+=(
+				--disable-pythoninterp
+				--disable-python3interp
+			)
+		fi
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope ; then
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd "${S}"/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../vim nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
--- a/app-shells/autojump/autojump-22.2.4-r3.ebuild
+++ b/app-shells/autojump/autojump-22.2.4-r3.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit bash-completion-r1 python-r1 vcs-snapshot
-
-DESCRIPTION="change directory command that learns"
-HOMEPAGE="https://github.com/joelthelion/autojump"
-SRC_URI="https://github.com/joelthelion/${PN}/archive/release-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
-IUSE="python test"
-
-# Not all tests pass. Need investigation.
-RESTRICT="test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="test? ( dev-python/flake8 dev-python/tox )"
-
-src_prepare() {
-	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
-		-e "s:/usr/local/share:/usr/share:" \
-		-i bin/autojump.sh || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin bin/autojump
-
-	insinto /etc/profile.d
-	doins bin/"${PN}".sh
-
-	insinto /usr/share/"${PN}"/
-	doins bin/"${PN}.bash"
-	doins bin/"${PN}.zsh"
-	insinto /usr/share/zsh/site-functions
-	doins bin/_j
-
-	python_foreach_impl python_domodule bin/autojump_argparse.py bin/autojump_data.py bin/autojump_utils.py
-	if use python; then
-		python_foreach_impl python_domodule tools/autojump_ipython.py
-		einfo 'This tool provides "j" for ipython, please add'
-		einfo '"import autojump_ipython" to your ipy_user_conf.py.'
-	fi
-
-	doman docs/"${PN}.1"
-	dodoc README.md
-}
--- a/app-shells/autojump/autojump-22.2.4-r4.ebuild
+++ b/app-shells/autojump/autojump-22.2.4-r4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -14,7 +14,7 @@ SRC_URI="https://github.com/joelthelion/${PN}/archive/release-v${PV}.tar.gz -> $

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="ipython test"

 # Not all tests pass. Need investigation.
@ -22,6 +22,11 @@ RESTRICT="test"
 RDEPEND="ipython? ( ${PYTHON_DEPS} )"
 DEPEND="test? ( dev-python/flake8 dev-python/tox )"

+PATCHES=(
+	"${FILESDIR}/${P}-fix-autojump.fish-bugs.patch"
+	"${FILESDIR}/${P}-fix-__aj_error-typo.patch"
+)
+
 src_prepare() {
 	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
 		-e "s:/usr/local/share:/usr/share:" \
@ -33,8 +38,7 @@ src_prepare() {

 	# upstream fixes to the autojump.fish script; the first patch is needed for
 	# the second patch to apply
-	epatch "${FILESDIR}/autojump-22.4.4-fix-autojump.fish-bugs.patch"
-	epatch "${FILESDIR}/autojump-22.4.4-fix-__aj_error-typo.patch"
+	epatch "${PATCHES[@]}"
 }

 src_compile() {
@ -42,8 +46,8 @@ src_compile() {
 }

 src_install() {
-	dobin bin/autojump
-	python_replicate_script "${ED}"/usr/bin/autojump
+	dobin bin/"${PN}"
+	python_replicate_script "${ED}"/usr/bin/"${PN}"

 	insinto /etc/profile.d
 	doins bin/"${PN}".sh
--- a/app-shells/autojump/files/autojump-21.3.0-supported-shells.patch
+++ b/app-shells/autojump/files/autojump-21.3.0-supported-shells.patch
@ -1,34 +0,0 @@
--- autojump-21.3.0/bin/autojump.sh
-+++ autojump-21.3.0/bin/autojump.sh
-@@ -1,17 +1,17 @@
- # source autojump on BASH or ZSH depending on the shell
- 
- shell=`echo ${SHELL} | awk -F/ '{ print $NF }'`
-
-# check local install
-if [ -s ~/.autojump/etc/profile.d/autojump.${shell} ]; then
-	source ~/.autojump/etc/profile.d/autojump.${shell}
-
-# check global install
-elif [ -s /etc/profile.d/autojump.${shell} ]; then
-	source /etc/profile.d/autojump.${shell}
-
-# check custom install locations (modified by Homebrew or using --destdir option)
-elif [ -s custom_install/autojump.${shell} ]; then
-	source custom_install/autojump.${shell}
-
-fi
-+case ${shell} in
-+	bash|zsh)
-+		# check local install
-+		if [ -s ~/.autojump/etc/profile.d/autojump.${shell} ]; then
-+			source ~/.autojump/etc/profile.d/autojump.${shell}
-+		# check global install
-+		elif [ -s "${EPREFIX}"/etc/profile.d/autojump.${shell} ]; then
-+			source "${EPREFIX}"/etc/profile.d/autojump.${shell}
-+		fi
-+		;;
-+	*)
-+		echo "Your shell ${shell} (from SHELL=${SHELL}) is unkown."
-+		;;
-+esac
--- a/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch
+++ b/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch
--- a/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch
+++ b/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch
--- a/dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild
+++ b/dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild
@ -1,32 +1,31 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

+EAPI=5
+
 JAVA_PKG_IUSE="doc source"
+
 inherit java-pkg-2 java-ant-2

 DESCRIPTION="A generic plugin framework for look-and-feels"
 HOMEPAGE="http://laf-plugin.dev.java.net/"
-# repackaged from zip and renamed to contain PV
 SRC_URI="mirror://gentoo/${P}-src.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"

-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+EANT_BUILD_TARGET="dist"

+java_prepare() {
 	cp "${FILESDIR}/${P}-build.xml" build.xml || die
 }

-EANT_BUILD_TARGET="dist"
-
 src_install() {
-	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dojar "dist/${PN}.jar"

 	use doc && java-pkg_dojavadoc api
 	use source && java-pkg_dosrc src/org
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@ -1,6 +1,9 @@
 DIST crystal-0.11.1-1-linux-i686.tar.gz 12283213 SHA256 2db84f6a287925d02832192cb7c5b99d0f543afd5323286a3a8c1799d5952abe SHA512 c4cfcd51efa76492c0174d8a5273303d17e672273de1b35eafcce920710afadd031e7cfec775880ccedd7d6e87d0f2c27958b1499c8ce494fcc849c6e78ec2a5 WHIRLPOOL 849abefe1ebbf9b8aae484567662973b5712e1d55a45a123cd41f7f0cfd4ecd5f7bfe5d27e6ce227922b4985772f4b70acfb8e94ff8042c48a48f08c9cab5887
 DIST crystal-0.11.1-1-linux-x86_64.tar.gz 11854829 SHA256 742ee62b23d2ada2a9baa39d0f30973ca0b5b003504b04f2aad8483ef9b6f07b SHA512 ff0a8f25a5732936797f9d9359be9725d4d93f80d1d33ddf43e1833d4fd9dc9dcfc99e6d3a54e51c380cbdaacf0c8bf7b0077b939739434e604ad33f38dc56e0 WHIRLPOOL d26aa43fe08d05f29e38885b005ccd43a3f35a51e909d2ff4c343f1d617041d7b3c7f80414781abee482f43115b9d4a9963fa5001391a5d9a487f89580605811
 DIST crystal-0.11.1.tar.gz 830437 SHA256 bdff81fcb4f2dfdd50d79abba8a1ed0260bad4c1f055002cd16b9b6f443b8a15 SHA512 ba2dc5a74925c8cc84e0654773e4befb604b3c485294d54e8ed738d7f1eef42173bb94aa12a08b65845e29494073b83b1da7bbe9438df0ba0ed30dd8491ce4ba WHIRLPOOL 9cf36214ef6df4d1e9249e8f725343eb3235cb12323416b9247c478dbca97b42c3be317c58d478576dd1cb81dc3d57b8c5e8118a4fd11d6c103a40b277de7cbe
+DIST crystal-0.12.0-1-linux-i686.tar.gz 12301739 SHA256 0595aab4336e48d0d04f0a0f172f641ebb1c17ebdb6e2eebbbfa36a650323242 SHA512 b893f1c36f658356b19257c7eb60219d2dd0a20f00d8d27ce4f3136a05153d4e3ded090979623f2895eb7b0070a902b59cdc891aba88515ee6ba9e6cf065351c WHIRLPOOL dc81e6e0ea6619e697ae81a247849bf2bf10b5134f45fd2979a7bbfa7e1be53a5f79890ecebeab9f35c86b58bfca486c0e071c5baee06600c0d76cf1f6db3224
+DIST crystal-0.12.0-1-linux-x86_64.tar.gz 11874469 SHA256 ecd444dab34803fd97dcb9f82da47c60fad9de3c2f43d20195108d678e874f16 SHA512 ffea0d3a9864249a91d9a8243ffdb39c8bd54e931479b35414065fe30d5d2d79f5f4b743eaf3f7e8936a183673e2ff3ccb83fa5f2a9e2521443eb0632f5f6723 WHIRLPOOL 3938a93c5647f784e1782e747a432668726bf901f2aa1ac0992ff19ac69a008313d3922e492343deda7ae1786847c4fb2781ac26c34870d3e2aa0f378c38b5bc
+DIST crystal-0.12.0.tar.gz 851051 SHA256 918bad9b906fe252f3f66685487892ad7c13a31135aa5874ac1e52ea399328e3 SHA512 86ba58e3f69ecada49a8e6596f49cc4e4becb109c2725b9436eb5aa587c247aa4c309242e3fdc5d6a655726595005db4e33fcf868d7c888448c58af74d1b947f WHIRLPOOL 4523f8a1904feade28584ce828fbb96d302f6976f6a0a7836c4b8cc40ac4cc2c28c9b41eb2da6dead314dbaa3422f46727cce2443e10776cd271627fb4c3d2d6
 DIST crystal-0.7.7-1-linux-i686.tar.gz 11289486 SHA256 7a1ccdce29c1437da1cbaafa3fefd5ebc3c4b84b885964a6d4eaf8bfc5922831 SHA512 758e1c6b9a00fca3080abd33adbb995157ad8a335e58899b7c6aba4d9eea5ff4cae27ac1476865b04d6b349dfd2bea0809fea7fcadcd5b08f617f30ec3e809cf WHIRLPOOL 465c3455d5ec1200345e6735e4616269f43e1e31097f22f81d0d3e6e6b3ea18f786e647da9d0d97da73de057a222d8ef234c3dbb4978a3a730ee1b498e709116
 DIST crystal-0.7.7-1-linux-x86_64.tar.gz 10907197 SHA256 433acbe8e88fe0c3df67ad64bd436349a6bcfc146284f0a690283ebefb93b5e6 SHA512 c2e895d3bc3c92da49aca6eba3f2cf5cefe5d88cf49c4230f887dd81d094a4a78d67eb10fcec8445fd66e29ad5167108807362ae9257c89859d2aa6c614ab0a9 WHIRLPOOL c1970d4ec8cde2bb181749f1d5d8d80ba4b309f07ce176d5d6312f6e978e0de8db83914e967da9d4995ee243d57cd0bb50739f5b726ff43a2553b65f00112477
 DIST crystal-0.7.7.tar.gz 709692 SHA256 5506f69ed59592666aa667a33ba90b07f1de2cc1ebeee25e771715f8521065f8 SHA512 ba0911bec52e82b9768a1535406a62b675bcfb996929d62e86791533847be233cbf3bd8f09dc7803de7b6b9c7d791f7fecaea6d6f3d1425d0c67047d7751322f WHIRLPOOL f70f8e40ff6ad86c4a868984aa2fba12ca31dbb3f8383f1fffa960f8d104fa7af3c253dfd9539691adadfb21c172e5cf4c19b9a06fbdbbbdcbe265021b98b4a2
--- a/dev-lang/crystal/crystal-0.12.0.ebuild
+++ b/dev-lang/crystal/crystal-0.12.0.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+BV=${PV}-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="http://crystal-lang.org"
+SRC_URI="https://github.com/manastech/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples +xml +yaml"
+
+# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
+DEPEND="
+	<sys-devel/llvm-3.7.0
+	dev-libs/boehm-gc[static-libs]
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	sys-libs/libunwind
+	dev-libs/pcl
+	dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+"
+
+src_compile() {
+	emake \
+		release=1 \
+		PATH="${PATH}":"${WORKDIR}"/${PN}-${BV}/bin \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		CRYSTAL_CONFIG_PATH="libs:/usr/$(get_libdir)/crystal"
+	use doc && emake doc
+}
+
+src_test() {
+	emake spec \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV}
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	use examples && dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r doc/.
+	fi
+}
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@ -1,23 +1,5 @@
-DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
-DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
-DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
-DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
-DIST parallel_studio_xe_2013_sp1_update1.tgz 3402142370 SHA256 5d0147c6907ed7950d7f14b615785f5e3c7977c62368f4a8ec7b06be758d614a SHA512 ce3f7a9710b3ec6eba5d4f97c9d7bd4cc633119750962d4de5a89b328a22323f5df68f679289930fa8651ee45fb59f7af63d943f9ef175799ab55dfbcc6d8029 WHIRLPOOL eeeef9e46e73f6eb2a1b5f5b9c8c604ff3c4709a53004d9a1887dbe690e0c597dbc683f4b19a8c544ea706e6cefbeedc5d1e6f12ca103cc6bdc35927250f5626
-DIST parallel_studio_xe_2013_sp1_update2.tgz 3410174020 SHA256 235c0f54832879e27afa2c11d7a4cc72bd5bcc6241963024a28cc9e1c74342f0 SHA512 589dee0cf806ac54be473d0a8a0b9da818898f7b91fec88c07c61f45973b6e40fe4a247bb140110a0be0c1422ddcfc0cd1007f2dc58e5ead0e4c77b25806aa4d WHIRLPOOL efde8852a8a708df4c161666f44404157ce4af776c0f2e2ddfdb039a2ca23af5fa68411e2adeba17f7a97b1a11c7e3e74e6806d0a4dcbe614752715161aa7e24
 DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 SHA256 cd332d1ab5241f7609ca6fefa905b50ec8d706e93870860af1ee9e9e5fd6cc1c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025 WHIRLPOOL 5407f994b0b26323a4e6540e3eafedf05f4dd900af8ebf778911bf156656057ac0bc394f0a3791b8f4e9aedac681827c5432ddd070692e0fbedbd2f152eda04b
-DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
-DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
-DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805
-DIST parallel_studio_xe_2013_update2.tgz 2152945149 SHA256 e8ddf6141f7d84c1f242891fabe0882c40269c358c0b946fee22ee6caa37121c SHA512 633370f58bd9fc14140912d5b3dd251ca4819a926b004a8053f92c83de6f9fdfdad192b425c5224d8b5aee47042a1a99d49628e6e2bb53e623ae429eefcfaac4 WHIRLPOOL 5b4a7c0c9cab758885ccffab25f1aaf64a6f5576d02df81a4797a2b9ae2151efb5e564e43397a2b61040d4af66024107a5a9c537982d3e17723655414dcba166
-DIST parallel_studio_xe_2013_update2_ia32.tgz 1190613262 SHA256 13063ea9c47c781ea8f368566d328434351002e7321b2021b5f04ff741a5d55f SHA512 1488a1b8c9b84881041ccf42d9f856d44aa0654ce3171b0f92114a3408d8cb1f1a18a6d488db6bbfd7322d5a230748612b53378b6ac01b8b7b3e66b3b8f94333 WHIRLPOOL f7d2b307d2f4e226004ddfcf073db087fff6d68e94f849e85350dc18894db884b62362bb3929076fdd531e29f5c49e2cd94eba8685b13fc52e293226516d909d
-DIST parallel_studio_xe_2013_update2_intel64.tgz 1488277925 SHA256 6136774de466de19f4024eeb5a8176ffbf559143b048fecc83848c27008361d6 SHA512 8260ab223d9a959089ae66c8948d90ce119cceeb719ef18c1a9d258ccd77e9b6a67af1a3e203d96a1c3c774def9a6fc302c126001072b7c5aa2bb3cdc68bc4dd WHIRLPOOL 006dc0e925c8265abf174682cd54f2c2fc4c4f1e059e045407d523b3e3b659cadc47da005126236a8b01b882fd0b4dfa7dadce0c52f640d5c0ada8122a9d6d08
-DIST parallel_studio_xe_2013_update3.tgz 2173061577 SHA256 98b3bfe9feefa8caaa1bea533362f31bcfe96aa8f9e59fc89f6a453d50df7508 SHA512 c6115f01b045c840b61e3c2a17fd39142c814d4e387fa5bc935c5cc6ca365c3fedddb6d8c045b5c239b948b42c02254d8b73c42cfe16d046dcf14d3a4597bbde WHIRLPOOL e857fbf0fc73406f7d787400f8ed6e45e93825616fe3d2d10dcd26fa03d56cd956a0b598270724be4ab3886d77502e0f456077ed3008cffc6bdb4abe60acedce
-DIST parallel_studio_xe_2013_update3_ia32.tgz 1207596909 SHA256 57017db1b00345d46ef9dff67dd4e5754ed0fe67fae7335489447f948dbfe7a8 SHA512 f3656fcbda74f253c8cc0ca56e16a84d77854ef51ecc7f24db02c820270bef3954d0d97d1be2aa5cf2ea7703a6e442c3be15df28de570aac7062e5c5958581a4 WHIRLPOOL 0407b59697da8a69c8ac512dec4187bf27eeb2e80516cd6a99968ef3b30a31e55eeaa31ec4bcbd34fe23678e68c4f00cc5dfce579edfb0268b789e1e65285945
-DIST parallel_studio_xe_2013_update3_intel64.tgz 1508395753 SHA256 081bc3d617f04243d459d92d05398df1a3634faf3de554346f732ed83ed4ef06 SHA512 344678ba9c6029ab095cc656c2153b20f0f996dab45115296fb624eca3863763e4010b519595892ffeecfc1a0880901ef5ae53924e41e470aec46efd0abcd822 WHIRLPOOL 1295f579ecc50014b285d47ecf6b92d1b9d0c2cbadd1a5972a832178263a9b3d4cf4208153df40e270c259c1307ed21277239e70371b39eaf4e12171c25a3c1f
 DIST parallel_studio_xe_2013_update4.tgz 2184817121 SHA256 55d549fc34f7a9eb96951c7be3216b68f9f960edfdc0997cf8dcffe5c78d66c8 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96 WHIRLPOOL 6bedfdbcad7f0d7ad4681d51ad865db247d5f264f5fa33e7136fc64c5e83eee30bb2611f39bd7f31b790432e314a7dbea755297ae3fd2b90ccecb7beffb20d79
 DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 SHA256 5bd75b2747f4b787b8128a83914b060d156ecdc41236f4100363b7ab4f9f6859 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247 WHIRLPOOL f2b03ebb78960718a15fc69be814eeb7996fdd7575720f4b09cb915086cc757fea188ef5ceb7e37ed00c995e11ae544d8bd55aba8ab2d12530e26b3d23362f3e
 DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7d9c76e727e63427387d9ee42358f5b5df75a0d8766cd318a11d SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a WHIRLPOOL d08447f27aee0f088797968d541fe98e3813a1daf5b87024d37493663238594c3e4e75a8d9636a4059191782f5eae9065d45b7ad2c27e1f73fc74eb110ad399f
-DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
-DIST parallel_studio_xe_2015_update1.tgz 4044230603 SHA256 84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b SHA512 894c911dce9d261fbe67d65c91c3b6c7117b183102fe7673a5e106d14994a082fdf03fdb573bbb1a9f0a01cf1539082b72ec75c39db7590bb2f63222f9a5b832 WHIRLPOOL f43b219ba82aa3f94c6818c54b971302f3693cb1c0266924f7ee79c67d6008699388afedaf4b2f72e969a73c8fd7d276309d80ff4dc8dfb1ba766cbe19b33872
-DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
-DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
+DIST parallel_studio_xe_2015_update6.tgz 4190044333 SHA256 e604ed2bb45d227b151dd2898f3edd93526d58d1db1cb9d6b6f614907864f392 SHA512 a9896289db8e820f02c330702ff1e954af11af5f9bbc0e5623a001b3a8c33a2bcb8660ac8b0e569994a3682bfd263bf119dbe6a43fb343139adbeaaaa13f8a81 WHIRLPOOL 997c96d0d9d6c603f8659a5ece91aa55b9a7bf5b428065ac55a0fa3d5577dab7fcc61157a983eb355832dc7c201fde4e5fcc9ff7bcb4d8b656847c2c1092b1dd
--- a/dev-lang/icc/icc-13.0.0.079.ebuild
+++ b/dev-lang/icc/icc-13.0.0.079.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-src_install() {
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
--- a/dev-lang/icc/icc-13.0.1.117.ebuild
+++ b/dev-lang/icc/icc-13.0.1.117.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2872
-INTEL_DPV=2013_update1
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-src_install() {
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
--- a/dev-lang/icc/icc-13.1.2.146.ebuild
+++ b/dev-lang/icc/icc-13.1.2.146.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2987
-INTEL_DPV=2013_update2
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
--- a/dev-lang/icc/icc-13.1.3.163.ebuild
+++ b/dev-lang/icc/icc-13.1.3.163.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
--- a/dev-lang/icc/icc-14.0.0.080.ebuild
+++ b/dev-lang/icc/icc-14.0.0.080.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/icc/icc-14.0.1.106.ebuild
+++ b/dev-lang/icc/icc-14.0.1.106.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/icc/icc-14.0.2.144.ebuild
+++ b/dev-lang/icc/icc-14.0.2.144.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/icc/icc-15.0.0.090.ebuild
+++ b/dev-lang/icc/icc-15.0.0.090.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4584
-INTEL_DPV=2015
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/icc/icc-15.0.2.164.ebuild
+++ b/dev-lang/icc/icc-15.0.2.164.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=5207
-INTEL_DPV=2015_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/icc/icc-15.0.3.187.ebuild
+++ b/dev-lang/icc/icc-15.0.3.187.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=7538
-INTEL_DPV=2015_update3
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++ Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	!dev-lang/ifc[linguas_ja]
-	eclipse? ( dev-util/eclipse-sdk )"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerproc compilerproc-devel"
-INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
-
-CHECKREQS_DISK_BUILD=325M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/icc/icc-15.0.6.233.ebuild
+++ b/dev-lang/icc/icc-15.0.6.233.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

 INTEL_DPN=parallel_studio_xe
-INTEL_DID=4992
-INTEL_DPV=2015_update1
+INTEL_DID=8470
+INTEL_DPV=2015_update6
 INTEL_SUBDIR=composerxe
 INTEL_SINGLE_ARCH=false

--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@ -1,2 +1,3 @@
 DIST icon-v950src.tgz 3115766 SHA256 ceb558bcf5b2edc3252b2d1d4ed640d2a218196f73d299b052f1e0c50e9b1557 SHA512 32f01ca65863525d92846b505ea61f6fbad5a11991d0476c5e79647459dee12746b4448f8d32f2766c198b6713587e48eb0f7f2a942ce42a929f080a85039fa3 WHIRLPOOL 641db3d8d6cc384772649cd0a80884ea9bbb7027df772b19ea6216f164bc589ffc1331cc80447483455e05f54405ed18af0ce69d9d48d4ea7d42ff1b341811c0
+DIST icon-v951src.tgz 3133040 SHA256 062a680862b1c10c21789c0c7c7687c970a720186918d5ed1f7aad9fdc6fa9b9 SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad WHIRLPOOL b79ba827a94b71982ad6df4eb1d3218fc4b44bd7331e611616da3544202ed1bd5ea607a6934496b3267b24bf9096cacbf303f4ab949a06e44a43dd8c81e55704
 DIST icon.v943src.tgz 3218627 SHA256 d6b6dc508922251748c4ceefbc3a96b54a9f488e260f9f517b5e08dc21615bff SHA512 9f89c7f1aaea1caea586aeb1ef74346a0f258c26ae74581a9ce7b59c2b590eb79316bdb9530b70d9af59ad06e6c444eec92016d0e5b015f4d467bde0baac2695 WHIRLPOOL e776f088ed6a4db10f9defc11a71187cdef4c6ca50b89f80c035b2981c650999cc27bebeab57b99b495653d42af2e34ea5827d6744d4b8f265c7d1883e864437
--- a/dev-lang/icon/files/icon-9.5.1-flags.patch
+++ b/dev-lang/icon/files/icon-9.5.1-flags.patch
@ -0,0 +1,75 @@
+--- icon-v951src/ipl/cfuncs/Makefile
+++ icon-v951src/ipl/cfuncs/Makefile
+@@ -25,7 +25,7 @@
+ # library
+ 
+ $(FUNCLIB):	$(FUNCS) mklib.sh
+-		CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../bin" \
+		CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../bin" \
+ 		    sh mklib.sh $(FUNCLIB) $(FUNCS)
+ $(FUNCS):	icall.h
+ 
+--- icon-v951src/ipl/cfuncs/mklib.sh
+++ icon-v951src/ipl/cfuncs/mklib.sh
+@@ -12,7 +12,7 @@
+ set -x
+ case "$SYS" in
+    Linux*|*BSD*|GNU*)
+-      $CC -shared -o $LIBNAME -fPIC "$@";;
+      $CC -shared -o $LIBNAME $CFLAGS $LDFLAGS -fPIC "$@";;
+    CYGWIN*)
+       # move the win32 import library for iconx.exe callbacks
+       # created when iconx.exe was built
+--- icon-v951src/ipl/packs/loadfunc/Makefile
+++ icon-v951src/ipl/packs/loadfunc/Makefile
+@@ -28,7 +28,7 @@
+ 		echo '$$define FUNCLIB "./$(FUNCLIB)"'	>libnames.icn
+ 
+ $(FUNCLIB):	$(FUNCS)
+-		CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../../bin" \
+		CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../../bin" \
+ 			sh $(MKLIB) $(FUNCLIB) $(FUNCS)
+ 
+ 
+--- icon-v951src/src/common/Makefile
+++ icon-v951src/src/common/Makefile
+@@ -8,7 +8,7 @@
+ common:		$(OBJS) gpxmaybe
+ 
+ patchstr:	patchstr.c
+-		$(CC) $(CFLAGS) -o patchstr patchstr.c
+		$(CC) $(CFLAGS) $(LDFLAGS) -o patchstr patchstr.c
+ 
+ gpxmaybe:
+ 		-if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi
+@@ -25,7 +25,7 @@
+ 	  ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h
+ 
+ ../h/arch.h:	infer.c
+-		$(CC) $(CFLAGS) -o infer infer.c
+		$(CC) $(CFLAGS) $(LDFLAGS) -o infer infer.c
+ 		./infer >../h/arch.h
+ 
+ identify.o: ../h/version.h
+--- icon-v951src/src/rtt/Makefile
+++ icon-v951src/src/rtt/Makefile
+@@ -22,7 +22,7 @@
+ 
+ 
+ rtt:	$(OBJ)
+-	$(CC) $(LDFLAGS) -o rtt $(OBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o rtt $(OBJ)
+ 
+ library:	$(OBJ)
+ 		rm -rf rtt.a
+--- icon-v951src/src/runtime/Makefile
+++ icon-v951src/src/runtime/Makefile
+@@ -30,7 +30,7 @@
+ 
+ iconx: $(COBJS) $(XOBJS)
+ 	cd ../common; $(MAKE)
+-	$(CC) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS)
+ 	cp iconx ../../bin
+ 	strip $(SFLAGS) ../../bin/iconx$(EXE)
+ 
--- a/dev-lang/icon/icon-9.5.1.ebuild
+++ b/dev-lang/icon/icon-9.5.1.ebuild
@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PV=${PV//./}
+SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v${MY_PV}src.tgz"
+HOMEPAGE="http://www.cs.arizona.edu/icon/"
+DESCRIPTION="very high level language"
+
+LICENSE="public-domain HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X iplsrc"
+
+S="${WORKDIR}/icon-v${MY_PV}src"
+
+DEPEND="X? ( x11-proto/xextproto
+		x11-proto/xproto
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt )
+	|| ( sys-devel/gcc sys-devel/gcc-apple )"
+
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	# do not prestrip files
+	find "${S}"/src -name 'Makefile' | xargs sed -i -e "/strip/d" || die
+}
+
+src_configure() {
+	# select the right compile target.  Note there are many platforms
+	# available
+	local mytarget;
+	if [[ ${CHOST} == *-darwin* ]]; then
+		mytarget="macintosh"
+	else
+		mytarget="linux"
+	fi
+
+	if use X; then
+		emake X-Configure name=${mytarget} -j1 || die
+	else
+		emake Configure name=${mytarget} -j1 || die
+	fi
+
+	# sanitise the Makedefs file generated by Configure
+	sed -i \
+		-e 's:-L/usr/X11R6/lib64::g' \
+		-e 's:-L/usr/X11R6/lib::g' \
+		-e 's:-I/usr/X11R6/include::g' \
+		Makedefs || die "sed of Makedefs failed"
+
+	append-flags $(test-flags -fno-strict-aliasing -fwrapv)
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+	make Samples || die "Samples failed"
+	make Test || die "Test failed"
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)
+
+	make Install dest="${ED}/usr/$(get_libdir)/icon" || die "Make install failed"
+	dosym /usr/$(get_libdir)/icon/bin/icont /usr/bin/icont
+	dosym /usr/$(get_libdir)/icon/bin/iconx /usr/bin/iconx
+	dosym /usr/$(get_libdir)/icon/bin/icon  /usr/bin/icon
+	dosym /usr/$(get_libdir)/icon/bin/vib   /usr/bin/vib
+
+	cd "${S}/man/man1" || die
+	doman "${PN}"t.1
+	doman "${PN}".1
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN}/man || die
+
+	cd "${S}/doc" || die
+	dodoc *.txt *.sed ../README
+	# dohtml ignores all anything except .html files, no use here
+	mkdir -p "${ED}"/usr/share/doc/${PF}/html
+	cp -dpR *.htm *.gif *.jpg *.css "${ED}"/usr/share/doc/${PF}/html || die
+	rm -rf "${ED}"/usr/$(get_libdir)/icon/{doc,README} || die
+
+	# optional Icon Programming Library
+	if use iplsrc; then
+		cd "${S}" || die
+		dodir /usr/$(get_libdir)/icon/ipl
+		rm -fv ipl/{BuildBin,BuildExe,CheckAll,Makefile} || die
+		insinto /usr/$(get_libdir)/icon
+		doins -r ipl
+	fi
+}
--- a/dev-lang/icon/metadata.xml
+++ b/dev-lang/icon/metadata.xml
@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>cwills@witznd.net</email>
+		<name> Cheyenne Wills</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
 <use><flag name="iplsrc">install the icon programming library source</flag></use>
 </pkgmetadata>
--- a/dev-lang/idb/Manifest
+++ b/dev-lang/idb/Manifest
@ -1,19 +1,4 @@
-DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
-DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
-DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
-DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
-DIST parallel_studio_xe_2013_sp1_update1.tgz 3402142370 SHA256 5d0147c6907ed7950d7f14b615785f5e3c7977c62368f4a8ec7b06be758d614a SHA512 ce3f7a9710b3ec6eba5d4f97c9d7bd4cc633119750962d4de5a89b328a22323f5df68f679289930fa8651ee45fb59f7af63d943f9ef175799ab55dfbcc6d8029 WHIRLPOOL eeeef9e46e73f6eb2a1b5f5b9c8c604ff3c4709a53004d9a1887dbe690e0c597dbc683f4b19a8c544ea706e6cefbeedc5d1e6f12ca103cc6bdc35927250f5626
-DIST parallel_studio_xe_2013_sp1_update2.tgz 3410174020 SHA256 235c0f54832879e27afa2c11d7a4cc72bd5bcc6241963024a28cc9e1c74342f0 SHA512 589dee0cf806ac54be473d0a8a0b9da818898f7b91fec88c07c61f45973b6e40fe4a247bb140110a0be0c1422ddcfc0cd1007f2dc58e5ead0e4c77b25806aa4d WHIRLPOOL efde8852a8a708df4c161666f44404157ce4af776c0f2e2ddfdb039a2ca23af5fa68411e2adeba17f7a97b1a11c7e3e74e6806d0a4dcbe614752715161aa7e24
 DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 SHA256 cd332d1ab5241f7609ca6fefa905b50ec8d706e93870860af1ee9e9e5fd6cc1c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025 WHIRLPOOL 5407f994b0b26323a4e6540e3eafedf05f4dd900af8ebf778911bf156656057ac0bc394f0a3791b8f4e9aedac681827c5432ddd070692e0fbedbd2f152eda04b
-DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
-DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
-DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805
-DIST parallel_studio_xe_2013_update2.tgz 2152945149 SHA256 e8ddf6141f7d84c1f242891fabe0882c40269c358c0b946fee22ee6caa37121c SHA512 633370f58bd9fc14140912d5b3dd251ca4819a926b004a8053f92c83de6f9fdfdad192b425c5224d8b5aee47042a1a99d49628e6e2bb53e623ae429eefcfaac4 WHIRLPOOL 5b4a7c0c9cab758885ccffab25f1aaf64a6f5576d02df81a4797a2b9ae2151efb5e564e43397a2b61040d4af66024107a5a9c537982d3e17723655414dcba166
-DIST parallel_studio_xe_2013_update2_ia32.tgz 1190613262 SHA256 13063ea9c47c781ea8f368566d328434351002e7321b2021b5f04ff741a5d55f SHA512 1488a1b8c9b84881041ccf42d9f856d44aa0654ce3171b0f92114a3408d8cb1f1a18a6d488db6bbfd7322d5a230748612b53378b6ac01b8b7b3e66b3b8f94333 WHIRLPOOL f7d2b307d2f4e226004ddfcf073db087fff6d68e94f849e85350dc18894db884b62362bb3929076fdd531e29f5c49e2cd94eba8685b13fc52e293226516d909d
-DIST parallel_studio_xe_2013_update2_intel64.tgz 1488277925 SHA256 6136774de466de19f4024eeb5a8176ffbf559143b048fecc83848c27008361d6 SHA512 8260ab223d9a959089ae66c8948d90ce119cceeb719ef18c1a9d258ccd77e9b6a67af1a3e203d96a1c3c774def9a6fc302c126001072b7c5aa2bb3cdc68bc4dd WHIRLPOOL 006dc0e925c8265abf174682cd54f2c2fc4c4f1e059e045407d523b3e3b659cadc47da005126236a8b01b882fd0b4dfa7dadce0c52f640d5c0ada8122a9d6d08
-DIST parallel_studio_xe_2013_update3.tgz 2173061577 SHA256 98b3bfe9feefa8caaa1bea533362f31bcfe96aa8f9e59fc89f6a453d50df7508 SHA512 c6115f01b045c840b61e3c2a17fd39142c814d4e387fa5bc935c5cc6ca365c3fedddb6d8c045b5c239b948b42c02254d8b73c42cfe16d046dcf14d3a4597bbde WHIRLPOOL e857fbf0fc73406f7d787400f8ed6e45e93825616fe3d2d10dcd26fa03d56cd956a0b598270724be4ab3886d77502e0f456077ed3008cffc6bdb4abe60acedce
-DIST parallel_studio_xe_2013_update3_ia32.tgz 1207596909 SHA256 57017db1b00345d46ef9dff67dd4e5754ed0fe67fae7335489447f948dbfe7a8 SHA512 f3656fcbda74f253c8cc0ca56e16a84d77854ef51ecc7f24db02c820270bef3954d0d97d1be2aa5cf2ea7703a6e442c3be15df28de570aac7062e5c5958581a4 WHIRLPOOL 0407b59697da8a69c8ac512dec4187bf27eeb2e80516cd6a99968ef3b30a31e55eeaa31ec4bcbd34fe23678e68c4f00cc5dfce579edfb0268b789e1e65285945
-DIST parallel_studio_xe_2013_update3_intel64.tgz 1508395753 SHA256 081bc3d617f04243d459d92d05398df1a3634faf3de554346f732ed83ed4ef06 SHA512 344678ba9c6029ab095cc656c2153b20f0f996dab45115296fb624eca3863763e4010b519595892ffeecfc1a0880901ef5ae53924e41e470aec46efd0abcd822 WHIRLPOOL 1295f579ecc50014b285d47ecf6b92d1b9d0c2cbadd1a5972a832178263a9b3d4cf4208153df40e270c259c1307ed21277239e70371b39eaf4e12171c25a3c1f
 DIST parallel_studio_xe_2013_update4.tgz 2184817121 SHA256 55d549fc34f7a9eb96951c7be3216b68f9f960edfdc0997cf8dcffe5c78d66c8 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96 WHIRLPOOL 6bedfdbcad7f0d7ad4681d51ad865db247d5f264f5fa33e7136fc64c5e83eee30bb2611f39bd7f31b790432e314a7dbea755297ae3fd2b90ccecb7beffb20d79
 DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 SHA256 5bd75b2747f4b787b8128a83914b060d156ecdc41236f4100363b7ab4f9f6859 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247 WHIRLPOOL f2b03ebb78960718a15fc69be814eeb7996fdd7575720f4b09cb915086cc757fea188ef5ceb7e37ed00c995e11ae544d8bd55aba8ab2d12530e26b3d23362f3e
 DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7d9c76e727e63427387d9ee42358f5b5df75a0d8766cd318a11d SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a WHIRLPOOL d08447f27aee0f088797968d541fe98e3813a1daf5b87024d37493663238594c3e4e75a8d9636a4059191782f5eae9065d45b7ad2c27e1f73fc74eb110ad399f
--- a/dev-lang/idb/idb-13.0.0.079.ebuild
+++ b/dev-lang/idb/idb-13.0.0.079.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="~dev-libs/intel-common-${PV}[compiler]"
-RDEPEND="${DEPEND}
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
--- a/dev-lang/idb/idb-13.0.1.117-r1.ebuild
+++ b/dev-lang/idb/idb-13.0.1.117-r1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2872
-INTEL_DPV=2013_update1
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="~dev-libs/intel-common-${PV}[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
--- a/dev-lang/idb/idb-13.0.2.146.ebuild
+++ b/dev-lang/idb/idb-13.0.2.146.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2987
-INTEL_DPV=2013_update2
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
--- a/dev-lang/idb/idb-13.0.3.163.ebuild
+++ b/dev-lang/idb/idb-13.0.3.163.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
--- a/dev-lang/idb/idb-14.0.0.080.ebuild
+++ b/dev-lang/idb/idb-14.0.0.080.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-_INTEL_PV1=14
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-pkg_setup() {
-	_INTEL_PV1=13 intel-sdp_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
--- a/dev-lang/idb/idb-14.0.1.106.ebuild
+++ b/dev-lang/idb/idb-14.0.1.106.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-_INTEL_PV1=14
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-pkg_setup() {
-	_INTEL_PV1=13 intel-sdp_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
--- a/dev-lang/idb/idb-14.0.2.144.ebuild
+++ b/dev-lang/idb/idb-14.0.2.144.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-_INTEL_PV1=14
-
-DESCRIPTION="Intel C/C++/FORTRAN debugger"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="eclipse"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-libs/intel-common-13.1[compiler]"
-RDEPEND="${DEPEND}
-	virtual/jre
-	eclipse? ( dev-util/eclipse-sdk )"
-
-INTEL_BIN_RPMS="idb"
-INTEL_DAT_RPMS="idb-common idbcdt"
-
-CHECKREQS_DISK_BUILD=475M
-
-pkg_setup() {
-	_INTEL_PV1=13 intel-sdp_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
-}
--- a/dev-lang/ifc/Manifest
+++ b/dev-lang/ifc/Manifest
@ -1,23 +1,5 @@
-DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
-DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
-DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
-DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
-DIST parallel_studio_xe_2013_sp1_update1.tgz 3402142370 SHA256 5d0147c6907ed7950d7f14b615785f5e3c7977c62368f4a8ec7b06be758d614a SHA512 ce3f7a9710b3ec6eba5d4f97c9d7bd4cc633119750962d4de5a89b328a22323f5df68f679289930fa8651ee45fb59f7af63d943f9ef175799ab55dfbcc6d8029 WHIRLPOOL eeeef9e46e73f6eb2a1b5f5b9c8c604ff3c4709a53004d9a1887dbe690e0c597dbc683f4b19a8c544ea706e6cefbeedc5d1e6f12ca103cc6bdc35927250f5626
-DIST parallel_studio_xe_2013_sp1_update2.tgz 3410174020 SHA256 235c0f54832879e27afa2c11d7a4cc72bd5bcc6241963024a28cc9e1c74342f0 SHA512 589dee0cf806ac54be473d0a8a0b9da818898f7b91fec88c07c61f45973b6e40fe4a247bb140110a0be0c1422ddcfc0cd1007f2dc58e5ead0e4c77b25806aa4d WHIRLPOOL efde8852a8a708df4c161666f44404157ce4af776c0f2e2ddfdb039a2ca23af5fa68411e2adeba17f7a97b1a11c7e3e74e6806d0a4dcbe614752715161aa7e24
 DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 SHA256 cd332d1ab5241f7609ca6fefa905b50ec8d706e93870860af1ee9e9e5fd6cc1c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025 WHIRLPOOL 5407f994b0b26323a4e6540e3eafedf05f4dd900af8ebf778911bf156656057ac0bc394f0a3791b8f4e9aedac681827c5432ddd070692e0fbedbd2f152eda04b
-DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
-DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
-DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805
-DIST parallel_studio_xe_2013_update2.tgz 2152945149 SHA256 e8ddf6141f7d84c1f242891fabe0882c40269c358c0b946fee22ee6caa37121c SHA512 633370f58bd9fc14140912d5b3dd251ca4819a926b004a8053f92c83de6f9fdfdad192b425c5224d8b5aee47042a1a99d49628e6e2bb53e623ae429eefcfaac4 WHIRLPOOL 5b4a7c0c9cab758885ccffab25f1aaf64a6f5576d02df81a4797a2b9ae2151efb5e564e43397a2b61040d4af66024107a5a9c537982d3e17723655414dcba166
-DIST parallel_studio_xe_2013_update2_ia32.tgz 1190613262 SHA256 13063ea9c47c781ea8f368566d328434351002e7321b2021b5f04ff741a5d55f SHA512 1488a1b8c9b84881041ccf42d9f856d44aa0654ce3171b0f92114a3408d8cb1f1a18a6d488db6bbfd7322d5a230748612b53378b6ac01b8b7b3e66b3b8f94333 WHIRLPOOL f7d2b307d2f4e226004ddfcf073db087fff6d68e94f849e85350dc18894db884b62362bb3929076fdd531e29f5c49e2cd94eba8685b13fc52e293226516d909d
-DIST parallel_studio_xe_2013_update2_intel64.tgz 1488277925 SHA256 6136774de466de19f4024eeb5a8176ffbf559143b048fecc83848c27008361d6 SHA512 8260ab223d9a959089ae66c8948d90ce119cceeb719ef18c1a9d258ccd77e9b6a67af1a3e203d96a1c3c774def9a6fc302c126001072b7c5aa2bb3cdc68bc4dd WHIRLPOOL 006dc0e925c8265abf174682cd54f2c2fc4c4f1e059e045407d523b3e3b659cadc47da005126236a8b01b882fd0b4dfa7dadce0c52f640d5c0ada8122a9d6d08
-DIST parallel_studio_xe_2013_update3.tgz 2173061577 SHA256 98b3bfe9feefa8caaa1bea533362f31bcfe96aa8f9e59fc89f6a453d50df7508 SHA512 c6115f01b045c840b61e3c2a17fd39142c814d4e387fa5bc935c5cc6ca365c3fedddb6d8c045b5c239b948b42c02254d8b73c42cfe16d046dcf14d3a4597bbde WHIRLPOOL e857fbf0fc73406f7d787400f8ed6e45e93825616fe3d2d10dcd26fa03d56cd956a0b598270724be4ab3886d77502e0f456077ed3008cffc6bdb4abe60acedce
-DIST parallel_studio_xe_2013_update3_ia32.tgz 1207596909 SHA256 57017db1b00345d46ef9dff67dd4e5754ed0fe67fae7335489447f948dbfe7a8 SHA512 f3656fcbda74f253c8cc0ca56e16a84d77854ef51ecc7f24db02c820270bef3954d0d97d1be2aa5cf2ea7703a6e442c3be15df28de570aac7062e5c5958581a4 WHIRLPOOL 0407b59697da8a69c8ac512dec4187bf27eeb2e80516cd6a99968ef3b30a31e55eeaa31ec4bcbd34fe23678e68c4f00cc5dfce579edfb0268b789e1e65285945
-DIST parallel_studio_xe_2013_update3_intel64.tgz 1508395753 SHA256 081bc3d617f04243d459d92d05398df1a3634faf3de554346f732ed83ed4ef06 SHA512 344678ba9c6029ab095cc656c2153b20f0f996dab45115296fb624eca3863763e4010b519595892ffeecfc1a0880901ef5ae53924e41e470aec46efd0abcd822 WHIRLPOOL 1295f579ecc50014b285d47ecf6b92d1b9d0c2cbadd1a5972a832178263a9b3d4cf4208153df40e270c259c1307ed21277239e70371b39eaf4e12171c25a3c1f
 DIST parallel_studio_xe_2013_update4.tgz 2184817121 SHA256 55d549fc34f7a9eb96951c7be3216b68f9f960edfdc0997cf8dcffe5c78d66c8 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96 WHIRLPOOL 6bedfdbcad7f0d7ad4681d51ad865db247d5f264f5fa33e7136fc64c5e83eee30bb2611f39bd7f31b790432e314a7dbea755297ae3fd2b90ccecb7beffb20d79
 DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 SHA256 5bd75b2747f4b787b8128a83914b060d156ecdc41236f4100363b7ab4f9f6859 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247 WHIRLPOOL f2b03ebb78960718a15fc69be814eeb7996fdd7575720f4b09cb915086cc757fea188ef5ceb7e37ed00c995e11ae544d8bd55aba8ab2d12530e26b3d23362f3e
 DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7d9c76e727e63427387d9ee42358f5b5df75a0d8766cd318a11d SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a WHIRLPOOL d08447f27aee0f088797968d541fe98e3813a1daf5b87024d37493663238594c3e4e75a8d9636a4059191782f5eae9065d45b7ad2c27e1f73fc74eb110ad399f
-DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
-DIST parallel_studio_xe_2015_update1.tgz 4044230603 SHA256 84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b SHA512 894c911dce9d261fbe67d65c91c3b6c7117b183102fe7673a5e106d14994a082fdf03fdb573bbb1a9f0a01cf1539082b72ec75c39db7590bb2f63222f9a5b832 WHIRLPOOL f43b219ba82aa3f94c6818c54b971302f3693cb1c0266924f7ee79c67d6008699388afedaf4b2f72e969a73c8fd7d276309d80ff4dc8dfb1ba766cbe19b33872
-DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
-DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
+DIST parallel_studio_xe_2015_update6.tgz 4190044333 SHA256 e604ed2bb45d227b151dd2898f3edd93526d58d1db1cb9d6b6f614907864f392 SHA512 a9896289db8e820f02c330702ff1e954af11af5f9bbc0e5623a001b3a8c33a2bcb8660ac8b0e569994a3682bfd263bf119dbe6a43fb343139adbeaaaa13f8a81 WHIRLPOOL 997c96d0d9d6c603f8659a5ece91aa55b9a7bf5b428065ac55a0fa3d5577dab7fcc61157a983eb355832dc7c201fde4e5fcc9ff7bcb4d8b656847c2c1092b1dd
--- a/dev-lang/ifc/ifc-13.0.0.079-r1.ebuild
+++ b/dev-lang/ifc/ifc-13.0.0.079-r1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-libs/intel-common-${PV}[compiler,multilib=]"
-DEPEND="${RDEPEND}"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=300M
-
-src_install() {
-	rm ${INTEL_SDP_DIR}/Documentation/en_US/gs_resources/intel_logo.gif || die
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
--- a/dev-lang/ifc/ifc-13.0.1.117.ebuild
+++ b/dev-lang/ifc/ifc-13.0.1.117.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2872
-INTEL_DPV=2013_update1
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-libs/intel-common-${PV}[compiler,multilib=]"
-DEPEND="${RDEPEND}"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=300M
-
-src_install() {
-	rm ${INTEL_SDP_DIR}/Documentation/ja_JP/gs_resources/intel_logo.gif || die
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
--- a/dev-lang/ifc/ifc-13.1.2.146.ebuild
+++ b/dev-lang/ifc/ifc-13.1.2.146.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2987
-INTEL_DPV=2013_update2
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-libs/intel-common-${PV}[compiler,multilib=]"
-DEPEND="${RDEPEND}"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	rm ${INTEL_SDP_DIR}/Documentation/ja_JP/gs_resources/intel_logo.gif || die
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
--- a/dev-lang/ifc/ifc-13.1.3.163.ebuild
+++ b/dev-lang/ifc/ifc-13.1.3.163.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="~dev-libs/intel-common-${PV}[compiler,multilib=]"
-DEPEND="${RDEPEND}"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	rm ${INTEL_SDP_DIR}/Documentation/ja_JP/gs_resources/intel_logo.gif || die
-	intel-sdp_src_install
-	local i
-	local idir=${INTEL_SDP_EDIR}/compiler/lib
-	for i in ${idir}/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet,helpxi}.cat; do
-		if [[ -e "${i}" ]]; then
-			rm -rvf "${D}${i}" || die
-		fi
-	done
-}
--- a/dev-lang/ifc/ifc-14.0.0.080.ebuild
+++ b/dev-lang/ifc/ifc-14.0.0.080.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/ifc/ifc-14.0.1.106.ebuild
+++ b/dev-lang/ifc/ifc-14.0.1.106.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/ifc/ifc-14.0.2.144.ebuild
+++ b/dev-lang/ifc/ifc-14.0.2.144.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/ifc/ifc-15.0.0.090.ebuild
+++ b/dev-lang/ifc/ifc-15.0.0.090.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4584
-INTEL_DPV=2015
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/ifc/ifc-15.0.1.133.ebuild
+++ b/dev-lang/ifc/ifc-15.0.1.133.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4992
-INTEL_DPV=2015_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-	intel-sdp_src_install
-}
--- a/dev-lang/ifc/ifc-15.0.2.164.ebuild
+++ b/dev-lang/ifc/ifc-15.0.2.164.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=5207
-INTEL_DPV=2015_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Intel FORTRAN Compiler"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
-
-IUSE="linguas_ja"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!dev-lang/ifc[linguas_jp]"
-RDEPEND="${DEPEND}
-	~dev-libs/intel-common-${PV}[compiler,multilib=]"
-
-INTEL_BIN_RPMS="compilerprof compilerprof-devel"
-INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
-
-CHECKREQS_DISK_BUILD=375M
-
-src_install() {
-	if ! use linguas_ja; then
-		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
-	fi
-
-	rm opt/intel/composerxe-2015_update2.2.164/documentation/en_US/third-party-programs.txt || die
-
-	intel-sdp_src_install
-}
--- a/dev-lang/ifc/ifc-15.0.6.233.ebuild
+++ b/dev-lang/ifc/ifc-15.0.6.233.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

 INTEL_DPN=parallel_studio_xe
-INTEL_DID=7538
-INTEL_DPV=2015_update3
+INTEL_DID=8470
+INTEL_DPV=2015_update6
 INTEL_SUBDIR=composerxe
 INTEL_SINGLE_ARCH=false

--- a/dev-lang/scala/scala-2.10.2-r3.ebuild
+++ b/dev-lang/scala/scala-2.10.2-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -73,7 +73,6 @@ COMMON_DEP="dev-java/ant-core:0

 DEPEND="${COMMON_DEP}
 	=virtual/jdk-1.7*
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		dev-java/ant-contrib:0
 	)
--- a/dev-lang/scala/scala-2.10.3-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.3-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -84,7 +84,6 @@ COMMON_DEP="dev-java/ant-core:0

 DEPEND="${COMMON_DEP}
 	=virtual/jdk-1.7*
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
--- a/dev-lang/scala/scala-2.10.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.4-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -81,7 +81,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"

 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		=virtual/jdk-1.7*
 		dev-java/ant-core:0
--- a/dev-lang/scala/scala-2.10.6.ebuild
+++ b/dev-lang/scala/scala-2.10.6.ebuild
@ -81,7 +81,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"

 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		=virtual/jdk-1.7*
 		dev-java/ant-core:0
--- a/dev-lang/scala/scala-2.11.1-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"

 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
--- a/dev-lang/scala/scala-2.11.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"

 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"

 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
--- a/dev-lang/scala/scala-2.11.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"

 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
--- a/dev-lang/scala/scala-2.11.6-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"

 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
--- a/dev-lang/scala/scala-2.11.7-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"

 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
 		dev-java/ant-core:0
--- a/dev-lang/scala/scala-2.9.3.ebuild
+++ b/dev-lang/scala/scala-2.9.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -79,7 +79,6 @@ COMMON_DEP="dev-java/ant-core:0
 	dev-java/hawtjni-runtime:0"

 DEPEND="${COMMON_DEP}
-	java-virtuals/jdk-with-com-sun:0
 	!binary? (
 		=virtual/jdk-1.7*
 		dev-java/ant-core:0
--- a/dev-libs/intel-common/Manifest
+++ b/dev-libs/intel-common/Manifest
@ -1,23 +1,5 @@
-DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
-DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
-DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
-DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
-DIST parallel_studio_xe_2013_sp1_update1.tgz 3402142370 SHA256 5d0147c6907ed7950d7f14b615785f5e3c7977c62368f4a8ec7b06be758d614a SHA512 ce3f7a9710b3ec6eba5d4f97c9d7bd4cc633119750962d4de5a89b328a22323f5df68f679289930fa8651ee45fb59f7af63d943f9ef175799ab55dfbcc6d8029 WHIRLPOOL eeeef9e46e73f6eb2a1b5f5b9c8c604ff3c4709a53004d9a1887dbe690e0c597dbc683f4b19a8c544ea706e6cefbeedc5d1e6f12ca103cc6bdc35927250f5626
-DIST parallel_studio_xe_2013_sp1_update2.tgz 3410174020 SHA256 235c0f54832879e27afa2c11d7a4cc72bd5bcc6241963024a28cc9e1c74342f0 SHA512 589dee0cf806ac54be473d0a8a0b9da818898f7b91fec88c07c61f45973b6e40fe4a247bb140110a0be0c1422ddcfc0cd1007f2dc58e5ead0e4c77b25806aa4d WHIRLPOOL efde8852a8a708df4c161666f44404157ce4af776c0f2e2ddfdb039a2ca23af5fa68411e2adeba17f7a97b1a11c7e3e74e6806d0a4dcbe614752715161aa7e24
 DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 SHA256 cd332d1ab5241f7609ca6fefa905b50ec8d706e93870860af1ee9e9e5fd6cc1c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025 WHIRLPOOL 5407f994b0b26323a4e6540e3eafedf05f4dd900af8ebf778911bf156656057ac0bc394f0a3791b8f4e9aedac681827c5432ddd070692e0fbedbd2f152eda04b
-DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
-DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
-DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805
-DIST parallel_studio_xe_2013_update2.tgz 2152945149 SHA256 e8ddf6141f7d84c1f242891fabe0882c40269c358c0b946fee22ee6caa37121c SHA512 633370f58bd9fc14140912d5b3dd251ca4819a926b004a8053f92c83de6f9fdfdad192b425c5224d8b5aee47042a1a99d49628e6e2bb53e623ae429eefcfaac4 WHIRLPOOL 5b4a7c0c9cab758885ccffab25f1aaf64a6f5576d02df81a4797a2b9ae2151efb5e564e43397a2b61040d4af66024107a5a9c537982d3e17723655414dcba166
-DIST parallel_studio_xe_2013_update2_ia32.tgz 1190613262 SHA256 13063ea9c47c781ea8f368566d328434351002e7321b2021b5f04ff741a5d55f SHA512 1488a1b8c9b84881041ccf42d9f856d44aa0654ce3171b0f92114a3408d8cb1f1a18a6d488db6bbfd7322d5a230748612b53378b6ac01b8b7b3e66b3b8f94333 WHIRLPOOL f7d2b307d2f4e226004ddfcf073db087fff6d68e94f849e85350dc18894db884b62362bb3929076fdd531e29f5c49e2cd94eba8685b13fc52e293226516d909d
-DIST parallel_studio_xe_2013_update2_intel64.tgz 1488277925 SHA256 6136774de466de19f4024eeb5a8176ffbf559143b048fecc83848c27008361d6 SHA512 8260ab223d9a959089ae66c8948d90ce119cceeb719ef18c1a9d258ccd77e9b6a67af1a3e203d96a1c3c774def9a6fc302c126001072b7c5aa2bb3cdc68bc4dd WHIRLPOOL 006dc0e925c8265abf174682cd54f2c2fc4c4f1e059e045407d523b3e3b659cadc47da005126236a8b01b882fd0b4dfa7dadce0c52f640d5c0ada8122a9d6d08
-DIST parallel_studio_xe_2013_update3.tgz 2173061577 SHA256 98b3bfe9feefa8caaa1bea533362f31bcfe96aa8f9e59fc89f6a453d50df7508 SHA512 c6115f01b045c840b61e3c2a17fd39142c814d4e387fa5bc935c5cc6ca365c3fedddb6d8c045b5c239b948b42c02254d8b73c42cfe16d046dcf14d3a4597bbde WHIRLPOOL e857fbf0fc73406f7d787400f8ed6e45e93825616fe3d2d10dcd26fa03d56cd956a0b598270724be4ab3886d77502e0f456077ed3008cffc6bdb4abe60acedce
-DIST parallel_studio_xe_2013_update3_ia32.tgz 1207596909 SHA256 57017db1b00345d46ef9dff67dd4e5754ed0fe67fae7335489447f948dbfe7a8 SHA512 f3656fcbda74f253c8cc0ca56e16a84d77854ef51ecc7f24db02c820270bef3954d0d97d1be2aa5cf2ea7703a6e442c3be15df28de570aac7062e5c5958581a4 WHIRLPOOL 0407b59697da8a69c8ac512dec4187bf27eeb2e80516cd6a99968ef3b30a31e55eeaa31ec4bcbd34fe23678e68c4f00cc5dfce579edfb0268b789e1e65285945
-DIST parallel_studio_xe_2013_update3_intel64.tgz 1508395753 SHA256 081bc3d617f04243d459d92d05398df1a3634faf3de554346f732ed83ed4ef06 SHA512 344678ba9c6029ab095cc656c2153b20f0f996dab45115296fb624eca3863763e4010b519595892ffeecfc1a0880901ef5ae53924e41e470aec46efd0abcd822 WHIRLPOOL 1295f579ecc50014b285d47ecf6b92d1b9d0c2cbadd1a5972a832178263a9b3d4cf4208153df40e270c259c1307ed21277239e70371b39eaf4e12171c25a3c1f
 DIST parallel_studio_xe_2013_update4.tgz 2184817121 SHA256 55d549fc34f7a9eb96951c7be3216b68f9f960edfdc0997cf8dcffe5c78d66c8 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96 WHIRLPOOL 6bedfdbcad7f0d7ad4681d51ad865db247d5f264f5fa33e7136fc64c5e83eee30bb2611f39bd7f31b790432e314a7dbea755297ae3fd2b90ccecb7beffb20d79
 DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 SHA256 5bd75b2747f4b787b8128a83914b060d156ecdc41236f4100363b7ab4f9f6859 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247 WHIRLPOOL f2b03ebb78960718a15fc69be814eeb7996fdd7575720f4b09cb915086cc757fea188ef5ceb7e37ed00c995e11ae544d8bd55aba8ab2d12530e26b3d23362f3e
 DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7d9c76e727e63427387d9ee42358f5b5df75a0d8766cd318a11d SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a WHIRLPOOL d08447f27aee0f088797968d541fe98e3813a1daf5b87024d37493663238594c3e4e75a8d9636a4059191782f5eae9065d45b7ad2c27e1f73fc74eb110ad399f
-DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
-DIST parallel_studio_xe_2015_update1.tgz 4044230603 SHA256 84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b SHA512 894c911dce9d261fbe67d65c91c3b6c7117b183102fe7673a5e106d14994a082fdf03fdb573bbb1a9f0a01cf1539082b72ec75c39db7590bb2f63222f9a5b832 WHIRLPOOL f43b219ba82aa3f94c6818c54b971302f3693cb1c0266924f7ee79c67d6008699388afedaf4b2f72e969a73c8fd7d276309d80ff4dc8dfb1ba766cbe19b33872
-DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
-DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
+DIST parallel_studio_xe_2015_update6.tgz 4190044333 SHA256 e604ed2bb45d227b151dd2898f3edd93526d58d1db1cb9d6b6f614907864f392 SHA512 a9896289db8e820f02c330702ff1e954af11af5f9bbc0e5623a001b3a8c33a2bcb8660ac8b0e569994a3682bfd263bf119dbe6a43fb343139adbeaaaa13f8a81 WHIRLPOOL 997c96d0d9d6c603f8659a5ece91aa55b9a7bf5b428065ac55a0fa3d5577dab7fcc61157a983eb355832dc7c201fde4e5fcc9ff7bcb4d8b656847c2c1092b1dd
--- a/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild
+++ b/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=325M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		MANPATH=${INTEL_SDP_EDIR}/man/en_US
-		INTEL_LICENSE_FILE=${INTEL_SDP_EDIR}/licenses
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-	dodir ${INTEL_SDP_DIR}/licenses
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-13.0.0.079.ebuild
+++ b/dev-libs/intel-common/intel-common-13.0.0.079.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=325M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		MANPATH=${INTEL_SDP_EDIR}/man/en_US
-		INTEL_LICENSE_FILE=${INTEL_SDP_EDIR}/licenses
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-	dodir ${INTEL_SDP_DIR}/licenses
-}
--- a/dev-libs/intel-common/intel-common-13.0.1.117.ebuild
+++ b/dev-libs/intel-common/intel-common-13.0.1.117.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2872
-INTEL_DPV=2013_update1
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=325M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-13.1.2.146.ebuild
+++ b/dev-libs/intel-common/intel-common-13.1.2.146.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=2987
-INTEL_DPV=2013_update2
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-13.1.3.163.ebuild
+++ b/dev-libs/intel-common/intel-common-13.1.3.163.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-14.0.0.080.ebuild
+++ b/dev-libs/intel-common/intel-common-14.0.0.080.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3447
-INTEL_DPV=2013_sp1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-14.0.1.106.ebuild
+++ b/dev-libs/intel-common/intel-common-14.0.1.106.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3644
-INTEL_DPV=2013_sp1_update1
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-14.0.2.144.ebuild
+++ b/dev-libs/intel-common/intel-common-14.0.2.144.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3949
-INTEL_DPV=2013_sp1_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-15.0.0.090-r1.ebuild
+++ b/dev-libs/intel-common/intel-common-15.0.0.090-r1.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=4584
-INTEL_DPV=2015
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common compilerpro-common-pset"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common ccompxe compxe fcompxe"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-15.0.2.164.ebuild
+++ b/dev-libs/intel-common/intel-common-15.0.2.164.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=5207
-INTEL_DPV=2015_update2
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common compilerpro-common-pset"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common ccompxe compxe fcompxe"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-15.0.3.187.ebuild
+++ b/dev-libs/intel-common/intel-common-15.0.3.187.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=7538
-INTEL_DPV=2015_update3
-INTEL_SUBDIR=composerxe
-INTEL_SINGLE_ARCH=false
-
-inherit intel-sdp
-
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"
-
-IUSE="+compiler"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CHECKREQS_DISK_BUILD=375M
-
-pkg_setup() {
-	einfo ${INTEL_SDP_EDIR}
-	INTEL_BIN_RPMS="openmp openmp-devel"
-	INTEL_DAT_RPMS="compilerpro-common compilerpro-common-pset"
-	if use compiler; then
-		INTEL_BIN_RPMS+=" compilerpro-devel sourcechecker-devel"
-		INTEL_DAT_RPMS+=" compilerpro-vars sourcechecker-common ccompxe compxe fcompxe"
-	fi
-	intel-sdp_pkg_setup
-}
-
-src_install() {
-	intel-sdp_src_install
-	local path rootpath ldpath arch fenv=35intelsdp
-	cat > ${fenv} <<-EOF
-		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
-		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
-	EOF
-	for arch in ${INTEL_ARCH}; do
-			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			rootpath=${rootpath}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
-			ldpath=${ldpath}:${INTEL_SDP_EDIR}/compiler/lib/${arch}:${INTEL_SDP_EDIR}/mpirt/lib/${arch}
-	done
-	cat >> ${fenv} <<-EOF
-		PATH=${path#:}
-		ROOTPATH=${rootpath#:}
-		LDPATH=${ldpath#:}
-	EOF
-
-	doenvd ${fenv}
-
-	cat >> "${T}"/40-${PN} <<- EOF
-	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"
-	EOF
-	insinto /etc/revdep-rebuild/
-	doins "${T}"/40-${PN}
-}
--- a/dev-libs/intel-common/intel-common-15.0.6.233.ebuild
+++ b/dev-libs/intel-common/intel-common-15.0.6.233.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

 INTEL_DPN=parallel_studio_xe
-INTEL_DID=4992
-INTEL_DPV=2015_update1
+INTEL_DID=8470
+INTEL_DPV=2015_update6
 INTEL_SUBDIR=composerxe
 INTEL_SINGLE_ARCH=false

--- a/dev-python/batinfo/Manifest
+++ b/dev-python/batinfo/Manifest
@ -0,0 +1 @@
+DIST batinfo-0.3.tar.gz 3951 SHA256 2991715439e7b48300eb539e2cf3faffe3c9d8a876197078c68616b97f9fdf3f SHA512 822e8e70f14a7f08713028ebc8b41aef6d9256984a6a381af11e5b36980a355636bc21d8b21753f4dabd20e38becf6152c623134a65109593ccba019afe3f3f3 WHIRLPOOL 85ce789aca7806ae07856b1e3a64afd07c2ab3a91627a7266ddfc1bde49068d62a1b970dd9dc329d6d696f923d3b019e83047329a0686ae8b26907b70d4b2883
--- a/dev-python/batinfo/batinfo-0.3.ebuild
+++ b/dev-python/batinfo/batinfo-0.3.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple Python lib to retreive battery information"
+HOMEPAGE="https://github.com/nicolargo/batinfo http://pypi.python.org/pypi/batinfo"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/batinfo/metadata.xml
+++ b/dev-python/batinfo/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">batinfo</remote-id>
+    <maintainer status="unknown">
+      <email>nicolas@nicolargo.com</email>
+      <name>Nicolas Hennion</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.1.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.1.2.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"

 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/cryptography/cryptography-1.1.2.ebuild
+++ b/dev-python/cryptography/cryptography-1.1.2.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl test"

 RDEPEND="
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@ -3,3 +3,4 @@ DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a
 DIST docker-py-1.3.1.tar.gz 71456 SHA256 4a980c55f22b97573b68f720ebc0b6f2a01cd9ec454d305bd13d2b83109a0bfa SHA512 f027a44cd15aa0a9d47a748c6f593e940ee4b6db0d8a933591e148bc9b0e6801c9ece3f81fc3a21eba762eff838ef40bf04fda299f28ba508e029b67658ee228 WHIRLPOOL 57d7429d58610bbef4473d5aabfe7f1771b2e3d4f083d44d6aba8f144bf44afeff9a0bcf458754f2787b54e1a1e07fddb9e66a42c16a6b1f20a8e1f9be3aa558
 DIST docker-py-1.4.0.tar.gz 75336 SHA256 81e2a7cd59b25c3df63ec47458c8a019ed7e11355ea0cfeec1f38df8c93f3179 SHA512 c4ea0a4a43063c90aa212952b3aeaa1a7c574dfcf7e8223c3fdb24216d0939c80258fe4ad2b6bba24d9d5fcde27332106860baf463482119b382670ed57c0da2 WHIRLPOOL f085dc4c59ce5b4b8c22695c90e054f3875dfa7553a600e025f089b3f5da34f91b5de3fb4106e737150b3e558319a5ae4bd1a6448f4bcafc9f9d45fa1a826d3a
 DIST docker-py-1.5.0.tar.gz 84712 SHA256 a7b437aa9bfd2ad1e9b3eeed57e376d28a93acb852bac2aaf01dd70a304d439b SHA512 948f63f48a1994f90041c7d2e2982a313ccc0c9aea0dc1cec03bcd9afd855459088b36d052ab061ada270c8fe06c0c18115910b40740c78f58258782791180ab WHIRLPOOL a34f3f896e5e3722fb9fed520e0f776875fd869f4dbd10ee922a73332dcd46b00c608c1a65f28eb9e53ba4a343b430a83ccacf7fd211113ee4dabde6dbf7963b
+DIST docker-py-1.7.0.tar.gz 95003 SHA256 13193dff1e29e0f3bfa8a51751a08eac8d56b3b7d14c4c2c9b7a56647303166b SHA512 98296c2bcc567caae6178599470999ee97b6e9648096a09790912e92191b88b2affaec5fb8dbe3b9070015ddb198fe8b9c3210d1a450ce91e620793d19da7b0c WHIRLPOOL 483f85e598d601346e933645819c78639adff1f1c2d0d65e7f22c71412d85442c74e1690b8457a372b4ab2dc0d1c56e4a30b44edc67bb150a16f2bb95aae1462
--- a/dev-python/docker-py/docker-py-1.7.0.ebuild
+++ b/dev-python/docker-py/docker-py-1.7.0.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	if use doc; then
+		mkdocs build || die "docs failed to build"
+	fi
+}
+
+python_test() {
+	py.test -vv tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( site/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker-py/metadata.xml
@ -10,6 +10,6 @@
    <name>Python</name>
  </maintainer>
  <upstream>
-	  <remote-id type="github">docker/docker-py</remote-id>
+    <remote-id type="github">docker/docker-py</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/hypothesis/hypothesis-1.19.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-1.19.0.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""

 RDEPEND=""
--- a/dev-python/influxdb/Manifest
+++ b/dev-python/influxdb/Manifest
@ -0,0 +1 @@
+DIST influxdb-2.12.0.tar.gz 48091 SHA256 b57f31205b4ef14aeca62dc9968c4a262ee5c29b44bff0d7fa6956d7bd4fbcf9 SHA512 2975cbf606833f56c30572cfb377f3a9b69b0e8c228419d5d1d93196ee55ee38e1455838b47c0834f7f1021da72ec721aa73d02934718848271a2287ccb281c6 WHIRLPOOL 6c6483eb759858d7139d08c59f4f9c9c8d4a0d59146825701169a355554175620070413ec5bfe0a90a48c746290fac592b43151f1fb4db003869faad258d74d8
--- a/dev-python/influxdb/influxdb-2.12.0.ebuild
+++ b/dev-python/influxdb/influxdb-2.12.0.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="InfluxDB client"
+HOMEPAGE="https://github.com/influxdb/influxdb-python http://pypi.python.org/pypi/influxdb"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
--- a/dev-python/influxdb/metadata.xml
+++ b/dev-python/influxdb/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">influxdb</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/netifaces/netifaces-0.10.4.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.4.ebuild
@ -4,12 +4,15 @@

 EAPI=5

-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy{,3} )

 inherit distutils-r1

 DESCRIPTION="Portable network interface information"
-HOMEPAGE="http://alastairs-place.net/netifaces/ https://pypi.python.org/pypi/netifaces/"
+HOMEPAGE="
+	https://pypi.python.org/pypi/netifaces/
+	http://alastairs-place.net/netifaces/
+	https://bitbucket.org/al45tair/netifaces"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@ -25,7 +25,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # It appears the docs haven't been upgraded, still @ 1.8.1
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"

 RDEPEND="
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@ -3,3 +3,4 @@ DIST oauth2client-1.4.12.tar.gz 109339 SHA256 f735b41a57fe46c0b170e919e81b9bbe7d
 DIST oauth2client-1.4.6.tar.gz 95325 SHA256 d4376fc0f5543612c62cdee5ea68530bd9c8542891b3f4427d8bf9a1f5a134c8 SHA512 e75e6c535ca4e427f3a869fa7e600bf7544752a100f623cbbeb117d872a2361a60d1524fc2639521393a58dc6f684d9e1452980d6a5ffb6f4dbed516911cc4ca WHIRLPOOL acb26ef17115138a8932313cbbb8c9a802e2296d20343ab746123ad0ef8a38ea8587c10c45863b56b7b4d5b052675434236a050ae64c6c05546a42fd3cdc4f6b
 DIST oauth2client-1.5.1.tar.gz 130237 SHA256 3e4ad7b3399cd9c4b8785acbbba2ca55eaefef17989f784352d2386776bf17c5 SHA512 ad228264b93ec23bfb4bbc9614a980172e3c763adde12e0b050166ccd49eece1d2464a078884ed16cbaea60a7bf88784a22314382073e360f1ec591b19a2da2f WHIRLPOOL 963b9518944dc081fdd3c32f1c6a12527a567f2c762355b109cee01b1cb1c1c35d85301bd2df6e47d2d11ac1e5b6c6a2bbc59098c10baa75ea2574567617f7ec
 DIST oauth2client-1.5.2.tar.gz 131665 SHA256 b8df20b122e4f49a5fe5bc3c825d16015f5012c171c6c81eb4048e4d8c2ffee3 SHA512 15f10b52aa93fc10289658d5ff671a247e5c92c5ff2be424a04617fee1a3a82439b829b0f5dcb04e3e84802e02580e366e08356df7ec6e24563a530d2f6b1db5 WHIRLPOOL 00f3033359eceda12528ef4caffc0a9d7d6561919272fe98e09d2599114f07d9be42eb32a4038c155c621581f98ecc0eb516bcaa018d4376e30906dd4a0adfbc
+DIST oauth2client-2.0.0.tar.gz 148575 SHA256 fc0ed9887399b640de58c5222f2d40be3c8b02359273be75105820ebf75082bd SHA512 4839f9ea6384fa19ee55ee953ef4e38211afd7e409a77658e535534632dd182aabb857cebc1969bcba5d80c63fa79f965a2c0b1bb2832975c1ed8dd3cd6d3042 WHIRLPOOL c418e89a9d5ef00928dae5e32aa90c664bff0b8b572ce09280ade26f764150ac42105041c3af494ad9a0ebaceb85c863be3b02c24b3216cb454e87e6e6744ac9
--- a/dev-python/oauth2client/oauth2client-2.0.0.ebuild
+++ b/dev-python/oauth2client/oauth2client-2.0.0.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+# Needs network
+RESTRICT=test
+
+python_prepare_all() {
+	sed \
+		-e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}
--- a/dev-python/oslo-log/oslo-log-1.10.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-1.10.0.ebuild
@ -49,7 +49,7 @@ DEPEND="
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"

-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+S="${WORKDIR}/oslo.log-${PV}"

 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@ -0,0 +1 @@
+DIST py-cpuinfo-0.1.8.tar.gz 15321 SHA256 892abe41eba777c2107c54703dde0c769965c3da79d100d94e4cd5e8a9ba3e59 SHA512 62941ff0a6074c6276568994b54e6b4b12403f3524941c958cb64113ee51e47f38d05a93d5434a17e6b9487ea98f56bed137fe5d82099b4180e0032aeea498d5 WHIRLPOOL 32b81ad3fafb149985960b66fbf1d98765723f2c60794cb9151c99b94b0dda8845fbb1d3373e43761ffe7e8d40623e7634bb41693e2a6a41b2658d2ec73d6e93
--- a/dev-python/py-cpuinfo/metadata.xml
+++ b/dev-python/py-cpuinfo/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">py-cpuinfo</remote-id>
+    <maintainer status="unknown">
+      <email>matthew.brennan.jones@gmail.com</email>
+      <name>Matthew Brennan Jones</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/py-cpuinfo/py-cpuinfo-0.1.8.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-0.1.8.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo http://pypi.python.org/pypi/py-cpuinfo"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://github.com/workhorsy/py-cpuinfo/issues/32
+RESTRICT="test"
+
+python_test() {
+	"${PYTHON}" test_suite.py || die
+}
--- a/dev-python/pymdstat/Manifest
+++ b/dev-python/pymdstat/Manifest
@ -0,0 +1 @@
+DIST pymdstat-0.4.2.tar.gz 5010 SHA256 fef53c6f1864fdfe8616d6e985498b7f05ef19d0952f7ec3e7f8379298b9ada9 SHA512 2e3c07d59151069962e1ba601b3751b331e233fdc6bbdeb0cada69ce36a731c12bcc6447218cc0c1ae4dd63d39d2be2bc3677aba739797cc534c5e38d1c72458 WHIRLPOOL 781fbc8b2217ed1e36a798fd05cc9d309085b75a2f4d56cf280bba63626c1d65a1bed1200d07d891261821e1e0f4a0733f66ba3f53e626b6d8be6a1600d3f801
--- a/dev-python/pymdstat/metadata.xml
+++ b/dev-python/pymdstat/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pymdstat</remote-id>
+    <maintainer status="unknown">
+      <email>nicolas@nicolargo.com</email>
+      <name>Nicolas Hennion</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST batinfo-0.3.tar.gz 3951 SHA256 2991715439e7b48300eb539e2cf3faffe3c9d8a876197078c68616b97f9fdf3f SHA512 822e8e70f14a7f08713028ebc8b41aef6d9256984a6a381af11e5b36980a355636bc21d8b21753f4dabd20e38becf6152c623134a65109593ccba019afe3f3f3 WHIRLPOOL 85ce789aca7806ae07856b1e3a64afd07c2ab3a91627a7266ddfc1bde49068d62a1b970dd9dc329d6d696f923d3b019e83047329a0686ae8b26907b70d4b2883`
				`@ -0,0 +1 @@`
				`DIST influxdb-2.12.0.tar.gz 48091 SHA256 b57f31205b4ef14aeca62dc9968c4a262ee5c29b44bff0d7fa6956d7bd4fbcf9 SHA512 2975cbf606833f56c30572cfb377f3a9b69b0e8c228419d5d1d93196ee55ee38e1455838b47c0834f7f1021da72ec721aa73d02934718848271a2287ccb281c6 WHIRLPOOL 6c6483eb759858d7139d08c59f4f9c9c8d4a0d59146825701169a355554175620070413ec5bfe0a90a48c746290fac592b43151f1fb4db003869faad258d74d8`
				`@ -0,0 +1 @@`
				`DIST py-cpuinfo-0.1.8.tar.gz 15321 SHA256 892abe41eba777c2107c54703dde0c769965c3da79d100d94e4cd5e8a9ba3e59 SHA512 62941ff0a6074c6276568994b54e6b4b12403f3524941c958cb64113ee51e47f38d05a93d5434a17e6b9487ea98f56bed137fe5d82099b4180e0032aeea498d5 WHIRLPOOL 32b81ad3fafb149985960b66fbf1d98765723f2c60794cb9151c99b94b0dda8845fbb1d3373e43761ffe7e8d40623e7634bb41693e2a6a41b2658d2ec73d6e93`
				`@ -0,0 +1 @@`
				`DIST pymdstat-0.4.2.tar.gz 5010 SHA256 fef53c6f1864fdfe8616d6e985498b7f05ef19d0952f7ec3e7f8379298b9ada9 SHA512 2e3c07d59151069962e1ba601b3751b331e233fdc6bbdeb0cada69ce36a731c12bcc6447218cc0c1ae4dd63d39d2be2bc3677aba739797cc534c5e38d1c72458 WHIRLPOOL 781fbc8b2217ed1e36a798fd05cc9d309085b75a2f4d56cf280bba63626c1d65a1bed1200d07d891261821e1e0f4a0733f66ba3f53e626b6d8be6a1600d3f801`