Sync with portage [Thu Sep 17 15:08:49 MSK 2015].

app-arch/pbzip2/pbzip2-1.1.12.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"
 
 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"

app-emacs/slime/Manifest

@@ -4,3 +4,4 @@ DIST slime-2.0_p20101103-patches.tar.bz2 4730 SHA256 9cab942f4ea64ec2f0e127db3b5
 DIST slime-2.0_p20101103.tar.bz2 725888 SHA256 0596532fa8cb78e59f685557474bd0ac5d00a79ac84c361ab93f079797a4041f SHA512 cb0cc3232304ef6efec5e01d3660cc649abb3e5803f17c82785b154b6f0b581889ea3b2dcf261be39b16ff22c912c34c7ec84c400856f5c4a29fbeaf7c49851d WHIRLPOOL 3421ea5aa5ed96a3d7b552fe74804bc3e7e822dd21623c0b36f7f84d7ad726fa57d0eb496e15d4ef9ea5027f0c247a3ba8ae7ae46118851c3f0ed13ec1cf482f
 DIST slime-2.11.tar.gz 1054516 SHA256 d63962c22f983a52519fb51b5ca28183aeb23ff6892804d02311e54d73ec8b2a SHA512 9507a4460a2f0d5b4f0857824fcaa36f6efeb09aebde7ca682bdc0214b6a722e471180c34ddce26a8f94d7cf3aae959954565ada314729e803d36767afc3e850 WHIRLPOOL 530c5b341f2ca4a95c954cea848c67cfd027345691feb9c246eb56ecaf6c420b642ed1991f1d615dabc0ca1f54bc6b28482e57c800498cf25a17ce39a7dc0ba3
 DIST slime-2.12.tar.gz 1057243 SHA256 29d57d1036abe69cb62809b5bb31d08c76c3e0e559b7e601b9d76fb7a554d53b SHA512 f18c79cba3eb75761982f2d1f163aab8213b77fa72a689d110fe91b1aa40953516566adc5f771638eee95d33ba8b4c8842ddf99738804483ccfb76a00290b2a1 WHIRLPOOL b0b78101f114514c16cba823dee02aac8a1fee74d23d5623838c2fdedaaa4fda953e6ee9bfcfcd6cf5a174d245f4ba801596c16e0bb67c1729d73a69d0ebc0b1
+DIST slime-2.15.tar.gz 1072190 SHA256 bad1851ce99b7f40b0593dc91842b261b526e0af797e660184159dda05355f50 SHA512 15f943981e35995b225b168a3d1c2099f7205c2ff359fa209f164464caf05f9fab4d24906442d94ddeb4222f7116d09a832c7377baf95fbe02d6a98a721fd611 WHIRLPOOL ff2d8f76314c111782f7c96c6e509197b0620149e683ebbc91714d77d6a0d4b52ba10dad5d8590b321de3867188997876b13fff533ca49361161b8fcff9a48d2

app-emacs/slime/files/2.15/gentoo-changelog-date.patch

@@ -0,0 +1,20 @@
+--- slime-2.15-orig/slime.el	2015-08-31 07:46:47.000000000 +1000
++++ slime-2.15/slime.el	2015-09-17 17:05:53.616659817 +1000
+@@ -138,16 +138,7 @@
+     "Return the datestring of the latest entry in the ChangeLog file.
+ Return nil if the ChangeLog file cannot be found."
+     (interactive "p")
+-    (let ((changelog (slime--changelog-file-name))
+-          (date nil))
+-      (when (file-exists-p changelog)
+-        (with-temp-buffer
+-          (insert-file-contents-literally changelog nil 0 100)
+-          (goto-char (point-min))
+-          (setq date (symbol-name (read (current-buffer))))))
+-      (when interactivep
+-        (message "Slime ChangeLog dates %s." date))
+-      date)))
++    "@SLIME-CHANGELOG-DATE@"))
+ 
+ (defvar slime-protocol-version nil)
+ (setq slime-protocol-version

app-emacs/slime/slime-2.11.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -54,10 +54,14 @@ src_prepare() {
 	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
 	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
 
-	# SLIME uses the changelog date to make sure that the emacs side and the CL side
-	# are in sync. We hardcode it instead of letting slime determine it at runtime
-	# because ChangeLog doesn't get installed to $EMACSDIR
-	epatch "${FILESDIR}"/2.11/gentoo-changelog-date.patch
+	if [[ "${PV}" == "2.11" ]] || [[ "${PV}" == "2.12" ]]; then
+		# SLIME uses the changelog date to make sure that the emacs side and the CL side
+		# are in sync. We hardcode it instead of letting slime determine it at runtime
+		# because ChangeLog doesn't get installed to $EMACSDIR
+		epatch "${FILESDIR}"/2.11/gentoo-changelog-date.patch
+	else
+		epatch "${FILESDIR}"/2.15/gentoo-changelog-date.patch
+	fi
 
 	# When starting slime in emacs, slime looks for ${S}/swank/backend.lisp as
 	# /usr/share/common-lisp/source/swank/swank-backend.lisp

app-emacs/slime/slime-2.12.ebuild

@@ -54,10 +54,14 @@ src_prepare() {
 	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
 	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
 
-	# SLIME uses the changelog date to make sure that the emacs side and the CL side
-	# are in sync. We hardcode it instead of letting slime determine it at runtime
-	# because ChangeLog doesn't get installed to $EMACSDIR
-	epatch "${FILESDIR}"/2.11/gentoo-changelog-date.patch
+	if [[ "${PV}" == "2.11" ]] || [[ "${PV}" == "2.12" ]]; then
+		# SLIME uses the changelog date to make sure that the emacs side and the CL side
+		# are in sync. We hardcode it instead of letting slime determine it at runtime
+		# because ChangeLog doesn't get installed to $EMACSDIR
+		epatch "${FILESDIR}"/2.11/gentoo-changelog-date.patch
+	else
+		epatch "${FILESDIR}"/2.15/gentoo-changelog-date.patch
+	fi
 
 	# When starting slime in emacs, slime looks for ${S}/swank/backend.lisp as
 	# /usr/share/common-lisp/source/swank/swank-backend.lisp

app-emacs/slime/slime-2.15.ebuild

@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+[[ ${PV} = *9999* ]] && GIT_ECLASS="git-r3" || GIT_ECLASS=""
+
+inherit common-lisp-3 ${GIT_ECLASS} elisp eutils
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2 xref? ( xref.lisp )"
+SLOT="0"
+if [[ ${PV} == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+IUSE="doc xref"
+RESTRICT=test # tests fail to contact sbcl
+
+RDEPEND="virtual/commonlisp
+		dev-lisp/asdf"
+DEPEND="${RDEPEND}
+		>=sys-apps/texinfo-5.1
+		doc? ( virtual/texi2dvi )"
+
+CLPACKAGE=swank
+CLSYSTEMS=swank
+SITEFILE=70${PN}-gentoo.el
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		EGIT_REPO_URI="https://github.com/slime/slime.git"
+		${GIT_ECLASS}_src_unpack
+	fi
+	elisp_src_unpack
+}
+
+src_prepare() {
+	if [[ "${PV}" == "2.11" ]]; then
+		epatch "${FILESDIR}"/2.11/dont-load-sbcl-pprint.patch
+	fi
+	epatch "${FILESDIR}"/2.0_p20130214/gentoo-module-load.patch
+	epatch "${FILESDIR}"/2.0_p20110617/gentoo-dont-call-init.patch
+	has_version ">=app-editors/emacs-24" && rm -f lib/cl-lib.el
+
+	# extract date of last update from ChangeLog, bug 233270
+	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
+	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
+
+	if [[ "${PV}" == "2.11" ]] || [[ "${PV}" == "2.12" ]]; then
+		# SLIME uses the changelog date to make sure that the emacs side and the CL side
+		# are in sync. We hardcode it instead of letting slime determine it at runtime
+		# because ChangeLog doesn't get installed to $EMACSDIR
+		epatch "${FILESDIR}"/2.11/gentoo-changelog-date.patch
+	else
+		epatch "${FILESDIR}"/2.15/gentoo-changelog-date.patch
+	fi
+
+	# When starting slime in emacs, slime looks for ${S}/swank/backend.lisp as
+	# /usr/share/common-lisp/source/swank/swank-backend.lisp
+	pushd swank || die
+	for i in *.lisp
+	do
+		mv ${i} ../swank-${i}
+	done
+	popd
+
+	sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
+		|| die "sed swank.lisp failed"
+	sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \
+		|| die "sed slime.el failed"
+	sed -i "s/@itemx INIT-FUNCTION/@item INIT-FUNCTION/" doc/slime.texi \
+		|| die "sed doc/slime.texi failed"
+
+	# Remove xref.lisp (which is non-free) unless USE flag is set
+	use xref || rm -f xref.lisp
+}
+
+src_compile() {
+	elisp-compile *.el || die
+	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+		elisp-compile contrib/*.el lib/*.el || die
+	emake -j1 -C doc slime.info || die "Cannot build info docs"
+
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts \
+			emake -j1 -C doc slime.pdf || die "emake doc failed"
+	fi
+}
+
+src_install() {
+	## install core
+	elisp-install ${PN} *.{el,elc} "${FILESDIR}"/swank-loader.lisp \
+		|| die "Cannot install SLIME core"
+	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/2.0_p20110617/${SITEFILE} \
+		>"${T}"/${SITEFILE} || die "sed failed"
+	elisp-site-file-install "${T}"/${SITEFILE} || die
+	cp "${FILESDIR}"/2.0_p20110617/swank.asd "${S}"
+	# remove upstream swank-loader, since it won't be used
+	rm "${S}"/swank-loader.lisp
+	common-lisp-install-sources *.lisp
+	common-lisp-install-asdf swank.asd
+
+	## install contribs
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} \
+		|| die "Cannot install contribs"
+	common-lisp-install-sources contrib/*.lisp
+
+	## install lib
+	elisp-install ${PN}/lib/ lib/*.{el,elc} \
+		|| die "Cannot install libs"
+
+	## install docs
+	dodoc README.md ChangeLog CONTRIBUTING.md NEWS PROBLEMS
+	newdoc contrib/README.md README-contrib.md
+	newdoc contrib/ChangeLog ChangeLog.contrib
+	doinfo doc/slime.info
+	use doc && dodoc doc/*.pdf
+}

app-misc/mc/mc-4.8.14.ebuild

@@ -14,7 +14,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
 
 REQUIRED_USE="spell? ( edit )"

app-office/texstudio/Manifest

@@ -1,3 +1,3 @@
-DIST texstudio-2.10.0.tar.gz 25674717 SHA256 cb055b5c5d40e129ff6fc87362501f45bdf11a6ee24bd733d9f7f28ae69169e8 SHA512 c8df9f8176e4d776b76efcf9abe1ff56b87e8ea7093b04f1d5766f8c8b4e5aafbdb6f40c811e7e08d3c5c8ae030327767beca2f1e79ff712c2a2a281fe8a6543 WHIRLPOOL 1eef24c4b923cda51a99fb63aa216df59e4605df81dff5bfc86b1a49c1e50f7f46173d38a4965a8640e636beff4a38971a4c6786b125067353a62d5d0a222ed8
+DIST texstudio-2.10.2.tar.gz 25669897 SHA256 0cf97c752ba30aba8a0536492893b71ed454c62e6a6e34cff65a8a4eeb308e64 SHA512 3c29b2ef0bb8ed290c66802ffc9419f39d5ff5c4905523ee3adb7177f1159739639d5e4eb9d038fd28472c6618e68b7839b9c816da462dd24046691ebcd9796c WHIRLPOOL e66da4486fa17aa940557af75a098cd03eeaefabe2bf16d38589a37fd065c313c911f76d44b7b81054ae8460a93da323d3472139445fa67df21bb661143ba607
 DIST texstudio-2.8.8.tar.gz 25198033 SHA256 5d00c42425c0d1464438c0c1701508fef281f5dbdd0fbcebdbba9de60ac6db95 SHA512 b4f50368ac4a145ad6cb6c764d2d84ac0c3b0b08903b53390e34fb3a8d2e2c12b72cdf77cf97ea22df94a29438be6db3004f8663e04c5254ae40bf28bc2be152 WHIRLPOOL 08d4af41163ebfa85539001fe540a5f48b86e341d93983a42da03015d00460b30280f5fa08c50c90c97d7e1ed38d324efea666c6640b6bba421cffd832031e27
 DIST texstudio-2.9.4.tar.gz 25292627 SHA256 dc71590e3745ac193a640667737befd665d549e642e268eec7a8238d3b61b5ea SHA512 6fd35a6490451f9cc3292245857e66d6b0d18d2fb06e0482a8e9bbb8695923c8d3da32a6aa6b8ec591c74ccd81f797ddb958e85db26c90d0096cc678a5f14a49 WHIRLPOOL 9ca5ad727d0096bd986b39b34691167bfafe6ae44c4193fdd1f6f02bdd8c4b8b0cd4ac31af3c1c2833c1ba13f0acf814d3ba14fb0709dc3bbd5ee50729968cdf

app-shells/zsh/Manifest

@@ -4,3 +4,5 @@ DIST zsh-5.0.7-doc.tar.bz2 3005587 SHA256 43e8665ba9d9eca8370c64e2d4846e84f9111c
 DIST zsh-5.0.7.tar.bz2 3181030 SHA256 544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3 SHA512 e309863b41c9f92996fb9301d96d1aa43270ef8a04626c946703675b16a0a2ac9fddc959184cd8c639bd061fc2dd21902b21515550f639faacccdabd59e256e5 WHIRLPOOL f7cfbc41a2c990f702fee4ee158db79ebaad794479a62ff0ccd1d466077556e93b5e563575f9fd25dde1cb5e3c3610a14c997155ea76d86293d0a08168a3a418
 DIST zsh-5.0.8-doc.tar.bz2 3204865 SHA256 0ee5088c47fa5ceac6e087c7e00f2ede3f5920a03d32220772342ce980339e40 SHA512 86f75cfa16a2d0acbd75dc11d16a9bd4813ea2f0c6e323ed6fd73e66250420333fe0be2dbd62171a36aa479b5b5b423777f7ca369afb29d0f456fb7ed68926f6 WHIRLPOOL 1b25a455e7617cf624f8656eef2064e35a3c7798aec3d2822522bb89cad11441e1658966c467ecd758fa9e02ffcc235ee036830fd00757a04c3ff8e1b21fc434
 DIST zsh-5.0.8.tar.bz2 3250542 SHA256 8079cf08cb8beff22f84b56bd72bb6e6962ff4718d816f3d83a633b4c9e17d23 SHA512 79e438e32802c030749fd1bfff07fb3e5e7f7864e5106233c6f51ea477aa5a8471449e22f262f03bf69f42e66bf39e3b8a93295a247436ce97c66409b582ceae WHIRLPOOL 3ed95b2763bd3e486104a9f935efc89fd9ff1b3d745c1c3a93181a511c2986246e4f14c6d15fd88dd735c006127523ce423150813147250343871c9e2f40f413
+DIST zsh-5.1.1-doc.tar.xz 3061616 SHA256 f5944f29ec77100afdc3634f0bb8ffc4328a2d03147f23d1aa6280b6aa7d622f SHA512 868444662ca9b1cc91f2ecff56ce0944e5e75fc5f5a349eb538ca23a8eb8fb4ebaa8efc2ba1d8581424f25b0009305ed7a6f08ca06db1ecde467eeb5d6b71621 WHIRLPOOL c72760d754e19e7fe1f501bd395becc13877d4b0ba20fbf1f08855be5affb78aac07e2c14e779c1b554e21e29d8bfd5203dd41da5d3f21020dac7033510a4662
+DIST zsh-5.1.1.tar.xz 2788676 SHA256 74e9453b5470b3c0970f9f93cfd603d241c3d7b1968adc0e4b3951073e8d3dec SHA512 732f183a03125e83da11a38c638ca54a667326a23ca19418b0df27b1d5b3b1f360383d84f66bde064911effaa2ce9cbb9b6ab86deddb92f80e8f601af8a82b3e WHIRLPOOL 55199e45557c2667e8f9b7564af44b32b610fe09db451493bd64642c2987e12a638b2b96d6530a16427ba17a6ca8c20e73f88013cf47996eea24e5e1595691e7

app-shells/zsh/zsh-5.1.1.ebuild

@@ -0,0 +1,212 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
+		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
+fi
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0
+	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? (
+		>=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] )
+	)
+	gdbm? ( sys-libs/gdbm )
+"
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+if [[ ${PV} == 9999* ]] ; then
+	DEPEND+=" app-text/yodl
+		doc? (
+			sys-apps/texinfo
+			app-text/texi2html
+			virtual/latex-base
+		)"
+fi
+
+src_prepare() {
+	# fix zshall problem with soelim
+	ln -s Doc man1
+	mv Doc/zshall.1 Doc/zshall.1.soelim
+	soelim Doc/zshall.1.soelim > Doc/zshall.1
+
+	epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+
+	cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+	eprefixify "${T}"/zprofile || die
+	if use prefix ; then
+		sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
+	else
+		sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
+	fi
+
+	if [[ ${PV} == 9999* ]] ; then
+		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf=()
+
+	if use static ; then
+		myconf+=( --disable-dynamic )
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=(
+			--enable-zsh-debug
+			--enable-zsh-mem-debug
+			--enable-zsh-mem-warning
+			--enable-zsh-secure-free
+			--enable-zsh-hash-debug
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --enable-libs=-liconv )
+		append-ldflags -Wl,-x
+	fi
+
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-etcdir="${EPREFIX}"/etc/zsh \
+		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--with-tcsetpgrp \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable caps cap) \
+		$(use_enable unicode multibyte) \
+		$(use_enable gdbm ) \
+		"${myconf[@]}"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			-i "${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+	fi
+}
+
+src_compile() {
+	default
+
+	if [[ ${PV} == 9999* ]] && use doc ; then
+		emake -C Doc everything
+	fi
+}
+
+src_test() {
+	addpredict /dev/ptmx
+	local i
+	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.info
+
+	insinto /etc/zsh
+	doins "${T}"/zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	local i
+
+	# install miscellaneous scripts (bug #54520)
+	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+		-i {Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/${PV%_*}/${i}
+		doins ${i}/*
+	done
+
+	# install header files (bug #538684)
+	insinto /usr/include/zsh
+	doins config.h Src/*.epro
+	for i in Src/{zsh.mdh,*.h} ; do
+		sed -e 's@\.\./config\.h@config.h@' \
+			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+			-i "${i}"
+		doins "${i}"
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		dohtml -r Doc/*
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you want to enable Portage completions and Gentoo prompt,"
+		elog "emerge app-shells/gentoo-zsh-completions and add"
+		elog "	autoload -U compinit promptinit"
+		elog "	compinit"
+		elog "	promptinit; prompt gentoo"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Also, if you want to enable cache for the completions, add"
+		elog "	zstyle ':completion::complete:*' use-cache 1"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Note that a system zprofile startup file is installed. This will override"
+		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
+		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
+		elog "or other user startup files that are sourced after the system zprofile."
+		echo
+		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
+		elog "one method is to use a separate path-setting file that is conditionally sourced"
+		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
+		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
+		echo
+		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
+		echo
+	fi
+}

app-shells/zsh/zsh-9999.ebuild

@@ -11,8 +11,8 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2
-		doc? ( http://www.zsh.org/pub/${P}-doc.tar.bz2 )"
+	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
+		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
@@ -23,11 +23,13 @@ SLOT="0"
 IUSE="caps debug doc examples gdbm maildir pcre static unicode"
 
 RDEPEND="
-	>=sys-libs/ncurses-5.1
+	>=sys-libs/ncurses-5.1:0
 	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
 	caps? ( sys-libs/libcap )
-	pcre? ( >=dev-libs/libpcre-3.9
-		static? ( >=dev-libs/libpcre-3.9[static-libs] ) )
+	pcre? (
+		>=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] )
+	)
 	gdbm? ( sys-libs/gdbm )
 "
 DEPEND="sys-apps/groff

app-text/yodl/yodl-3.05.01.ebuild

@@ -7,7 +7,7 @@ EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="http://yodl.sourceforge.net/"
+HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"

dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild

@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CMAKE_MIN_VERSION="2.8.12"
+
+inherit cmake-multilib eutils multilib
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mysql/my_config.h
+)
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
+LICENSE="GPL-2"
+
+SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+
+SUBSLOT="18"
+SLOT="0/${SUBSLOT}"
+IUSE="+ssl static-libs"
+
+CDEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	"
+RDEPEND="${CDEPEND}
+	!dev-db/mysql[client-libs(+)]
+	!dev-db/mysql-cluster[client-libs(+)]
+	!dev-db/mariadb[client-libs(+)]
+	!dev-db/mariadb-connector-c[mysqlcompat]
+	!dev-db/mariadb-galera[client-libs(+)]
+	!dev-db/percona-server[client-libs(+)]
+	"
+DEPEND="${CDEPEND}"
+
+DOCS=( README Docs/ChangeLog )
+
+src_prepare() {
+	epatch "${FILESDIR}/openssl-cmake-detection.patch" \
+		"${FILESDIR}/conn-c-includes.patch" \
+		"${FILESDIR}/mysql_com.patch"
+	epatch_user
+}
+
+multilib_src_configure() {
+	mycmakeargs+=(
+		-DINSTALL_LAYOUT=RPM
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
+		-DWITH_DEFAULT_FEATURE_SET=OFF
+		-DENABLED_LOCAL_INFILE=ON
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_ZLIB=system
+		-DENABLE_DTRACE=OFF
+		-DWITH_SSL=$(usex ssl system bundled)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}

dev-db/virtuoso-odbc/Manifest

@@ -1,4 +0,0 @@
-DIST VOS-genpatches-6.1.6.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
-DIST VOS-genpatches-6.1.8.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
-DIST virtuoso-opensource-6.1.6.tar.gz 113255048 SHA256 c6bfa6817b3dad5f87577b68f4cf554d1bfbff48178a734084ac3dcbcea5a037 SHA512 d423e872bce8737f60a348c89e24f20de5581e7b943856df534b4c86015e50969cbe46fe0c73eb0f1a29a1a45f2d7cebca98564ab38044f1f731f661635ded55 WHIRLPOOL e44df5c484a92d3197c06fb4a3e338bbabfb49e0b087126799bfe0415cd6335dd61fa664f6b50cb4300d554b1519d70b51a1b27a3837faee2dc9df18459b68b1
-DIST virtuoso-opensource-6.1.8.tar.gz 117756529 SHA256 08d05c6165117de0370e81aa89ddab618e645b5110be301f72e6ffea7044ca50 SHA512 34812406eaa087fa200548c678de748a552a4189f6818df335d80e7680f0376c949cf1d0a2c4caddeafd0d79fac52d21b57b2150297368a7268fc3b83bc0af6b WHIRLPOOL 10bba34ee9a66fa46e3e60defbed7767df23e1bf826d8684c2cf2f7da87c05feb9798fdef85958d3ac81fb66208bed33dbd147d826ccc7b7d3b896133bc332c6

dev-db/virtuoso-odbc/files/virtuoso-odbc-6.1.6-am_config_header.patch

@@ -1,12 +0,0 @@
-+++ a/configure.in
---- b/configure.in
-@@ -36,7 +36,7 @@ 
- AC_INIT([Virtuoso Open Source Edition],
- AC_CONFIG_SRCDIR([libsrc/Dk.h])
- AC_CONFIG_AUX_DIR([binsrc/config])
- AC_CONFIG_MACRO_DIR([binsrc/config])
--AM_CONFIG_HEADER([libsrc/Dk/config.h])
-+AC_CONFIG_HEADER([libsrc/Dk/config.h])
- 
- dnl
- dnl You may need to change the next macro for older versions of automake: 

dev-db/virtuoso-odbc/metadata.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-	<maintainer>
-		<email>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<maintainer>
-		<email>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
-</pkgmetadata>

dev-db/virtuoso-odbc/virtuoso-odbc-6.1.6.ebuild

@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit virtuoso
-
-DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/openssl-0.9.7i:0
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-6.1.6-am_config_header.patch" )
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/odbcsdk
-	libsrc/util
-	binsrc/driver
-"
-
-src_configure() {
-	myconf+="
-		--disable-static
-		--without-iodbc
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	default_src_install
-
-	# Remove libtool files
-	find "${ED}" -name '*.la' -delete
-}

dev-db/virtuoso-odbc/virtuoso-odbc-6.1.8.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit virtuoso
-
-DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
-
-KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/openssl-0.9.7i:0
-"
-DEPEND="${RDEPEND}"
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/odbcsdk
-	libsrc/util
-	binsrc/driver
-"
-
-src_configure() {
-	myconf+="
-		--disable-static
-		--without-iodbc
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	default_src_install
-
-	# Remove libtool files
-	find "${ED}" -name '*.la' -delete
-}

dev-db/virtuoso-server/Manifest

@@ -1,4 +0,0 @@
-DIST VOS-genpatches-6.1.6.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
-DIST VOS-genpatches-6.1.8.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
-DIST virtuoso-opensource-6.1.6.tar.gz 113255048 SHA256 c6bfa6817b3dad5f87577b68f4cf554d1bfbff48178a734084ac3dcbcea5a037 SHA512 d423e872bce8737f60a348c89e24f20de5581e7b943856df534b4c86015e50969cbe46fe0c73eb0f1a29a1a45f2d7cebca98564ab38044f1f731f661635ded55 WHIRLPOOL e44df5c484a92d3197c06fb4a3e338bbabfb49e0b087126799bfe0415cd6335dd61fa664f6b50cb4300d554b1519d70b51a1b27a3837faee2dc9df18459b68b1
-DIST virtuoso-opensource-6.1.8.tar.gz 117756529 SHA256 08d05c6165117de0370e81aa89ddab618e645b5110be301f72e6ffea7044ca50 SHA512 34812406eaa087fa200548c678de748a552a4189f6818df335d80e7680f0376c949cf1d0a2c4caddeafd0d79fac52d21b57b2150297368a7268fc3b83bc0af6b WHIRLPOOL 10bba34ee9a66fa46e3e60defbed7767df23e1bf826d8684c2cf2f7da87c05feb9798fdef85958d3ac81fb66208bed33dbd147d826ccc7b7d3b896133bc332c6

dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch

@@ -1,36 +0,0 @@
-diff -urN virtuoso-opensource-6.1.4.orig/configure.in virtuoso-opensource-6.1.4/configure.in
---- virtuoso-opensource-6.1.4.orig/configure.in	2011-11-20 03:38:18.000000000 +0400
-+++ virtuoso-opensource-6.1.4/configure.in	2011-11-20 03:42:44.000000000 +0400
-@@ -1550,14 +1550,15 @@
- then
-     AC_CHECK_HEADER(zlib.h)
-     AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal])
-+    AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal])
- fi
- if test "x$with_zlib" = "xinternal"
- then
-     ZLIB_INC='-I$(top_srcdir)/libsrc/zlib'
-     ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la'
- else
--    ZLIB_INC=""
--    ZLIB_LIB="-lz"
-+    ZLIB_INC=`pkg-config --cflags zlib minizip`
-+    ZLIB_LIB=`pkg-config --libs zlib minizip`
- fi
- AC_SUBST(ZLIB_INC)
- AC_SUBST(ZLIB_LIB)
-diff -urN virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c
---- virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c	2011-10-26 17:54:19.000000000 +0400
-+++ virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c	2011-11-20 03:44:36.000000000 +0400
-@@ -6167,10 +6167,7 @@
- #define fopen64  fopen
- #endif
- 
--#include "zlib/contrib/minizip/unzip.h"
--#include "zlib/contrib/minizip/ioapi.h"
--#include "zlib/contrib/minizip/ioapi.c"
--#include "zlib/contrib/minizip/unzip.c"
-+#include "unzip.h"
- 
- static caddr_t
- bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)

dev-db/virtuoso-server/files/virtuoso-server-6.1.6-am_config_header.patch

@@ -1,12 +0,0 @@
-+++ a/configure.in
---- b/configure.in
-@@ -36,7 +36,7 @@ 
- AC_INIT([Virtuoso Open Source Edition],
- AC_CONFIG_SRCDIR([libsrc/Dk.h])
- AC_CONFIG_AUX_DIR([binsrc/config])
- AC_CONFIG_MACRO_DIR([binsrc/config])
--AM_CONFIG_HEADER([libsrc/Dk/config.h])
-+AC_CONFIG_HEADER([libsrc/Dk/config.h])
- 
- dnl
- dnl You may need to change the next macro for older versions of automake: 

dev-db/virtuoso-server/metadata.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-	<maintainer>
-		<email>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<maintainer>
-		<email>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
-	<longdescription>
-OpenLink Virtuoso Open-Source Edition is a new generation of hybrid data server
-product called a "Universal Server". It implements a wide range of industry
-standard APIs and protocols, covering a broad range of functionality realms
-that include: Object-Relational Data Managemtent, Virtualization of
-Heterogeneous Data Sources (SQL, XML, RDF), Document Web Server (WebDAV/HTTP),
-Data Web Server (RDF Linked Data Deployment), Web Services Platform, Discussion
-Server, and many more.
-	</longdescription>
-</pkgmetadata>

dev-db/virtuoso-server/virtuoso-server-6.1.6.ebuild

@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit virtuoso
-
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="kerberos ldap readline"
-
-# Bug 305077
-RESTRICT="test"
-
-# zeroconf support looks like broken - disabling - last checked around 5.0.12
-# mono support fetches mono source and compiles it manually - disabling for now
-# mono? ( dev-lang/mono )
-COMMON_DEPEND="
-	dev-libs/libxml2:2
-	>=dev-libs/openssl-0.9.7i:0
-	>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gperf-2.7.2
-	sys-apps/gawk
-	>=sys-devel/bison-2.3
-	>=sys-devel/flex-2.5.33
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	~dev-db/virtuoso-odbc-${PV}:${SLOT}
-"
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/Tidy
-	libsrc/Wi
-	libsrc/Xml.new
-	libsrc/langfunc
-	libsrc/odbcsdk
-	libsrc/plugin
-	libsrc/util
-	binsrc/virtuoso
-	binsrc/tests
-"
-
-DOCS=( AUTHORS ChangeLog CREDITS INSTALL NEWS README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch"
-	"${FILESDIR}/${PN}-6.1.6-am_config_header.patch"
-)
-
-src_prepare() {
-	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
-		|| die "failed to disable installation of static lib"
-
-	virtuoso_src_prepare
-}
-
-src_configure() {
-	myconf+="
-		$(use_enable kerberos krb)
-		$(use_enable ldap openldap)
-		$(use_with readline)
-		--disable-static
-		--disable-hslookup
-		--disable-rendezvous
-		--without-iodbc
-		--program-transform-name="s/isql/isql-v/"
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	default_src_install
-
-	keepdir /var/lib/virtuoso/db
-}

dev-db/virtuoso-server/virtuoso-server-6.1.8.ebuild

@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit virtuoso
-
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-
-KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="kerberos ldap readline"
-
-# Bug 305077
-RESTRICT="test"
-
-# zeroconf support looks like broken - disabling - last checked around 5.0.12
-# mono support fetches mono source and compiles it manually - disabling for now
-# mono? ( dev-lang/mono )
-COMMON_DEPEND="
-	dev-libs/libxml2:2
-	>=dev-libs/openssl-0.9.7i:0
-	>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gperf-2.7.2
-	sys-apps/gawk
-	>=sys-devel/bison-2.3
-	>=sys-devel/flex-2.5.33
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	~dev-db/virtuoso-odbc-${PV}:${SLOT}
-"
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/Tidy
-	libsrc/Wi
-	libsrc/Xml.new
-	libsrc/langfunc
-	libsrc/odbcsdk
-	libsrc/plugin
-	libsrc/util
-	binsrc/virtuoso
-	binsrc/tests
-"
-
-DOCS=( AUTHORS ChangeLog CREDITS INSTALL NEWS README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch"
-)
-
-src_prepare() {
-	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
-		|| die "failed to disable installation of static lib"
-
-	virtuoso_src_prepare
-}
-
-src_configure() {
-	myconf+="
-		$(use_enable kerberos krb)
-		$(use_enable ldap openldap)
-		$(use_with readline)
-		--disable-static
-		--disable-hslookup
-		--disable-rendezvous
-		--without-iodbc
-		--program-transform-name="s/isql/isql-v/"
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	default_src_install
-
-	keepdir /var/lib/virtuoso/db
-}

dev-haskell/nats/nats-0.1.2.ebuild

@@ -18,7 +18,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:=
+RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8

dev-haskell/nats/nats-0.1.ebuild

@@ -18,6 +18,6 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.10"

dev-haskell/nats/nats-0.2.ebuild

@@ -18,7 +18,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 IUSE="+hashable"
 
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-7.10:=
 	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
 "
 DEPEND="${RDEPEND}

dev-haskell/time-compat/time-compat-0.1.0.3.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-# ebuild generated by hackport 0.3.2.9999
+# ebuild generated by hackport 0.4.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,6 +18,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.12.1:="
+RDEPEND="dev-haskell/old-time:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
+	>=dev-haskell/cabal-1.10
+"

dev-lang/clojure/Manifest

@@ -1,2 +1,3 @@
 DIST clojure-1.5.1.tar.gz 540021 SHA256 ee6cc9360e3545a35cdd6a9ae48b5f4034ef2eb2aaa19721df976078952a805b SHA512 8bc4b7098ec11a3cd4d077f32607c5d23118d5f84b88af69b2051c4dd5b17f28f092b77206fba87e23f1163d2d0f7a2c37b1b1ffa1bcfef3ad4c8f74695d71cd WHIRLPOOL e77d13a771903100a3fe6b0ade84375217c5b150498e727a7cef2d856a4004e640e0c95717fb67be6cae1fbab7611189a1f3999726f7bbec43968eef646dcb32
 DIST clojure-1.6.0.tar.gz 579154 SHA256 70b664b24bd8cc7bf0b5519cfa5fa98424eb3e23303fec04b24a03b8bc4f0b4a SHA512 52bf54d157dae77e71e53bac421daa1bca7ef55b837600c8b04751a545cbed0f04d3718543031d1e5b8ca43e2518d356082b9f8c029c2e318996450cfaee9c81 WHIRLPOOL b79b008773ad678e6418a719183c5b240ad0629d3a32384ec6e5979f0377ba2bd39768f27b71da815342bffbd8bdfa5b66cb24e90cf4f489273b33515f591509
+DIST clojure-1.7.0.tar.gz 614331 SHA256 51a950b5b67575869a52debbafe52967759757f2e302a0bd42fb56b0e9859a74 SHA512 243d3120fa1a0f559c1f6b4724d0f7ba72e6f6dd009d0849377087e890aa04dba7c119862001d0c543eb0e35ef5c13cc8967ad494ffa9522daa9f8b1dfc77ef1 WHIRLPOOL 6c002d736968bc5af91eb2f8f593ded5ac14582aeecac67d62a9125c1911986313fece4a19e946b742292df1673b787cc1506c7ff22abe3e534e433e1403e35b

dev-lang/clojure/clojure-1.7.0.ebuild

@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
+HOMEPAGE="http://clojure.org/"
+SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 Apache-2.0 BSD"
+SLOT="1.7"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE=""
+RESTRICT="test" # patches welcome to fix the test
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S=${WORKDIR}/clojure-clojure-147f19e
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar ${P/_/-}.jar
+	java-pkg_dolauncher  ${PN}-${SLOT} --main clojure.main
+	dodoc changes.md CONTRIBUTING.md readme.txt
+}

dev-libs/shared-desktop-ontologies/Manifest

@@ -1 +0,0 @@
-DIST shared-desktop-ontologies-0.11.0.tar.bz2 3967786 SHA256 82afe6c24cf574f242c1fa85a5daff8c3631cc9b4cbcb80379dce6f364b4bbd4 SHA512 5dfaf0b28ed4ffe8beadac137decf6ce5d881353df5efeedd8f328e6ba8e7d2f02bbae920356abb4baa61388c30f50464eaac1d14b650880b35ac0aa6bd3ecce WHIRLPOOL 833b11c684e42736e029baaf1ea11beffc6517725f76304f1f44674bb0506cfcca72aacf526570c0ff4e0ba28d414ae9e5b7b32b0203b7d98bc19be543b77f16

dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-0.11.0.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]]; then
-	SCM_ECLASS="git-2"
-fi
-EGIT_REPO_URI="git://oscaf.git.sourceforge.net/gitroot/oscaf/shared-desktop-ontologies"
-inherit cmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="Shared OSCAF desktop ontologies"
-HOMEPAGE="http://sourceforge.net/projects/oscaf"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://sourceforge/oscaf/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( BSD CC-BY-SA-3.0 )"
-SLOT="0"
-IUSE=""
-
-DOCS=(AUTHORS ChangeLog README)

dev-libs/soprano/Manifest

@@ -1 +0,0 @@
-DIST soprano-2.9.4.tar.bz2 1958856 SHA256 64066fbd54e71d7ae4c8a4116997448a72808a2813cff3bb5d2c28f0fce9e0e5 SHA512 3a907d7fa564cc5641e6d620a46efb3c01f8a141fb3a1afdf72422727d968baf00268c2dce420db24de2e86d3373fdd3473eeabaa736170f76bb2672c8ad80b0 WHIRLPOOL 9d823734f3f983bbc362e13827c0144620422dcb2f54708d3ff2bbae378b2fd17abcb011d3d42c75d5e634a17afdb06fd7840b051827bd6ab030cdec79abfa93

dev-libs/soprano/files/soprano-2.4.4-make-broken-redland-fatal.cmake

@@ -1,12 +0,0 @@
-diff -ru cmake/modules/FindRedland.cmake cmake/modules/FindRedland.cmake
---- cmake/modules/FindRedland.cmake	2009-12-18 15:33:44.000000000 +0100
-+++ cmake/modules/FindRedland.cmake	2010-07-06 03:25:55.421484970 +0200
-@@ -108,7 +108,7 @@
-     if(NOT "${_TEST_EXITCODE}" EQUAL 0)
-       set(_REDLAND_VERSION_OK)
-       message(STATUS "${_OUTPUT}")
--      message(STATUS "Redland with broken NEEDED section detected, disabling")
-+      message(SEND_ERROR "Broken Redland detected, rebuild it now. If problem persists, report bug at bugs.gentoo.org.")
-     endif(NOT "${_TEST_EXITCODE}" EQUAL 0)
-   endif(_REDLAND_STORAGE_LIBS)
- 

dev-libs/soprano/metadata.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-	<use>
-		<flag name="raptor">Enables support for <pkg>media-libs/raptor</pkg> RDF parser/serializer.</flag>
-		<flag name="redland">Enables support for the <pkg>dev-libs/redland</pkg> storage backend (really slow one).</flag>
-		<flag name="virtuoso">Enables support for <pkg>dev-db/virtuoso</pkg> storage backend.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">soprano</remote-id>
-	</upstream>
-</pkgmetadata>

dev-libs/soprano/soprano-2.9.4.ebuild

@@ -1,101 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	git_eclass="git-2"
-	EGIT_REPO_URI="git://anongit.kde.org/soprano"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-inherit base cmake-utils flag-o-matic ${git_eclass}
-
-DESCRIPTION="Library that provides a nice Qt interface to RDF storage solution"
-HOMEPAGE="http://soprano.sourceforge.net"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="+dbus debug doc elibc_FreeBSD +raptor +redland test +virtuoso"
-
-RESTRICT="test"
-# bug 281712
-
-COMMON_DEPEND="
-	>=dev-qt/qtcore-4.5.0:4
-	dbus? ( >=dev-qt/qtdbus-4.5.0:4 )
-	raptor? ( >=media-libs/raptor-2.0.4:2 )
-	redland? (
-		>=dev-libs/rasqal-0.9.26
-		>=dev-libs/redland-1.0.14
-	)
-	virtuoso? ( dev-db/libiodbc:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-qt/qttest-4.5.0:4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	virtuoso? ( >=dev-db/virtuoso-server-6.1.6 )
-"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
-)
-
-pkg_setup() {
-	if [[ ${PV} = *9999* && -z $I_KNOW_WHAT_I_AM_DOING ]]; then
-		echo
-		ewarn "WARNING! This is an experimental ebuild of ${PN} Git tree. Use at your own risk."
-		ewarn "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
-		echo
-	fi
-
-	if ! use virtuoso; then
-		echo
-		ewarn "You have explicitly disabled the default soprano backend."
-		ewarn "Applications using soprano may need at least one backend"
-		ewarn "to be functional. If you experience any problems, enable"
-		ewarn "the virtuoso USE flag."
-		echo
-	fi
-}
-
-src_configure() {
-	# Fix for missing pthread.h linking
-	# NOTE: temporarily fix until a better cmake files patch will be provided.
-	use elibc_FreeBSD && append-flags -pthread
-
-	local mycmakeargs=(
-		-DSOPRANO_BUILD_TESTS=OFF
-		-DCMAKE_SKIP_RPATH=OFF
-		-DSOPRANO_DISABLE_SESAME2_BACKEND=ON
-		-DSOPRANO_DISABLE_CLUCENE_INDEX=ON
-		$(cmake-utils_use !dbus SOPRANO_DISABLE_DBUS)
-		$(cmake-utils_use !raptor SOPRANO_DISABLE_RAPTOR_PARSER)
-		$(cmake-utils_use !redland SOPRANO_DISABLE_RAPTOR_SERIALIZER)
-		$(cmake-utils_use !redland SOPRANO_DISABLE_REDLAND_BACKEND)
-		$(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
-		$(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
-		$(cmake-utils_use test SOPRANO_BUILD_TESTS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc AUTHORS ChangeLog README TODO
-	newdoc backends/virtuoso/README README.virtuoso
-	newdoc backends/sesame2/README README.sesame2
-	if use doc ; then
-		dohtml -r docs/html/
-	fi
-}

dev-python/catkin_pkg/Manifest

@@ -0,0 +1 @@
+DIST catkin_pkg-0.2.10.tar.gz 44290 SHA256 df4a5e81dbcb42530cb7ccb4007e352f00ee4059de801f868e79949151e96403 SHA512 fe3fb8297319d410c4aa3f86c52ede5eabae4f51e70181b7ee2c6c4db9a576466d9d39970d410c95dd24900c6d9287cf64185aa267891bdb884b37d397807f7e WHIRLPOOL eac3196a9b00938eedb64710683951a3ca7d1d61110aeea5f82b3a863055e25861a8c61b89617d26a68f42a2573630c63e91423bff0e11c86b4f07076090d418

dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild

@@ -0,0 +1,51 @@
+# 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="
+		http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+		"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
+
+python_test() {
+	nosetests -s --tests test || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Avoid recursing in the whole hierarchy
+	dodir /usr/
+	touch "${ED}/usr/CATKIN_IGNORE"
+}

dev-python/catkin_pkg/catkin_pkg-9999.ebuild

@@ -0,0 +1,51 @@
+# 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="
+		http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+		"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
+
+python_test() {
+	nosetests -s --tests test || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Avoid recursing in the whole hierarchy
+	dodir /usr/
+	touch "${ED}/usr/CATKIN_IGNORE"
+}

dev-python/catkin_pkg/files/catkin_prefix.patch

@@ -0,0 +1,28 @@
+Allow CATKIN_PREFIX_PATH to work as CMAKE_PREFIX_PATH:
+When building with SYSROOT!=/, CMAKE_PREFIX_PATH is the same as with SYSROOT=/
+but we need to find packages in SYSROOT.
+
+Index: catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
+===================================================================
+--- catkin_pkg-0.2.8.orig/src/catkin_pkg/workspaces.py
++++ catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
+@@ -42,15 +42,16 @@ CATKIN_WORKSPACE_MARKER_FILE = '.catkin_
+ 
+ def get_spaces(paths=None):
+     """
+-    Return a list of spaces based on the CMAKE_PREFIX_PATH or passed in list of workspaces.
++    Return a list of spaces based on the CMAKE_PREFIX_PATH/CATKIN_PREFIX_PATH or passed in list of workspaces.
+     It resolves the source space for each devel space and ignores non-catkin paths.
+     :param paths_to_order: list of paths
+     :param prefix_paths: list of prefixes, must not end with '/'
+     """
+     if paths is None:
+-        if 'CMAKE_PREFIX_PATH' not in os.environ:
+-            raise RuntimeError('Neither the environment variable CMAKE_PREFIX_PATH is set nor was a list of paths passed.')
++        if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ :
++            raise RuntimeError('None of the environment variables CMAKE_PREFIX_PATH or CATKIN_PREFIX_PATH are set nor was a list of paths passed.')
+         paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ['CMAKE_PREFIX_PATH'] else []
++        paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if os.environ['CATKIN_PREFIX_PATH'] else []
+ 
+     spaces = []
+     for path in paths:

dev-python/catkin_pkg/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<herd>ros</herd>
 </pkgmetadata>

dev-python/django-grappelli/Manifest

@@ -0,0 +1 @@
+DIST django-grappelli-2.7.1.tar.gz 1971448 SHA256 81a5dc24fd8e540d5acdb3cfecb44b6787bce328a0e9bd9581b77f7821d256cb SHA512 18afdb0c06360fda2fadb8af7918eb9a18372c964ac14a0faf350424fcd5f945a409adbf972d93ff7d7e89a3c6cda95f9d5e658b5980531e00363655ab2e07be WHIRLPOOL 377240b4fa4af8e9f700bfb6d52939cb4f273a4482b2a13678599d1ebc035a9a3505945a33d3e143949a99ad6f30e38d9a54c0daf4dea6255d606c85a9c755f4

dev-python/django-grappelli/django-grappelli-2.7.1.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A jazzy skin for the Django Admin-Interface"
+HOMEPAGE="
+	https://pypi.python.org/pypi/django-grappelli
+	https://django-grappelli.readthedocs.org
+	https://github.com/sehmaschine/django-grappelli"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""

dev-python/django-grappelli/metadata.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<upstream>
-		<remote-id type="sourceforge">oscaf</remote-id>
-	</upstream>
+	<herd>python</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
 </pkgmetadata>

dev-python/rosdistro/Manifest

@@ -0,0 +1 @@
+DIST rosdistro-0.4.2.tar.gz 50857 SHA256 3d5bf062bd0ecbfef272456f1862a6bb7a4100d8f2ac9b4ce7792dbdcfed7a84 SHA512 24dd08a959918fa44faa465acd22bd8d157b792391a2701ee40997028ea90dd13848f72abf1098930cd4e7b8a162cea1ab28ceb0d82df74167c85c0ef014ad65 WHIRLPOOL 8207d60268282d9075655ec3676179b1e6a7d8b1ee571c5df90d4680f54c345175788d7abbf3c2b78504c491a7453193490574f8e68ca2bdba270b5db8983e2b

dev-python/rosdistro/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<herd>ros</herd>
 </pkgmetadata>

dev-python/rosdistro/rosdistro-0.4.2.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2014 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Tools to work with catkinized rosdistro files"
+HOMEPAGE="http://wiki.ros.org/rosdistro"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}

dev-python/rosdistro/rosdistro-9999.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2014 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Tools to work with catkinized rosdistro files"
+HOMEPAGE="http://wiki.ros.org/rosdistro"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}

dev-python/rospkg/Manifest

@@ -0,0 +1 @@
+DIST rospkg-1.0.35.tar.gz 88589 SHA256 9ce13cb1d0f470f24cdb7f665d53948fcd0db19be7c8946ad998cbcf3998da30 SHA512 01e59dc3eb8290af661dc54902da950649a81b3caa0b65ad7dba18c0c6d0ba1ed08bec802edbced49f65515f20f1b8db719bfb576eb38c87982386aac22a2e31 WHIRLPOOL 20ebafd588c6cf8598d155cdd6ec76a9f1b7ce1bb9f1a545159a75d4fe5c3621005ea5abb5b15080716439bdec91a943855a564014eee295999126caed5c34e3

dev-python/rospkg/files/norecurse.patch

@@ -0,0 +1,64 @@
+commit c2e06e0ea0b4a1cbb67049ab77a80f53646fb0b2
+Author: Alexis Ballier <aballier@gentoo.org>
+Date:   Tue Dec 23 12:27:19 2014 +0100
+
+    Add support for rospack_norecurse to avoid recursing into all subdirectories when looking for a package.
+    
+    I am installing ros into /usr, hence this searches in /usr/share. I have a lot of directories, not ROS related, into /usr/share (e.g. a full TeX Live install), and I get these timings:
+    
+    Without rospack_norecurse in /usr/share:
+    $ time rosversion rospack
+    2.2.5
+    
+    real    0m2.861s
+    user    0m1.588s
+    sys     0m1.267s
+    
+    With rospack_norecurse in /usr/share:
+    $ time rosversion rospack
+    2.2.5
+    
+    real    0m0.135s
+    user    0m0.100s
+    sys     0m0.034s
+    
+    This is on a desktop with a SSD drive. On an arm board, with much less packages in /usr/share but way much slower I/O I remember hitting the 10 seconds timeout for roscore to start.
+
+diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
+index e55acec..7ed98de 100644
+--- a/src/rospkg/rospack.py
++++ b/src/rospkg/rospack.py
+@@ -42,7 +42,7 @@ from .stack import parse_stack_file, InvalidStack
+ _cache_lock = Lock()
+ 
+ 
+-def list_by_path(manifest_name, path, cache):
++def list_by_path(manifest_name, path, cache, recurse=True):
+     """
+     List ROS stacks or packages within the specified path.
+ 
+@@ -53,6 +53,7 @@ def list_by_path(manifest_name, path, cache):
+     :param manifest_name: MANIFEST_FILE or STACK_FILE, ``str``
+     :param path: path to list resources in, ``str``
+     :param cache: path cache to update. Maps resource name to directory path, ``{str: str}``
++    :param recurse: search recursively in subdirectories ``bool``
+     :returns: complete list of resources in ROS environment, ``[str]``
+     """
+     resources = []
+@@ -89,9 +90,15 @@ def list_by_path(manifest_name, path, cache):
+             # optimization for stacks.
+             del dirs[:]
+             continue #leaf     
+-        elif 'rospack_nosubdirs' in files:
++        elif 'rospack_nosubdirs' in files or not recurse:
+             del dirs[:]
+             continue  #leaf
++        elif 'rospack_norecurse' in files:
++            for sd in dirs:
++                spath = os.path.join(d, sd)
++                resources += list_by_path(manifest_name, spath, cache, False)
++            del dirs[:]
++            continue
+         # remove hidden dirs (esp. .svn/.git)
+         [dirs.remove(di) for di in dirs if di[0] == '.']
+     return resources

dev-python/rospkg/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+<herd>ros</herd>
 </pkgmetadata>

dev-python/rospkg/rospkg-1.0.35.ebuild

@@ -0,0 +1,56 @@
+# Copyright 1999-2014 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=(
+	"${FILESDIR}/norecurse.patch"
+)
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid recursing into /usr/share when looking for packages.
+	dodir /usr/share
+	touch "${ED}/usr/share/rospack_norecurse"
+}

dev-python/rospkg/rospkg-9999.ebuild

@@ -0,0 +1,56 @@
+# Copyright 1999-2014 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=(
+	"${FILESDIR}/norecurse.patch"
+)
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid recursing into /usr/share when looking for packages.
+	dodir /usr/share
+	touch "${ED}/usr/share/rospack_norecurse"
+}

dev-python/vcstools/Manifest

@@ -0,0 +1 @@
+DIST vcstools-0.1.37.tar.gz 54213 SHA256 8d66379c5e5772a42b9680c9120a718bdc904745be22096d1f2bd5934cd625fc SHA512 c2992fd9977dd5cb0090319b828add26f60769bb7649d873e8edcac45c23a913667cde31f7ab658d5ce7de82930a5eb0ea9083994ea93b6ee9433966e70ee7b2 WHIRLPOOL aea89a863217ad09e2d183aa04f5c5173f6e7330ff2bfa1e713ab910f3ad0017e95fbf69c1cd94c10e20b7baa5974ad40fe9efda546860ef2a35f100808eb09e

dev-python/vcstools/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+<herd>ros</herd>
 </pkgmetadata>

dev-python/vcstools/vcstools-0.1.37.ebuild

@@ -0,0 +1,59 @@
+# Copyright 1999-2014 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Python library for interacting with various VCS systems"
+HOMEPAGE="http://wiki.ros.org/vcstools"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	#git config --global user.email "you@example.com"
+	#git config --global user.name "Your Name"
+
+	nosetests --with-coverage --cover-package vcstools || die
+}

dev-python/vcstools/vcstools-9999.ebuild

@@ -0,0 +1,59 @@
+# Copyright 1999-2014 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Python library for interacting with various VCS systems"
+HOMEPAGE="http://wiki.ros.org/vcstools"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	#git config --global user.email "you@example.com"
+	#git config --global user.name "Your Name"
+
+	nosetests --with-coverage --cover-package vcstools || die
+}

dev-ruby/sprockets/Manifest

@@ -3,3 +3,4 @@ DIST sprockets-2.12.3-git.tgz 195647 SHA256 998ed806114a50b9168ad569c67d037fa866
 DIST sprockets-2.2.3-git.tgz 185139 SHA256 d8d8c59a4f129357f5d9093db02d8e5df0b2df7aaeee23fc6c5864fdbc29997c SHA512 6850423efbb8521e4f4980e30e1464821be148474b511aca05478078b2601cf569a244cddeb9f164ba759d4207dcc2605c89b4b5b45431ebbee26b56f07b5e01 WHIRLPOOL 5b8eb85651975429c994e3e741d31a7989b031d51c4d9fb3d2a70da700a9187e888e100965b4f034f13d38d9066cb48a8c201841d2d639398c1c4f7c0dc1985e
 DIST sprockets-3.1.0-git.tgz 290551 SHA256 b49a8f300adb526f9e1fa65e5e648e113885e820f33a63a004afaf3d37e9ea90 SHA512 e74e7ac1e29d92dc6ef064e103c7b2af3cf202ef2bfd5c8ec4215d2ae60cf1283cb53ba2496d1aabae87497dd372a0caf67b8a9be261d9d44b0df35735aaf6ca WHIRLPOOL 28de9f6ffefb959eac4bb845b252e3b138d6e1b6a63b550c8af83d1be9392d2d727d23e243214a92bce5bb118f7f366ad9d5156d21c57b986a93b83fb077d707
 DIST sprockets-3.2.0-git.tgz 290551 SHA256 231cde13cc79f548d72eb53aef52515aff885461fde6c98281133f973c3fccd8 SHA512 c146ce41518d86754f60478b4501df4fef8f77d3f6210637d460d8d7aad182908d5eea5f6677aac32dab6bf2ced0078d5cb9d00b5a4a51252c1c079041254a3e WHIRLPOOL 79bd194a44475afd8ecafd37179eb6d0fe99d05c4ceb55c7e0b6f3cc558309284c4c030bdc897f8e1f575900abaab42f8e4162cbc3318cdd9153cf61cf40654f
+DIST sprockets-3.3.4-git.tgz 297110 SHA256 b8059ed5be77a7a9f8aefbf4aef873851e6fd198af454b20f05986e83dd7dff1 SHA512 907e0d24532c37e3085304c13b633467cf2793a2b2b899e270f1022cbcbde3c9979d4bdff6bd20560758c76c214e45b8b174f5992ff767ad499807d9c71721ff WHIRLPOOL 77d97c9e028c136d9b26d17c88b0a8c3bab21c60a9e474710248e5540de4db374434539a82146766704c0dbe79d4270c559d94aee2713889cb4b2cd2eed48ee2

dev-ruby/sprockets/sprockets-3.3.4.ebuild

@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Ruby library for compiling and serving web assets"
+HOMEPAGE="https://github.com/rails/sprockets"
+SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+ruby_add_rdepend "
+	=dev-ruby/rack-1*:*
+	!!<dev-ruby/sprockets-2.12.3-r1:2"
+
+ruby_add_bdepend "test? (
+		dev-ruby/json
+		dev-ruby/rack-test
+		=dev-ruby/coffee-script-2*
+		=dev-ruby/execjs-2*
+		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
+		dev-ruby/uglifier
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for template types that we currently don't package:
+	# eco and ejs.
+	sed -i -e '/eco templates/,/end/ s:^:#:' \
+		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
+	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
+}
+
+each_ruby_test() {
+	# Make sure we have completely separate copies. Hardlinks won't work
+	# for this test suite.
+	cp -R test test-new || die
+	rm -rf test || die
+	mv test-new test || die
+
+	each_fakegem_test
+}

dev-util/catkin/Manifest

@@ -0,0 +1 @@
+DIST catkin-0.6.14.tar.gz 197628 SHA256 0ca265803be8a2c1b6036d67ed63505551f4bbc02fa6cb8180dc3167b9f3afc9 SHA512 e2aec7bfbef0f103d96c71408917823cd80e205c021bcd78c018eb2aaaabff04bc268f661ada52963929726e0a986115cbe2c4d791cfa4542a20f7841cd74372 WHIRLPOOL 18a4173b5536da3ec6f7395c39f382b03d173e878b81ffef7d224d2828d6930099a74e08a6299b09a68bd56de87e4be225a735cc8a423b8a0b810cd92b1a5e1d

dev-util/catkin/catkin-0.6.14.ebuild

@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/empy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/distutils.patch"
+	"${FILESDIR}/catkin_prefix_path.patch"
+)
+
+src_prepare() {
+	# fix libdir
+	sed -i \
+		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+		cmake/*.cmake || die
+	cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+	mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+		)
+	python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	unset PYTHON_SCRIPTDIR
+	python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_install
+	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+		dodir /usr/bin
+		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+		done
+		touch "${T}/.catkin_python_symlinks_generated"
+	fi
+}
+
+src_install() {
+	python_foreach_impl catkin_src_install_internal
+	# needed to be considered as a workspace
+	touch "${ED}/usr/.catkin"
+}

dev-util/catkin/catkin-9999.ebuild

@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/empy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/distutils.patch"
+	"${FILESDIR}/catkin_prefix_path.patch"
+)
+
+src_prepare() {
+	# fix libdir
+	sed -i \
+		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+		cmake/*.cmake || die
+	cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+	mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+		)
+	python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	unset PYTHON_SCRIPTDIR
+	python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_install
+	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+		dodir /usr/bin
+		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+		done
+		touch "${T}/.catkin_python_symlinks_generated"
+	fi
+}
+
+src_install() {
+	python_foreach_impl catkin_src_install_internal
+	# needed to be considered as a workspace
+	touch "${ED}/usr/.catkin"
+}

dev-util/catkin/files/catkin_prefix_path.patch

@@ -0,0 +1,55 @@
+Allow CATKIN_PREFIX_PATH to override/complement CMAKE_PREFIX_PATH.
+This serves two goals: when SYSROOT!=/, CMAKE_PREFIX_PATH is the same as when
+SYSROOT=/ but we need to find packages in SYSROOT/CMAKE_PREFIX_PATH.
+
+Moreover, this allows to set CATKIN_PREFIX_PATH in global environment so that
+ROS packages are properly configured without needed to source a shellrc file in
+every shell session. This can't be done with CMAKE_PREFIX_PATH which is way too
+generic.
+
+Index: catkin-0.6.9/cmake/all.cmake
+===================================================================
+--- catkin-0.6.9.orig/cmake/all.cmake
++++ catkin-0.6.9/cmake/all.cmake
+@@ -52,7 +52,11 @@ set(CMAKE_PREFIX_PATH_AS_IS ${CMAKE_PREF
+ 
+ # list of unique catkin workspaces based on CMAKE_PREFIX_PATH
+ set(CATKIN_WORKSPACES "")
+-foreach(path ${CMAKE_PREFIX_PATH})
++if(NOT DEFINED CATKIN_PREFIX_PATH)
++  set(CATKIN_PREFIX_PATH ${CMAKE_PREFIX_PATH})
++endif()
++
++foreach(path ${CATKIN_PREFIX_PATH})
+   if(EXISTS "${path}/.catkin")
+     list(FIND CATKIN_WORKSPACES ${path} _index)
+     if(_index EQUAL -1)
+Index: catkin-0.6.11/python/catkin/workspace.py
+===================================================================
+--- catkin-0.6.11.orig/python/catkin/workspace.py
++++ catkin-0.6.11/python/catkin/workspace.py
+@@ -44,7 +44,7 @@ def get_workspaces():
+     """
+     # get all cmake prefix paths
+     env_name = 'CMAKE_PREFIX_PATH'
+-    paths = [path for path in os.environ.get(env_name, '').split(os.pathsep) if path]
++    paths = [path for path in os.environ.get(env_name, '').split(os.pathsep) + os.environ.get('CATKIN_PREFIX_PATH', '').split(os.pathsep) if path]
+     # remove non-workspace paths
+     workspaces = [path for path in paths if os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))]
+     return workspaces
+Index: catkin-0.6.9/cmake/catkinConfig.cmake.in
+===================================================================
+--- catkin-0.6.9.orig/cmake/catkinConfig.cmake.in
++++ catkin-0.6.9/cmake/catkinConfig.cmake.in
+@@ -64,6 +64,11 @@ if(catkin_FIND_COMPONENTS)
+ 
+       # get search paths from CMAKE_PREFIX_PATH (which includes devel space)
+       set(paths "")
++      foreach(path ${CATKIN_PREFIX_PATH})
++        if(IS_DIRECTORY ${path}/share/${component}/cmake)
++          list(APPEND paths ${path}/share/${component}/cmake)
++        endif()
++      endforeach()
+       foreach(path ${CMAKE_PREFIX_PATH})
+         if(IS_DIRECTORY ${path}/share/${component}/cmake)
+           list(APPEND paths ${path}/share/${component}/cmake)

dev-util/catkin/files/distutils.patch

@@ -0,0 +1,13 @@
+Allow to install scripts in PYTHON_SCRIPTDIR.
+Needed for Gentoo multi-python support.
+
+Index: catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
+===================================================================
+--- catkin-0.6.11.orig/cmake/templates/python_distutils_install.sh.in
++++ catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
+@@ -25,4 +25,4 @@ cd "@INSTALL_CMD_WORKING_DIRECTORY@"
+     build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
+     install \
+     $DESTDIR_ARG \
+-    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@"
++    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"

dev-util/catkin/files/tests.patch

@@ -0,0 +1,40 @@
+Fix tests.
+Allow them to run even with CATKIN_BUILD_BINARY_PACKAGE set.
+
+Index: catkin-0.6.9/cmake/test/tests.cmake
+===================================================================
+--- catkin-0.6.9.orig/cmake/test/tests.cmake
++++ catkin-0.6.9/cmake/test/tests.cmake
+@@ -40,9 +40,6 @@ if(DEFINED CATKIN_ENABLE_TESTING AND NOT
+   return()
+ endif()
+ 
+-# do not enable ctest's on the farm, since they are automatically executed by the current rules files
+-# and since the tests have not been build rostests would hang forever
+-if(NOT CATKIN_BUILD_BINARY_PACKAGE)
+   # do not enable ctest's for dry packages, since they have a custom test target which must not be overwritten
+   if(NOT ROSBUILD_init_called)
+     message(STATUS "Call enable_testing()")
+@@ -50,9 +47,6 @@ if(NOT CATKIN_BUILD_BINARY_PACKAGE)
+   else()
+     message(STATUS "Skip enable_testing() for dry packages")
+   endif()
+-else()
+-  message(STATUS "Skip enable_testing() when building binary package")
+-endif()
+ 
+ # allow overriding CATKIN_TEST_RESULTS_DIR when explicitly passed to CMake as a command line argument
+ if(DEFINED CATKIN_TEST_RESULTS_DIR)
+Index: catkin-9999/test/utils.py
+===================================================================
+--- catkin-9999.orig/test/utils.py
++++ catkin-9999/test/utils.py
+@@ -189,6 +189,8 @@ class AbstractCatkinWorkspaceTest(unitte
+                 prefix_path = self.installdir
+             args += ["-DCMAKE_PREFIX_PATH=%s" % (prefix_path)]
+ 
++        args += ["-DCMAKE_INSTALL_LIBDIR=lib"]
++
+         if not os.path.isdir(this_builddir):
+             os.makedirs(this_builddir)
+         cmd = ["cmake", this_srcdir] + args

dev-util/catkin/metadata.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>

dev-util/icmake/icmake-7.22.01.ebuild

@@ -7,7 +7,7 @@ EAPI=5
 inherit multilib toolchain-funcs eutils
 
 DESCRIPTION="Hybrid between a make utility and a shell scripting language"
-HOMEPAGE="http://icmake.sourceforge.net/"
+HOMEPAGE="https://fbb-git.github.io/icmake/ https://github.com/fbb-git/icmake"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"

dev-util/nvidia-cuda-sdk/Manifest

@@ -1,8 +1,3 @@
-DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f9ddb677bc8cc898ec38990b8226778d SHA512 e2e4fbc78c2e6373b3f81778d8044b299429459e8e27632e86c0d97e6fe7f4db7cd5652044beb0ce7ee3c7abaa7dcec7d85639a2de4b9cc213ab52a2d204aa6b WHIRLPOOL e5df7de03aaec8488a7fa093e272d64b5d3adaedca1458c550d4ae9c6bf2a0ead71496c8a0c9aac966500aa01401e95cc57a951e3a2554e8d823b97c10336850
-DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
 DIST cuda_6.5.14_linux_32.run 76788277 SHA256 63fa1fe5d013e9944d6c1a3a71768fa4dcb35d6a157c1b06765bb56198c205c5 SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc WHIRLPOOL c1094dd84883ef08d91c6eec3634a285496418db1e76b70f449f833dcb01069a620af504b6df7fe2752559688ed1f60f4adda8c97d849d648cba1be0f8196954
 DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
-DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c4c9c09b5da1bc09fe49e0f804bc7a6 SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e WHIRLPOOL ac94b4e7f29811b4240623fb69b3c54214e7f0c60a286d899944dbab9da7fd3c122760199a3357667e33879bd48fbf352d5d39029acca6021e7caf21785557ed
-DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
-DIST cuda_7.0.28_linux.run 1118797679 SHA256 d1292e9c2bbaddad24c46e0b0d15a7130831bfac0382f7159321f41ae385a5ce SHA512 f002433133e40000cbb78283e08c25f7397612957c0440605311f8921bcebd54a808069ca36b218be66a054e8afab4871b2bf1bd4d419c6f98a0d74b00a9bc78 WHIRLPOOL dcf21d2e356a1797b9e79ac9edfb3924a1d4a2914382dbe21b2172c200dd4f7d93905ac44fbc2e994ce14b7ab28e78163f4c81ddcc6cbb97e4ce085efd2d8475
 DIST cuda_7.5.18_linux.run 1195431560 SHA256 245ffb6c1e2b69d323f8ae3a1b63d3384fec3934222e56e9d801ecc0d6e919c5 SHA512 cb933512fde09376b1d6040c72d24c4f91dc44f73322ca87aa7d1f34156c9c87feea41f9a00f1a403cfb89645b5e7a6a5f2bfe4933703ba81f0cf94968d430fd WHIRLPOOL b1a06acba02043fabf496ba683fb984b1c90df2cd71396457f664beb8cb26b2e3074c8568ec6ce0cfe565721986670c7a40351a29a4856a7e03268c14d545247

dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.02.0807.1535-make_cpp_fix.patch

@@ -1,111 +0,0 @@
-diff -Naurp sdk/common/inc/cmd_arg_reader.h sdk-fixed/common/inc/cmd_arg_reader.h
---- sdk/common/inc/cmd_arg_reader.h	2008-09-02 22:17:26.000000000 +0200
-+++ sdk-fixed/common/inc/cmd_arg_reader.h	2008-10-15 22:10:45.000000000 +0200
-@@ -37,6 +37,7 @@
- #include <iostream>
- #include <sstream>
- #include <algorithm>
-+#include <typeinfo>
- 
- // includes, project
- #include <exception.h>
-diff -Naurp sdk/common/inc/exception.h sdk-fixed/common/inc/exception.h
---- sdk/common/inc/exception.h	2008-09-02 22:17:26.000000000 +0200
-+++ sdk-fixed/common/inc/exception.h	2008-10-15 23:57:46.000000000 +0200
-@@ -32,6 +32,7 @@
- #define _EXCEPTION_H_
- 
- // includes, system
-+#include <cstdlib>
- #include <exception>
- #include <stdexcept>
- #include <iostream>
-diff -Naurp sdk/common/src/cmd_arg_reader.cpp sdk-fixed/common/src/cmd_arg_reader.cpp
---- sdk/common/src/cmd_arg_reader.cpp	2008-09-02 22:17:26.000000000 +0200
-+++ sdk-fixed/common/src/cmd_arg_reader.cpp	2008-10-15 22:10:23.000000000 +0200
-@@ -35,6 +35,8 @@
- // includes, system
- #include <vector>
- 
-+#include <typeinfo>
-+
- // internal unnamed namespace
- 
- namespace 
-diff -Naurp sdk/common/src/cutil.cpp sdk-fixed/common/src/cutil.cpp
---- sdk/common/src/cutil.cpp	2008-09-02 22:17:26.000000000 +0200
-+++ sdk-fixed/common/src/cutil.cpp	2008-10-15 23:56:15.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <cutil.h>
- 
- // includes, system
-+#include <cstring>
- #include <fstream>
- #include <vector>
- #include <iostream>
-diff -Naurp sdk/common/src/paramgl.cpp sdk-fixed/common/src/paramgl.cpp
---- sdk/common/src/paramgl.cpp	2008-09-02 22:17:26.000000000 +0200
-+++ sdk-fixed/common/src/paramgl.cpp	2008-10-15 23:58:10.000000000 +0200
-@@ -4,6 +4,7 @@
-     sgg 8/2001
- */
- 
-+#include <cstring>
- #include <param.h>
- #include <paramgl.h>
- 
-diff -Naurp sdk/Makefile sdk-fixed/Makefile
---- sdk/Makefile	2008-09-02 22:17:26.000000000 +0200
-+++ sdk-fixed/Makefile	2008-10-16 13:42:42.000000000 +0200
-@@ -2,32 +2,32 @@
- PROJECTS := $(shell find projects -name Makefile)
- 
- %.ph_build : lib/libcutil.so lib/libparamgl.so lib/librendercheckgl.so
--	make -C $(dir $*) $(MAKECMDGOALS)
-+	$(MAKE) -C $(dir $*) $(MAKECMDGOALS)
- 
- %.ph_clean : 
--	make -C $(dir $*) clean $(USE_DEVICE)
-+	$(MAKE) -C $(dir $*) clean $(USE_DEVICE)
- 
- %.ph_clobber :
--	make -C $(dir $*) clobber $(USE_DEVICE)
-+	$(MAKE) -C $(dir $*) clobber $(USE_DEVICE)
- 
- all:  $(addsuffix .ph_build,$(PROJECTS))
- 	@echo "Finished building all"
- 
- lib/libcutil.so:
--	@make -C common
-+	@$(MAKE) -C common
- 
- lib/libparamgl.so:
--	@make -C common -f Makefile_paramgl
-+	@$(MAKE) -C common -f Makefile_paramgl
- 
- lib/librendercheckgl.so:
--	@make -C common -f Makefile_rendercheckgl
-+	@$(MAKE) -C common -f Makefile_rendercheckgl
- 
- tidy:
- 	@find | egrep "#" | xargs rm -f
- 	@find | egrep "\~" | xargs rm -f
- 
- clean: tidy $(addsuffix .ph_clean,$(PROJECTS))
--	@make -C common clean
-+	@$(MAKE) -C common clean
- 
- clobber: clean $(addsuffix .ph_clobber,$(PROJECTS))
--	@make -C common clobber
-+	@$(MAKE) -C common clobber
-diff -Naurp sdk/projects/cppIntegration/main.cpp sdk-fixed/projects/cppIntegration/main.cpp
---- sdk/projects/cppIntegration/main.cpp	2008-09-02 22:17:33.000000000 +0200
-+++ sdk-fixed/projects/cppIntegration/main.cpp	2008-10-15 23:59:14.000000000 +0200
-@@ -41,6 +41,7 @@
- 
- // includes, system
- #include <iostream>
-+#include <cstdlib>
- 
- // Required to include CUDA vector types
- #include <vector_types.h>

dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch

@@ -1,21 +0,0 @@
-diff -Naurp cuda-orig/sdk/common/common.mk cuda/sdk/common/common.mk
---- cuda-orig/sdk/common/common.mk	2009-03-22 10:59:39.000000000 +0100
-+++ cuda/sdk/common/common.mk	2009-03-22 11:31:55.000000000 +0100
-@@ -100,6 +99,8 @@ NVCCFLAGS := 
- CXXFLAGS  := $(CXXWARN_FLAGS)
- CFLAGS    := $(CWARN_FLAGS)
- 
-+NVCCFLAGS += -include=vararg-fix.h
-+
- # Common flags
- COMMONFLAGS += $(INCLUDES) -DUNIX
- 
-diff -Naurp cuda-orig/sdk/common/inc/vararg-fix.h cuda/sdk/common/inc/vararg-fix.h
---- cuda-orig/sdk/common/inc/vararg-fix.h	1970-01-01 01:00:00.000000000 +0100
-+++ cuda/sdk/common/inc/vararg-fix.h	2009-03-22 11:17:11.000000000 +0100
-@@ -0,0 +1,5 @@
-+#ifndef __CUDA_VARARG_FIX
-+#define __CUDA_VARARG_FIX
-+// HACK: avoid compilation errors with GCC 4.3.3+
-+int __builtin_va_arg_pack();
-+#endif

dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch

@@ -1,89 +0,0 @@
---- a/sdk/C/common/common.mk
-+++ b/sdk/C/common/common.mk
-@@ -268,18 +268,18 @@ endif
- 
- # If dynamically linking to CUDA and CUDART, we exclude the libraries from the LIB
- ifeq ($(USECUDADYNLIB),1)
--     LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} -ldl -rdynamic 
-+     LIB += $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} -ldl -rdynamic 
- else
- # static linking, we will statically link against CUDA and CUDART
-   ifeq ($(USEDRVAPI),1)
--     LIB += -lcuda   ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} 
-+     LIB += -lcuda $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} 
-   else
-      ifeq ($(emu),1) 
-          LIB += -lcudartemu
-      else 
-          LIB += -lcudart
-      endif
--     LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB}
-+     LIB += $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB}
-   endif
- endif
- 
---- a/sdk/CUDALibraries/common/common_cudalib.mk
-+++ b/sdk/CUDALibraries/common/common_cudalib.mk
-@@ -253,7 +253,7 @@ ifeq ($(USEPARAMGL),1)
- endif
- 
- ifeq ($(USERENDERCHECKGL),1)
--	RENDERCHECKGLLIB := -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX)
-+	RENDERCHECKGLLIB := -L../../../C/lib -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX)
- endif
- 
- ifeq ($(USENVCUVID), 1)
---- a/sdk/CUDALibraries/src/boxFilterNPP/Makefile
-+++ b/sdk/CUDALibraries/src/boxFilterNPP/Makefile
-@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk
- # Targets
- ################################################################################
- all:
--	$(CXX) $(INC) $(LIB) -o boxFilterNPP boxFilterNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH)
-+	$(CXX) $(INC) -o boxFilterNPP boxFilterNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB)
- 	mkdir -p ../../bin
- 	mkdir -p ../../bin/$(OSLOWER)/
- 	mkdir -p ../../bin/$(OSLOWER)/debug
---- a/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile
-+++ b/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile
-@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk
- # Targets
- ################################################################################
- all:
--	$(CXX) $(INC) $(LIB) -o freeImageInteropNPP freeImageInteropNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH)
-+	$(CXX) $(INC) -o freeImageInteropNPP freeImageInteropNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB)
- 	mkdir -p ../../bin
- 	mkdir -p ../../bin/$(OSLOWER)
- 	mkdir -p ../../bin/$(OSLOWER)/release
---- a/sdk/CUDALibraries/src/histEqualizationNPP/Makefile
-+++ b/sdk/CUDALibraries/src/histEqualizationNPP/Makefile
-@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk
- # Targets
- ################################################################################
- all:
--	$(CXX) $(INC) $(LIB) -o histEqualizationNPP histEqualizationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH)
-+	$(CXX) $(INC) -o histEqualizationNPP histEqualizationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB)
- 	mkdir -p ../../bin
- 	mkdir -p ../../bin/$(OSLOWER)
- 	mkdir -p ../../bin/$(OSLOWER)/release
---- a/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile
-+++ b/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile
-@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk
- # Targets
- ################################################################################
- all:
--	$(CXX) $(INC) $(LIB) -o imageSegmentationNPP imageSegmentationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH)
-+	$(CXX) $(INC) -o imageSegmentationNPP imageSegmentationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB)
- 	mkdir -p ../../bin
- 	mkdir -p ../../bin/$(OSLOWER)
- 	mkdir -p ../../bin/$(OSLOWER)/release
---- a/sdk/CUDALibraries/src/randomFog/Makefile
-+++ b/sdk/CUDALibraries/src/randomFog/Makefile
-@@ -45,6 +45,7 @@ CCFILES		:= randomFog.cpp rng.cpp
- USECURAND   := 1
- USEGLLIB    := 1
- USEGLUT     := 1
-+USERENDERCHECKGL := 1
- 
- ################################################################################
- # Rules and targets

dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-asneeded.patch

@@ -1,22 +0,0 @@
---- a/cuda-samples/0_Simple/cudaOpenMP/Makefile
-+++ b/cuda-samples/0_Simple/cudaOpenMP/Makefile
-@@ -166,7 +166,7 @@
-   endif
- endif
- 
--GOMPLIB         ?= $(shell find $(OPENMPDIR)/libgomp* 2>/dev/null)
-+GOMPLIB         ?= $(shell find $(OPENMPDIR) -type f -name libgomp* 2>/dev/null)
- 
- ifeq ($(GOMPLIB),)
-       $(info -----------------------------------------------------------------------------------------------)
---- a/cuda-samples/0_Simple/UnifiedMemoryStreams/Makefile
-+++ b/cuda-samples/0_Simple/UnifiedMemoryStreams/Makefile
-@@ -166,7 +166,7 @@
-   endif
- endif
- 
--GOMPLIB         ?= $(shell find $(OPENMPDIR)/libgomp* 2>/dev/null)
-+GOMPLIB         ?= $(shell find $(OPENMPDIR) -type f -name libgomp* 2>/dev/null)
- 
- ifeq ($(GOMPLIB),)
-       $(info -----------------------------------------------------------------------------------------------)

dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.5.22.ebuild

@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cuda eutils flag-o-matic toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-304.54
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/cuda-samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-	sed \
-		-e "/^LDFLAGS/s|\(:=\)$|\1 ${LDFLAGS}|g" \
-		-i 0_Simple/simpleMPI/Makefile || die
-
-#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		${myopts} ${verbose}
-}
-
-src_test() {
-	local _dir _subdir
-
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	for _dir in {0..9}*; do
-		pushd ${_dir} > /dev/null
-		for _subdir in *; do
-			emake -C ${_subdir} run
-		done
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local i j f t crap=""
-	if use doc; then
-		ebegin "Installing docs ..."
-		dodoc -r doc releaseNotesData
-		dohtml *htm*
-		eend
-	fi
-
-	crap+=" *.txt doc Samples.htm* releaseNotesData"
-
-	ebegin "Cleaning before installation..."
-	for i in ${crap}; do
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-		fi
-	done
-	eend
-
-	ebegin "Moving files..."
-	for f in $(find .); do
-		local t="$(dirname ${f})"
-		if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-			continue
-		fi
-		if [[ ! -d ${f} ]]; then
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/${t}
-				doexe ${f}
-			else
-				insinto /opt/cuda/sdk/${t}
-				doins ${f}
-			fi
-		fi
-	done
-	eend
-}

dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild

@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-340.32[uvm]
-		x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/cuda-samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-
-	if use x86; then
-		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
-		ewarn "the support for 32bit linux."
-		ewarn "Be aware that bugfixes and new features may not be available."
-		ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		${myopts} ${verbose}
-}
-
-src_test() {
-	local _dir _subdir
-
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	for _dir in {0..9}*; do
-		pushd ${_dir} > /dev/null
-		for _subdir in *; do
-			emake -C ${_subdir} run
-		done
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local i j f t crap=""
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
-			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
-		eend
-	fi
-
-	crap+=" *.txt Samples.htm*"
-
-	ebegin "Cleaning before installation..."
-		for i in ${crap}; do
-			if [[ -e ${i} ]]; then
-				find ${i} -delete || die
-			fi
-		done
-		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		for f in $(find .); do
-			local t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ ! -d ${f} ]]; then
-				if [[ -x ${f} ]]; then
-					exeinto /opt/cuda/sdk/${t}
-					doexe ${f}
-				else
-					insinto /opt/cuda/sdk/${t}
-					doins ${f}
-				fi
-			fi
-	done
-	eend
-}

dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.28.ebuild

@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-downloads"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-346.35[uvm]
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		${myopts} ${verbose}
-}
-
-src_test() {
-	local _dir _subdir
-
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	for _dir in {0..9}*; do
-		pushd ${_dir} > /dev/null
-		for _subdir in *; do
-			emake -C ${_subdir} run
-		done
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local i j f t crap=""
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
-			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
-		eend
-	fi
-
-	crap+=" *.txt Samples.htm*"
-
-	ebegin "Cleaning before installation..."
-		for i in ${crap}; do
-			if [[ -e ${i} ]]; then
-				find ${i} -delete || die
-			fi
-		done
-		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		for f in $(find .); do
-			local t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ ! -d ${f} ]]; then
-				if [[ -x ${f} ]]; then
-					exeinto /opt/cuda/sdk/${t}
-					doexe ${f}
-				else
-					insinto /opt/cuda/sdk/${t}
-					doins ${f}
-				fi
-			fi
-	done
-	eend
-}

dev-util/nvidia-cuda-toolkit/Manifest

@@ -1,8 +1,3 @@
-DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f9ddb677bc8cc898ec38990b8226778d SHA512 e2e4fbc78c2e6373b3f81778d8044b299429459e8e27632e86c0d97e6fe7f4db7cd5652044beb0ce7ee3c7abaa7dcec7d85639a2de4b9cc213ab52a2d204aa6b WHIRLPOOL e5df7de03aaec8488a7fa093e272d64b5d3adaedca1458c550d4ae9c6bf2a0ead71496c8a0c9aac966500aa01401e95cc57a951e3a2554e8d823b97c10336850
-DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
 DIST cuda_6.5.14_linux_32.run 76788277 SHA256 63fa1fe5d013e9944d6c1a3a71768fa4dcb35d6a157c1b06765bb56198c205c5 SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc WHIRLPOOL c1094dd84883ef08d91c6eec3634a285496418db1e76b70f449f833dcb01069a620af504b6df7fe2752559688ed1f60f4adda8c97d849d648cba1be0f8196954
 DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
-DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c4c9c09b5da1bc09fe49e0f804bc7a6 SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e WHIRLPOOL ac94b4e7f29811b4240623fb69b3c54214e7f0c60a286d899944dbab9da7fd3c122760199a3357667e33879bd48fbf352d5d39029acca6021e7caf21785557ed
-DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
-DIST cuda_7.0.28_linux.run 1118797679 SHA256 d1292e9c2bbaddad24c46e0b0d15a7130831bfac0382f7159321f41ae385a5ce SHA512 f002433133e40000cbb78283e08c25f7397612957c0440605311f8921bcebd54a808069ca36b218be66a054e8afab4871b2bf1bd4d419c6f98a0d74b00a9bc78 WHIRLPOOL dcf21d2e356a1797b9e79ac9edfb3924a1d4a2914382dbe21b2172c200dd4f7d93905ac44fbc2e994ce14b7ab28e78163f4c81ddcc6cbb97e4ce085efd2d8475
 DIST cuda_7.5.18_linux.run 1195431560 SHA256 245ffb6c1e2b69d323f8ae3a1b63d3384fec3934222e56e9d801ecc0d6e919c5 SHA512 cb933512fde09376b1d6040c72d24c4f91dc44f73322ca87aa7d1f34156c9c87feea41f9a00f1a403cfb89645b5e7a6a5f2bfe4933703ba81f0cf94968d430fd WHIRLPOOL b1a06acba02043fabf496ba683fb984b1c90df2cd71396457f664beb8cb26b2e3074c8568ec6ce0cfe565721986670c7a40351a29a4856a7e03268c14d545247

dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild

@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit check-reqs cuda unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	=sys-devel/gcc-4.7*[cxx]
-	!<=x11-drivers/nvidia-drivers-270.41
-	|| (
-		>=x11-drivers/nvidia-drivers-331[uvm]
-		<x11-drivers/nvidia-drivers-331
-	)
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir}
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin:${ecudadir}/libnvvp
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}

dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild

@@ -23,13 +23,13 @@ IUSE="debugger doc eclipse profiler"
 DEPEND=""
 RDEPEND="${DEPEND}
 	<sys-devel/gcc-4.9[cxx]
-	>=x11-drivers/nvidia-drivers-340.32[uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
 		sys-libs/ncurses[tinfo]
 		)
 	eclipse? ( >=virtual/jre-1.6 )
 	profiler? ( >=virtual/jre-1.6 )
+	amd64? ( >=x11-drivers/nvidia-drivers-340.32[uvm] )
 	x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
 	"
 

dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild

@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit check-reqs cuda unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-4.9[cxx]
-	>=x11-drivers/nvidia-drivers-343.22[uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )
-	x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
-	"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-
-	if use x86; then
-		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
-		ewarn "the support for 32bit linux."
-		ewarn "Be aware that bugfixes and new features may not be available."
-		ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
-	fi
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	if use amd64; then
-		mv doc/man/man3/{,cuda-}deprecated.3 || die
-		doman doc/man/man*/*
-	fi
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	ln -sf lib lib32 || die
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}

dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild

@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit check-reqs cuda unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	<sys-devel/gcc-4.9[cxx]
-	>=x11-drivers/nvidia-drivers-343.22[uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )
-	x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
-	"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-
-	if use x86; then
-		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
-		ewarn "the support for 32bit linux."
-		ewarn "Be aware that bugfixes and new features may not be available."
-		ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
-	fi
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	if use amd64; then
-		mv doc/man/man3/{,cuda-}deprecated.3 || die
-		doman doc/man/man*/*
-	fi
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}

dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild

@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit check-reqs cuda unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	>=x11-drivers/nvidia-drivers-346.35[uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	ln -sf lib lib32 || die
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${ecudadir}/lib
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			ewarn "gcc >= ${b} will not work with CUDA"
-			ewarn "Make sure you set an earlier version of gcc with gcc-config"
-			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
-			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-			ewarn "to the nvcc compiler flags"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}

dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r1.ebuild

@@ -107,7 +107,7 @@ src_install() {
 	cat > "${T}"/99cuda <<- EOF
 		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
 		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
 	EOF
 	doenvd "${T}"/99cuda
 

dev-util/plasmate/Manifest

@@ -1 +0,0 @@
-DIST plasmate-1.0.tar.gz 288285 SHA256 5e9486a76faf7fbf11ac0a9c8275eea7b037662508217928f052434d65611e28 SHA512 6e61e3274ee5cc74ea18e64484077e609d146f10ff0a82cdbd9776657487724fdfc0ace09dfa36ae8d46e7c03f67411eb92e38e065b6c750d5ca5f91a91901d2 WHIRLPOOL 3bc5edaf48e48c46c4aa4ba1a82c7ed9be3d301bfc9a6d433443d7953ed78600ece76fb778d47be2908260000aeb91dbc8a747a82a5af173873d20fcff9c2fd7

dev-util/plasmate/metadata.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-	<maintainer>
-		<email>terietor@gmail.com</email>
-		<name>Giorgos Tsiapaliwkas</name>
-		<description>A small IDE taylored for development of Plasma components.</description>
-	</maintainer>
-</pkgmetadata>

dev-util/plasmate/plasmate-1.0.ebuild

@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-inherit kde4-base
-
-DESCRIPTION="IDE for writing KDE Plasma/KWin components (themes, Plasmoids, runners, data engines)"
-HOMEPAGE="https://projects.kde.org/projects/extragear/sdk/plasmate"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	dev-libs/libattica
-	dev-libs/soprano
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdeapps_dep knewstuff)
-"
-
-RDEPEND="
-	${DEPEND}
-	dev-vcs/git
-"

dev-util/rosdep/Manifest

@@ -0,0 +1 @@
+DIST rosdep-0.11.2.tar.gz 106456 SHA256 89da05bdc082005815a9679dc34509a16647374d746a9e636c4238dd8f7aed9e SHA512 55057bb478dce1a7be3025d52fa6fb616b2de95017981ead934d7965282fa6ceb81780b7825d914531f87af492f3b5ce91ecf2607e6bddb65e13744e8a8d6743 WHIRLPOOL 37407d99d58f62c00a54b94a5820cab599c7700be355132e5d7b9d277faa220f89d68c9950cd386e984c64a1f0c493d53db15b31082f485d4786aff232f73d34

dev-util/rosdep/metadata.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>

dev-util/rosdep/rosdep-0.11.2.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2014 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Command-line tool for installing ROS system dependencies"
+HOMEPAGE="http://wiki.ros.org/rosdep"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/rosdistro[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
+}
+
+pkg_postrm() {
+	if [ "${ROOT:-/}" = "/" ] ; then
+		einfo "Removing rosdep default sources list."
+		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
+		einfo "Initializing rosdep"
+		rosdep init
+	fi
+}

dev-util/rosdep/rosdep-9999.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2014 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Command-line tool for installing ROS system dependencies"
+HOMEPAGE="http://wiki.ros.org/rosdep"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/rosdistro[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
+}
+
+pkg_postrm() {
+	if [ "${ROOT:-/}" = "/" ] ; then
+		einfo "Removing rosdep default sources list."
+		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
+		einfo "Initializing rosdep"
+		rosdep init
+	fi
+}

eclass/mysql-multilib.eclass

@@ -190,7 +190,7 @@ if [[ ${PN} == "percona-server" ]]; then
 	DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
 fi
 LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:=0}"
+SLOT="0/${SUBSLOT:-0}"
 
 IUSE="+community cluster debug embedded extraengine jemalloc latin1
 	+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
@@ -783,6 +783,27 @@ mysql-multilib_pkg_preinst() {
 	if [[ ${PN} == "mysql-cluster" ]] ; then
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
 	fi
+	# Here we need to see if the implementation switched client libraries
+	# First, we check if this is a new instance of the package and a client library already exists
+	# Then, we check if this package is rebuilt but the previous instance did not
+	# have the client-libs USE set.
+	# Instances which do not have a client-libs USE can only be replaced by a different provider
+	local SHOW_ABI_MESSAGE
+	if ! in_iuse client-libs || use_if_iuse client-libs ; then
+	        if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+			SHOW_ABI_MESSAGE=1
+		elif [[ ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] && \
+			in_iuse client-libs && ! built_with_use ${CATEGORY}/${PN} client-libs ; then
+			SHOW_ABI_MESSAGE=1
+		fi
+
+	fi
+	if [[ ${SHOW_ABI_MESSAGE} ]] ; then
+                elog "Due to ABI changes when switching between different client libraries,"
+                elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+                elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT:-18}"
+                ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+        fi
 }
 
 # @FUNCTION: mysql-multilib_pkg_postinst

eclass/virtuoso.eclass

@@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @ECLASS: virtuoso.eclass
-# @MAINTAINER:
-# Maciej Mrozowski <reavertm@gentoo.org>
-# Chris Reffett <creffett@gentoo.org>
-#
-# @BLURB: Provides splitting functionality for Virtuoso
-# @DESCRIPTION:
-# This eclass provides common code for splitting Virtuoso OpenSource database
-
-case ${EAPI:-0} in
-	2|3|4|5) : ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-inherit autotools multilib eutils
-
-MY_P="virtuoso-opensource-${PV}"
-
-case ${PV} in
-	*9999*)
-		ECVS_SERVER="virtuoso.cvs.sourceforge.net:/cvsroot/virtuoso"
-		ECVS_PROJECT='virtuoso'
-		SRC_URI=""
-		inherit cvs
-		;;
-	*)
-		# Use this variable to determine distribution method (live or tarball)
-		TARBALL="${MY_P}.tar.gz"
-		SRC_URI="mirror://sourceforge/virtuoso/${TARBALL} mirror://gentoo/VOS-genpatches-${PV}.tar.bz2"
-		;;
-esac
-
-EXPORT_FUNCTIONS src_prepare src_configure
-
-# Set some defaults
-HOMEPAGE='http://virtuoso.openlinksw.com/wiki/main/Main/'
-LICENSE='GPL-2'
-SLOT='0'
-
-DEPEND='
-	>=sys-devel/libtool-2.2.6a
-'
-RDEPEND=''
-
-S="${WORKDIR}/${MY_P}"
-
-# @FUNCTION: virtuoso_src_prepare
-# @DESCRIPTION:
-# 1. Applies common release patches
-# 2. Applies package-specific patches (from ${FILESDIR}/, PATCHES can be used)
-# 3. Applies user patches from /etc/portage/patches/${CATEGORY}/${PN}/
-# 4. Modifies makefiles for split build. Uses VOS_EXTRACT
-# 5. eautoreconf
-virtuoso_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	EPATCH_SUFFIX='patch' EPATCH_FORCE='yes' epatch
-	pushd "${S}" >/dev/null
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
-	debug-print "$FUNCNAME: applying user patches"
-	epatch_user
-
-
-	# @ECLASS-VARIABLE: VOS_EXTRACT
-	# @DESCRIPTION:
-	# Lists any subdirectories that are required to be extracted
-	# and enabled in Makefile.am's for current package.
-	if [[ -n ${VOS_EXTRACT} ]]; then
-		# Comment out everything
-		find . -name Makefile.am -exec \
-			sed -e '/SUBDIRS\s*=/s/^/# DISABLED /g' -i {} + \
-				|| die 'failed to disable subdirs'
-
-		# Uncomment specified
-		local path
-		for path in ${VOS_EXTRACT}; do
-			if [[ -d "${path}" ]]; then
-				# Uncomment leaf
-				if [[ -f "${path}"/Makefile.am ]]; then
-					sed -e '/^# DISABLED \s*SUBDIRS\s*=/s/# DISABLED //g' \
-						-i "${path}"/Makefile.am || die "failed to uncomment leaf in ${path}/Makefile.am"
-				fi
-				# Process remaining path elements
-				while true; do
-					local subdir=`basename "${path}"`
-					path=`dirname "${path}"`
-					if [[ -f "${path}"/Makefile.am ]]; then
-						# Uncomment if necessary
-						sed -e '/^# DISABLED \s*SUBDIRS\s*=/s/.*/SUBDIRS =/g' \
-							-i "${path}"/Makefile.am
-						# Append subdirs if not there already
-						if [[ -z `sed -ne "/SUBDIRS\s*=.*${subdir}\b/p" "${path}"/Makefile.am` ]]; then
-							sed -e "/^SUBDIRS\s*=/s|$| ${subdir}|" \
-								-i "${path}"/Makefile.am || die "failed to append ${subdir}"
-						fi
-					fi
-					[[ "${path}" = . ]] && break
-				done
-			fi
-		done
-	fi
-
-	eautoreconf
-}
-
-# @FUNCTION: virtuoso_src_configure
-# @DESCRIPTION:
-# Runs ./configure with common and user options specified via myconf variable
-virtuoso_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Override some variables to make tests work
-	if [[ ${PN} != virtuoso-server ]]; then
-		[[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX=
-		export ISQL="${EPREFIX}"/usr/bin/isql-v
-		export SERVER="${EPREFIX}"/usr/bin/virtuoso-t
-	fi
-
-	econf \
-		--with-layout=gentoo \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-shared \
-		--with-pthreads \
-		--without-internal-zlib \
-		${myconf}
-}

kde-apps/nepomuk/Manifest

@@ -1 +0,0 @@
-DIST kde-runtime-4.14.3.tar.xz 7867308 SHA256 78a74e519b4e897ffcee14be98eebd7b672ad2bb6e71a4aa2fe77682b5bc8605 SHA512 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 WHIRLPOOL 4d021d826eb2ba553bb6fa320f71ed3d1f1614aef29f2d9e26285eabb9c015e6577e85ee6b0874cd1f8b89ef33cfa3dde5a6002e2178a11ede38cb8bf471a5a2

kde-apps/nepomuk/nepomuk-4.14.3.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Nepomuk KDE4 client"
-HOMEPAGE+=" https://userbase.kde.org/Nepomuk"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/soprano-2.9.0[dbus,raptor,redland,virtuoso]
-	$(add_kdebase_dep kdelibs 'nepomuk')
-	$(add_kdebase_dep nepomuk-core)
-	!kde-misc/nepomukcontroller
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	# Collides with baloo
-	pushd nepomuk/kioslaves > /dev/null
-	comment_add_subdirectory timeline
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDERUNTIME_BUILD_NEPOMUK=true
-	)
-
-	kde4-meta_src_configure
-}

kde-base/akonadi/Manifest

@@ -1 +0,0 @@
-DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec

kde-base/akonadi/akonadi-4.4.11.1-r1.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
-HOMEPAGE="https://pim.kde.org/akonadi"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=app-office/akonadi-server-1.3.1[soprano(+)]
-	$(add_kdebase_dep kdelibs 'nepomuk' 4.13.1)
-	$(add_kdebase_dep kdepimlibs '' 4.13.1)
-	$(add_kdebase_dep libkdepim)
-	!kde-base/akonadiconsole
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-KMEXTRA="
-	akonadiconsole/
-"
-
-src_configure() {
-	mycmakeargs=(
-		# Set the dbus dirs, otherwise it searches in KDEDIR
-		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces"
-		-DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services"
-	)
-
-	kde4-meta_src_configure
-}

kde-base/akonadi/metadata.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<!--
-<use>
-	<flag name="opensync">Enables OpenSync data synchronization protocol support.</flag>
-</use>
--->
-</pkgmetadata>

kde-base/kdepim-strigi-analyzer/Manifest

@@ -1 +0,0 @@
-DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec

kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.11.1-r1.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="strigi-analyzer"
-inherit kde4-meta
-
-DESCRIPTION="kdepim: strigi plugins"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-	$(add_kdebase_dep kdelibs 'nepomuk' 4.13.1)
-	$(add_kdebase_dep kdepimlibs '' 4.6)
-"
-RDEPEND="${DEPEND}"

kde-base/nepomuk-core/Manifest

@@ -1 +0,0 @@
-DIST nepomuk-core-4.14.3.tar.xz 383516 SHA256 74e725577f2f513c577c138e395448c3ca451cd894e35e14017b4b3ce63eab3d SHA512 e7e4eb999e34c14e30465b69eb312fad9ecd28ff349fa8c9c50c7deeebeda42d3ccfc7104ec35c568a1bbeec23e79878c8cc96e3fc85fa409ea1cd327fb6675f WHIRLPOOL fe99a7d6404cf2acd762c91c4fe3e65b8a268f9d7cdd88a5ae8ccdcde47dfbb87c9031d8e7ede6c034f79f0454050067e65eefcf5e972f78a96791d07835064e