proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

1884 files changed, 65348 insertions, 0 deletions

diff --git a/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild b/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
new file mode 100644
index 000000000000..f395b2fd95b7
--- /dev/null
+++ b/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR="INFINOID"
+
+inherit perl-module
+
+DESCRIPTION="Binary search through svn revisions"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-lang/perl
+	dev-perl/YAML-Syck
+	dev-perl/IO-All
+	dev-vcs/subversion"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? ( dev-perl/Test-Exception
+		dev-perl/Test-Output
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage )"
+
+SRC_TEST="do"
diff --git a/dev-util/App-SVN-Bisect/Manifest b/dev-util/App-SVN-Bisect/Manifest
new file mode 100644
index 000000000000..fe819b1bc799
--- /dev/null
+++ b/dev-util/App-SVN-Bisect/Manifest
@@ -0,0 +1 @@
+DIST App-SVN-Bisect-1.1.tar.gz 20534 SHA256 ababf6d81c079a921cbbc5a2ff1bc58f8ff5edb47b08c6b9f6aaf3bf4db2624e SHA512 8eeab59dc83273aed8de751ff2c175a9bea9d858e112d24cb21be616582106e69824e2496b8d5860acbfcec4c01e79b1a8ddace5b0ca68a88d9cd9804ed84e57 WHIRLPOOL 95060b5ff86acabcf619e62fe9dc722d86c7256b9b5e09a8d4a3874d0b668834508c7dc78ae3d833931afe1b3c017ebf4b09465e4132b49f1e99f5fa31c0c6ae
diff --git a/dev-util/App-SVN-Bisect/metadata.xml b/dev-util/App-SVN-Bisect/metadata.xml
new file mode 100644
index 000000000000..028fc2d80854
--- /dev/null
+++ b/dev-util/App-SVN-Bisect/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">App-SVN-Bisect</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/Orange/Manifest b/dev-util/Orange/Manifest
new file mode 100644
index 000000000000..391a486026ec
--- /dev/null
+++ b/dev-util/Orange/Manifest
@@ -0,0 +1 @@
+DIST Orange-2.7.2.tar.gz 12639045 SHA256 02ca4f711c0d792ef5a4d5a066756d179476af73c944ee6a9e208369801e11de SHA512 30646443a5eedecb2dc003513b1cb0061812649cc90efc5ea793ffab88269a06cc238c384a0c09d3549cdd262a86131b4e4c152004853a2489cd798755654cf7 WHIRLPOOL 765cebfc90c1d04c454e137dc8dabaf39662d53562fdad99e63e1b9ec5ef61cc9cff9ac8a05bab757af64da0180cefb2f8a2571a21b1a232601bc7239878a11c
diff --git a/dev-util/Orange/Orange-2.7.2.ebuild b/dev-util/Orange/Orange-2.7.2.ebuild
new file mode 100644
index 000000000000..1e16e2720f95
--- /dev/null
+++ b/dev-util/Orange/Orange-2.7.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Open source data visualization and analysis for novice and experts."
+HOMEPAGE="http://orange.biolab.si/"
+SRC_URI="http://orange.biolab.si/download/files/archive/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/matplotlib[qt4]
+	dev-python/pillow
+	dev-python/PyQt4[webkit]
+	dev-python/pyqwt
+	sci-libs/scikits_learn
+	sci-libs/scipy"
+
+DEPEND="${RDEPEND}
+	dev-python/numpy"
diff --git a/dev-util/Orange/metadata.xml b/dev-util/Orange/metadata.xml
new file mode 100644
index 000000000000..8bf23c2b9577
--- /dev/null
+++ b/dev-util/Orange/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>amynka@gentoo.org</email>
+</maintainer>
+<use>
+</use>
+</pkgmetadata>
diff --git a/dev-util/a8/Manifest b/dev-util/a8/Manifest
new file mode 100644
index 000000000000..723d59d0c8de
--- /dev/null
+++ b/dev-util/a8/Manifest
@@ -0,0 +1 @@
+DIST a8-0.11.tar.gz 39435 SHA256 0ef94e70f0b97de0ecfdd7297f70435b52efbdf3a04e0b8ba1927d3535cca7f2 SHA512 253aa8161a195d4dd1d1fb392338478c179b5878e672d94baffa99a5e7e42f1deeb6d1dc8bbc9f3991411ca231d054a71ab96be1aae7925a22347d478832e0a2 WHIRLPOOL f64d61b6a59d03c2cd9e78f57c01842ea0b7e2c3542aa533cdf7c15d6c9e41750d4581ca5d7348beb311754e273e168275e36d80daca00ca58e999559f3ef348
diff --git a/dev-util/a8/a8-0.11-r2.ebuild b/dev-util/a8/a8-0.11-r2.ebuild
new file mode 100644
index 000000000000..9866f8132dbb
--- /dev/null
+++ b/dev-util/a8/a8-0.11-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils gnome2-utils
+
+DESCRIPTION="An ultra-lightweight IDE, that embeds Vim, a terminal emulator, and a file browser"
+HOMEPAGE="http://github.com/aliafshar/a8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+	dev-python/logbook[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.22[${PYTHON_USEDEP}]
+	>=dev-python/pygtkhelpers-0.4.3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=x11-libs/vte-0.28.2-r206:0[python,${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	app-editors/gvim
+	app-editors/vim"
+
+PATCHES=( "${FILESDIR}"/${P}-argparse.patch )
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doicon -s 48 a8/data/icons/a8.png
+	make_desktop_entry ${PN} ${PN} ${PN} 'Development;IDE'
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/a8/files/a8-0.11-argparse.patch b/dev-util/a8/files/a8-0.11-argparse.patch
new file mode 100644
index 000000000000..3357b1890f44
--- /dev/null
+++ b/dev-util/a8/files/a8-0.11-argparse.patch
@@ -0,0 +1,13 @@
+https://code.google.com/p/abominade/issues/detail?id=26
+https://bugzilla.redhat.com/show_bug.cgi?id=700596
+
+--- a8-0.11/setup.py
++++ a8-0.11/setup.py
+@@ -19,7 +19,6 @@
+     'psutil',
+     'logbook',
+     'pygtkhelpers>=0.4.3',
+-    'argparse',
+     'pyyaml',
+   ],
+   packages = [
diff --git a/dev-util/a8/metadata.xml b/dev-util/a8/metadata.xml
new file mode 100644
index 000000000000..3daaf12cf09e
--- /dev/null
+++ b/dev-util/a8/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">a8</remote-id>
+		<remote-id type="github">aliafshar/a8</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/aap/Manifest b/dev-util/aap/Manifest
new file mode 100644
index 000000000000..adc88e239bb7
--- /dev/null
+++ b/dev-util/aap/Manifest
@@ -0,0 +1,2 @@
+DIST aap-1.076.zip 1637913 SHA256 dc223d5e88a25426544bcfeebe4f97a71cfb3aea5fe983956f643d83b6f3841e SHA512 581f34f7bc531e989c725b2e732d47bac57b85b5c738aca3df35279d5979c050277cf9fafffce8bafe304034be1d490abbd089eda2244cf272ad77a61958df11 WHIRLPOOL 52a369f73830c92865ae86b5405ef0e883ef4ff84403e8b4abb086680dd27575e390a5db360aa4e1a6865a14c3e40e844437490d563422fc4a2c45871c98b3ad
+DIST aap-1.091.zip 1645498 SHA256 1cae4e5c6426f3862ef6795e3e1966ef15ab618cde57be2005a0a6c6eac41aae SHA512 37fbbc1d816bfdadf3c4e16a31d002326ce86dbfbdfa60b30785f88aa202e52d79a13c91e7e0e843d93620e5eb9ba50545bc761550386b715359122cd375341e WHIRLPOOL 9b7ec209fe3c86d288037ced9cc5b44b406ed55ccabfada96c1a3423f8eecc91ae50e76f01b07f47d7bb54c0b06f47c7150a3dd5620e71045f3810fc32a857fd
diff --git a/dev-util/aap/aap-1.076.ebuild b/dev-util/aap/aap-1.076.ebuild
new file mode 100644
index 000000000000..d08f1a50a0bc
--- /dev/null
+++ b/dev-util/aap/aap-1.076.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+IUSE="doc"
+
+DESCRIPTION="Bram Moolenaar's super-make program"
+HOMEPAGE="http://www.a-a-p.org/"
+SRC_URI="mirror://sourceforge/a-a-p/${P}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ia64 ~mips ~ppc sparc x86"
+DEPEND="app-arch/unzip"
+RDEPEND=">=dev-lang/python-1.5"
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	mkdir "${S}" && cd "${S}" && unzip -q "${DISTDIR}"/${A} || die
+}
+
+src_install() {
+	rm doc/*.sgml
+	rm doc/*.pdf
+
+	if use doc ; then
+		dodir /usr/share/doc/${PF}/html
+		cp -R doc/* "${D}"/usr/share/doc/${PF}/html
+	fi
+	rm doc/*.html
+	rm -fr doc/images
+
+	dodoc doc/*
+	doman aap.1
+	rm -rf doc aap.1
+
+	# Move the remainder directly into the dest tree
+	dodir /usr/share
+	cd "${WORKDIR}"
+	mv aap "${D}"/usr/share
+
+	# Create a symbolic link for the executable
+	dodir /usr/bin
+	ln -s ../share/aap/aap "${D}"/usr/bin/aap
+}
diff --git a/dev-util/aap/aap-1.091-r2.ebuild b/dev-util/aap/aap-1.091-r2.ebuild
new file mode 100644
index 000000000000..49089bd00bc3
--- /dev/null
+++ b/dev-util/aap/aap-1.091-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Bram Moolenaar's super-make program"
+HOMEPAGE="http://www.a-a-p.org/"
+SRC_URI="mirror://sourceforge/a-a-p/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S=${WORKDIR}
+
+src_install() {
+	rm doc/*.sgml doc/*.pdf COPYING || die
+	use doc && dohtml -r doc/*.html doc/images
+	rm -r doc/*.html doc/images || die
+
+	dodoc doc/*
+	doman aap.1
+	rm -r doc aap.1 || die
+
+	# Move the remainder directly into the dest tree
+	python_moduleinto /usr/share/aap
+	python_domodule .
+
+	# Create a symbolic link for the executable
+	dosym ../share/aap/aap /usr/bin/aap
+	python_fix_shebang "${ED}"/usr/share/aap/aap
+}
diff --git a/dev-util/aap/metadata.xml b/dev-util/aap/metadata.xml
new file mode 100644
index 000000000000..efa518256292
--- /dev/null
+++ b/dev-util/aap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>vim</herd>
+	<upstream>
+		<remote-id type="sourceforge">a-a-p</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/abi-compliance-checker/Manifest b/dev-util/abi-compliance-checker/Manifest
new file mode 100644
index 000000000000..b494110d456b
--- /dev/null
+++ b/dev-util/abi-compliance-checker/Manifest
@@ -0,0 +1,4 @@
+DIST abi-compliance-checker-1.98.4.tar.gz 258639 SHA256 889f26c3c58c36afbaf1e7bde7f49107f25231acf901ce85a10f93812755401b SHA512 31773a26911b89a2e472fe6b2b9504d4cd196a193765593cec8d7f8a4dbc1ceea7e70585ec8b6d73f2664ca53bafd1c85657c3c4553da3f7cc8e2350e84ce052 WHIRLPOOL 1475e14bb42de5e7d2fa934dec6f1333f72d4e493a87d352a0da4a2e326b75648d1f146e90743f20d9bfd066911b2dd1e568ce98a560dfd14b3f655a303303ff
+DIST abi-compliance-checker-1.98.7.tar.gz 256069 SHA256 b1198a4c726ead9d02d1ab1fdbc384f72c34d43e4d29b8438d1b1460aca73699 SHA512 a925c12b0cebc72ee6af84ea1663a8f3e2333e130c1bff494866a54efc644a1825bfc5ce84d5c183e4031dc4037847b42a808099e127874e0184e83b33d499ec WHIRLPOOL 17c6f92d889e4236abc1607dfc3547b3f20d74084be562e390a177d345026fc539056e302ef0b9a682e6e0203502010af5ec900011a8077790bd1688c680081d
+DIST abi-compliance-checker-1.98.8.tar.gz 259591 SHA256 e3850394b8b8c1e6bad5e4136fc83a8ed8dab9f429c0f6a45cf3d1a7351742cb SHA512 b65d8ad2050e51b15c26e999886ec9b23aee1e7ce3836fc6ede7201f0831a0a8070317908fa33f68fcb552ed997b2949ecb6c663066d307cb1b5edad0bfbb700 WHIRLPOOL 9679fec45ae6e0b6c819ff55b06bd1d5d7bc578dd446498b0e5334d7ffb99a9d5a9d532a0c17586fccd323c027ee89c09490311cfcdab0ab461ab5b0c91f4a46
+DIST abi-compliance-checker-1.99.9.tar.gz 272227 SHA256 52b0daca89fcda73cde126497c8015ca823417074ba02fcff68b7acf2f45e516 SHA512 bf3530463a93ed453c9479fa2907e8e68d34949e71bb552fabc43b37f7fa562a49339adc86de09596a13ccd5586bfc5fcb5df1d03ffa04020d9ac3622025b2be WHIRLPOOL 0d62b5c4b14e814231cfa06ffdcfd7fa44fecd2d154bf57b0abb13f2540f755b3de3179fd9d3c34720329f674285877b3b4e43dc904b9b1ae1c7b3c88467094e
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.4.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.4.ebuild
new file mode 100644
index 000000000000..7f4b4f64f5ff
--- /dev/null
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
+HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
+SRC_URI="mirror://github/lvc/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	mkdir -p "${D}"/usr || die
+	perl Makefile.pl --install --prefix=/usr --destdir="${D}" || die
+}
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.7.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.7.ebuild
new file mode 100644
index 000000000000..86efde193d89
--- /dev/null
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
+HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
+SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	mkdir -p "${D}"/usr || die
+	perl Makefile.pl --install --prefix=/usr --destdir="${D}" || die
+}
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.8.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.8.ebuild
new file mode 100644
index 000000000000..8b1df7125fc4
--- /dev/null
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
+HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
+SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	mkdir -p "${D}"/usr || die
+	perl Makefile.pl --install --prefix=/usr --destdir="${D}" || die
+}
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild
new file mode 100644
index 000000000000..46f358e26deb
--- /dev/null
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
+HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
+SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	mkdir -p "${D}"/usr || die
+	perl Makefile.pl --install --prefix=/usr --destdir="${D}" || die
+}
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
new file mode 100644
index 000000000000..6d6c5bd2949a
--- /dev/null
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+EGIT_REPO_URI="git://github.com/lvc/${PN}.git
+	http://github.com/lvc/${PN}.git"
+
+inherit git-r3
+#endif
+
+DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
+HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
+SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+#if LIVE
+SRC_URI=
+KEYWORDS=
+#endif
+
+src_install() {
+	mkdir -p "${D}"/usr || die
+	perl Makefile.pl --install --prefix=/usr --destdir="${D}" || die
+}
diff --git a/dev-util/abi-compliance-checker/metadata.xml b/dev-util/abi-compliance-checker/metadata.xml
new file mode 100644
index 000000000000..5cb9324943ab
--- /dev/null
+++ b/dev-util/abi-compliance-checker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/ald/Manifest b/dev-util/ald/Manifest
new file mode 100644
index 000000000000..805eeb43d252
--- /dev/null
+++ b/dev-util/ald/Manifest
@@ -0,0 +1 @@
+DIST ald-0.1.7.tar.gz 665998 SHA256 673575054a203db13cb01090491c5be30f376ac6d6e4209c8995011ae5cd7c02 SHA512 dbde0929beebe51ef5f77055b5f396630e16fd01ded4210d828f9ce97c676e7863700a98bf02d26e10cc2d8481adf329d8c8cb11c866302361221f072dbf45bf WHIRLPOOL 73a2cf1a09561f8bcba3386034e1fba574c02f9ab2df574fdcf38e88789b98467b42da0f8d04a84eb8ae07b8d04925d18d6acbbceae47a457f812dffef791b2b
diff --git a/dev-util/ald/ald-0.1.7-r1.ebuild b/dev-util/ald/ald-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..31b708e12d74
--- /dev/null
+++ b/dev-util/ald/ald-0.1.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools
+
+DESCRIPTION="Assembly Language Debugger - a tool for debugging executable programs at the assembly level"
+HOMEPAGE="http://ald.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ald/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="debug ncurses"
+
+DEPEND="ncurses? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}"
+
+DOCS=( BUGS ChangeLog README TODO )
+
+src_prepare() {
+	# respect CFLAGS (bug #240268)
+	sed -i -e "/^CFLAGS/d" configure.ac || die 'sed on CFLAGS failed'
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ncurses curses) \
+		$(use_enable debug assert)
+}
diff --git a/dev-util/ald/ald-0.1.7.ebuild b/dev-util/ald/ald-0.1.7.ebuild
new file mode 100644
index 000000000000..84c5f39358bd
--- /dev/null
+++ b/dev-util/ald/ald-0.1.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Assembly Language Debugger - a tool for debugging executable programs at the assembly level"
+HOMEPAGE="http://ald.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ald/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	econf $(use_enable ncurses curses)
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README ChangeLog TODO BUGS
+}
diff --git a/dev-util/ald/metadata.xml b/dev-util/ald/metadata.xml
new file mode 100644
index 000000000000..2b6fbc1053e9
--- /dev/null
+++ b/dev-util/ald/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>dev-tools</herd>
+	<upstream>
+		<remote-id type="sourceforge">ald</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/alleyoop/Manifest b/dev-util/alleyoop/Manifest
new file mode 100644
index 000000000000..5432c15045ec
--- /dev/null
+++ b/dev-util/alleyoop/Manifest
@@ -0,0 +1 @@
+DIST alleyoop-0.9.8.tar.xz 252292 SHA256 adaa432fbbdccdb07751b2a5b8f0159a31d8d8f3d27503374a96122778163ff1 SHA512 b056b41692da1824e233160c1053075cabcd11394c8c571dd654167be3ef29680357f69371b36f672b4e8b8a769ba3d0a33ad48c1409a8141bcbfa0ba8187bfb WHIRLPOOL fcb22915144a472d64a477149abd4564ca690211cf0e0f1157edd164cf8e3a07de718b0ac158af3b533a62bd0c794499eb0f129604d96dc2cce10f0d909bad0a
diff --git a/dev-util/alleyoop/alleyoop-0.9.8.ebuild b/dev-util/alleyoop/alleyoop-0.9.8.ebuild
new file mode 100644
index 000000000000..13a9e5232794
--- /dev/null
+++ b/dev-util/alleyoop/alleyoop-0.9.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A Gtk+ front-end to the Valgrind memory checker"
+HOMEPAGE="http://alleyoop.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-alpha amd64 ~ppc -sparc x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.14:2
+	>=x11-libs/gtk+-2.2:2
+	>=gnome-base/gconf-2.2:2
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libglade-2.2
+	gnome-base/libgnome-keyring
+	sys-devel/binutils
+	>=dev-util/valgrind-2.4
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/dev-util/alleyoop/metadata.xml b/dev-util/alleyoop/metadata.xml
new file mode 100644
index 000000000000..1076258a0ce8
--- /dev/null
+++ b/dev-util/alleyoop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<longdescription></longdescription>
+</pkgmetadata>
diff --git a/dev-util/amtterm/Manifest b/dev-util/amtterm/Manifest
new file mode 100644
index 000000000000..ce7c6941ae23
--- /dev/null
+++ b/dev-util/amtterm/Manifest
@@ -0,0 +1,2 @@
+DIST amtterm-1.3.tar.gz 37671 SHA256 769d02f087c7594e4a29a901580b2d39154db49ca1f3a6881598d0c595b9bc50 SHA512 04514b7d7a38f7e579739186829f1aba95b3580d24a47fe82382e1c85e8a24a11983117e5cc75c1f7e1f360927b40a5adc1d2ed65a2e325e7abcc01320aa654b WHIRLPOOL 86e873ebe06ef4fab401b4f2fbe876b540503a0ec21fd415108a5e5f5604dd5b649800055be5e5a14b59019cca7f34b9975dce79fe223284cbf850cd729f869b
+DIST amtterm-1.4.tar.gz 38445 SHA256 e10af2b02dbf66fb24abd292b9ddc6d86b31eea09887da5cb0eb8fb2ee900e21 SHA512 64bad394a2526291daa72fd211952caff20c0aa1f1c580dcbae3c92882c9fd57238c140e14749a9d58580e49890abd447e7ca466b39221301e4108c19298502f WHIRLPOOL 2004c69ad03b164c317f3e7d8fdedb83196cf79fee51642b912a380ecdb17a895de67eedf4beadf0e5d5293928fee48aaf79d521d3949bc6ddb1c3110d215a29
diff --git a/dev-util/amtterm/amtterm-1.3-r1.ebuild b/dev-util/amtterm/amtterm-1.3-r1.ebuild
new file mode 100644
index 000000000000..2ab3ff64d88c
--- /dev/null
+++ b/dev-util/amtterm/amtterm-1.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A nice tool to manage amt-enabled machines"
+HOMEPAGE="https://www.kraxel.org/blog/linux/amtterm/"
+SRC_URI="https://www.kraxel.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="gtk"
+
+DEPEND="gtk? (
+	x11-libs/gtk+:2
+	x11-libs/vte:0 )"
+RDEPEND="${DEPEND}
+	dev-perl/SOAP-Lite"
+
+src_prepare() {
+	sed -i -e 's|\(INSTALL_BINARY  := \$(INSTALL)\) \$(STRIP)|\1|' mk/Variables.mk || die
+}
+
+src_configure() {
+	echo "LIB := $(get_libdir)" > Make.config || die
+
+	# enable gamt
+	echo "HAVE_GTK := $(usex gtk)" >> Make.config || die
+	echo "HAVE_VTE := $(usex gtk)" >> Make.config || die
+}
+
+src_compile() {
+	prefix="/usr" emake || die
+}
+
+src_install() {
+	prefix="/usr" emake DESTDIR=${ED} install || die
+
+	if ! use gtk; then
+		rm -rf "${D}"/usr/share/applications || die
+		rm -rf "${D}"/usr/share/man/man1/gamt* || die
+	fi
+}
diff --git a/dev-util/amtterm/amtterm-1.4.ebuild b/dev-util/amtterm/amtterm-1.4.ebuild
new file mode 100644
index 000000000000..2ab3ff64d88c
--- /dev/null
+++ b/dev-util/amtterm/amtterm-1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A nice tool to manage amt-enabled machines"
+HOMEPAGE="https://www.kraxel.org/blog/linux/amtterm/"
+SRC_URI="https://www.kraxel.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="gtk"
+
+DEPEND="gtk? (
+	x11-libs/gtk+:2
+	x11-libs/vte:0 )"
+RDEPEND="${DEPEND}
+	dev-perl/SOAP-Lite"
+
+src_prepare() {
+	sed -i -e 's|\(INSTALL_BINARY  := \$(INSTALL)\) \$(STRIP)|\1|' mk/Variables.mk || die
+}
+
+src_configure() {
+	echo "LIB := $(get_libdir)" > Make.config || die
+
+	# enable gamt
+	echo "HAVE_GTK := $(usex gtk)" >> Make.config || die
+	echo "HAVE_VTE := $(usex gtk)" >> Make.config || die
+}
+
+src_compile() {
+	prefix="/usr" emake || die
+}
+
+src_install() {
+	prefix="/usr" emake DESTDIR=${ED} install || die
+
+	if ! use gtk; then
+		rm -rf "${D}"/usr/share/applications || die
+		rm -rf "${D}"/usr/share/man/man1/gamt* || die
+	fi
+}
diff --git a/dev-util/amtterm/metadata.xml b/dev-util/amtterm/metadata.xml
new file mode 100644
index 000000000000..24cbb90cf0c4
--- /dev/null
+++ b/dev-util/amtterm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest
new file mode 100644
index 000000000000..e02afc2d76aa
--- /dev/null
+++ b/dev-util/android-ndk/Manifest
@@ -0,0 +1,28 @@
+DIST android-ndk-10d-amd64.7z 459151600 SHA256 812949f9299afd4b91890863054dc42f6547b6d485211d5f0faca9f286685df6 SHA512 b2ba10d7757ed7189b4e6dc2ecd38fce0c32dc6701151542b9e225e890faee84dded30dd4e907b0e42473e2a6df8ef4d46f37514edc270a04e1129d9c9e677fa WHIRLPOOL 6eddc1401db7d2766335f8a9ddc2dbe395999a1e210855e23ee7b3c5f65ff1e56859c8cdcaff598acd52f8ffe30e148e6ff2e6e2f712d1e4f69fb350a8d3a174
+DIST android-ndk-10d-x86.7z 449997190 SHA256 c0d07e5ce2fff13b5eb456c10e99527184c9139e798cb7fd1adfadafa65cb696 SHA512 8d66229f6f07d6fba00650a96267c3c4a8308d296d9f13aa359af34ad49f57ba3a02e39f14d2b04609816e5f28ed939e71024043a0f08dc3711895a42e39f771 WHIRLPOOL 482ea86675f2b983669d30e508a21d813a7b03eb19c98696017591ecebf78102f5549df2b4be2d29c301b0b2dfc774b2057248facc2f395beec7f04326841e62
+DIST android-ndk-10e-amd64.7z 401522849 SHA256 102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a SHA512 8948c7bd1621e32dce554d5cd1268ffda2e9c5e6b2dda5b8cf0266ea60aa2dd6fddf8d290683fc1ef0b69d66c898226c7f52cc567dbb14352b4191ac19dfb371 WHIRLPOOL a372ea7753aafadc2a12663f56e4feb865569d9372b777410b7df61b04310879be0c0398bd4f675564e3bf4088707cddf7fc721d2c76c42691c37e4dc49a2c7f
+DIST android-ndk-10e-x86.7z 394281908 SHA256 92b07d25aaad9b341a7f2b2a62402d508e948bf2dea3ee7b65a6aeb18bca7df5 SHA512 fdce2537c4f9bca980948961448ec746bca0626b92c1edf0db46df34819b6ea2f6acb4f0921c3ff8da8e20dd6b414749c6cb3b973d7d1cdecccb4b8f4f2e0679 WHIRLPOOL 40205439cf16b3bf374aaaa9930bab96e8b3dba8b2de07fb920564e78c62017c2f7693cc1880b8e6da2542a20af8822d1851ee8a3097d325074efb3a89ac1579
+DIST android-ndk-r8b-linux-x86.tar.bz2 160466240 SHA256 4309c6e8f6bc48bfda7a4b339dc792e926f18ed765bedda7727bb6778937dad0 SHA512 a7a4bb00a16a473cec33c185f21b386d72a4d1dc1294f86bfeff95de70c45e0a9b357ac53d482a3b0e8dfc527de9d561e2b121c199c9149662bd4f05e6bef1b2 WHIRLPOOL c799cc7cc06baafb67b4630debebf458513d203998e1fae1b9395daaa8d5998e71468c3a0e43cacb1ec959ae854a016c4407129ed86c3d5a2fd0e3162bc1c395
+DIST android-ndk-r8c-linux-x86.tar.bz2 179945337 SHA256 1d3c463bb33e1c429771745e7e287321f9ebecc8eb30d0e514396508887b9ba4 SHA512 317d6786a33bc94ef9bf983c7836284e74442521a7f1aaa653f1b1c3d2d6428633fb410ac219b90f21ee6a89493a006eebb77fd7ae00889d1e4c5408162bbb89 WHIRLPOOL d30902cfd65a6402bdae28a332f6ef8ba9f94a30eebc8e39ccea3d7e01ab82eeb95c787bfd13d78fd043e0e37bf5d5b66b61bfd4f23781aa4b1a605f23fd1f23
+DIST android-ndk-r8d-linux-x86.tar.bz2 254644383 SHA256 29b9e1cc0aade159f1b2e0ebf7f53dfbe3e4e43f96387f43f28b1cfce5c707e5 SHA512 76fba8f76325338a29df24c071ab838cde4457de302b91f9c461913b1e26a14aae11c41fbfbb98071c698ffe949d0909ed20a43bc5072141e3c075ce3252480f WHIRLPOOL 206906094bcd84b0a502e28ceda2593add269ced8724e5873951c6094b1fb8c7d3a90704119c140687725ee97f7b216fc506e1a592b1d69b86177b515f561082
+DIST android-ndk-r8e-linux-x86.tar.bz2 461526099 SHA256 c2c4e0c8b3037149a0f5dbb08d72f814a52af4da9fff9d80328c675457e95a98 SHA512 c8f897441d803960f4dbc18b9c99688a952a5175ff5b3c332a8ca25e5612a7d4c931f354cfbb7efd0f9497ada53124f792bb839d07594218187d4a19a0bce5dd WHIRLPOOL 36c9f4d63ef2e29c089deec1229d297c3f462ca376360237c7df75ad6fb649f73e3d664466a423f6768b0dcb7fe3e2f301c5662fcc2590da90bb6bb1b772d467
+DIST android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2 241172797 SHA256 26b94f0a5d686b4892cb22b06094751efded0958baed380b2ccce56517fd830b SHA512 4c8f1c9c6dfe264f227959124dc19f9fc9596c166076b8ec82b37f033101285ccd5832962e233d2605869308b2367280665a1f53f4693cb753434b480c49af25 WHIRLPOOL 60fa7d65c34850ae8b247cca067e2ff41c34986fd87fe8752d6da5b866f4967946eab6f4192701554532c688e075cd2b6f3231ba84698de6216bff33b12024c0
+DIST android-ndk-r9-linux-x86.tar.bz2 419862465 SHA256 30f3da01e4d8d3415777b5d88a0b70fac5a4620807fd28110f9bc4c8093f6b6e SHA512 9c2da6b52df00ff6177ac18314f7c7abef585d2297362d426a9b0a28c8319531d684c1515971066050181178ab205210a7f25ec1de9be843fd0da7c1e897747e WHIRLPOOL 0cdf68e15cac621c686dbc6c6f5fd40e164ee043030a861a1f0484ae6abc8a73c521130c6ec8e6fe6f1beba5b87256634134efcfdc6b0ebf4cda83dbc78db88e
+DIST android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2 244427866 SHA256 087fbca38a1a2c1a309de272d22e84bbc1c3e2254211761180572fde75faab27 SHA512 dde193474b46ac2ceb69f5ad3ba106eb840daf18470538d85e147b17dff8b1b1b848d499727e28bb8e76bdd16dd4bb99dc073c06f80949080551ae0437f08eed WHIRLPOOL e821828e0ceb8f977dabae8ef92f0b763158ad8d9a7709c6bf051f80db1a7e699ec5c6b5801c08b77e9e7cfc97053497272445ec46d671c1cbdffc0999dc4009
+DIST android-ndk-r9-linux-x86_64.tar.bz2 425113267 SHA256 8a6013bfd8a8709592c53086c4f841933f5f2b175dd030326406d24ff4daa267 SHA512 4196a71c20ad2f12bb5d3fe994179e76ba6e535a5460c34ff07974e74afc362ed271a20c24ac565e8f8863bca152f24befdd1954711d844200a676ba08e1a0aa WHIRLPOOL 5aa753c260015763791c417f8c0c9699e6a394f1a1483db45a24b2884a05907f42cdac17672fae1478ac66ccce097a5519a99fcda4d35ec1c1fc3c8aec42841e
+DIST android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2 125676842 SHA256 606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f SHA512 a6f7189b033a55b4623d4831c35adc635faf80393da217aeabc959d97a246347b8d67150b086ed8f13cd93313d06563f54aa8f29f887d23ffaf8f8a3ac5d3876 WHIRLPOOL 833d877e069400ba578bf55b8e626d14607027f36c9306b3798b7295a4a2386ca327cef2124edbe359e1fa21dcf75b3aae6a0cf8d8430f7476571cb80849f922
+DIST android-ndk-r9b-linux-x86.tar.bz2 361394055 SHA256 748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81 SHA512 e8448f2dda591a1e18bb2dc40d6682c19ca01b7d6914fd079e7e6b86cdc152a3c05f7a3853714bfa5b1df7c3eb3f124ba7912caef53fd0d0a335b89c352e8a94 WHIRLPOOL 01c613eb7b66a1d932f787a0ce424f7c4dcadae5ca027273b106e7b24319adc96ed7deda9ad32ea745f88cf210672e64249855b1cead414fc4ab85f938d5ce93
+DIST android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2 127742633 SHA256 de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1 SHA512 eeddc80ec3cb75a248ab8e66948a5e5001812cb19213541e5fb85b9b30cae6aac62849c91c9dfd3af2f822382060b069d2efc21294d2f87824be695e9d9abc50 WHIRLPOOL c0c0b7a87890943083bebdbf75cf2ee8c79204b607843f752baa8296da60b65873d3ad3370946cea992217c14486e773411e82fead0ceb662e3132d033119871
+DIST android-ndk-r9b-linux-x86_64.tar.bz2 366988131 SHA256 8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532 SHA512 99eb950ceff8a6fc931859fadb1151326b9fbcfddf1ac8027076b3a4ba5d746b31c38cbde925ab6882510a7b39d93b93b0ff346d452db5c364997bff1bdc0887 WHIRLPOOL 84a542a0f47956a3b5f41717e7a48d3c4ce558a8bcd0cd4b5c8b38fc40c4740b89ab9d8d91286ab2ee8d5330d6c8e66146adca9ebfad44e11ea8c6474684fa71
+DIST android-ndk-r9c-linux-x86.tar.bz2 365412557 SHA256 3497ca83dc8e7c0e35c6fbe8aab882d307613a5f2ec64a2df50e99b9bb6d3cde SHA512 ebd85d9670956db60fb3842a827288d32df70a7b2febc0477fd2ec63531fa8fa61a89a3c3916decf6dba7ef3f2794121ffdd3c1b8263b0e9c259650e44dfb675 WHIRLPOOL cbe66cf87f538ca1f558760f83c7ef81e81373102d0fc945d94d0d7244a4dde1f5e5e5434219b1b132c063e887168bf03d5dd5e268972b406cc5821f6b7d94a9
+DIST android-ndk-r9c-linux-x86_64.tar.bz2 371254928 SHA256 300be3963d775d83c349487a68b4985df492561433d2eb25d81725db1a98b958 SHA512 317a3904561c850b9129a855fd353a7ba706986f08bde709d16ef10c6adffe546cdf3cb48e5e19a0261f33edde4b2d3b6f5ae9aa59280ec0742dbdacbba93755 WHIRLPOOL 8a468837bf79906692aed7d49b91b3317e6fe4edc0b5fa91a4b6f1ee2ea6fd633104032cb992c40dc02573c3dccf2e80a7cee818b5bef2ce2942c3577d2025a8
+DIST android-ndk-r9d-linux-x86.tar.bz2 405218267 SHA256 d5ec2e6cad089ea1229326b137f42edbb2db4d961840eb9b38aa55ca32ea3d53 SHA512 9ba1603d3ac5daf8816dbc7ba998d6b93d4f3d197a30beaaccb02fefe785554769b453462c90fe19194200808b38128396e77c32425c8d0872652c81a916304e WHIRLPOOL 90a0160e13535cb95fb9d5dfd15a03c9c67f3949ea154ddc792c20f470b34f2aa4462b51033df43067886133d599256d35cf295ba856c7fa3d37aa9e3077e09c
+DIST android-ndk-r9d-linux-x86_64.tar.bz2 412879983 SHA256 14e1d183a85caca5e08e5e56e5a5beaa2e3f539755eb7a693efdb0e16ce6b19a SHA512 b6b663533785fb6cbc10e467a109cf47f4a49d87abc72f03439ac7b3aa57350e1602d766793bf6c3c5f6e4f4ab8733311ef1c761ac335691566b2e936f853af3 WHIRLPOOL 3f0b9a5692253c2776567ad9ce2b328716662b79755818727446bfe46411975f76b8d8f8c2a609d8060986d7fabb436b9dd8c89be2ae96d744b27aab91823ddb
+DIST android-ndk32-r10-linux-x86.tar.bz2 420078216 SHA256 7480eea8fe699cfc6a3fcfca9debe8d7e2cd6ef00e31e12b91dead49fcb782b4 SHA512 c3acf611b360bea4d559341c4093d1194fa3131ad807ad9aa8f6c159c12bd4979cadc65388b9826baad89c0ba6a4a03f192ddd885c50f0066022ae3265d8e59c WHIRLPOOL a451edb6bb840d88c8f26b3615b27d87d7c5aa78954b5082a78ef184f5c3bafe161c2430803ab8db5dfb91b52d22ef66aa62acfaef75481e4e51f76f71978621
+DIST android-ndk32-r10-linux-x86_64.tar.bz2 420671390 SHA256 9d0b4aab6e3f34158a3698226ab7d6c8df4aa8c9cc5242da9b733ac1f988090e SHA512 004e223b741c8b63ab86bd37f2c83d89457d5144e18221e792676e070ffb9b23078568b52abee2067de7daa0dbe5e8152bcc82685273d60e1a243b3c5f159f84 WHIRLPOOL 8faa4a85a6b8d4a3a0fa1afff543f42a5484d43c4fd4c3ff5f93c2b592edc0ed50d59fae725e4fc26b07f3330b8a87a23fd3fb7aab30e0f4a5a974b445874c06
+DIST android-ndk32-r10b-linux-x86.tar.bz2 421052081 SHA256 e4766586d0f65452317e662758eb7d070c55ad4092e1e82ab1717a1114a1c430 SHA512 ecd270244c9f00b9bf883014f65a04459a5cd422e65239b13a463c363b9e82d7907495792bbe1287dee082117c03356b1f8d869339a4cf1966f2a56ae664aeb9 WHIRLPOOL 28710389c31d8f81f59565af744d17f2d6c081a063046306d9182a13995b7ec99688bdefa9cfd52613f3d76213e005eee84110c3f8cd709007416edddbc92459
+DIST android-ndk32-r10b-linux-x86_64.tar.bz2 422237011 SHA256 f309365a809f61ab012dd3560dff1ecdad8a3652b316938a6f9943cba42bda95 SHA512 6b7ec25a7c2d6cef94ba61403274276a912c5fa757dda5206548619fb155e97bd6eab0eb3354f51f703b82300a754ec8da352aeb20cdcdf80884aaa4bcd97a6f WHIRLPOOL 250d84d1d717db946a09e23a0689a544ea5999c4bfd9e420ea41ccc497102200e62a088c0a421721610e07fc15b112e61856aba59768b4bba87906ab503bb682
+DIST android-ndk64-r10-linux-x86.tar.bz2 338544906 SHA256 e8bdee2e7696b97e9e9e4ef62a59b39edb38a759dc0a566ff81caf08938c7d9f SHA512 09a54fb86a7a157e9dac5a682f2cbae9492fe8c2f64a23f613d7e331844eb682e8e4affbaea116895310f417514bd85b66e6841755197b9add4e84237114d4f5 WHIRLPOOL d5f593e7e9c2b55e631204f11546fded6abcfc52518905d16508ab393a86886cf8d7cee6c2916e76e9474cc2da13c3c8f7332a8908ac273a36e86df53c272bce
+DIST android-ndk64-r10-linux-x86_64.tar.bz2 339708042 SHA256 b99bbc74973d0b2c17df22bc0ba9e61704d6f631deb036885fce05964d9ec921 SHA512 2d2a9689912c72e1f3ef5c14acef1b747460531b234d9fc9af25de7102a0195406c47e5c6e98cd5be2a58163fbf76eb1cbf3098a84f93b5c68c18eec94625a9e WHIRLPOOL 79dac240bdc48fed682e129cb8397deddd266397e5b6443b01e98491dbf876cc102c4f1cb7c6c8fff0e4a9d8ef2e4c5089dc47d2efd22380776833a27b32030b
+DIST android-ndk64-r10b-linux-x86.tar.bz2 358060577 SHA256 f56782b70ceff53749b9e63f0384e4e0ad04a46a2d7cd64c3b27c7493d2f64dc SHA512 c951a3a50d0db66c435190a6a8000467785932fa1ff000d59b9f4c5917ddf78874df3e2163b5757c019a68a3dcb13492f486248f30d0c762279ff5d67327f26b WHIRLPOOL 022ca2d9968bd9214ad56fa81afa4969147913fb2c74234cbe69a250a8513a9220776e69675cafa5337f45382661b063149c949d8a74baac007e311b4e27f54f
+DIST android-ndk64-r10b-linux-x86_64.tar.bz2 358835298 SHA256 32452087a846e73ef3007903e1368edc21847720566b34ae113e454ae259bd8b SHA512 95627d327db205b7a3ec1fb940a8f1509dcde3c2367d779cc06dd7bb2ffd41f3d2eece79bf4578279a571a42233f58109eb6586330b11844f98c79fa410f2c37 WHIRLPOOL c689b6efa8de4f1c1ae1312a99198c036476caa915ae649c4bd66b6879adb9ac790c597361c87a5aa733ef6908e02d8a03fd68186e0c8f1022daa4e99c2661a3
diff --git a/dev-util/android-ndk/android-ndk-10.ebuild b/dev-util/android-ndk/android-ndk-10.ebuild
new file mode 100644
index 000000000000..2b545855efd7
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="x86? ( target-32? ( http://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86.tar.bz2 )
+		target-64? ( http://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86.tar.bz2 ) )
+	amd64? ( target-32? ( http://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86_64.tar.bz2 )
+		target-64? (  http://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86_64.tar.bz2 ) )"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+target-32 target-64"
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
+	printf '%s' \
+		"PATH=\"${ANDROID_PATH}\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-10b.ebuild b/dev-util/android-ndk/android-ndk-10b.ebuild
new file mode 100644
index 000000000000..2b545855efd7
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-10b.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="x86? ( target-32? ( http://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86.tar.bz2 )
+		target-64? ( http://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86.tar.bz2 ) )
+	amd64? ( target-32? ( http://dl.google.com/android/ndk/${PN}32-r${PV}-linux-x86_64.tar.bz2 )
+		target-64? (  http://dl.google.com/android/ndk/${PN}64-r${PV}-linux-x86_64.tar.bz2 ) )"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+target-32 target-64"
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
+	printf '%s' \
+		"PATH=\"${ANDROID_PATH}\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-10d.ebuild b/dev-util/android-ndk/android-ndk-10d.ebuild
new file mode 100644
index 000000000000..44f92a0d5815
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-10d.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="x86? ( http://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86.bin -> ${P}-x86.7z )
+	amd64? ( http://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86_64.bin -> ${P}-amd64.7z )"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip installsources test"
+
+DEPEND="app-arch/p7zip"
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
+	printf '%s' \
+		"PATH=\"${ANDROID_PATH}\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-10e.ebuild b/dev-util/android-ndk/android-ndk-10e.ebuild
new file mode 100644
index 000000000000..54d6c82cde57
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-10e.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CHECKREQS_DISK_BUILD="6G"
+inherit check-reqs
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="x86? ( http://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86.bin -> ${P}-x86.7z )
+	amd64? ( http://dl.google.com/android/ndk/${PN}-r${PV}-linux-x86_64.bin -> ${P}-amd64.7z )"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip installsources test"
+
+DEPEND="app-arch/p7zip"
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+QA_PREBUILT="*"
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
+	printf '%s' \
+		"PATH=\"${ANDROID_PATH}\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-8b.ebuild b/dev-util/android-ndk/android-ndk-8b.ebuild
new file mode 100644
index 000000000000..cac57652e426
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-8b.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+MY_P="${PN}-r${PV}"
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="http://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${MY_P}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+ANDROID_TC_ARM_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_ARM_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}"
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	printf '%s' \
+		"PATH=\"${EPREFIX}/${ANDROID_NDK_DIR}:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_6}/bin/\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}" || die
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-8c.ebuild b/dev-util/android-ndk/android-ndk-8c.ebuild
new file mode 100644
index 000000000000..cac57652e426
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-8c.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+MY_P="${PN}-r${PV}"
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="http://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${MY_P}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+ANDROID_TC_ARM_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_ARM_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}"
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	printf '%s' \
+		"PATH=\"${EPREFIX}/${ANDROID_NDK_DIR}:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_6}/bin/\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}" || die
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-8d.ebuild b/dev-util/android-ndk/android-ndk-8d.ebuild
new file mode 100644
index 000000000000..21ab36b8e37f
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-8d.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+MY_P="${PN}-r${PV}"
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="http://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${MY_P}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+ANDROID_TC_ARM_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_ARM_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86"
+ANDROID_TC_ARM_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.7/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.7/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/x86-4.7/prebuilt/linux-x86"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}"
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	printf '%s' \
+		"PATH=\"${EPREFIX}/${ANDROID_NDK_DIR}:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_7}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_7}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_7}/bin/\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}" || die
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-8e.ebuild b/dev-util/android-ndk/android-ndk-8e.ebuild
new file mode 100644
index 000000000000..7e333122dbe5
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-8e.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+MY_P="${PN}-r${PV}"
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="http://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${MY_P}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+ANDROID_TC_ARM_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_ARM_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86"
+ANDROID_TC_ARM_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.7/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86"
+ANDROID_TC_MIPS_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.7/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86"
+ANDROID_TC_X86_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/x86-4.7/prebuilt/linux-x86"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}"
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	printf '%s' \
+		"PATH=\"${EPREFIX}/${ANDROID_NDK_DIR}:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_7}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_7}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_4}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_6}/bin/:" \
+		"${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_7}/bin/\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}" || die
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-9.ebuild b/dev-util/android-ndk/android-ndk-9.ebuild
new file mode 100644
index 000000000000..18280c801516
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-r${PV}"
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="x86? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2
+	legacy-toolchains? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86-legacy-toolchains.tar.bz2 ) )
+	amd64? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2
+	legacy-toolchains? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86_64-legacy-toolchains.tar.bz2 ) )"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="legacy-toolchains"
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${MY_P}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
+	printf '%s' \
+		"PATH=\"${ANDROID_PATH}\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-9b.ebuild b/dev-util/android-ndk/android-ndk-9b.ebuild
new file mode 100644
index 000000000000..18280c801516
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-9b.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-r${PV}"
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="x86? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2
+	legacy-toolchains? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86-legacy-toolchains.tar.bz2 ) )
+	amd64? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2
+	legacy-toolchains? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86_64-legacy-toolchains.tar.bz2 ) )"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="legacy-toolchains"
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${MY_P}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
+	printf '%s' \
+		"PATH=\"${ANDROID_PATH}\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-9c.ebuild b/dev-util/android-ndk/android-ndk-9c.ebuild
new file mode 100644
index 000000000000..9a7acd58d984
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-9c.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-r${PV}"
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="x86? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2 )
+	amd64? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2 )"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${MY_P}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
+	printf '%s' \
+		"PATH=\"${ANDROID_PATH}\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/android-ndk-9d.ebuild b/dev-util/android-ndk/android-ndk-9d.ebuild
new file mode 100644
index 000000000000..9a7acd58d984
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-9d.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-r${PV}"
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="x86? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2 )
+	amd64? ( http://dl.google.com/android/ndk/${MY_P}-linux-x86_64.tar.bz2 )"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror strip installsources test"
+
+DEPEND=""
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81"
+
+S="${WORKDIR}/${MY_P}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+QA_PREBUILT="*"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains}
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners root:android "/${ANDROID_NDK_DIR}/out"
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
+	printf '%s' \
+		"PATH=\"${ANDROID_PATH}\"" \
+		$'\n' \
+		> "${T}/80${PN}"  || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \
+		> "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/android-ndk/metadata.xml b/dev-util/android-ndk/metadata.xml
new file mode 100644
index 000000000000..905572c5b252
--- /dev/null
+++ b/dev-util/android-ndk/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<maintainer>
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+		<description>Feel free to update/modify this package, just don't break
+			my limited use case that I use it for.</description>
+	</maintainer>
+
+	<use>
+		<flag name="legacy-toolchains">Install legacy toolchains</flag>
+        <flag name="target-32">Support for 32-bit targets</flag>
+        <flag name="target-64">Support for 64-bit targets</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
new file mode 100644
index 000000000000..db0649f2be49
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -0,0 +1,11 @@
+DIST android-sdk_r21-linux.tgz 91378351 SHA256 ad3e642626407b78d0fafe7ff89d1ee388b1f5c6f2eba83ce9364957a038ab9d SHA512 3a3338265a2d00f8b7fbb35783d7449498afd8107ddd4ed4c2c34e47582d83eb23f78d02fe01db54c12c48dba0167f60118c1061f1bfeb0048147674fee8d87c WHIRLPOOL feeb9d060a460ec2738a612ae90689791edf54deabcb1b1c37ddec22fb8bfaa13fc4dd53aecfbd5ac70309ce299a88ed84080ef7a2e1a14a6959d4ecf21fbfc9
+DIST android-sdk_r21.1-linux.tgz 91617112 SHA256 276e3c13a10f37927d4e04d036a94a0cbbf62326981f0ba61a303b76567e3379 SHA512 160cd51f965a23120cf63abe02b9a9ce8913d1239a848bc423b33ad10eff65b30147c6b11ab751aa12154292ce0a7837aa60def1cd31a2ccb5d4fc6fcb6d2c24 WHIRLPOOL a4f413356ac87d4753f8d33bddad737cadf41b2d8246f8971addbec568261212505bef4be3c098c8e21e148960a90b87c2c6952665d1845e0aeee9a307c06b44
+DIST android-sdk_r22-linux.tgz 99643077 SHA256 fd75de430bd83f90fbeb0d15ae017cccf998a87286188232cfeab27a6d89bd32 SHA512 9beda1ae872dde3ca7884d1c389566ce2c8b511ef74d95bc9ddf53683445cc454f9a5a1871a80d5826083d98713040cb1b8b239a77a8eadf56daf30440c7108d WHIRLPOOL e5c39b61d8f9f3f72420af21d7329f04492787543e4693c4eee010b9ec4d48c04bd4eb8d1d202c32552e46e220b2e3e973fe5248602b5d147f0788f89ed23e88
+DIST android-sdk_r22.0.1-linux.tgz 105617062 SHA256 216ae659a53682b97a0e0c2b3dc2c7c3d35011ed10302ae1a5ddbaf52a62459c SHA512 7c97ba8daf4a1b8b6e422d8fca21a5e23f3a5e92d769e13ab5e649a967f2662c71ae201a6c1d40202bda98c4fb80eaa60a3ff5e4af9f613cfab1366f63774ac7 WHIRLPOOL e029de8eaa746796fda38d7716880275d19da5dba08dd514970f7b5b8382a9aaac5415c66529d40f036f717e66f4a7842ebadc3ec323a284a583f0648eac54e0
+DIST android-sdk_r22.0.4-linux.tgz 105640988 SHA256 3eec3c2accfb90d8344d29ed7e80fdf59ea0eecfed3535a7c78116ace5b522e7 SHA512 10e047f6b5384d6c2d3f87e883203f2ab384ac826def16c07f1969d59dc79f97ccba36f0185d564fe0dd4811425fe18767c326b3712ee47b5515f0aba47ed612 WHIRLPOOL 76f21a8d44a7e9c79b8b9c8aea7b46de152577f7526f2d6861eb0c5cabbea20979721d22b2bee9978945ed920898754817f47fafc858a1d90199244b4152274f
+DIST android-sdk_r22.0.5-linux.tgz 105641005 SHA256 b664d1024b6fcf897e05eb1674c998df0ed2e4c9c280469445d914f8fcfa4454 SHA512 655f709994a8c5f9bd78216d8587bda66f23b7fccd556fd78adc989a835540af89529f2fb4d846e28196952a0a3c5bc919563c83fb73e6ecf7a4ad0560eb7f81 WHIRLPOOL acf50cd009107614e13d589d5ca7f956f72a80f462413def2de29aa7f8ee873b146ec391c0cab9fdeca8774ede5666b1c936a20ef44ef28d945bfe6bace3c5c6
+DIST android-sdk_r22.2.1-linux.tgz 100918342 SHA256 17ea4610008985eb1454b3b25ad00c59300cee3141f7ea3deec98f45d862faa5 SHA512 4eb7087c27db2b2435aa11bba01fccd09617ea58dd84aca8b249d81b3d15c913844d204463a6d83064c6cf8f07e26c0f70130315b281b1bbfd32c01d6e53bfef WHIRLPOOL b51611c4000464f2f0872893adea4bf7027f188582081d7beedc2b77700841b7e82ca6415db44603d4c186eda0e00dd4f51e603bf4416963ae80a0b57b617e0a
+DIST android-sdk_r22.3-linux.tgz 100968558 SHA256 4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f SHA512 c05e610e0979f61d217b6612bccd48120719123cf80282cca442e81be6e0c4cfd5a4b3f398d1c8835c86bc67b730a7bf5a5e511abe57a1d70b6c1f62940832a3 WHIRLPOOL 3a05248c6e784a82dd2eb92de403e6e7634e4d3c472334c7d9d539f41a7d0612c48e6aecbd784081cc5477f22f595c723748ea69d8313c8550c63923a3ce1969
+DIST android-sdk_r22.6-linux.tgz 100992666 SHA256 da4c25536ba7f85cdd37be8636fcc563480410788df30c3fc5b5c876e6220e5f SHA512 2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322 WHIRLPOOL 0d83ba871ea5ffd66d8543a563eac351b82f8597b7c8959848247e469c616fe52101c2d825648dbe6361dde3029bc4a8e06c097868eb3edcdeac1337beed9f03
+DIST android-sdk_r22.6.1-linux.tgz 101052129 SHA256 4ee7bb43fe6f20faf755b0988ecf818312392be52780db13ab4792a0b1627388 SHA512 5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca WHIRLPOOL 09d6d11c08489d07b5b0da32734d70be8da65e949359b1155c9b59f3c07cbd21eed87c15f509e95604b7ed404f99b289700a10373268af132208b3e99178a113
+DIST android-sdk_r23-linux.tgz 137880977 SHA256 2eaab06852ac21b6c79df73c07a667c5da5be57f7ffcbd4f17aef7efeea22ac1 SHA512 c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60 WHIRLPOOL f5fa2012fea5fa8f950626ad7281149c2a40b847514b61c22b8d3eaa0c92c3dfcdd1c7051e0bb990fd5c28babeadaf667228f630e7c19a69280aed06b6ba407b
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
new file mode 100644
index 000000000000..219a0359a800
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	>=dev-java/swt-3.5[cairo]
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="4.2 3.7 3.6 3.5"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
new file mode 100644
index 000000000000..fa0e573292db
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND="
+	>=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	>=dev-java/swt-3.5[cairo]
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
+	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="4.2 3.7 3.6 3.5"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
new file mode 100644
index 000000000000..18fa3ee55115
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
new file mode 100644
index 000000000000..0ae24e844724
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	>=dev-java/swt-3.5[cairo]
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="4.2 3.7 3.6 3.5"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
new file mode 100644
index 000000000000..18fa3ee55115
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
new file mode 100644
index 000000000000..8b9dc301557d
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
new file mode 100644
index 000000000000..18fa3ee55115
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
new file mode 100644
index 000000000000..8b9dc301557d
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
new file mode 100644
index 000000000000..0a8c3eed5e1d
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user udev
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+	udev_dorules "${FILESDIR}"/80-android.rules || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
new file mode 100644
index 000000000000..0a8c3eed5e1d
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user udev
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+	udev_dorules "${FILESDIR}"/80-android.rules || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
new file mode 100644
index 000000000000..0a8c3eed5e1d
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user udev
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+	udev_dorules "${FILESDIR}"/80-android.rules || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
new file mode 100644
index 000000000000..0ae24e844724
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	>=dev-java/swt-3.5[cairo]
+	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="4.2 3.7 3.6 3.5"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
new file mode 100644
index 000000000000..203379b0ee96
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user udev
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+		app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6.5
+	|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+	sys-libs/zlib[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+	${ANDROID_SDK_DIR/\/}/tools/emulator
+	${ANDROID_SDK_DIR/\/}/tools/adb
+	${ANDROID_SDK_DIR/\/}/tools/mksdcard
+	${ANDROID_SDK_DIR/\/}/tools/sqlite3
+	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+	${ANDROID_SDK_DIR/\/}/tools/zipalign
+	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+	enewgroup android
+}
+
+src_prepare(){
+	rm -rf tools/lib/x86*
+}
+
+src_install(){
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+	udev_dorules "${FILESDIR}"/80-android.rules || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development	environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See http://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/android-sdk-update-manager/files/80-android.rules b/dev-util/android-sdk-update-manager/files/80-android.rules
new file mode 100644
index 000000000000..e6eda7c938a0
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/files/80-android.rules
@@ -0,0 +1,4 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0664", GROUP="android"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0664", GROUP="android"
+SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0664", GROUP="android"
+SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="android"
diff --git a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop
new file mode 100644
index 000000000000..83f1d25990ca
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Android SDK update-manager
+Type=Application
+Comment=Manage/update Android SDK (tools).
+Terminal=false
+Exec=/opt/android-sdk-update-manager/tools/android
+Icon=/opt/android-sdk-update-manager/tools/apps/SdkController/res/drawable-xhdpi/ic_launcher.png
+Categories=Development;
+GenericName=Android SDK update-manager
diff --git a/dev-util/android-sdk-update-manager/metadata.xml b/dev-util/android-sdk-update-manager/metadata.xml
new file mode 100644
index 000000000000..9f81922e6010
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>rich0@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
new file mode 100644
index 000000000000..e85f9f047e34
--- /dev/null
+++ b/dev-util/android-studio/Manifest
@@ -0,0 +1,3 @@
+DIST android-studio-ide-141.1890965-linux.zip 259139652 SHA256 f6c083902156ab83435fa91ae0743d9a2ae64e8aca1396afd553a44071366906 SHA512 bed422287003072ea4d65c05724fce22d3e847d5d292d2fa53cf799e344c2638d721e1e0c1c2b1444e1a52931e96f83499c5f9c6fb64e79aacbbf03dd1c10b61 WHIRLPOOL 58b542bb7f0a4375a5281e500ed74542c17af10582f305dd56792b7efb666a1a316a2d8fded99801d219ceceba919e527272b87067531a0a910d34197740dde1
+DIST android-studio-ide-141.1980579-linux.zip 258628239 SHA256 46a1b492360f873f7b99f53b535ce79503f4127a8ee5d06afbe0f53ec5f56a21 SHA512 54a83e6a54cd07ade1bfd3756bdff9c3431594412a01809ac3d2b1b5b2fb1719b8dd4f980516eeba5f7016c7757950c93a1d368ad1034d1300b9fe44577a1bcd WHIRLPOOL 567bcc5ae38015a586224e7c5870d7766f18b4241b46aa53eb7459a7f26d859d9855632cdcf54d3b35bca1b7c39b15cfc1141d11a4d017d9b3e199b72f088b56
+DIST android-studio-ide-141.2117773-linux.zip 351742127 SHA256 061be01b266fea24517dfee24ed98cec1eee2ef840f062a697c6bd07d2db5d27 SHA512 e21291c3e759e1b500eca487ef1e43c2dfd44e051cffd6fe2abbf9445c7577846d8e11aaaf0cb7423b70185bbcbdca8bf4ae2d084fedba7f28adc9063409520c WHIRLPOOL 22e00aae65870af2d9e0c77754f9b0fe9a35b9798c2e0e4535288cbb9803a40c405b2235b078f97e203356e8468fb6e49f270d00704abdc2027448984adf794a
diff --git a/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild b/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild
new file mode 100644
index 000000000000..f20bd5e129be
--- /dev/null
+++ b/dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="amd64 x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+	>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+	>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
+	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
+	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
+	>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	>=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild b/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild
new file mode 100644
index 000000000000..f20bd5e129be
--- /dev/null
+++ b/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="amd64 x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+	>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+	>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
+	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
+	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
+	>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	>=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-util/android-studio/android-studio-1.3.0.10.141.2117773.ebuild b/dev-util/android-studio/android-studio-1.3.0.10.141.2117773.ebuild
new file mode 100644
index 000000000000..10fb9347d776
--- /dev/null
+++ b/dev-util/android-studio/android-studio-1.3.0.10.141.2117773.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+	>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+	>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
+	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
+	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
+	>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	>=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-util/android-studio/metadata.xml b/dev-util/android-studio/metadata.xml
new file mode 100644
index 000000000000..b8f80ceaee13
--- /dev/null
+++ b/dev-util/android-studio/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>perfinion@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
new file mode 100644
index 000000000000..7a1e58d0d1e7
--- /dev/null
+++ b/dev-util/android-tools/Manifest
@@ -0,0 +1,3 @@
+DIST android-tools-e89e09dd2b9b42184973e3ade291186a2737bced.patch 1115 SHA256 3bac2ec91d6d53cc7a2bd31f0670ff2e560b15d8722d3961e7b24b2f41cf5932 SHA512 2239e883269dc2cbd9f25dde9159cff8de8525b021ea9e2a243d4553e60c28398cb8e830117cc20e7cfe1b951f2841430e9bc950916d30b0f6c9e6dbd154f6b9 WHIRLPOOL 1bdbb65ebbf94e8c732f4893f090f895d24173928f6cc48b53160595449efc0457130ab67e6be132f77763110fd08e7aeba6701effa27de6fe3c0bdc0d82a8d1
+DIST android-tools_4.2.2+git20130218-3ubuntu36.debian.tar.gz 152459 SHA256 1bb63a418dc785277173ce971711a86f66d35d4ca7053cd1ff4afff8001cc7a6 SHA512 8e03fa08433f0cc358855d116926e50f0e6346c29ab3d1a865eb5b0e3be00091d861bd3ac2f3bc236a9028b35bf40988ab8130f566c3aca8c4ccbd7066a317f9 WHIRLPOOL 50c152c32a6d7f505a86faf24d2645053362073608990228eaa88f25e86c54b2a4dcab51f8d52941af493ac68628cf75c2abd320ec7c80a7aa89431277578e6c
+DIST android-tools_4.2.2+git20130218.orig.tar.xz 215868 SHA256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f SHA512 c5bfd3c8e514809db257ba5559c865742768b7520b38aa2f53185aff5c328e5cf7fb328a6ff6450eeddd5056985f232d492eba63a87978440e2147e26d62f458 WHIRLPOOL 0ad784e8524adf1d23958336b73f22fe504074b85c93f17e023a10e57f4e413d8b803c619a0dd7ff495ff8910681d3023932d7a87a008f3e44bacbe6c1fd70a4
diff --git a/dev-util/android-tools/android-tools-0_p20130218.ebuild b/dev-util/android-tools/android-tools-0_p20130218.ebuild
new file mode 100644
index 000000000000..91c0f05b7ffd
--- /dev/null
+++ b/dev-util/android-tools/android-tools-0_p20130218.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+MY_VERSION="${PV##*_p}"
+GIT_SHA1="e89e09dd2b9b42184973e3ade291186a2737bced"
+
+DESCRIPTION="Android platform tools (adb and fastboot)"
+HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git${MY_VERSION}.orig.tar.xz
+	https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git${MY_VERSION}-3ubuntu36.debian.tar.gz
+	https://github.com/android/platform_system_core/commit/${GIT_SHA1}.patch -> ${PN}-${GIT_SHA1}.patch"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD.
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-libs/zlib:=
+	dev-libs/openssl:0="
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	pushd core >/dev/null || die
+	epatch "${DISTDIR}"/${PN}-${GIT_SHA1}.patch #500480
+	popd >/dev/null
+	epatch ../debian/patches/*.patch
+	mv ../debian/makefiles/adb.mk core/adb/Makefile || die
+	mv ../debian/makefiles/fastboot.mk core/fastboot/Makefile || die
+
+	# Avoid libselinux dependency.
+	sed -e 's: -lselinux::' -i core/fastboot/Makefile || die
+	sed -e '/#include <selinux\/selinux.h>/d' \
+		-e 's:#include <selinux/label.h>:struct selabel_handle;:' \
+		-i extras/ext4_utils/make_ext4fs.h || die
+	sed -e '62,63d;180,189d;231,234d;272,274d;564,579d' \
+		-i extras/ext4_utils/make_ext4fs.c || die
+
+	tc-export CC
+}
+
+src_compile() {
+	emake -C core/adb adb
+	emake -C core/fastboot fastboot
+}
+
+src_install() {
+	dobin core/adb/adb core/fastboot/fastboot
+}
diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
new file mode 100644
index 000000000000..c6894f04dc61
--- /dev/null
+++ b/dev-util/android-tools/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<bugs-to>https://code.google.com/p/android/issues/list</bugs-to>
+		<changelog>https://android.googlesource.com/platform/system/core.git/+log/HEAD</changelog>
+		<doc>https://android.googlesource.com/platform/system/core.git/+/master/adb/OVERVIEW.TXT</doc>
+		<remote-id type="github">android/platform_system_core</remote-id>
+		<remote-id type="launchpad">ubuntu</remote-id>
+	</upstream>
+	<maintainer>
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
new file mode 100644
index 000000000000..c19130a5b1cc
--- /dev/null
+++ b/dev-util/anjuta/Manifest
@@ -0,0 +1,2 @@
+DIST anjuta-3.14.1.tar.xz 6310008 SHA256 b26cd75ddb603c3cca4348e277d17360e511d75bd77ee2ef52047b75408e617b SHA512 474e5db8799c99645314c8822b97c375f91102d6617e2b8d5e3d856df5d51e11508ca76405ee333a1c208255b98c90c2816de0f2df9f70523d98a2aa0aa3837e WHIRLPOOL 928d6eefca146869a1e7ff004e0f4a990789758416e7209fa62e9dac8b1eafe53ee61d2c6a41d4dfc847cbd3411bd4032a12d3741287488438d6339cabbd459c
+DIST anjuta-3.16.0.tar.xz 6311980 SHA256 77432a01b37b46f5558bf4cc435f9a023abf17c5273d472e17dff1f9b3d9943c SHA512 c679ed615f4e8163bcb8857a8f3865bd7db983995e3cf944a0450926f17b805a8f622e22744c03556a43287b5fa6031465d7f8e8810abf4022a2c78dd080cdf1 WHIRLPOOL 7fc11eb4f3cf52d62ace2109b06c4a8fb4928748be5f4c6f384763d113ff64bf5c42280a4c70eab6cc67f559c36bf7b0625f94f9de2195a08734fcc5c9b93ebb
diff --git a/dev-util/anjuta/anjuta-3.14.1.ebuild b/dev-util/anjuta/anjuta-3.14.1.ebuild
new file mode 100644
index 000000000000..578600d30db6
--- /dev/null
+++ b/dev-util/anjuta/anjuta-3.14.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+# libanjuta-language-vala.so links to a specific slot of libvala; we want to
+# avoid automagic behavior.
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
+
+inherit gnome2 flag-o-matic readme.gentoo python-single-r1 vala
+
+DESCRIPTION="A versatile IDE for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
+
+IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: make python dependency non-automagic
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libxml2-2.4.23
+	>=dev-libs/gdl-3.5.5:3=
+	>=x11-libs/gtksourceview-3:3.0
+
+	sys-devel/autogen
+
+	>=gnome-extra/libgda-5:5=
+	dev-util/ctags
+
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	${PYTHON_DEPS}
+
+	devhelp? ( >=dev-util/devhelp-3.7.4:= )
+	glade? ( >=dev-util/glade-3.12:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	subversion? (
+		>=dev-vcs/subversion-1.8:=
+		>=net-libs/serf-1.2:1=
+		>=dev-libs/apr-1:=
+		>=dev-libs/apr-util-1:= )
+	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.1
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	!!dev-libs/gnome-build
+	test? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	app-text/yelp-tools
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# yelp-tools, gi-common and gnome-common are required by eautoreconf
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use vala; then
+		DISABLE_AUTOFORMATTING="yes"
+		DOC_CONTENTS="To create a generic vala project you will need to specify
+desired valac versioned binary to be used, to do that you
+will need to:
+1. Go to 'Build' -> 'Configure project'
+2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
+'Configure options'."
+	fi
+
+	# COPYING is used in Anjuta's help/about entry
+	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
+
+	# Conflicts with -pg in a plugin, bug #266777
+	filter-flags -fomit-frame-pointer
+
+	# python2.7-configure in Fedora vs. python-configure in Gentoo
+	sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
+		-i plugins/am-project/tests/anjuta.lst || die "sed failed"
+
+	# Do not build benchmarks, they are not installed and for dev purpose only
+	sed -e '/SUBDIRS =/ s/benchmark//' \
+		-i plugins/symbol-db/Makefile.{am,in} || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-neon \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable devhelp plugin-devhelp) \
+		$(use_enable glade plugin-glade) \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable subversion plugin-subversion) \
+		$(use_enable subversion serf) \
+		$(use_enable terminal plugin-terminal) \
+		$(use_enable vala)
+}
+
+src_install() {
+	# COPYING is used in Anjuta's help/about entry
+	docompress -x "/usr/share/doc/${PF}/COPYING"
+
+	# Anjuta uses a custom rule to install DOCS, get rid of it
+	gnome2_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
+
+	use vala && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use vala && readme.gentoo_print_elog
+}
diff --git a/dev-util/anjuta/anjuta-3.16.0.ebuild b/dev-util/anjuta/anjuta-3.16.0.ebuild
new file mode 100644
index 000000000000..373de7593988
--- /dev/null
+++ b/dev-util/anjuta/anjuta-3.16.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+# libanjuta-language-vala.so links to a specific slot of libvala; we want to
+# avoid automagic behavior.
+VALA_MIN_API_VERSION="0.28"
+VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
+
+inherit gnome2 flag-o-matic readme.gentoo python-single-r1 vala
+
+DESCRIPTION="A versatile IDE for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: make python dependency non-automagic
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libxml2-2.4.23
+	>=dev-libs/gdl-3.5.5:3=
+	>=x11-libs/gtksourceview-3:3.0
+
+	sys-devel/autogen
+
+	>=gnome-extra/libgda-5:5=
+	dev-util/ctags
+
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	${PYTHON_DEPS}
+
+	devhelp? ( >=dev-util/devhelp-3.7.4:= )
+	glade? ( >=dev-util/glade-3.12:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	subversion? (
+		>=dev-vcs/subversion-1.8:=
+		>=net-libs/serf-1.2:1=
+		>=dev-libs/apr-1:=
+		>=dev-libs/apr-util-1:= )
+	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.1
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	!!dev-libs/gnome-build
+	test? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	app-text/yelp-tools
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# yelp-tools, gi-common and gnome-common are required by eautoreconf
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use vala; then
+		DISABLE_AUTOFORMATTING="yes"
+		DOC_CONTENTS="To create a generic vala project you will need to specify
+desired valac versioned binary to be used, to do that you
+will need to:
+1. Go to 'Build' -> 'Configure project'
+2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
+'Configure options'."
+	fi
+
+	# COPYING is used in Anjuta's help/about entry
+	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
+
+	# Conflicts with -pg in a plugin, bug #266777
+	filter-flags -fomit-frame-pointer
+
+	# python2.7-configure in Fedora vs. python-configure in Gentoo
+	sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
+		-i plugins/am-project/tests/anjuta.lst || die "sed failed"
+
+	# Do not build benchmarks, they are not installed and for dev purpose only
+	sed -e '/SUBDIRS =/ s/benchmark//' \
+		-i plugins/symbol-db/Makefile.{am,in} || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-neon \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable devhelp plugin-devhelp) \
+		$(use_enable glade plugin-glade) \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable subversion plugin-subversion) \
+		$(use_enable subversion serf) \
+		$(use_enable terminal plugin-terminal) \
+		$(use_enable vala)
+}
+
+src_install() {
+	# COPYING is used in Anjuta's help/about entry
+	docompress -x "/usr/share/doc/${PF}/COPYING"
+
+	# Anjuta uses a custom rule to install DOCS, get rid of it
+	gnome2_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
+
+	use vala && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use vala && readme.gentoo_print_elog
+}
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
new file mode 100644
index 000000000000..32ad5a24d818
--- /dev/null
+++ b/dev-util/anjuta/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="devhelp">Enable devhelp integration</flag>
+    <flag name="glade">Build glade plugin for anjuta</flag>
+    <flag name="packagekit">Use packagekit to search for missing tools</flag>
+    <flag name="terminal">Enable terminal plugin based on <pkg>x11-libs/vte</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/antlrworks/Manifest b/dev-util/antlrworks/Manifest
new file mode 100644
index 000000000000..e1c213566790
--- /dev/null
+++ b/dev-util/antlrworks/Manifest
@@ -0,0 +1 @@
+DIST antlrworks-1.2.3-src.zip 2993008 SHA256 97a51561ea0c48495d7b5a968284309c3b692c02c2d6cfe932fcd4c5fdadcc62 SHA512 7ec39d30b3f22fd8f07d031841e2a71729c8080a8976c6f23fb217881b625cca349d4fa5f69d799abe81fc9a88b2b10156b54a33496197bc301f28fb58005806 WHIRLPOOL 466fd3e267f32932fe1cd51ba8d8a631a7c6b24eef42d88c74941effbcba8929f80f1960c5360b155a63220c384482e338befcd411015a03b8422472806a9207
diff --git a/dev-util/antlrworks/antlrworks-1.2.3.ebuild b/dev-util/antlrworks/antlrworks-1.2.3.ebuild
new file mode 100644
index 000000000000..6b84261a6c4c
--- /dev/null
+++ b/dev-util/antlrworks/antlrworks-1.2.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit java-pkg-2
+
+DESCRIPTION="A novel grammar development environment for ANTLR v3 grammars"
+HOMEPAGE="http://www.antlr.org/works/index.html"
+SRC_URI="http://www.antlr.org/download/${P}-src.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+IUSE=""
+
+COMMON_DEP="
+	dev-java/stringtemplate:0
+	dev-java/antlr:0
+	>=dev-java/antlr-3.1.3:3
+	dev-java/jgoodies-forms:0
+"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	epatch "${FILESDIR}/antlr-3.1.3.patch"
+	rm -vr src/aw/org/antlr/xjlib/appkit/app/MacOS/ || die
+	rm -v lib/*.jar || die
+	mkdir build
+}
+
+src_compile() {
+	find src/aw -name "*.java" > "${T}/source.list"
+	ejavac -d build -classpath \
+		$(java-pkg_getjars antlr,antlr-3,jgoodies-forms,stringtemplate) \
+		"@${T}/source.list"
+
+	local dest="${S}/${PN}.jar"
+
+	cd src/aw || die
+	jar cf "${dest}" $(find -type f -and -not -name "*.java" ) || die
+
+	cd "${S}/build" || die
+	jar uf "${dest}" org || die
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	java-pkg_dolauncher ${PN} --main "org.antlr.works.IDE"
+}
diff --git a/dev-util/antlrworks/files/antlr-3.1.3.patch b/dev-util/antlrworks/files/antlr-3.1.3.patch
new file mode 100644
index 000000000000..3ab2d49c9f48
--- /dev/null
+++ b/dev-util/antlrworks/files/antlr-3.1.3.patch
@@ -0,0 +1,24 @@
+diff -ur work.old/src/aw/org/antlr/works/dialog/DialogAbout.java work/src/aw/org/antlr/works/dialog/DialogAbout.java
+--- work.old/src/aw/org/antlr/works/dialog/DialogAbout.java	2009-03-30 11:56:30.000000000 +0300
++++ work/src/aw/org/antlr/works/dialog/DialogAbout.java	2009-03-30 11:57:34.000000000 +0300
+@@ -65,7 +65,7 @@
+         if(IDE.isPlugin()) {
+             tableModel.addInfo("ANTLRWorks Plugin", IDE.getPluginVersionShort());
+         }
+-        tableModel.addInfo("ANTLR", Tool.VERSION);
++        tableModel.addInfo("ANTLR", new Tool().VERSION);
+         tableModel.addInfo("StringTemplate", StringTemplate.VERSION);
+         tableModel.addInfo("Java", System.getProperty("java.version")+" ("+System.getProperty("java.vendor")+")");
+         tableModel.fireTableDataChanged();
+diff -ur work.old/src/aw/org/antlr/works/utils/HelpManager.java work/src/aw/org/antlr/works/utils/HelpManager.java
+--- work.old/src/aw/org/antlr/works/utils/HelpManager.java	2009-03-30 11:56:30.000000000 +0300
++++ work/src/aw/org/antlr/works/utils/HelpManager.java	2009-03-30 11:57:21.000000000 +0300
+@@ -60,7 +60,7 @@
+     public static void sendFeedback(Container parent) {
+         StringBuilder url = new StringBuilder(Localizable.getLocalizedString(Localizable.FEEDBACK_URL));
+         url.append("?ANTLRVersion=");
+-        url.append(XJUtils.encodeToURL(Tool.VERSION));
++        url.append(XJUtils.encodeToURL(new Tool().VERSION));
+         url.append("&StringTemplateVersion=");
+         url.append(XJUtils.encodeToURL(StringTemplate.VERSION));
+         url.append("&ANTLRWorksVersion=");
diff --git a/dev-util/antlrworks/metadata.xml b/dev-util/antlrworks/metadata.xml
new file mode 100644
index 000000000000..3ae83fc7830c
--- /dev/null
+++ b/dev-util/antlrworks/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+		ANTLRWorks is a novel grammar development environment for ANTLR v3
+		grammars written by Jean Bovet (with suggested use cases from
+		Terence Parr). It combines an excellent grammar-aware editor with an
+		interpreter for rapid prototyping and a language-agnostic debugger
+		for isolating grammar errors. ANTLRWorks helps eliminate grammar
+		nondeterminisms, one of the most difficult problems for beginners
+		and experts alike, by highlighting nondeterministic paths in the
+		syntax diagram associated with a grammar. ANTLRWorks' goal is to make
+		grammars more accessible to the average programmer, improve
+		maintainability and readability of grammars by providing excellent
+		grammar navigation and refactoring tools, and address the most common
+		questions and problems encountered by grammar developers.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
new file mode 100644
index 000000000000..77da9dd664c2
--- /dev/null
+++ b/dev-util/apitrace/Manifest
@@ -0,0 +1,4 @@
+DIST apitrace-4.0.tar.gz 1736912 SHA256 078cfe09a5a021559326e8ee92ce863dd99d48c36433ac37140233616bb6cbd3 SHA512 063e1dfc7993b6d014a8e62e5d038318b22a7cfdaac1970714cf6bcb7e31079f552ad198f2992f042b05a027322f86e58d77a0e3aa2e0b266b278c8d0708200c WHIRLPOOL a1b251929ffade5f5b498428d942a01fd6c141494e3de09520e7bcd5aa5b4e15e50144ccf6ef979650e75ddb03373a3f5c198a3554448161623c3e33d8a9160a
+DIST apitrace-5.0.tar.gz 1868044 SHA256 c11e97452b3b74533b82af28951382c77e3d639bd434cbc4e1dc43bc799c8ea6 SHA512 af83860c8bfd49a2a2b1483fe13a83f2e1aa93ca474f1efb12cb311a99f2ca29ce4c39831a941efdde80fe2ae76b11cdfc6fde3349d325c71fc2a3ecae6b1424 WHIRLPOOL ba6fe7c354db3e6ba8edd46675631ef6d2edfc01c9201ffd951fc48110d0120463d52b4778984b01ae766d662edfc386a1965240377bcd2b2bae71936e94d42a
+DIST apitrace-6.0.tar.gz 1738830 SHA256 4ac99fbd5076c9e4db9d09ef22fb1958f28115f162b6ee40a23130aacc1e2acb SHA512 e937ca8ddece11d180ed306083788fc7e5fa5d4ceeef0ae69ab5a8140e4169c583b281f6f4806b5c4d71c72fb79ac8399e2f0f49fa1052b90f14306247a4091c WHIRLPOOL 1d5f43f5576a4f258f249f3d2777ad221dce3d7dc9489db924568c5c26af3542d016d722ef9c9be7ae50e380684c597840cc869c4d11cf3f3dcb96f952cc4ee0
+DIST apitrace-6.1.tar.gz 1741041 SHA256 0285610a6afbe9fbc47c0ecb80cafabb34dc1998c1c8308bacb7fdd15817930b SHA512 218fc8e59bc6cff6733c98f53c57b0e793d2f7aa530560f8da0dff83c4fa255c5fd5db97a9a43c364490c355ddb1ea6557ced64eae3e6c5e0c6f4504b9299bcd WHIRLPOOL 6334a96a0d70fce927faed0923efe1e320d4a52909ab01223f0486774a13e3cef53d2920933bc3167d9d766d647da6ab36b95ccbbcf78a0af55d16775000f2ea
diff --git a/dev-util/apitrace/apitrace-4.0.ebuild b/dev-util/apitrace/apitrace-4.0.ebuild
new file mode 100644
index 000000000000..8e9012799c3d
--- /dev/null
+++ b/dev-util/apitrace/apitrace-4.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib eutils python-single-r1 vcs-snapshot
+
+DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cli egl qt4"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
+	egl? ( || (
+		>=media-libs/mesa-8.0[gles1,gles2]
+		<media-libs/mesa-8.0[gles]
+	) )
+	media-libs/libpng:0=
+	sys-process/procps
+	x11-libs/libX11
+	qt4? (
+		>=dev-qt/qtcore-4.7:4
+		>=dev-qt/qtgui-4.7:4
+		>=dev-qt/qtwebkit-4.7:4
+		>=dev-libs/qjson-0.5
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-libs.patch
+	"${FILESDIR}"/${P}-glxtrace-only.patch
+	"${FILESDIR}"/${P}-glext-texture-storage.patch
+	"${FILESDIR}"/${P}-glxcopysubbuffermesa.patch
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-disable-multiarch.patch
+	"${FILESDIR}"/${P}-memcpy.patch
+)
+
+src_prepare() {
+	enable_cmake-utils_src_prepare
+
+	# The apitrace code grubs around in the internal zlib structures.
+	# We have to extract this header and clean it up to keep that working.
+	# Do not be surprised if a zlib upgrade breaks things ...
+	sed -r \
+		-e 's:OF[(]([^)]*)[)]:\1:' \
+		thirdparty/zlib/gzguts.h > gzguts.h
+	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
+}
+
+src_configure() {
+	my_configure() {
+		mycmakeargs=(
+			-DARCH_SUBDIR=
+			$(cmake-utils_use_enable egl EGL)
+		)
+		if multilib_is_native_abi ; then
+			mycmakeargs+=(
+				$(cmake-utils_use_enable cli CLI)
+				$(cmake-utils_use_enable qt4 GUI)
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_LIB_ONLY=ON
+				-DENABLE_CLI=OFF
+				-DENABLE_GUI=OFF
+			)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+
+	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
+
+	exeinto /usr/$(get_libdir)/${PN}/scripts
+	doexe $(find scripts -type f -executable)
+}
diff --git a/dev-util/apitrace/apitrace-5.0.ebuild b/dev-util/apitrace/apitrace-5.0.ebuild
new file mode 100644
index 000000000000..5b250871b90c
--- /dev/null
+++ b/dev-util/apitrace/apitrace-5.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib eutils python-single-r1 vcs-snapshot
+
+DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cli egl qt4"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
+	egl? ( || (
+		>=media-libs/mesa-8.0[gles1,gles2]
+		<media-libs/mesa-8.0[gles]
+	) )
+	media-libs/libpng:0=
+	sys-process/procps
+	x11-libs/libX11
+	qt4? (
+		>=dev-qt/qtcore-4.7:4
+		>=dev-qt/qtgui-4.7:4
+		>=dev-qt/qtwebkit-4.7:4
+		>=dev-libs/qjson-0.5
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-system-libs.patch
+	"${FILESDIR}"/${P}-glxtrace-only.patch
+	"${FILESDIR}"/${P}-disable-multiarch.patch
+)
+
+src_prepare() {
+	enable_cmake-utils_src_prepare
+
+	# The apitrace code grubs around in the internal zlib structures.
+	# We have to extract this header and clean it up to keep that working.
+	# Do not be surprised if a zlib upgrade breaks things ...
+	sed -r \
+		-e 's:OF[(]([^)]*)[)]:\1:' \
+		thirdparty/zlib/gzguts.h > gzguts.h
+	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
+}
+
+src_configure() {
+	my_configure() {
+		mycmakeargs=(
+			-DARCH_SUBDIR=
+			$(cmake-utils_use_enable egl EGL)
+		)
+		if multilib_is_native_abi ; then
+			mycmakeargs+=(
+				$(cmake-utils_use_enable cli CLI)
+				$(cmake-utils_use_enable qt4 GUI)
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_LIB_ONLY=ON
+				-DENABLE_CLI=OFF
+				-DENABLE_GUI=OFF
+			)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+
+	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
+
+	exeinto /usr/$(get_libdir)/${PN}/scripts
+	doexe $(find scripts -type f -executable)
+}
diff --git a/dev-util/apitrace/apitrace-6.0.ebuild b/dev-util/apitrace/apitrace-6.0.ebuild
new file mode 100644
index 000000000000..4c8493b4cc68
--- /dev/null
+++ b/dev-util/apitrace/apitrace-6.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib eutils python-single-r1
+
+DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cli egl qt4"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
+	egl? ( || (
+		>=media-libs/mesa-8.0[gles1,gles2]
+		<media-libs/mesa-8.0[gles]
+	) )
+	media-libs/libpng:0=
+	sys-process/procps
+	x11-libs/libX11
+	qt4? (
+		>=dev-qt/qtcore-4.7:4
+		>=dev-qt/qtgui-4.7:4
+		>=dev-qt/qtwebkit-4.7:4
+		>=dev-libs/qjson-0.5
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-system-libs.patch
+	"${FILESDIR}"/${PN}-5.0-glxtrace-only.patch
+	"${FILESDIR}"/${P}-disable-multiarch.patch
+)
+
+src_prepare() {
+	enable_cmake-utils_src_prepare
+
+	# The apitrace code grubs around in the internal zlib structures.
+	# We have to extract this header and clean it up to keep that working.
+	# Do not be surprised if a zlib upgrade breaks things ...
+	sed -r \
+		-e 's:OF[(]([^)]*)[)]:\1:' \
+		thirdparty/zlib/gzguts.h > gzguts.h
+	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
+}
+
+src_configure() {
+	my_configure() {
+		mycmakeargs=(
+			-DARCH_SUBDIR=
+			$(cmake-utils_use_enable egl EGL)
+		)
+		if multilib_is_native_abi ; then
+			mycmakeargs+=(
+				$(cmake-utils_use_enable cli CLI)
+				$(cmake-utils_use_enable qt4 GUI)
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_LIB_ONLY=ON
+				-DENABLE_CLI=OFF
+				-DENABLE_GUI=OFF
+			)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+
+	dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown
+
+	exeinto /usr/$(get_libdir)/${PN}/scripts
+	doexe $(find scripts -type f -executable)
+}
diff --git a/dev-util/apitrace/apitrace-6.1.ebuild b/dev-util/apitrace/apitrace-6.1.ebuild
new file mode 100644
index 000000000000..00844442dae1
--- /dev/null
+++ b/dev-util/apitrace/apitrace-6.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib eutils python-single-r1
+
+DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cli egl qt4"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
+	egl? ( || (
+		>=media-libs/mesa-8.0[gles1,gles2]
+		<media-libs/mesa-8.0[gles]
+	) )
+	media-libs/libpng:0=
+	sys-process/procps
+	x11-libs/libX11
+	qt4? (
+		>=dev-qt/qtcore-4.7:4
+		>=dev-qt/qtgui-4.7:4
+		>=dev-qt/qtwebkit-4.7:4
+		>=dev-libs/qjson-0.5
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-system-libs.patch
+	"${FILESDIR}"/${PN}-5.0-glxtrace-only.patch
+	"${FILESDIR}"/${PN}-6.0-disable-multiarch.patch
+)
+
+src_prepare() {
+	enable_cmake-utils_src_prepare
+
+	# The apitrace code grubs around in the internal zlib structures.
+	# We have to extract this header and clean it up to keep that working.
+	# Do not be surprised if a zlib upgrade breaks things ...
+	sed -r \
+		-e 's:OF[(]([^)]*)[)]:\1:' \
+		thirdparty/zlib/gzguts.h > gzguts.h
+	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
+}
+
+src_configure() {
+	my_configure() {
+		mycmakeargs=(
+			-DARCH_SUBDIR=
+			$(cmake-utils_use_enable egl EGL)
+		)
+		if multilib_is_native_abi ; then
+			mycmakeargs+=(
+				$(cmake-utils_use_enable cli CLI)
+				$(cmake-utils_use_enable qt4 GUI)
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_LIB_ONLY=ON
+				-DENABLE_CLI=OFF
+				-DENABLE_GUI=OFF
+			)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+
+	dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown
+
+	exeinto /usr/$(get_libdir)/${PN}/scripts
+	doexe $(find scripts -type f -executable)
+}
diff --git a/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch
new file mode 100644
index 000000000000..0ced4d84cbf6
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch
@@ -0,0 +1,32 @@
+respect the libdir cmake already set up for us instead of using the multiarch crap
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -184,12 +184,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+ # Installation directories
+ 
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+-    # Debian multiarch support
+-    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+-        OUTPUT_VARIABLE ARCH_SUBDIR
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+     CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
+     if (READPROC_H_FOUND)
+         add_definitions (-DHAVE_READPROC_H)
+@@ -205,11 +205,11 @@ if (WIN32 OR APPLE)
+     set (LIB_ARCH_INSTALL_DIR lib)
+ else ()
+     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+-    set (LIB_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
++    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
+     if (ARCH_SUBDIR)
+-        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
++        set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
+     else ()
+-        set (LIB_ARCH_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
++        set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+     endif ()
+ endif ()
+ 
diff --git a/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch b/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch
new file mode 100644
index 000000000000..2d04db408693
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch
@@ -0,0 +1,73 @@
+Upstream commit to support GL_EXT_texture_storage.
+
+commit 0436cc01329b6be60801dd7bfe641be7d8be5bc7
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Nov 13 13:57:43 2013 +0000
+
+    egltrace: Add GL_EXT_texture_storage entrypoints
+    
+    Prototypes obtained through:
+    
+      specs/scripts/gltxt.py http://www.khronos.org/registry/gles/extensions/EXT/EXT_texture_storage.txt
+    
+    Issue #184.
+
+commit 0bacf23eacd15c8f15413b85bdcb6ccc4d288f37
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Nov 13 13:59:51 2013 +0000
+
+    glxtrace: Add GLES prototypes too.
+    
+    Some applications seem to fail to distinguish GLES and GL entrypoints
+    apart.  To have complete traces in that situation, generate wrappers
+    for both GLES and GL prototypes.
+    
+    Issue #184.
+
+--- apitrace/specs/glesapi.py
++++ apitrace/specs/glesapi.py
+@@ -255,4 +255,16 @@ glesapi.addFunctions([
+     #GlFunction(Void, "glProgramUniformMatrix4fvEXT", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Array(Const(GLfloat), "count*4*4"), "value")]),
+     GlFunction(Void, "glValidateProgramPipelineEXT", [(GLpipeline, "pipeline")]),
+     GlFunction(Void, "glGetProgramPipelineInfoLogEXT", [(GLpipeline, "pipeline"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstring, "infoLog")], sideeffects=False),
++
++    # GL_EXT_multisampled_render_to_texture
++    #GlFunction(Void, "glRenderbufferStorageMultisampleEXT", [(GLenum, "target"), (GLsizei, "samples"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
++    GlFunction(Void, "glFramebufferTexture2DMultisampleEXT", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (GLtexture, "texture"), (GLint, "level"), (GLsizei, "samples")]),
++
++    # GL_EXT_texture_storage
++    GlFunction(Void, "glTexStorage1DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
++    GlFunction(Void, "glTexStorage2DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
++    GlFunction(Void, "glTexStorage3DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
++    #GlFunction(Void, "glTextureStorage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
++    #GlFunction(Void, "glTextureStorage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
++    #GlFunction(Void, "glTextureStorage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
+ ])
+--- apitrace/wrappers/CMakeLists.txt
++++ apitrace/wrappers/CMakeLists.txt
+@@ -393,6 +393,7 @@ elseif (X11_FOUND)
+             gltrace.py
+             trace.py
+             ${CMAKE_SOURCE_DIR}/specs/glxapi.py
++            ${CMAKE_SOURCE_DIR}/specs/glesapi.py
+             ${CMAKE_SOURCE_DIR}/specs/glapi.py
+             ${CMAKE_SOURCE_DIR}/specs/glparams.py
+             ${CMAKE_SOURCE_DIR}/specs/gltypes.py
+--- apitrace/wrappers/glxtrace.py
++++ apitrace/wrappers/glxtrace.py
+@@ -32,6 +32,7 @@ from gltrace import GlTracer
+ from specs.stdapi import Module, API
+ from specs.glapi import glapi
+ from specs.glxapi import glxapi
++from specs.glesapi import glesapi
+ 
+ 
+ class GlxTracer(GlTracer):
+@@ -104,6 +105,7 @@ if __name__ == '__main__':
+     module = Module()
+     module.mergeModule(glxapi)
+     module.mergeModule(glapi)
++    module.mergeModule(glesapi)
+     api = API()
+     api.addModule(module)
+     tracer = GlxTracer()
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch b/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch
new file mode 100644
index 000000000000..4dd3cdc6be3a
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch
@@ -0,0 +1,80 @@
+Upstream commit to support glxCopySubBufferMESA.  Modified to fix compile error with egl.
+
+commit 4dc3f3bdc3611ca1b3dec402f9242a036db8c8e4
+Author: Carl Worth <cworth@cworth.org>
+Date:   Thu Oct 17 14:52:21 2013 -0700
+
+    retrace: Implement glxCopySubBufferMESA
+    
+    This enables replay of a trace captured on ChromeOS.
+    
+    Note: Replaying on EGL is not supported, (will trigger a warning),
+    since, as far as I know, EGL does not provide an equivalent function.
+
+--- apitrace/retrace/glretrace_glx.cpp
++++ apitrace/retrace/glretrace_glx.cpp
+@@ -111,6 +111,16 @@ static void retrace_glXDestroyContext(trace::Call &call) {
+     delete context;
+ }
+ 
++static void retrace_glXCopySubBufferMESA(trace::Call &call) {
++    glws::Drawable *drawable = getDrawable(call.arg(1).toUInt());
++    int x = call.arg(2).toSInt();
++    int y = call.arg(3).toSInt();
++    int width = call.arg(4).toSInt();
++    int height = call.arg(5).toSInt();
++
++    drawable->copySubBuffer(x, y, width, height);
++}
++
+ static void retrace_glXSwapBuffers(trace::Call &call) {
+     glws::Drawable *drawable = getDrawable(call.arg(1).toUInt());
+ 
+@@ -173,7 +183,7 @@ const retrace::Entry glretrace::glx_callbacks[] = {
+     {"glXChooseVisual", &retrace::ignore},
+     //{"glXCopyContext", &retrace_glXCopyContext},
+     //{"glXCopyImageSubDataNV", &retrace_glXCopyImageSubDataNV},
+-    //{"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA},
++    {"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA},
+     {"glXCreateContextAttribsARB", &retrace_glXCreateContextAttribsARB},
+     {"glXCreateContext", &retrace_glXCreateContext},
+     //{"glXCreateContextWithConfigSGIX", &retrace_glXCreateContextWithConfigSGIX},
+--- apitrace/retrace/glws.hpp
++++ apitrace/retrace/glws.hpp
+@@ -127,6 +127,8 @@ public:
+         visible = true;
+     }
+ 
++    virtual void copySubBuffer(int x, int y, int width, int height) = 0;
++
+     virtual void swapBuffers(void) = 0;
+ };
+ 
+--- apitrace/retrace/glws_egl_xlib.cpp
++++ apitrace/retrace/glws_egl_xlib.cpp
+@@ -244,6 +244,10 @@ public:
+         Drawable::show();
+     }
+ 
++    void copySubBuffer(int x, int y, int width, int height) {
++        std::cerr << "glws_egl_xlib: Warning: copySubBuffer Not yet implemented\n";
++    }
++
+     void swapBuffers(void) {
+         eglBindAPI(api);
+         eglSwapBuffers(eglDisplay, surface);
+--- apitrace/retrace/glws_glx.cpp
++++ apitrace/retrace/glws_glx.cpp
+@@ -213,6 +213,12 @@ public:
+         Drawable::show();
+     }
+ 
++    void copySubBuffer(int x, int y, int width, int height) {
++        glXCopySubBufferMESA(display, window, x, y, width, height);
++
++        processKeys();
++    }
++
+     void swapBuffers(void) {
+         glXSwapBuffers(display, window);
+ 
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
new file mode 100644
index 000000000000..08ce65e2fc0a
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
@@ -0,0 +1,49 @@
+Allow building of just glxtrace library for ebuilds without GUI tools.
+
+Updated from 3.0 version of patch to apply against 4.0.
+
+--- apitrace/CMakeLists.txt
++++ apitrace/CMakeLists.txt
+@@ -30,6 +30,7 @@ set (ENABLE_CLI true CACHE BOOL "Enable command Line interface.")
+ 
+ set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
+ 
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
+ 
+ ##############################################################################
+ # Find dependencies
+@@ -248,6 +255,8 @@ endif ()
+ # - The packaged versions QJson are very old, and do not support NaN/Infinity.
+ # - To make it easier to build the GUI on Windows and MacOSX, as there are no
+ # binaries at all.
++if (NOT BUILD_LIB_ONLY)
++
+ if (QT4_FOUND)
+     add_definitions (-DQJSON_EXPORT=)
+     add_subdirectory (thirdparty/qjson)
+@@ -257,6 +266,8 @@ if (QT4_FOUND)
+     set (QJSON_FOUND TRUE)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
++
+ # We use bundled headers for all Khronos APIs, to guarantee support for both
+ # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
+ # are so intertwined that conditional compilation extremely difficult. This
+--- apitrace/retrace/CMakeLists.txt
++++ apitrace/retrace/CMakeLists.txt
+@@ -11,6 +11,8 @@ include_directories (
+ 
+ add_definitions (-DRETRACE)
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ add_custom_command (
+     OUTPUT glretrace_gl.cpp
+     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
+@@ -259,3 +261,5 @@ if (WIN32)
+ 
+     install (TARGETS d3dretrace RUNTIME DESTINATION bin)
+ endif ()
++
++endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-4.0-memcpy.patch b/dev-util/apitrace/files/apitrace-4.0-memcpy.patch
new file mode 100644
index 000000000000..5b49808ada9b
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-memcpy.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/465504
+http://github.com/apitrace/apitrace/issues/118
+
+--- a/image/image_png.cpp
++++ b/image/image_png.cpp
+@@ -31,6 +31,7 @@
+ #include <assert.h>
+ #include <stdint.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <fstream>
+ 
diff --git a/dev-util/apitrace/files/apitrace-4.0-multilib.patch b/dev-util/apitrace/files/apitrace-4.0-multilib.patch
new file mode 100644
index 000000000000..6ad78c7cde08
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-multilib.patch
@@ -0,0 +1,59 @@
+Upstream commit to find wrappers in lib64 directory.
+
+commit 3f9c2ecf18d8fa37fad5a7062f80952692eaa8e7
+Author: Alexander Monakov <amonakov@ispras.ru>
+Date:   Wed Oct 16 20:51:47 2013 +0400
+
+    cli: use $LIB to handle multilib automagically on glibc
+
+--- apitrace/cli/CMakeLists.txt
++++ apitrace/cli/CMakeLists.txt
+@@ -31,6 +31,7 @@ target_link_libraries (apitrace
+     ${ZLIB_LIBRARIES}
+     ${SNAPPY_LIBRARIES}
+     ${GETOPT_LIBRARIES}
++    dl
+ )
+ 
+ if (NOT CMAKE_CROSSCOMPILING)
+--- apitrace/cli/cli_resources.cpp
++++ apitrace/cli/cli_resources.cpp
+@@ -32,6 +32,20 @@
+ 
+ #include "cli_resources.hpp"
+ 
++#ifdef __GLIBC__
++
++#include <dlfcn.h>
++
++static bool
++tryLib(const os::String &path)
++{
++    void *handle = dlopen(path.str(), RTLD_LAZY);
++    bool exists = (handle != NULL);
++    if (exists)
++        dlclose(handle);
++    return exists;
++}
++#endif
+ 
+ os::String
+ findProgram(const char*programFilename)
+@@ -76,6 +90,17 @@ findWrapper(const char *wrapperFilename)
+         return wrapperPath;
+     }
+ 
++#ifdef __GLIBC__
++    // We want to take advantage of $LIB dynamic string token expansion in
++    // glibc dynamic linker to handle multilib layout for us
++    wrapperPath = processDir;
++    wrapperPath.join("../$LIB/apitrace/wrappers");
++    wrapperPath.join(wrapperFilename);
++    if (tryLib(wrapperPath)) {
++        return wrapperPath;
++    }
++#endif
++
+     // Try relative install directory
+     wrapperPath = processDir;
+ #if defined(_WIN32)
diff --git a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch b/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
new file mode 100644
index 000000000000..68468a30bde1
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
@@ -0,0 +1,72 @@
+Find external system libraries for ebuild.
+
+Updated from 3.0 version of patch to apply against 4.0.
+
+--- apitrace/CMakeLists.txt
++++ apitrace/CMakeLists.txt
+@@ -224,23 +224,14 @@ set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
+ # - on unices to prevent symbol collisions when tracing applications that link
+ # against other versions of these libraries
+ 
+-set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
+-set (ZLIB_LIBRARIES z_bundled)
+-add_subdirectory (thirdparty/zlib)
+-
+-include_directories (${ZLIB_INCLUDE_DIRS})
+-
+-set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
+-set (SNAPPY_LIBRARIES snappy_bundled)
+-add_subdirectory (thirdparty/snappy)
++find_package (ZLIB REQUIRED)
++include_directories (${ZLIB_INCLUDE_DIRS})
+ 
++find_package (SNAPPY REQUIRED)
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+ 
+-set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
+-set (PNG_DEFINITIONS "")
+-set (PNG_LIBRARIES png_bundled)
+-
+-add_subdirectory (thirdparty/libpng)
++find_package (PNG REQUIRED)
++include_directories (${PNG_INCLUDE_DIRS})
+ 
+ if (MSVC)
+     add_subdirectory (thirdparty/getopt)
+diff --git a/cmake/FindSNAPPY.cmake b/cmake/FindSNAPPY.cmake
+new file mode 100644
+index 0000000..5cd64c3
+--- /dev/null
++++ apitrace/cmake/FindSNAPPY.cmake
+@@ -0,0 +1,31 @@
++# Find SNAPPY - A fast compressor/decompressor
++#
++# This module defines
++#  SNAPPY_FOUND - whether the qsjon library was found
++#  SNAPPY_LIBRARIES - the snappy library
++#  SNAPPY_INCLUDE_DIR - the include path of the snappy library
++#
++
++if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
++
++  # Already in cache
++  set (SNAPPY_FOUND TRUE)
++
++else (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
++
++  find_library (SNAPPY_LIBRARIES
++    NAMES
++    snappy
++    PATHS
++  )
++
++  find_path (SNAPPY_INCLUDE_DIR
++    NAMES
++    snappy.h
++    PATHS
++  )
++
++  include(FindPackageHandleStandardArgs)
++  find_package_handle_standard_args(SNAPPY DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR)
++
++endif (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
diff --git a/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch
new file mode 100644
index 000000000000..aac018e65817
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch
@@ -0,0 +1,34 @@
+respect the libdir cmake already set up for us instead of using the multiarch crap
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17f3dce..c3fe52e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -216,12 +216,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+ # Installation directories
+ 
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+-    # Debian multiarch support
+-    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+-        OUTPUT_VARIABLE ARCH_SUBDIR
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+     CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
+     if (READPROC_H_FOUND)
+         add_definitions (-DHAVE_READPROC_H)
+@@ -237,11 +231,11 @@ if (WIN32 OR APPLE)
+     set (LIB_ARCH_INSTALL_DIR lib)
+ else ()
+     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+-    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
++    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
+     if (ARCH_SUBDIR)
+-        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
++        set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
+     else ()
+-        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
++        set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+     endif ()
+ endif ()
+ 
diff --git a/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch
new file mode 100644
index 000000000000..03e6143afff0
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch
@@ -0,0 +1,53 @@
+Allow building of just glxtrace library for ebuilds without GUI tools.
+
+Updated from 4.0 version of patch to apply against 5.0.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17f3dce..3bba2a9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,6 +33,7 @@ set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
+ 
+ set (ENABLE_WAFFLE false CACHE BOOL "Enable WAFFLE support.")
+ 
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
+ 
+ ##############################################################################
+ # Find dependencies
+@@ -301,6 +302,8 @@ set (MD5_LIBRARIES md5_bundled)
+ # - The packaged versions QJson are very old, and do not support NaN/Infinity.
+ # - To make it easier to build the GUI on Windows and MacOSX, as there are no
+ # binaries at all.
++if (NOT BUILD_LIB_ONLY)
++
+ if (QT4_FOUND)
+     add_definitions (-DQJSON_EXPORT=)
+     add_subdirectory (thirdparty/qjson)
+@@ -310,6 +313,8 @@ if (QT4_FOUND)
+     set (QJSON_FOUND TRUE)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
++
+ # We use bundled headers for all Khronos APIs, to guarantee support for both
+ # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
+ # are so intertwined that conditional compilation extremely difficult. This
+diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
+index 4e37979..2607ddf 100644
+--- a/retrace/CMakeLists.txt
++++ b/retrace/CMakeLists.txt
+@@ -11,6 +11,8 @@ include_directories (
+ 
+ add_definitions (-DRETRACE)
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ add_custom_command (
+     OUTPUT glretrace_gl.cpp
+     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
+@@ -282,3 +284,5 @@ if (WIN32)
+ 
+     install (TARGETS d3dretrace RUNTIME DESTINATION bin)
+ endif ()
++
++endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
new file mode 100644
index 000000000000..bc6ba03060a4
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
@@ -0,0 +1,35 @@
+respect the libdir cmake already set up for us instead of using debian-specific multiarch paths
+
+--- apitrace-6.0/CMakeLists.txt
++++ apitrace-6.0/CMakeLists.txt
+@@ -280,15 +280,6 @@
+ ##############################################################################
+ # Installation directories
+ 
+-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+-    # Debian multiarch support
+-    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+-        OUTPUT_VARIABLE ARCH_SUBDIR
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+-endif()
+-
+ if (WIN32 OR APPLE)
+     # On Windows/MacOSX, applications are usually installed on a directory of
+     # their own
+@@ -297,12 +288,8 @@
+     set (LIB_ARCH_INSTALL_DIR lib)
+ else ()
+     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+-    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+-    if (ARCH_SUBDIR)
+-        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
+-    else ()
+-        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+-    endif ()
++    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
++    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+ endif ()
+ 
+ set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
new file mode 100644
index 000000000000..fa13c0dcafc9
--- /dev/null
+++ b/dev-util/apitrace/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="cli">Enable command line interface</flag>
+		<flag name="egl">Enable EGL support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">apitrace/apitrace</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/appdata-tools/Manifest b/dev-util/appdata-tools/Manifest
new file mode 100644
index 000000000000..cfb40960102c
--- /dev/null
+++ b/dev-util/appdata-tools/Manifest
@@ -0,0 +1 @@
+DIST appdata-tools-0.1.7.tar.gz 124580 SHA256 a80333ee6107f6eb38466d2c47d0ae29527416a8fa4789c55c103fe41f79f8af SHA512 d0e32a2028f54482bd9715627bbc2050cfecfaea4be37fc3eeef273cdf989aa270a55112cbc81406dadedea87ae3521d26acf0011834d0055a473083147dcdc7 WHIRLPOOL a4ab56578ab3a82bed1c29c1fc49f58f6f2ef8932b2d1e68abe3cbf629f520113e4a556247cab7f14dde0be76d873b2694e70d4a88e0af5db39126f86e07a8bb
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
new file mode 100644
index 000000000000..478b2ca8a386
--- /dev/null
+++ b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+MY_P="${PN/-/_}_${PV//./_}"
+
+DESCRIPTION="CLI designed to validate AppData descriptions for standards compliance and to the style guide"
+HOMEPAGE="https://github.com/hughsie/appdata-tools/"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.14
+	>=net-libs/libsoup-2.4
+	>=x11-libs/gdk-pixbuf-2.0"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	nls? ( >=dev-util/intltool-0.35.0
+		sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-man \
+		--disable-schemas
+}
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
new file mode 100644
index 000000000000..a8610e68dfa9
--- /dev/null
+++ b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="CLI designed to validate AppData descriptions for standards compliance and to the style guide"
+HOMEPAGE="https://github.com/hughsie/appdata-tools/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE=""
+
+# Superseeded by appstream-glib.
+RDEPEND=">=dev-libs/appstream-glib-0.3.2"
diff --git a/dev-util/appdata-tools/metadata.xml b/dev-util/appdata-tools/metadata.xml
new file mode 100644
index 000000000000..6eb354a7ef11
--- /dev/null
+++ b/dev-util/appdata-tools/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hughsie/appdata-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/appinventor/Manifest b/dev-util/appinventor/Manifest
new file mode 100644
index 000000000000..6da9cbc9f34a
--- /dev/null
+++ b/dev-util/appinventor/Manifest
@@ -0,0 +1 @@
+DIST appinventor-setup_1.1.tar.gz 85941449 SHA256 5479cf8680e77befd552c6e7c0d5b82f2ab9bb2588b362849db25433bdc26eab SHA512 fb04e6dda57e55602cc1f1a556062b7468ce9386c35710f3e84394500077c50bb7969b909cff785c100c46620794daa943c80f5feef22756a6ef8f809cf383e7 WHIRLPOOL d810ca59cfdd8e7bee033d92ca63d605c695aac1c8d55bab004b77b88d0262c2aea4dad4bad04fcee299079b754d27f36ee8074239865f4a236ef420b6bbf2b7
diff --git a/dev-util/appinventor/appinventor-1.1.ebuild b/dev-util/appinventor/appinventor-1.1.ebuild
new file mode 100644
index 000000000000..09531c0f28ee
--- /dev/null
+++ b/dev-util/appinventor/appinventor-1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+MY_P="${PN}-setup_${PV}"
+DESCRIPTION="MIT App Inventor Setup package"
+HOMEPAGE="http://www.appinventor.mit.edu/"
+SRC_URI="http://dl.google.com/dl/${PN}/installers/linux/${MY_P}.tar.gz"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.6.0"
+
+APP_INSTALL_DIR="/opt/${PN}"
+S="${WORKDIR}/${MY_P}"
+QA_PREBUILT="/opt/appinventor/commands-for-Appinventor/adb
+	/opt/appinventor/commands-for-Appinventor/emulator
+	/opt/appinventor/commands-for-Appinventor/mksdcard"
+
+src_install() {
+	insinto ${APP_INSTALL_DIR}
+	dodir ${APP_INSTALL_DIR}
+	doins -r "${PN}"/extras
+	doins -r "${PN}"/from-Android-SDK
+	exeinto "${APP_INSTALL_DIR}"/commands-for-Appinventor/
+	doexe "${PN}"/commands-for-Appinventor/*
+}
diff --git a/dev-util/appinventor/metadata.xml b/dev-util/appinventor/metadata.xml
new file mode 100644
index 000000000000..b57d3682eec5
--- /dev/null
+++ b/dev-util/appinventor/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>gentoo.power@gmail.com</email>
+	<name>Iván Atienza</name>
+	<description>Maintainer. Assign bugs to him</description>
+</maintainer>
+<maintainer>
+	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+	<description>Proxy maintainer. Assign bugs to him</description>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/dev-util/archdiff/Manifest b/dev-util/archdiff/Manifest
new file mode 100644
index 000000000000..f3145d70f3e9
--- /dev/null
+++ b/dev-util/archdiff/Manifest
@@ -0,0 +1 @@
+DIST archdiff-1.1.6.tar.gz 96743 SHA256 0167280353a1bc4fb94fdbfe5faead7ca62daeaa612e532d2a9968f2e0a2a0c2 SHA512 0f924418c2aea8bc966b6967038b60d40d727037739e75fa785a4f4fa452558287cc6e2c51d93a3066994e67cbac989e96120561e460a4d543c451229f7420b2 WHIRLPOOL 2a2a8828d33be71a9967111e8c52287d6b6683cbf9ee0ee9160f79e87b8552ce809cfd97e27addef2af146f0dc0094b57fb39bcedbe15bb27ef9275aab0ef2f8
diff --git a/dev-util/archdiff/archdiff-1.1.6.ebuild b/dev-util/archdiff/archdiff-1.1.6.ebuild
new file mode 100644
index 000000000000..83c1685ed411
--- /dev/null
+++ b/dev-util/archdiff/archdiff-1.1.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Utility to view the differences between two source code archives"
+HOMEPAGE="https://frigidcode.com/code/archdiff/"
+SRC_URI="https://frigidcode.com/code/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bzip2 +lzma +gzip"
+
+DEPEND="app-arch/libarchive[bzip2?,lzma?]
+	gzip? ( app-arch/libarchive[zlib] )
+	dev-libs/rremove"
+RDEPEND="${DEPEND}
+	app-misc/colordiff"
+
+src_configure() {
+	econf \
+		$(use_enable bzip2) \
+		$(use_enable gzip) \
+		$(use_enable lzma)
+}
diff --git a/dev-util/archdiff/metadata.xml b/dev-util/archdiff/metadata.xml
new file mode 100644
index 000000000000..157326a7e891
--- /dev/null
+++ b/dev-util/archdiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/argouml/Manifest b/dev-util/argouml/Manifest
new file mode 100644
index 000000000000..b51b699fe112
--- /dev/null
+++ b/dev-util/argouml/Manifest
@@ -0,0 +1,4 @@
+DIST ArgoUML-0.34.tar.gz 16504818 SHA256 818fdbbbaf48f70f3a7386cd4dab5313cdba3293b3d8df49a3045911a5372dc3 SHA512 111d5ff588fe895274b02f5d5a8385455bf3130918a371f3e549c0a7d41c8bd1d109c976b2039ceae26847fac29689aa4339e35916352be633d1fe1a277d79e5 WHIRLPOOL 1b207c330e2d81c5f6e8e4c00a5c10ce78418c6ffc379b68e95c6f6114d394a936a4f1f16e768f776744f677310cb3a3b9a5cbdfebf3970c89dbeaaae3c822fa
+DIST dbuml-module-1.0.4.zip 6231786 SHA256 47b3b26c5eeb884ffcc88d9a56f327a0e746b1851fa53d2ca66845bf5536d0d9 SHA512 a281a8bb8b8422cfceaf704e6b26a0c8b7c8ee393756ebee86ede8a8681b0ba9f8f5b5e568899e6e7b55fba20edba74f9e7a532f647dbf1549f582b3226028b6 WHIRLPOOL a1a4c7027f1f131948b099c374b37c263b80e54e442c8795818a3ed94d3f1d2dcdff29a9ec2e448385ca5ba10bdc1a5594c279a3f400fe794e099430163452c6
+DIST manual-0.34.pdf 3405949 SHA256 13c91e8b7802fe3a4d4462b9608f06755981549865a710dccc2372021b270c49 SHA512 1dfaf66485beb82d309a58f3868f7c150575d99d652dbef261991429df85073ffce0cf8d73f44f4f9c13299be3cd11f92826da695901846c7b8dc6561b0090d8 WHIRLPOOL edeee1ea860629ceb8b13552672f56113d0293eab8dcfa4c819b42786e2d672f03b97a8553b127a0679ac00a7839b0ed9e043f003d632a71162aa7695f40af09
+DIST quickguide-0.34.pdf 58334 SHA256 6972651140234aad7c1c93948f1d788b1c0a64dc09d8a5342d712904d181e458 SHA512 0bcdeaa643d400e17b12d92c78eddb33a202220ccb26e5a9933528faa0e8d3fccde432a1fba2103b28bec59d3df75e1176ed2918308533f7e490fbdb5d60a82d WHIRLPOOL 73c660703e021f58f0ce3be9cdb8edfd4819337e02465c3d0d9632b1e28ada05a1ac39b9379437729275a20f46a2d14a1c41177688c635e5bd16c7ccc4061035
diff --git a/dev-util/argouml/argouml-0.34.ebuild b/dev-util/argouml/argouml-0.34.ebuild
new file mode 100644
index 000000000000..ecea86cac794
--- /dev/null
+++ b/dev-util/argouml/argouml-0.34.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit eutils fdo-mime java-pkg-2
+
+DESCRIPTION="Modelling tool that helps you do your design using UML"
+HOMEPAGE="http://argouml.tigris.org"
+BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
+SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
+	http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip
+	doc? (
+		${BASE_URI}/manual-${PV}.pdf
+		${BASE_URI}/quickguide-${PV}.pdf
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+src_install() {
+	java-pkg_jarinto /opt/${PN}/lib
+	java-pkg_dojar ${P}/*.jar
+
+	java-pkg_jarinto /opt/${PN}/lib/ext
+	java-pkg_dojar ${P}/ext/*.jar release/ext/*.jar
+
+	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
+
+	dodoc ${P}/README.txt || die
+
+	if use doc ; then
+		dohtml -r release/{Readme.htm,www}
+		insinto /usr/share/doc/${P}
+		doins "${DISTDIR}/manual-${PV}.pdf"
+		doins "${DISTDIR}/quickguide-${PV}.pdf"
+	fi
+
+	newicon ${P}/icon/ArgoIcon128x128.png ${PN}.png || die
+	make_desktop_entry ${PN} "ArgoUML"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-util/argouml/metadata.xml b/dev-util/argouml/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-util/argouml/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>java</herd>
+</pkgmetadata>
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
new file mode 100644
index 000000000000..b3ab21e742c1
--- /dev/null
+++ b/dev-util/aruba/Manifest
@@ -0,0 +1,4 @@
+DIST aruba-0.5.4.gem 69632 SHA256 6f1c2210195ac94cf48e06de574e6f3897ec5ff7a7ca71cd10425b2cc889b0dc SHA512 e783aedccd4be6915621cc1f0d8b61f8a2895204ff9e483fdbd4b34b6f32eaccc973938a5e507c5346f50f9f9166fc7b7a885700aa13c6c7b00ffdf0eed78720 WHIRLPOOL 843e7cd5a0a70d15030bad868bbd1de94b25d96961865338c2596777ec87935bc0d3e4835259cb7b3e4843f4b0b5162cc11c44677ed966a927cae60eeb90c33b
+DIST aruba-0.6.2.gem 75776 SHA256 7c518ca72da37dc966c6a2f589d9953ab7576a43332b7bac38949d06f5009842 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e WHIRLPOOL cf85f65672946776f4de3f6b0b060c99adfa376353c3f11a0e27d2a32f7e400c58d863c0e574b415a19c52386294dfff01a7591c133772f45211700ea19f83ac
+DIST aruba-0.7.4.gem 91648 SHA256 64726a908f9355c1fdc15f26e4f657bc0c43aa034f86f3ce141c51f501e516b3 SHA512 f36f50b629a039c894b5a5e7e21dd37db2dacd0947c7288e254666110baa81975e1f2c0372fc20b915cdc6906715bbc10e0b078d3321c9d7c875da4b097de118 WHIRLPOOL 2512507ee530d767b3ee6bfd7fd0de289c9289da69fd1c940f16817b8458b7a8c532e235c9605ec0a00ee0aab591181bfa37ee3ba93900b3fe6cab16a4a3f135
+DIST aruba-0.8.1.gem 121344 SHA256 110440880e0f572f44805765bc22ea20e5f822fede3628be9de3f55c7d0af3f3 SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f WHIRLPOOL 70b2ad1033b374e3ef61a7fe0b795d2bdf961b7d3d0a24e2a052fdd70755eaba37b3dfa1ff8e42a49fac1c715aca2859facb9c97d42d1a01fa425138c5255a58
diff --git a/dev-util/aruba/aruba-0.5.4-r1.ebuild b/dev-util/aruba/aruba-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..263d94c55342
--- /dev/null
+++ b/dev-util/aruba/aruba-0.5.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+LICENSE="MIT"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.3.6
+	>=dev-ruby/rspec-expectations-2.7:2
+	>=dev-util/cucumber-1.1.1"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 >=dev-ruby/bcat-0.6.1 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# Remove references to git ls-files.
+	sed -i -e '/git ls-files/d' aruba.gemspec || die
+}
diff --git a/dev-util/aruba/aruba-0.6.2.ebuild b/dev-util/aruba/aruba-0.6.2.ebuild
new file mode 100644
index 000000000000..ff774ffead21
--- /dev/null
+++ b/dev-util/aruba/aruba-0.6.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.3.6
+	>=dev-ruby/rspec-expectations-2.7:2
+	>=dev-util/cucumber-1.1.1"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 >=dev-ruby/bcat-0.6.1 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# Remove references to git ls-files.
+	sed -i -e '/git ls-files/d' aruba.gemspec || die
+}
diff --git a/dev-util/aruba/aruba-0.7.4.ebuild b/dev-util/aruba/aruba-0.7.4.ebuild
new file mode 100644
index 000000000000..3c33b8750232
--- /dev/null
+++ b/dev-util/aruba/aruba-0.7.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.3.6
+	>=dev-ruby/rspec-expectations-2.7:2
+	>=dev-util/cucumber-1.1.1"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 >=dev-ruby/bcat-0.6.1 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+	rm Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/Before/,/^end/ s:^:#:' \
+		spec/spec_helper.rb features/support/env.rb || die
+	rm -f features/support/simplecov_setup.rb || die
+	sed -i -e '1i require "time"' spec/spec_helper.rb || die
+
+	# Remove references to git ls-files.
+	sed -i -e '/git ls-files/d' aruba.gemspec || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	ruby-ng_cucumber
+}
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
new file mode 100644
index 000000000000..a0e4979c0f05
--- /dev/null
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.5.6 =dev-ruby/childprocess-0.5*
+	>=dev-ruby/contracts-0.9:0
+	>=dev-ruby/rspec-expectations-2.99:2
+	>=dev-util/cucumber-1.3.19"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 >=dev-ruby/bcat-0.6.2 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+	rm Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/Before/,/^end/ s:^:#:' \
+		spec/spec_helper.rb features/support/env.rb || die
+	rm -f features/support/simplecov_setup.rb || die
+	sed -i -e '1i require "time"' spec/spec_helper.rb || die
+
+	# Remove references to git ls-files.
+	sed -i -e '/git ls-files/d' aruba.gemspec || die
+
+	# Avoid scenarios making broken assumptions on ${HOME}
+	sed -i -e '/Scenario: Use ~ in path/i @wip' \
+			features/api/core/expand_path.feature || die
+	rm -f features/configuration/home_directory.feature || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
+}
diff --git a/dev-util/aruba/files/aruba-0.4.11+childprocess-0.2.4.patch b/dev-util/aruba/files/aruba-0.4.11+childprocess-0.2.4.patch
new file mode 100644
index 000000000000..f5408aaeec1a
--- /dev/null
+++ b/dev-util/aruba/files/aruba-0.4.11+childprocess-0.2.4.patch
@@ -0,0 +1,37 @@
+diff --git a/features/exit_statuses.feature b/features/exit_statuses.feature
+index 5c5dffe..b971152 100644
+--- a/features/exit_statuses.feature
++++ b/features/exit_statuses.feature
+@@ -30,13 +30,3 @@ Feature: exit statuses
+   Scenario: Unsuccessfully run something
+     When I do aruba I successfully run `ruby -e 'exit 10'`
+     Then aruba should fail with "Exit status was 10"
+-
+-  @posix
+-  Scenario: Try to run something that doesn't exist
+-    When I run `does_not_exist`
+-    Then the exit status should be 1
+-
+-  @posix
+-  Scenario: Try to run something that doesn't exist with `
+-    When I run `does_not_exist`
+-    Then the exit status should be 1
+diff --git a/features/output.feature b/features/output.feature
+index 8af06ca..7eea5a5 100644
+--- a/features/output.feature
++++ b/features/output.feature
+@@ -5,14 +5,6 @@ Feature: Output
+   I want to use the "the output should contain" step
+ 
+   @posix
+-  Scenario: Run unknown command
+-    When I run `neverever gonna work`
+-    Then the output should contain:
+-      """
+-      No such file or directory - neverever
+-      """
+-
+-  @posix
+   Scenario: Detect subset of one-line output
+     When I run `ruby -e 'puts \"hello world\"'`
+     Then the output should contain "hello world"
diff --git a/dev-util/aruba/metadata.xml b/dev-util/aruba/metadata.xml
new file mode 100644
index 000000000000..d9731d588533
--- /dev/null
+++ b/dev-util/aruba/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cucumber/aruba</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/as11/Manifest b/dev-util/as11/Manifest
new file mode 100644
index 000000000000..05fb42a2c6e8
--- /dev/null
+++ b/dev-util/as11/Manifest
@@ -0,0 +1 @@
+DIST as11_src.tar.gz 24376 SHA256 422a76ce1f9b06812c82526445040dfc9921a86331b607b2e01f83b1a60ce579 SHA512 caa6f67258575a1c84ff57b404f7ae36488c0c6a3ba6059a18dff840766db4664960e077071f1c4722f4294406a395a8ae1594dc0c26a47980a6380fd4be28d6 WHIRLPOOL 8144cc9a4f5ee7abb8c1af4d1e37a00c8024d34f45fa21386a9463dc0e1c10e35f9466059bf6532839ada90744b46c21a0903ff5e89b32c792a4bb655b3c578a
diff --git a/dev-util/as11/as11-1.0.ebuild b/dev-util/as11/as11-1.0.ebuild
new file mode 100644
index 000000000000..096c782d287d
--- /dev/null
+++ b/dev-util/as11/as11-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Motorola's AS11 Assembler for the 68HC11"
+HOMEPAGE="http://www.ai.mit.edu/people/rsargent/as11.html"
+SRC_URI="http://www.ai.mit.edu/people/rsargent/source/${PN}_src.tar.gz"
+LICENSE="freedist"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/Makefile.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ${PN}.doc CHANGELOG README
+}
diff --git a/dev-util/as11/files/Makefile.patch b/dev-util/as11/files/Makefile.patch
new file mode 100644
index 000000000000..ccebcdf7b818
--- /dev/null
+++ b/dev-util/as11/files/Makefile.patch
@@ -0,0 +1,11 @@
+--- /tmp/as11/Makefile	1996-01-09 01:02:53.000000000 +0100
++++ Makefile	2012-10-15 18:11:19.398154832 +0200
+@@ -5,7 +5,4 @@
+ AS11DEP=as11.c as.c do11.c pseudo.c eval.c symtab.c util.c ffwd.c output.c as.h
+ 
+ as11: $(AS11DEP)
+-	$(CC) $(STATIC) -o as11 as11.c
+-
+-as9:
+-	$(CC) -o as9 as9.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o as11 as11.c
diff --git a/dev-util/as11/metadata.xml b/dev-util/as11/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/dev-util/as11/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
new file mode 100644
index 000000000000..6701525c12bc
--- /dev/null
+++ b/dev-util/astyle/Manifest
@@ -0,0 +1,3 @@
+DIST astyle_2.02.1_linux.tar.gz 153253 SHA256 0bece9a32887e51f42c57617cf7c4f9b63d0a386749fe3a094f5525b639ef953 SHA512 5a156910a2610b1c49bfe78ac237e1bb13e9627912db107ef98fead88a29f000ed355446c033fd052112d54a4f2bbdf3f484ef58b9976c311c06cde951fda274 WHIRLPOOL 96451afd3f4bb6eaa51f33b2f565e545f401973a00ef6653ee4dbeff85ca7c06928e12d54249a8221e881c20f4d1bdea023fbe04ac57631601e15a3453dc2b79
+DIST astyle_2.03_linux.tar.gz 142577 SHA256 22b5249a0b8c9fab3b3bcd467abcb3c6b4a78458b528028634a83dca4c6ca389 SHA512 5f23ef010edba0ddd7377b2a6023a0d97e22f7247e20a0c94d56252fef55b6de291b3c9de67f5ddfa02906cd44470e136ae49e38f7bd2afe65a204245230a579 WHIRLPOOL b97a212dd4c92e24af9c5aa99fafcc5de929e94a81e160244d9cbc66bc7b97e0ca415e21b8e1eae35ef659b42423e1dd9b154fbddf36fef7fc344deca39dc156
+DIST astyle_2.04_linux.tar.gz 156974 SHA256 70b37f4853c418d1e2632612967eebf1bdb93dfbe558c51d7d013c9b4e116b60 SHA512 bc0f6351fac4198ab969251342c4e453064b07512a2d06825a93c75daf86b06469c9971f35fbadad872d23368dc546019d8d174e07ceaad6e10007f562fdeffd WHIRLPOOL d9aa3f537885e373d791204652ed5c8d5231be0840ef5dde3714bb8c9c524e327585a51b7b14da1aae2952f7c9248401bc2769290bc5828d15f030f41d95c1fe
diff --git a/dev-util/astyle/astyle-2.02.1.ebuild b/dev-util/astyle/astyle-2.02.1.ebuild
new file mode 100644
index 000000000000..66bf3afacb91
--- /dev/null
+++ b/dev-util/astyle/astyle-2.02.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils java-pkg-opt-2 multilib toolchain-funcs
+
+DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
+HOMEPAGE="http://astyle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+IUSE="doc java static-libs"
+
+DEPEND="app-arch/xz-utils
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	tc-export CXX
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build_system.patch
+	java-pkg-opt-2_src_prepare
+	sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
+		-e "s:ar crs:$(tc-getAR) crs:" \
+		-i build/gcc/Makefile || die
+}
+
+src_compile() {
+	local mk_opts="-f ../build/gcc/Makefile -C src"
+	emake ${mk_opts} ${PN}
+	emake ${mk_opts} shared
+	if use java ; then
+		emake ${mk_opts} java
+	fi
+	if use static-libs ; then
+		emake ${mk_opts} static
+	fi
+}
+
+src_install() {
+	insinto /usr/include
+	doins src/${PN}.h
+
+	pushd src/bin &> /dev/null
+	dobin ${PN}
+
+	dolib.so lib${PN}.so.0.0.0
+	dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so.0
+	dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so
+	if use java ; then
+		dolib.so lib${PN}j.so.0.0.0
+		dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so.0
+		dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so
+	fi
+	if use static-libs ; then
+		dolib lib${PN}.a
+	fi
+	popd &> /dev/null
+
+	use doc && dohtml doc/*
+}
diff --git a/dev-util/astyle/astyle-2.03.ebuild b/dev-util/astyle/astyle-2.03.ebuild
new file mode 100644
index 000000000000..a29b39744a42
--- /dev/null
+++ b/dev-util/astyle/astyle-2.03.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils java-pkg-opt-2 multilib toolchain-funcs
+
+DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
+HOMEPAGE="http://astyle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+IUSE="doc java static-libs"
+
+DEPEND="app-arch/xz-utils
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	tc-export CXX
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.02.1-build_system.patch
+	java-pkg-opt-2_src_prepare
+	sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
+		-e "s:ar crs:$(tc-getAR) crs:" \
+		-i build/gcc/Makefile || die
+}
+
+src_compile() {
+	local mk_opts="-f ../build/gcc/Makefile -C src"
+	emake ${mk_opts} ${PN}
+	emake ${mk_opts} shared
+	if use java ; then
+		emake ${mk_opts} java
+	fi
+	if use static-libs ; then
+		emake ${mk_opts} static
+	fi
+}
+
+src_install() {
+	insinto /usr/include
+	doins src/${PN}.h
+
+	pushd src/bin &> /dev/null
+	dobin ${PN}
+
+	dolib.so lib${PN}.so.0.0.0
+	dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so.0
+	dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so
+	if use java ; then
+		dolib.so lib${PN}j.so.0.0.0
+		dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so.0
+		dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so
+	fi
+	if use static-libs ; then
+		dolib lib${PN}.a
+	fi
+	popd &> /dev/null
+
+	use doc && dohtml doc/*
+}
diff --git a/dev-util/astyle/astyle-2.04.ebuild b/dev-util/astyle/astyle-2.04.ebuild
new file mode 100644
index 000000000000..71a7e6c0104c
--- /dev/null
+++ b/dev-util/astyle/astyle-2.04.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-opt-2 multilib toolchain-funcs
+
+DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
+HOMEPAGE="http://astyle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+IUSE="doc java static-libs"
+
+DEPEND="app-arch/xz-utils
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	tc-export CXX
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.02.1-build_system.patch
+	java-pkg-opt-2_src_prepare
+	sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
+		-e "s:ar crs:$(tc-getAR) crs:" \
+		-i build/gcc/Makefile || die
+}
+
+src_compile() {
+	emake -f ../build/gcc/Makefile -C src \
+		${PN} \
+		shared \
+		$(usex java java '') \
+		$(usex static-libs static '')
+}
+
+src_install() {
+	insinto /usr/include
+	doins src/${PN}.h
+
+	pushd src/bin &> /dev/null
+	dobin ${PN}
+
+	dolib.so lib${PN}.so.0.0.0
+	dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so.0
+	dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so
+	if use java ; then
+		dolib.so lib${PN}j.so.0.0.0
+		dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so.0
+		dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so
+	fi
+	if use static-libs ; then
+		dolib lib${PN}.a
+	fi
+	popd &> /dev/null
+
+	use doc && dohtml doc/*
+}
diff --git a/dev-util/astyle/files/astyle-2.02.1-build_system.patch b/dev-util/astyle/files/astyle-2.02.1-build_system.patch
new file mode 100644
index 000000000000..1d63a512e9bc
--- /dev/null
+++ b/dev-util/astyle/files/astyle-2.02.1-build_system.patch
@@ -0,0 +1,54 @@
+--- a/build/gcc/Makefile
++++ b/build/gcc/Makefile
+@@ -34,25 +34,25 @@
+ ipath=$(prefix)/bin
+ CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions
+ JAVAINCS   = -I$(JAVA_HOME)/include
+-CXX = g++
++CXX ?= g++
+ INSTALL=install -o $(USER) -g $(USER)
+ 
+ ##################################################
+ 
+ # define compile options for each build
+-ifdef CFLAGS
+-    CFLAGSr   = -DNDEBUG $(CBASEFLAGS) $(CFLAGS)
+-    CFLAGSd   = -g $(CBASEFLAGS) $(CFLAGS)
++ifdef CXXFLAGS
++    CFLAGSr   = -DNDEBUG $(CBASEFLAGS) $(CXXFLAGS)
++    CFLAGSd   = -g $(CBASEFLAGS) $(CXXFLAGS)
+ else 
+     CFLAGSr   = -DNDEBUG -O3 $(CBASEFLAGS)
+     CFLAGSd   = -g $(CBASEFLAGS)
+ endif
+-CFLAGSs   = -DASTYLE_LIB -fpic $(CFLAGSr)
+-CFLAGSsd  = -DASTYLE_LIB -fpic $(CFLAGSd)
++CFLAGSs   = -DASTYLE_LIB -fPIC $(CFLAGSr)
++CFLAGSsd  = -DASTYLE_LIB -fPIC $(CFLAGSd)
+ CFLAGSa   = -DASTYLE_LIB $(CFLAGSr)
+ CFLAGSad  = -DASTYLE_LIB $(CFLAGSd)
+-CFLAGSsj  = -DASTYLE_JNI -fpic $(CFLAGSr) $(JAVAINCS)
+-CFLAGSsjd = -DASTYLE_JNI -fpic $(CFLAGSd) $(JAVAINCS)
++CFLAGSsj  = -DASTYLE_JNI -fPIC $(CFLAGSr) $(JAVAINCS)
++CFLAGSsjd = -DASTYLE_JNI -fPIC $(CFLAGSd) $(JAVAINCS)
+ 
+ # define link options
+ ifdef LDFLAGS
+@@ -134,7 +134,7 @@
+ shared:  libastyle.so
+ libastyle.so:  $(OBJs)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^
++	$(CXX) -shared -Wl,-soname,$@.0 $(LDFLAGSr) -o $(bindir)/$@.0.0.0 $^
+ 	@ echo
+ 
+ shareddebug:  libastyled.so
+@@ -158,7 +158,7 @@
+ java:  libastylej.so
+ libastylej.so:  $(OBJsj)
+ 	@ mkdir -p $(bindir)
+-	$(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^
++	$(CXX) -shared -Wl,-soname,$@.0 $(LDFLAGSr) -o $(bindir)/$@.0.0.0 $^
+ 	@ echo
+ 
+ javadebug:  libastylejd.so
diff --git a/dev-util/astyle/metadata.xml b/dev-util/astyle/metadata.xml
new file mode 100644
index 000000000000..3ed3c4b22b24
--- /dev/null
+++ b/dev-util/astyle/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>dev-tools</herd>
+  <longdescription>
+  From the web page:
+
+  Artistic Style is a reindenter and reformatter of C++, C and Java source
+  code.
+      
+  When indenting source code, we as programmers have a tendency to use both 
+  spaces and tab characters to create the wanted indentation. Moreover, some 
+  editors by default insert spaces instead of tabs when pressing the tab key, 
+  and other editors (Emacs for example) have the ability to "pretty up" lines 
+  by automatically setting up the white space before the code on the line, 
+  possibly inserting spaces in a code that up to now used only tabs for 
+  indentation. 
+
+  Since the NUMBER of space characters showed on screen for each tab character
+  in the source code changes between editors (until the user sets up the 
+  number to his liking...), one of the standard problems facing programmers 
+  when moving from one source code editor to another is that code containing 
+  both spaces and tabs that was up to now perfectly indented, suddenly becomes
+  a mess to look at when changing to another editor. Even if you as a 
+  programmer take care to ONLY use spaces or tabs, looking at other peoples 
+  source code can still be problematic.
+
+  To address this problem I have created Artistic Style - a series of filters,
+  written in C++, that automatically reindent &amp; reformat C/C++/Java source 
+  files. These can be used from a command line, or it can be incorporated as 
+  classes in another C++ program.  
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">astyle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/atomic-install/Manifest b/dev-util/atomic-install/Manifest
new file mode 100644
index 000000000000..e4804f1446e6
--- /dev/null
+++ b/dev-util/atomic-install/Manifest
@@ -0,0 +1 @@
+DIST atomic-install-0.1.1.tar.bz2 279555 SHA256 941ecd58029e691539d799b0e4fa8f90f5018d8d3bf44dfe0c244f219d03c615 SHA512 6614b47ab24f3ce480dd977983c2117836418915a13689e301922dce3091cfbb4dfec412402fa4c68f77d15c7dc297f14d70c12aeccab98d77af0a3534f29c8a WHIRLPOOL d6e8429441810eaae456593beeacdab5db8303b60f8ad7c88e0a51b178a6daac35735fdf96481ddb96628ef8c9904aeac2247928865c3f00df0d7e97b0fd136b
diff --git a/dev-util/atomic-install/atomic-install-0.1.1.ebuild b/dev-util/atomic-install/atomic-install-0.1.1.ebuild
new file mode 100644
index 000000000000..bee6b11f03ea
--- /dev/null
+++ b/dev-util/atomic-install/atomic-install-0.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="A library and tool to atomically install sets of files"
+HOMEPAGE="https://github.com/mgorny/atomic-install/"
+SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs xattr"
+
+RDEPEND="xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.18 )"
+
+src_configure() {
+	myeconfargs=(
+		$(use_enable doc gtk-doc)
+		$(use_enable xattr libattr)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/atomic-install/atomic-install-9999.ebuild b/dev-util/atomic-install/atomic-install-9999.ebuild
new file mode 100644
index 000000000000..7e911d1cf119
--- /dev/null
+++ b/dev-util/atomic-install/atomic-install-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="git://github.com/mgorny/${PN}.git
+	http://github.com/mgorny/${PN}.git"
+
+inherit git-2
+#endif
+
+inherit autotools-utils
+
+DESCRIPTION="A library and tool to atomically install sets of files"
+HOMEPAGE="https://github.com/mgorny/atomic-install/"
+SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs xattr"
+
+RDEPEND="xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.18 )"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+DEPEND="${DEPEND}
+	>=dev-util/gtk-doc-1.18"
+#endif
+
+src_configure() {
+	myeconfargs=(
+		$(use_enable doc gtk-doc)
+		$(use_enable xattr libattr)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/atomic-install/metadata.xml b/dev-util/atomic-install/metadata.xml
new file mode 100644
index 000000000000..1e50b7ed36cd
--- /dev/null
+++ b/dev-util/atomic-install/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://github.com/mgorny/atomic-install/issues/</bugs-to>
+		<remote-id type="github">mgorny/atomic-install</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/autodia/Manifest b/dev-util/autodia/Manifest
new file mode 100644
index 000000000000..225f9e97caa0
--- /dev/null
+++ b/dev-util/autodia/Manifest
@@ -0,0 +1,2 @@
+DIST Autodia-2.14-dbi.patch.gz 343 SHA256 b89556577240e75889995d8685cfd9791ec492187da691ee0a11ccd1b3602300 SHA512 2a7c1b4bacfaab3d0c0c16c12362be0a16161db0465ad1b5c4cc955296fd611824aa87b49e7c3672435d10004a383125e2edd3aff640fada2e1694cc02a8abd5 WHIRLPOOL 23ae7d3f9b90d3a36593a26004a1a2079bc99cd35fc6a8952e36ba37ad6ae56e403961a21616e411fbe8c16913810ac3a7b10bccb2f0bb2af6631b26c9db6338
+DIST Autodia-2.14.tar.gz 78070 SHA256 ac8125c88abe39d9fe01ca3acc13a00a29f3336a4bb7ef60447e6b8b822ff422 SHA512 41cd0d9dd8fc66d70aaf987a8a62ed8b916e9a38263c61cc1cb7994e7bfb24843bbd3440bbdad054fccbf0fbbdaa11ec3a35db2a6f926bc87ba65a5f4ac160ee WHIRLPOOL d857afa6d5f203750c69e0ea1af2bbec155cd6e202a20a3ba288a1f9fbd8a25402b4b4e2e987d336e6730c87111f1f312e6ca5de0307e166f5a9c8e91e811786
diff --git a/dev-util/autodia/autodia-2.140.0-r1.ebuild b/dev-util/autodia/autodia-2.140.0-r1.ebuild
new file mode 100644
index 000000000000..9b2d8aa98743
--- /dev/null
+++ b/dev-util/autodia/autodia-2.140.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=Autodia
+MODULE_VERSION=2.14
+MODULE_AUTHOR=TEEJAY
+GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
+inherit perl-app multilib
+
+DESCRIPTION="Parses source code, XML or data and produces an XML document in Dia format"
+HOMEPAGE="http://www.aarontrevena.co.uk/opensource/autodia/ ${HOMEPAGE}"
+SRC_URI+=" http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${MY_PN}-2.14-dbi.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz test"
+
+RDEPEND="
+	dev-perl/Template-Toolkit
+	dev-perl/XML-Simple
+	graphviz? (
+		dev-perl/GraphViz
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Pod
+	)
+"
+
+SRC_TEST=do
+PATCHES=( "${WORKDIR}"/${MY_PN}-2.14-dbi.patch )
+mydoc="DEVELOP"
diff --git a/dev-util/autodia/metadata.xml b/dev-util/autodia/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/autodia/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/automoc/Manifest b/dev-util/automoc/Manifest
new file mode 100644
index 000000000000..b884d4973936
--- /dev/null
+++ b/dev-util/automoc/Manifest
@@ -0,0 +1 @@
+DIST automoc4-0.9.88.tar.bz2 9153 SHA256 234116f4c05ae21d828594d652b4c4a052ef75727e2d8a4f3a4fb605de9e4c49 SHA512 96dfa096a3793f93f6a4acf98c051c871c0285124bff09b12914a17e08a1f26cd63f0bb1c22fdf2c5c29550a1727a087b5de86bfa8a555c562e96052b4a2d820 WHIRLPOOL b66cdf3e04f825bacbdab7b5e6206db4979f3a8625bdb8e86f64b61fdc1e9cfe3e18a151d61ceb3e8b7b2dac5878dd9ee9de4e3b265326f496e781f8f18ac0ef
diff --git a/dev-util/automoc/automoc-0.9.88-r1.ebuild b/dev-util/automoc/automoc-0.9.88-r1.ebuild
new file mode 100644
index 000000000000..c6d70717acf4
--- /dev/null
+++ b/dev-util/automoc/automoc-0.9.88-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="automoc4"
+MY_P="${MY_PN}-${PV}"
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="KDE Meta Object Compiler"
+HOMEPAGE="http://www.kde.org"
+SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.88-objc++.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ ${ELIBC} = uclibc ]]; then
+		append-flags -pthread
+	fi
+}
diff --git a/dev-util/automoc/files/automoc-0.9.88-objc++.patch b/dev-util/automoc/files/automoc-0.9.88-objc++.patch
new file mode 100644
index 000000000000..1f4dacdc06eb
--- /dev/null
+++ b/dev-util/automoc/files/automoc-0.9.88-objc++.patch
@@ -0,0 +1,48 @@
+Please refer to
+  http://websvn.kde.org/?view=revision&revision=934696
+
+Adds support for objc++ in automoc, so that running moc on .mm-files will work.
+
+--- trunk/kdesupport/automoc/Automoc4Config.cmake	2009/03/03 15:40:57	934695
++++ trunk/kdesupport/automoc/Automoc4Config.cmake	2009/03/03 15:42:18	934696
+@@ -105,9 +105,9 @@
+       if(NOT  _generated  AND NOT  _skip)
+          get_filename_component(_suffix "${_current_FILE}" EXT)
+          # skip every source file that's not C++
+-         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
++         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
+              list(APPEND _moc_files ${_abs_current_FILE})
+-         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
++         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
+       endif(NOT  _generated  AND NOT  _skip)
+    endforeach (_current_FILE)
+ 
+@@ -156,7 +156,7 @@
+       if(NOT  _generated  AND NOT  _skip)
+          get_filename_component(_suffix "${_current_FILE}" EXT)
+          # skip every source file that's not C++
+-         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
++         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
+              get_filename_component(_basename "${_current_FILE}" NAME_WE)
+              get_filename_component(_abs_path "${_abs_current_FILE}" PATH)
+              set(_header "${_abs_path}/${_basename}.h")
+@@ -168,7 +168,7 @@
+                 list(APPEND _moc_headers ${_pheader})
+              endif(EXISTS "${_pheader}")
+              list(APPEND _moc_files ${_abs_current_FILE})
+-         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
++         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
+       endif(NOT  _generated  AND NOT  _skip)
+    endforeach (_current_FILE)
+ 
+--- trunk/kdesupport/automoc/kde4automoc.cpp	2009/03/03 15:40:57	934695
++++ trunk/kdesupport/automoc/kde4automoc.cpp	2009/03/03 15:42:18	934696
+@@ -326,7 +326,7 @@
+     foreach (const QString &absFilename, sourceFiles) {
+         //qDebug() << absFilename;
+         const QFileInfo sourceFileInfo(absFilename);
+-        if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") ||
++        if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") || absFilename.endsWith(".mm") ||
+                 absFilename.endsWith(".cxx") || absFilename.endsWith(".C")) {
+             //qDebug() << "check .cpp file";
+             QFile sourceFile(absFilename);
diff --git a/dev-util/automoc/metadata.xml b/dev-util/automoc/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/dev-util/automoc/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>kde</herd>
+</pkgmetadata>
diff --git a/dev-util/autoproject/Manifest b/dev-util/autoproject/Manifest
new file mode 100644
index 000000000000..a92f53a0959f
--- /dev/null
+++ b/dev-util/autoproject/Manifest
@@ -0,0 +1,3 @@
+DIST autoproject_0.20-3.diff.gz 4704 SHA256 f201fc7431d189c80297fba31867013e9efe6dec2c19399d52e9ceb4356ee562 SHA512 8058fb2430010ddc8613c9e310c262b28379eb3d38b7e9badca7e3adb3560e5965bbe6612a0211d38920094a4851502471f9e1670e694ea3ef7d29bbfde340e9 WHIRLPOOL ad827a1424856f6dc3ddf91f5209414c77a4bccab7b969429a9c9c44bf75146e4c7139268d76f274fa72639a72e7ee7ef4ba32ec7ece5260e29617b134b2fc7d
+DIST autoproject_0.20-5.diff.gz 5287 SHA256 b7ece8099d19453cb6eff78b2ce6b8fc4f1cfb72e8bdfe4cbd6d7eb7f277b59b SHA512 156f8feff53936c3113bda9d8a3f2e19679f249656ace69aacb1f0a13ae93066eef49de3e5a268c47ed3e440144de629f6b84a477ecfc6a3f793c41412cc9b5a WHIRLPOOL eaf1aff7d4e2f8a3b49d2ad7c41e1115c57c076aa5dc441562546d352387a30b996cbe8079ca3193c57ae6bad3a12bed4b13c6562a51e24b48ba08f0af22ecfc
+DIST autoproject_0.20.orig.tar.gz 151101 SHA256 850ff70e250fbd34c1193461b0fc8e1254803ee22a9d116cdbcc822b551766cc SHA512 eb6ba12af96e03f4da51b6b9fc0db618180d92b8a363f30182013a003bb13f5b66ee12b28531a234f6035b64bda29bb0f838466ccbeaddbce06a437a18c05288 WHIRLPOOL 83616aca1fe8ce08b509058585f740ace8121544910846a137940965f5ee8e904fd2f04ee158ea5e312a2a8a2cf9c7be1ee6a02430bb1f58cb1ccbf9abc6e335
diff --git a/dev-util/autoproject/autoproject-0.20.ebuild b/dev-util/autoproject/autoproject-0.20.ebuild
new file mode 100644
index 000000000000..9286454a1d88
--- /dev/null
+++ b/dev-util/autoproject/autoproject-0.20.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DEB_VER=3
+DESCRIPTION="Used to start a programming project using autotools and a command line parser generator"
+HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
+SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/a/autoproject/${PN}_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="test"
+
+RDEPEND="sys-devel/automake
+	sys-devel/autoconf"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/texinfo )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${PN}_${PV}-${DEB_VER}.diff
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS NEWS README TODO ChangeLog
+}
diff --git a/dev-util/autoproject/autoproject-0.20_p5.ebuild b/dev-util/autoproject/autoproject-0.20_p5.ebuild
new file mode 100644
index 000000000000..0df09eb4c481
--- /dev/null
+++ b/dev-util/autoproject/autoproject-0.20_p5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_PV=${PV%_p*}
+DEB_VER=${PV#*_p}
+DESCRIPTION="Used to start a programming project using autotools and a command line parser generator"
+HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
+SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}-${DEB_VER}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+RDEPEND="sys-devel/automake
+	sys-devel/autoconf"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/texinfo )"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${PN}_${MY_PV}-${DEB_VER}.diff
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS NEWS README TODO ChangeLog
+}
diff --git a/dev-util/autoproject/metadata.xml b/dev-util/autoproject/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/dev-util/autoproject/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>base-system</herd>
+</pkgmetadata>
diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
new file mode 100644
index 000000000000..50eac23572a7
--- /dev/null
+++ b/dev-util/babeltrace/Manifest
@@ -0,0 +1,2 @@
+DIST babeltrace-1.2.3.tar.bz2 995094 SHA256 796fa6978102244d9c64d474baeac4e4292a0186660a53cf58f20d47226987ac SHA512 de231c9e25797d0f3cfb8692fc75b8ce4159d317bb861806955f098a99d5749b627c830111d37788d0da486fdef92c83c020588a6598b4e95bcff6cbf9fce77f WHIRLPOOL c473821bc5648865d5460c9b55d8e59cb6416057f7e43d6d8a81950ce62310309cc1dc23845cc7b16ba3533d6f28d0c2352a2f304163bf378725ac10c5831e86
+DIST babeltrace-1.2.4.tar.bz2 995829 SHA256 666e3a1ad2dc7d5703059963056e7800f0eab59c8eeb6be2efe4f3acc5209eb1 SHA512 5cfd4572519ec53ad531d333ac5e1df026ebd1a200e0fbec59c892cad5273316e07482a4199a1cb2dcb4994310b04b259748de169c4a7c1ddafd7e185f32c5f9 WHIRLPOOL 31c5a65c7dea2318d1938e6163a6650ca0bab47579389c44c35caa47d7d7f6465e48c7e877450f200690da277e1aace4097eef90bb72dc66f842fa1bc2da98dc
diff --git a/dev-util/babeltrace/babeltrace-1.2.3.ebuild b/dev-util/babeltrace/babeltrace-1.2.3.ebuild
new file mode 100644
index 000000000000..19b8315b2c52
--- /dev/null
+++ b/dev-util/babeltrace/babeltrace-1.2.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A command-line tool and library to read and convert trace files"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/popt
+	sys-apps/util-linux
+	"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	"
+src_configure() {
+	econf $(use_enable test glibtest)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/dev-util/babeltrace/babeltrace-1.2.4.ebuild b/dev-util/babeltrace/babeltrace-1.2.4.ebuild
new file mode 100644
index 000000000000..19b8315b2c52
--- /dev/null
+++ b/dev-util/babeltrace/babeltrace-1.2.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A command-line tool and library to read and convert trace files"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/popt
+	sys-apps/util-linux
+	"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	"
+src_configure() {
+	econf $(use_enable test glibtest)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/dev-util/babeltrace/metadata.xml b/dev-util/babeltrace/metadata.xml
new file mode 100644
index 000000000000..0968da43259a
--- /dev/null
+++ b/dev-util/babeltrace/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<longdescription>
+		Babeltrace is a command-line tool and library to read and convert trace files to and from different formats. It supports the CTF format, which is outputted by the LTTng 2.0 tracers.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/bakefile/Manifest b/dev-util/bakefile/Manifest
new file mode 100644
index 000000000000..279e1b3ba763
--- /dev/null
+++ b/dev-util/bakefile/Manifest
@@ -0,0 +1 @@
+DIST bakefile-0.2.9.tar.gz 775528 SHA256 9f3c65411ad3932027e3c3e765337d89be2f9cf5ee9a204da80e92a8c2d76ca5 SHA512 dc28a3a68c080dababef68b9f39ad141739ecb5e4e1129620274bd80ac13f68cddd6e5625776f23c508f20e1f984a8830a949c425457cfeada8b44081873102f WHIRLPOOL fe050f76f17c1dcce3687eaf7b91cad0cf8b85789cc3a5065ce113b58d0cf9d507c374b3249ecec945086ee666cd9b919bcf6e3d14cc3d0343dce2a3cbaae1e7
diff --git a/dev-util/bakefile/bakefile-0.2.9-r1.ebuild b/dev-util/bakefile/bakefile-0.2.9-r1.ebuild
new file mode 100644
index 000000000000..dc9c677a82e4
--- /dev/null
+++ b/dev-util/bakefile/bakefile-0.2.9-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 bash-completion-r1
+
+DESCRIPTION="Native makefiles generator"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://bakefile.sourceforge.net"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+src_install () {
+	default
+
+	if use doc ; then
+		dohtml -r doc/html/.
+	fi
+
+	# TODO: symlink the two
+	newbashcomp bash_completion bakefile
+	newbashcomp bash_completion bakefile_gen
+}
diff --git a/dev-util/bakefile/files/bakefile-0.2.6-enlarge-buffers.patch b/dev-util/bakefile/files/bakefile-0.2.6-enlarge-buffers.patch
new file mode 100644
index 000000000000..c0af7bb47bc8
--- /dev/null
+++ b/dev-util/bakefile/files/bakefile-0.2.6-enlarge-buffers.patch
@@ -0,0 +1,12 @@
+diff -urN ./bakefile-0.2.6.orig/src/bottlenecks.c ./bakefile-0.2.6/src/bottlenecks.c
+--- ./bakefile-0.2.6.orig/src/bottlenecks.c	2009-03-26 20:34:42.000000000 +0100
++++ ./bakefile-0.2.6/src/bottlenecks.c	2009-07-21 22:36:18.111411153 +0200
+@@ -37,7 +37,7 @@
+ /* ------------------------------------------------------------------------ */
+ 
+ #define TEXTBUF_COUNT                8
+-#define TEXTBUF_SIZE            102400
++#define TEXTBUF_SIZE            120000
+ 
+ static char *textbuf[TEXTBUF_COUNT] = 
+         {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
diff --git a/dev-util/bakefile/metadata.xml b/dev-util/bakefile/metadata.xml
new file mode 100644
index 000000000000..c1a4dd3eb2e0
--- /dev/null
+++ b/dev-util/bakefile/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>wxwidgets</herd>
+	<upstream>
+		<remote-id type="sourceforge">bakefile</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/bam/Manifest b/dev-util/bam/Manifest
new file mode 100644
index 000000000000..195b940264eb
--- /dev/null
+++ b/dev-util/bam/Manifest
@@ -0,0 +1 @@
+DIST bam-0.4.0.tar.bz2 164033 SHA256 56030670aa21e227ce0a00f1ee0c9b5129469a6e69e7b67c3dd459d2fce6207d SHA512 10ba53b05ac1604a9e9a01f4c008a8cbdc4e4e9df2fc039c8ca59251461e4c5f95770b5b72945d07693db7abe7cd312bc38725686b4d509d5dc21a585fffc810 WHIRLPOOL 01399ae9347b52318b7589b05e156362948773ef7b7060b299b79c3d8519565d38cdc786257b929a5f0c3c96d56eedcdd4adc4702ff9c9773c2037adb52414a8
diff --git a/dev-util/bam/bam-0.4.0-r1.ebuild b/dev-util/bam/bam-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..d3a69b71df2c
--- /dev/null
+++ b/dev-util/bam/bam-0.4.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 toolchain-funcs
+
+DESCRIPTION="Fast and flexible Lua-based build system"
+HOMEPAGE="http://matricks.github.com/bam/"
+SRC_URI="http://github.com/downloads/matricks/${PN}/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="dev-lang/lua:="
+DEPEND="${RDEPEND}
+	doc? ( ${PYTHON_DEPS} )
+	test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	if use doc || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/${PV}/Makefile "${S}"/Makefile || die "cp failed"
+	epatch "${FILESDIR}"/${PV}/${P}-test.py.patch
+	tc-export CC
+}
+
+src_compile() {
+	emake ${PN}
+	if use doc; then
+		"${PYTHON}" scripts/gendocs.py || die "doc generation failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+	if use doc; then
+		dohtml docs/${PN}{.html,_logo.png}
+	fi
+}
diff --git a/dev-util/bam/files/0.4.0/Makefile b/dev-util/bam/files/0.4.0/Makefile
new file mode 100644
index 000000000000..d64f43abcd11
--- /dev/null
+++ b/dev-util/bam/files/0.4.0/Makefile
@@ -0,0 +1,22 @@
+LIBS		+= -lm -lpthread -llua -ldl
+TARGETS	= txt2c internal_base bam
+BAM_OBJ	= $(patsubst %.c,%.o,$(wildcard src/*.c))
+TXT2C_LUA	= $(wildcard src/*.lua)
+
+all: $(TARGETS)
+
+txt2c: src/tools/txt2c
+
+internal_base: src/internal_base.h
+
+src/internal_base.h:
+	src/tools/txt2c $(TXT2C_LUA) > src/internal_base.h
+
+bam: txt2c internal_base $(BAM_OBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BAM_OBJ) $(LIBS)
+
+test: $(TARGETS)
+	python scripts/test.py
+
+clean:
+	rm -f $(BAM_OBJ) $(TARGETS) src/internal_base.h src/tools/txt2c
diff --git a/dev-util/bam/files/0.4.0/bam-0.4.0-test.py.patch b/dev-util/bam/files/0.4.0/bam-0.4.0-test.py.patch
new file mode 100644
index 000000000000..5ea2acd3e440
--- /dev/null
+++ b/dev-util/bam/files/0.4.0/bam-0.4.0-test.py.patch
@@ -0,0 +1,11 @@
+--- scripts/test.py.old	2010-03-22 19:23:23.000000000 +0100
++++ scripts/test.py	2010-03-22 19:23:43.000000000 +0100
+@@ -178,6 +178,8 @@
+ 	print "FAILED TESTS:"
+ 	for t in failed_tests:
+ 		print "\t"+t
++	sys.exit(1)
+ else:
+ 	print "ALL TESTS PASSED!"
++	sys.exit(0)
+ 
diff --git a/dev-util/bam/metadata.xml b/dev-util/bam/metadata.xml
new file mode 100644
index 000000000000..89a3497cd9b1
--- /dev/null
+++ b/dev-util/bam/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">downloads/matricks</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/bbe/Manifest b/dev-util/bbe/Manifest
new file mode 100644
index 000000000000..349d865ee7ff
--- /dev/null
+++ b/dev-util/bbe/Manifest
@@ -0,0 +1 @@
+DIST bbe-0.2.2.tar.gz 211590 SHA256 baaeaf5775a6d9bceb594ea100c8f45a677a0a7d07529fa573ba0842226edddb SHA512 6ac31aa005f18cbfd3fbacfe86b3d81ee61a027764296f574c4180da6ccc23dbf716a835fb013730d30c09c045197a70e28584303f3521afab0e5c63d0cf693f WHIRLPOOL f9c124a08b2458cc4368bdc7153da986c4ebf27b26ecfc3d356677f927bf3fac499c93265a6f2c74daf96c2c88efa7038eb2dca80627c8ce39cd8060a9222d4a
diff --git a/dev-util/bbe/bbe-0.2.2.ebuild b/dev-util/bbe/bbe-0.2.2.ebuild
new file mode 100644
index 000000000000..6eba798cfe23
--- /dev/null
+++ b/dev-util/bbe/bbe-0.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="Sed-like editor for binary files"
+HOMEPAGE="http://sourceforge.net/projects/bbe-/"
+SRC_URI="mirror://sourceforge/${PN}-/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	sed -i -e '/^htmldir/d' doc/Makefile.am || die
+	eaclocal
+	eautoreconf
+}
+
+src_configure() {
+	econf --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
diff --git a/dev-util/bbe/metadata.xml b/dev-util/bbe/metadata.xml
new file mode 100644
index 000000000000..1043bd2739bc
--- /dev/null
+++ b/dev-util/bbe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bbe-</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
new file mode 100644
index 000000000000..ec0f0aeb89cc
--- /dev/null
+++ b/dev-util/bcpp/Manifest
@@ -0,0 +1,2 @@
+DIST bcpp-20050725.tgz 132649 SHA256 1a4b5e8e741d6be400eb68b7c4a3eebc6dabe29948a72a7a0bccb1db075eaa2a SHA512 0ada3aee998fa6748e7492bfe2e0d6e5417640eaa19aa3342637ee1d162c907d2af4fd2d1ab24661f36798d2d51fa017d9c113b8499b32bf4d521e130aa75323 WHIRLPOOL fff51c65b60351c9a7c55d060754e3e09383b905820ab79aa2f371a894a82d8a3fa5a00b00a066380909c49487e262f99a832022b5f214d564e43b8939fcbdcb
+DIST bcpp-20090630.tgz 138757 SHA256 27b46ab3cef53a658605f350e3982862e17b523e703f23617530a57180200a34 SHA512 660d11c0d8a8d3ccc2a4c14ccb60164a43647fface79ffd86b8d99519e227e32a882fc213a5fef64fd3aee1c409c4bb0a871dfd6d6a09a8ad35e253baef6496b WHIRLPOOL 1fa68efd9874933de2097b87aab0dd586cbc29cf7fc3d4ba6d80984ecb289f01d8093e82fbca3f8077300887a8d1b1b970ed5bcabb0a766489bdcb23704f7ac2
diff --git a/dev-util/bcpp/bcpp-20050725.ebuild b/dev-util/bcpp/bcpp-20050725.ebuild
new file mode 100644
index 000000000000..dacf2758c5ae
--- /dev/null
+++ b/dev-util/bcpp/bcpp-20050725.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Indents C/C++ source code"
+HOMEPAGE="http://invisible-island.net/bcpp/"
+SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-etc-cfg-files.patch"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
+		txtdocs/manual.txt
+
+	# install our configuration files
+	insinto /etc/bcpp
+	doins bcpp.cfg indent.cfg
+}
+
+pkg_postinst() {
+	elog "Check the documentation for more information on how to"
+	elog "Run bcpp.  Please note that in order to get help for"
+	elog "bcpp, please run bcpp -h and not the command by itself."
+	elog ""
+	elog "Configuration files are at /etc/bcpp."
+	elog "To use them, use the -c option followed by the filename."
+}
diff --git a/dev-util/bcpp/bcpp-20090630.ebuild b/dev-util/bcpp/bcpp-20090630.ebuild
new file mode 100644
index 000000000000..a64445f9a6db
--- /dev/null
+++ b/dev-util/bcpp/bcpp-20090630.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Indents C/C++ source code"
+HOMEPAGE="http://invisible-island.net/bcpp/"
+SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-20050725-etc-cfg-files.patch"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
+		txtdocs/manual.txt || die "dodoc failed"
+
+	# Install our configuration files.
+	insinto /etc/bcpp
+	doins bcpp.cfg indent.cfg || die "doins failed"
+}
+
+pkg_postinst() {
+	elog "Check the documentation for more information on how to"
+	elog "Run bcpp.  Please note that in order to get help for"
+	elog "bcpp, please run bcpp -h and not the command by itself."
+	elog ""
+	elog "Configuration files are at /etc/bcpp."
+	elog "To use them, use the -c option followed by the filename."
+}
diff --git a/dev-util/bcpp/files/bcpp-20050725-etc-cfg-files.patch b/dev-util/bcpp/files/bcpp-20050725-etc-cfg-files.patch
new file mode 100644
index 000000000000..e6ba66cd794c
--- /dev/null
+++ b/dev-util/bcpp/files/bcpp-20050725-etc-cfg-files.patch
@@ -0,0 +1,22 @@
+*** bcpp-20050725/code/bcpp.cpp.orig	2008-07-12 10:07:55.000000000 -0700
+--- bcpp-20050725/code/bcpp.cpp	2008-07-12 10:07:57.000000000 -0700
+***************
+*** 3100,3110 ****
+--- 3100,3116 ----
+      const char* pathSepChar;
+      char  backUp;
+      int   count       = 0;
++ 	char buf[40];
+  
+      // test to see if file is in current directory first !
+      if ((pCfgFile = fopen(pCfgName, "r")) != NULL)
+          return;
+  
++ 	// try /etc/bcpp
++ 	snprintf(buf, 40, "/etc/bcpp/%s", pCfgName);
++     if ((pCfgFile = fopen(buf, "r")) != NULL)
++         return;
++ 
+      // environment variable not found, lord knows what it is !
+      if (pSPath == NULL)
+         return;
diff --git a/dev-util/bcpp/metadata.xml b/dev-util/bcpp/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/dev-util/bcpp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/bdelta/Manifest b/dev-util/bdelta/Manifest
new file mode 100644
index 000000000000..7aa80cbc9371
--- /dev/null
+++ b/dev-util/bdelta/Manifest
@@ -0,0 +1 @@
+DIST bdelta-0.3.1.tar.gz 14476 SHA256 6633945f0893186b1b1ab4d930e6ab6b7fcec248e0288d28e77e0465074f82e7 SHA512 914e5c38297a273c446cddc17fc4cf312b4f54e6fe332e4ef0474104af559a6dca327cfb069f2d224b7cf63b8c81ae1cc4b384371b8fcc8c01cedc199ee871be WHIRLPOOL aec6fc9a3abf8988c70ec0c4aafe84dc1d98461a6920fdb4ebee6ce716e72b510c4d65652800bfe9eca664002bb8c069d81f365160a77d5034c4ca4feec743b6
diff --git a/dev-util/bdelta/bdelta-0.3.1.ebuild b/dev-util/bdelta/bdelta-0.3.1.ebuild
new file mode 100644
index 000000000000..baf7d00d8060
--- /dev/null
+++ b/dev-util/bdelta/bdelta-0.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/jjwhitney/BDelta.git"
+	UNPACKER_ECLASS="git-2"
+	LIVE_EBUILD=yes
+else
+	UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit eutils multilib toolchain-funcs ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+	SRC_URI="http://github.com/jjwhitney/BDelta/tarball/v${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
+HOMEPAGE="http://bdelta.org"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-soname.patch
+}
+
+src_compile() {
+	emake -C src \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake -C src install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	dodoc README
+}
diff --git a/dev-util/bdelta/bdelta-9999.ebuild b/dev-util/bdelta/bdelta-9999.ebuild
new file mode 100644
index 000000000000..479bbdeb174b
--- /dev/null
+++ b/dev-util/bdelta/bdelta-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/jjwhitney/BDelta.git"
+	UNPACKER_ECLASS="git-2"
+	LIVE_EBUILD=yes
+else
+	UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit multilib toolchain-funcs ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+	SRC_URI="http://github.com/jjwhitney/BDelta/tarball/v${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
+HOMEPAGE="http://bdelta.org"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+src_compile() {
+	emake -C src \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake -C src install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	dodoc README
+}
diff --git a/dev-util/bdelta/files/bdelta-0.3.1-soname.patch b/dev-util/bdelta/files/bdelta-0.3.1-soname.patch
new file mode 100644
index 000000000000..360a16d7c0da
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.3.1-soname.patch
@@ -0,0 +1,21 @@
+diff --git a/src/Makefile b/src/Makefile
+index 65fb88d..3b4a261 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,6 +3,7 @@ PREFIX   ?= /usr
+ BINDIR   ?= $(PREFIX)/bin
+ LIBDIR   ?= ${PREFIX}/lib
+ CXXFLAGS += -O2
++DYLIB_LDFLAGS ?= -Wl,-soname,libbdelta.so
+ 
+ ifeq ($(shell uname -s),Darwin)
+ 	SHAREDLIB := libbdelta.dylib
+@@ -19,7 +20,7 @@ libbdelta.a: libbdelta.cpp compatibility.h checksum.h file.h
+ 	$(AR) rs $@ $<.o
+ 
+ libbdelta.so: libbdelta.cpp compatibility.h checksum.h file.h
+-	$(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $< -o $@
++	$(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $(DYLIB_LDFLAGS) $< -o $@
+ 
+ libbdelta.dylib: libbdelta.cpp compatibility.h checksum.h file.h
+ 	$(CXX) -dynamiclib $(CXXFLAGS) $< -o $@
diff --git a/dev-util/bdelta/metadata.xml b/dev-util/bdelta/metadata.xml
new file mode 100644
index 000000000000..6b82cf0d48fc
--- /dev/null
+++ b/dev-util/bdelta/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+    <description>Primary Maintainer</description>
+  </maintainer>
+  <herd>tools-portage</herd>
+  <upstream>
+    <remote-id type="github">jjwhitney/BDelta</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/beediff/Manifest b/dev-util/beediff/Manifest
new file mode 100644
index 000000000000..41c09d97ee5d
--- /dev/null
+++ b/dev-util/beediff/Manifest
@@ -0,0 +1 @@
+DIST beediff_1.9_src.tar.gz 77382 SHA256 c733071a1884dea3eecc582d7006bb7c165563489ba65dc85bdfb58e2ab11bc8 SHA512 b3aaa2f5ca6907269fb38c33c136928d379e85b776ad1fb5acb2217063a3f742a32fe59010672bc5c53644e878cb31fb044658f8ffb8b8481c9867dfe2bf64c2 WHIRLPOOL e445cf2e476bceeca55d5d42ceebc7caf394bd7edbc79ea6c6e353f2885b85cd0055645622dedde026d00cced9344e6502bf28a4cb73bb6b00e30c725dcf8fdb
diff --git a/dev-util/beediff/beediff-1.9.ebuild b/dev-util/beediff/beediff-1.9.ebuild
new file mode 100644
index 000000000000..f4c3df1f9168
--- /dev/null
+++ b/dev-util/beediff/beediff-1.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qt4-r2
+
+DESCRIPTION="A graphical user interface for comparing and merging files"
+HOMEPAGE="http://www.beesoft.pl/index.php?id=beediff"
+SRC_URI="http://www.beesoft.pl/download/${PN}_${PV}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i \
+		-e '/QMAKE_CXXFLAGS/d' \
+		beediff.pro || die
+}
+
+src_install() {
+	dobin ${PN}
+	doicon img/${PN}.png
+	make_desktop_entry ${PN} "Beesoft Differ" ${PN} "Qt;Development;"
+	dodoc ChangeLog.txt
+}
diff --git a/dev-util/beediff/metadata.xml b/dev-util/beediff/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/dev-util/beediff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/biew/Manifest b/dev-util/biew/Manifest
new file mode 100644
index 000000000000..ecf676842361
--- /dev/null
+++ b/dev-util/biew/Manifest
@@ -0,0 +1 @@
+DIST biew-610-src.tar.bz2 860517 SHA256 2e85f03c908dd6ec832461fbfbc79169a33f4caccf48c8fe60cbd29f5fb06d17 SHA512 df8d3c10c30e30db1bc5fdba73601a148f7a1480e69a3d03a02ec303534f37db9c5a9eb7ac087d8f1d8cc64d4a0f6e11548c5b385e132e3a981a6f328e3b5742 WHIRLPOOL df1227579b21155cc651c273802cd4b57cdbde12d4faa7532661e568f9b8b3de8db6c81d9283bef7ad705f6bdf4ff13a811ccf41ba23243947c6cb3c6d99e7ba
diff --git a/dev-util/biew/biew-6.1.0-r3.ebuild b/dev-util/biew/biew-6.1.0-r3.ebuild
new file mode 100644
index 000000000000..5412959d81b6
--- /dev/null
+++ b/dev-util/biew/biew-6.1.0-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils flag-o-matic toolchain-funcs versionator
+
+MY_P=${PN}-$(replace_all_version_separators "")
+
+DESCRIPTION="A portable viewer of binary files, hexadecimal and disassembler modes"
+HOMEPAGE="http://beye.sourceforge.net/"
+SRC_URI="mirror://sourceforge/beye/${PV}/${MY_P}-src.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gpm cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RDEPEND="gpm? ( sys-libs/gpm )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	append-flags -mmmx -msse #362043
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-610-fix_localedep-1.patch"
+	epatch "${FILESDIR}/${PN}-610-portable_configure-1.patch"
+	epatch "${FILESDIR}/${PN}-610-crash.patch"
+	sed -i -e 's^man/man1/biew.1^share/man/man1/biew.1^' makefile || die "Failed to edit makefile."
+}
+
+src_configure() {
+	if use gpm; then
+		append-cppflags -DHAVE_MOUSE
+	else
+		append-cppflags -UHAVE_MOUSE
+	fi
+	./configure --datadir=/usr/share/${PN} \
+		--prefix=/usr \
+		--cc="$(tc-getCC)" \
+		--ld="$(tc-getCC)" \
+		--ar="$(tc-getAR) -rcu" \
+		--as="$(tc-getAS)" \
+		--ranlib="$(tc-getRANLIB)" || die "configure failed."
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/{biew_en,release,unix}.txt
+}
+
+pkg_postinst() {
+	elog
+	elog "Note: if you are upgrading from <=dev-util/biew-6.1.0 you will need"
+	elog "to change the paths in the setup dialog (F9) from /usr/share/ to"
+	elog "/usr/share/biew/ Alternatively, you can delete ~/.biewrc and it will"
+	elog "automatically determine the correct locations on the next run."
+	elog
+}
diff --git a/dev-util/biew/files/biew-610-crash.patch b/dev-util/biew/files/biew-610-crash.patch
new file mode 100644
index 000000000000..244f94a7ad53
--- /dev/null
+++ b/dev-util/biew/files/biew-610-crash.patch
@@ -0,0 +1,28 @@
+If .biewrc does not exist, the setup dialog appears at program start. If you try
+to click a checkbox with the mouse, biew tries to dereference a null pointer
+(because the MainWindow is not yet set).
+
+This patch adds a workaround. Note that you actually cannot click a checkbox.
+But that is what users might expect. (Maybe the biew code should be changed to
+handle this properly.) Well, it is better not to crash, even if the checkboxes
+are not clickable.
+
+ –nico
+
+
+diff -Naur biew-610.orig/events.c biew-610/events.c
+--- biew-610.orig/events.c	2009-09-03 16:57:40.000000000 +0000
++++ biew-610/events.c	2011-09-06 09:41:01.000000000 +0000
+@@ -118,7 +118,11 @@
+                     }
+                     else
+                     {
+-                      X1 = 0; X2 = twGetClientWidth(MainWnd); Y1 = 1; Y2 = twGetClientHeight(MainWnd) - 1;
++                      TWindow *wnd =
++                              MainWnd ? MainWnd :  /*XXX:drop this line?*/
++                              twGetWinAtPos(mx, my);
++                      if(!wnd) return KE_MOUSE;
++                      X1 = 0; X2 = twGetClientWidth(wnd); Y1 = 1; Y2 = twGetClientHeight(wnd) - 1;
+                     }
+                     wdh = X2 - X1;
+                     hght = Y2 - Y1;
diff --git a/dev-util/biew/files/biew-610-fix_localedep-1.patch b/dev-util/biew/files/biew-610-fix_localedep-1.patch
new file mode 100644
index 000000000000..babe994e070a
--- /dev/null
+++ b/dev-util/biew/files/biew-610-fix_localedep-1.patch
@@ -0,0 +1,26 @@
+The configure script of biew-6.1.0 fails with
+    Checking for C compiler name ... gcc-Version
+if using the de_DE.UTF-8 locale and sys-devel/gcc-4.5.2. It may fail with other
+locales and/or compilers, too. The problem occurs due to the fact that the
+string “gcc version” written by gcc for ‘gcc -v’ is translated according to the
+language (German in the case mentioned above).
+
+This patch makes sure that the POSIX locale is used when the biew configure
+script checks for the name of the compiler. This allows the configure script to
+parse the output properly.
+
+ –nico
+
+
+diff -Naur biew-610.orig/configure biew-610/configure
+--- biew-610.orig/configure	2009-11-13 15:52:36.000000000 +0100
++++ biew-610/configure	2011-01-13 11:11:59.000000000 +0100
+@@ -497,7 +497,7 @@
+ 
+ _cdefos="-DDATADIR='\"$_datadir\"'"
+ 
+-cc_name=`$_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1`
++cc_name=`LC_ALL=POSIX $_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1`
+ cc_version=`$_cc -dumpversion`
+ 
+ echocheck "C compiler name"
diff --git a/dev-util/biew/files/biew-610-portable_configure-1.patch b/dev-util/biew/files/biew-610-portable_configure-1.patch
new file mode 100644
index 000000000000..c64f6280ba08
--- /dev/null
+++ b/dev-util/biew/files/biew-610-portable_configure-1.patch
@@ -0,0 +1,167 @@
+Changes the biew-610 configure script to use portable test constructs. See the
+Autoconf manual <URL:https://www.gnu.org/software/autoconf/manual/html_node/
+Limitations-of-Builtins.html#index-g_t_0040command_007btest_007d-1725> for
+explanations.
+
+ –nico
+
+
+diff -Naur biew-610.orig/configure biew-610/configure
+--- biew-610.orig/configure	2009-11-13 14:52:36.000000000 +0000
++++ biew-610/configure	2011-02-24 09:44:10.000000000 +0000
+@@ -171,7 +171,7 @@
+ # 1st: print out help
+ 
+ for parm in "$@" ; do
+-  if test "$parm" = "--help" || test "$parm" = "-help" || test "$parm" = "-h" ; then
++  if test "X$parm" = "X--help" || test "X$parm" = "X-help" || test "X$parm" = "X-h" ; then
+     cat << EOF
+ 
+ Usage: $0 [OPTIONS]...
+@@ -235,7 +235,7 @@
+ _cp=cp
+ _libext=a
+ _libprefix=lib
+-test "$CC" && _cc="$CC"
++test "X$CC" != X && _cc="$CC"
+ _prefix="/usr/local"
+ _datadir=
+ _libdir=
+@@ -340,11 +340,11 @@
+     ;;
+   esac
+ done
+-test -z "$_datadir" && _datadir=$_prefix"/share/biew"
+-test -z "$_libdir" && _libdir=$_prefix"/lib/biew"
++test "X$_datadir" = X && _datadir=$_prefix"/share/biew"
++test "X$_libdir" = X && _libdir=$_prefix"/lib/biew"
+ 
+ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do
+-  test "$I" && break
++  test "X$I" != X && break
+ done
+ 
+ TMPLOG="config.log"
+@@ -357,8 +357,8 @@
+ _tee="tee -a $TMPLOG"
+ 
+ echocheck "architecture"
+-if test "$_target_arch" = auto ; then
+-  if test -z "$host_arch" ; then
++if test "X$_target_arch" = Xauto ; then
++  if test "X$host_arch" = X ; then
+   host_arch=`( uname -p ) 2>&1`
+   log "uname -p :" "$host_arch"
+   case "$host_arch" in
+@@ -416,8 +416,8 @@
+ x86_64  && _bitness=64
+ 
+ echocheck "target OS"
+-if test "$_target_system" = auto ; then
+-  if test -z "$system_name" ; then
++if test "X$_target_system" = Xauto ; then
++  if test "X$system_name" = X ; then
+     # OS name
+     system_name=`uname -s`
+     log "uname -s :" "$system_name"
+@@ -461,8 +461,8 @@
+   fi
+ fi
+ 
+-if test "$_target_system" = auto ; then
+-  if test -z "$system_name" ; then
++if test "X$_target_system" = Xauto ; then
++  if test "X$system_name" = X ; then
+     # OS name
+     system_name=`/bin/sh --version 2>&1 | sed -n 's/^.*\([(]\)./\1/p'`
+     log "/bin/sh --version:" "$system_name"
+@@ -549,7 +549,7 @@
+     ;;
+ esac
+ 
+-if test -z "$_x11incdir" ; then
++if test "X$_x11incdir" = X ; then
+ echocheck "X11 headers"
+   for I in /usr/include /usr/X11R6/include /usr/X11/include /usr/openwin/include ; do
+     if test -d "$I/X11" ; then
+@@ -559,11 +559,11 @@
+     fi
+   done
+ fi
+-if test -z "$_x11incdir" ; then
++if test "X$_x11incdir" = X ; then
+     echores "x11inc not found"
+ fi
+ 
+-if test -z "$_x11libdir" ; then
++if test "X$_x11libdir" = X ; then
+ echocheck "X11 libs"
+   for I in /usr/X11R6/lib /usr/X11/lib /usr/lib32 /usr/openwin/lib ; do
+     if test -d "$I" ; then
+@@ -573,24 +573,24 @@
+     fi
+   done
+ fi
+-if test -z "$_x11libdir" ; then
++if test "X$_x11libdir" = X ; then
+     echores "x11lib not found"
+ fi
+ 
+-test -z "$_debug" && _osldef="-s $_osldef" || _cdefos="-finline-limit-5 $_cdefos"
+-if test "$_profile" -o "$_debug" -o "$_gcov"; then
++test "X$_debug" = X && _osldef="-s $_osldef" || _cdefos="-finline-limit-5 $_cdefos"
++if test "X$_profile" != X || test "X$_debug" != X || test "X$_gcov" != X ; then
+   _cdefos="-W -Wall -O2 -fno-builtin $_debug $_profile $_gcov $_cdefos"
+   _osldef="$_debug $_profile $_osldef"
+-elif test -z "$CFLAGS" ; then
++elif test "X$CFLAGS" = X ; then
+     _cdefos="-DNDEBUG=1 -O2 -ffast-math -fomit-frame-pointer $_cdefos"
+     x86 && _cdefos="-mmmx -msse $_cdefos"
+ else
+     _cdefos="-DNDEBUG=1 $CFLAGS $_cdefos"
+ fi
+-test -n "$LDFLAGS" && _osldef="$LDFLAGS $_osldef"
+-test -n "$LIBS" && _osldef="$LIBS $_osldef"
++test "X$LDFLAGS" != X && _osldef="$LDFLAGS $_osldef"
++test "X$LIBS" != X && _osldef="$LIBS $_osldef"
+ 
+-if test "$_target_system" = dos ; then
++if test "X$_target_system" = Xdos ; then
+ # disable cc_check call for DJGPP due bugs in bash
+ _cdefos="-D__HAVE_PRAGMA_PACK__=1 $_cdefos"
+ else
+@@ -668,10 +668,10 @@
+ 	_curseslib=
+ 	disable _curses
+ 	cc_check -lcurses && _curseslib="-lcurses"
+-	if test -z "$_curseslib" ; then
++	if test "X$_curseslib" = X ; then
+ 	    cc_check -lncurses && _curseslib="-lncurses"
+ 	fi
+-	if test -n "$_curseslib" ; then
++	if test "X$_curseslib" != X ; then
+ 	    enable _curses
+ 	    _cdefos="-D_CURSES_ -D__OS_NAME__='\"Unix/Curses\"' $_cdefos"
+ 	    _oslibs="$_curseslib $_oslibs"
+@@ -711,10 +711,10 @@
+ enabled sys_resource_h && _cdefos="-DHAVE_SYS_RESOURCE=1 $_cdefos"
+ echores "$sys_resource_h"
+ 
+-if test -z "$_x11libdir" ; then
++if test "X$_x11libdir" = X ; then
+  _cdefos="$_cdefos"
+ else
+-  if test -z "$_x11incdir" ; then
++  if test "X$_x11incdir" = X ; then
+    _cdefos="$_cdefos"
+   else
+     _cdefos="-DHAVE_X11 $_cdefos"
+@@ -738,7 +738,7 @@
+ fi
+ 
+ # Checking for INSTALL
+-if test -z $_install
++if test "X$_install" = X
+ then
+     _install="install"
+     $_install --version 1>/dev/null 2>/dev/null || _install=""
diff --git a/dev-util/biew/metadata.xml b/dev-util/biew/metadata.xml
new file mode 100644
index 000000000000..8c882ff26dab
--- /dev/null
+++ b/dev-util/biew/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">beye</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/bin_replace_string/Manifest b/dev-util/bin_replace_string/Manifest
new file mode 100644
index 000000000000..c94b99ce5b5d
--- /dev/null
+++ b/dev-util/bin_replace_string/Manifest
@@ -0,0 +1 @@
+DIST bin_replace_string-0.2.tar.bz2 69287 SHA256 4ab092edc3e30dec85b01747b67cdcabb1b535bdbe74732879d9e9cb7b6bd7be SHA512 1dc369a036df48afb199d90438db34139c58ddb9bff61ccec11b78ff2173130bf8124eac784088b3ec3f376a515a543df22e81f8bbac201abc3e3e5dec8d1a92 WHIRLPOOL fef60d8973a14983cdb8a747acc85d87d52c622bcadf84758f733e18e60e2ab4ed4c1927b4b62fbf8780b1d92c2b86f1459137302958bccdc463b16d078c1868
diff --git a/dev-util/bin_replace_string/bin_replace_string-0.2.ebuild b/dev-util/bin_replace_string/bin_replace_string-0.2.ebuild
new file mode 100644
index 000000000000..f5c29b8d57e4
--- /dev/null
+++ b/dev-util/bin_replace_string/bin_replace_string-0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="A tool to edit C strings in compiled binaries"
+HOMEPAGE="http://ohnopub.net/~ohnobinki/bin_replace_string"
+SRC_URI="ftp://mirror.ohnopub.net/mirror/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="doc"
+
+RDEPEND="|| ( >=dev-libs/libelf-0.8.13
+		dev-libs/elfutils )"
+DEPEND="doc? ( app-text/txt2man )
+	${RDEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/bin_replace_string/metadata.xml b/dev-util/bin_replace_string/metadata.xml
new file mode 100644
index 000000000000..548448307c18
--- /dev/null
+++ b/dev-util/bin_replace_string/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>binki@gentoo.org</email>
+    <name>Nathan Phillip Brink</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
new file mode 100644
index 000000000000..ef232502ea2c
--- /dev/null
+++ b/dev-util/bitcoin-tx/Manifest
@@ -0,0 +1,6 @@
+DIST bitcoin-0.10.0.ljr20150311.patches.tar.xz 34836 SHA256 353b82a933d234daaaed3f807f940a701646c7c9669867fbf5cdb48a1065312c SHA512 dc2a24f141d591f288e846f29a3263dea463f77dda22b92f91e781a8500c695be8b6f497251b6c960e1acdf43e839a7f0bc06fb7a18cdbda90b3d6a61f21c4af WHIRLPOOL 3b898c529e7967750dabcbb235657c19bab0ce75b6f47017ae7bdc7943acb8001cc19eff2d319e1ad405037ecf0674759a575116b1b0c1f32fde89a98f0052a3
+DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
+DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
+DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
+DIST bitcoin-v0.10.1.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
+DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.10.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.10.0.ebuild
new file mode 100644
index 000000000000..d6c083465ba9
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="047a89831760ff124740fe9f58411d57ee087078"
+BITCOINCORE_LJR_DATE="20150311"
+BITCOINCORE_IUSE=""
+BITCOINCORE_NEED_LIBSECP256K1=1
+inherit bitcoincore
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	bitcoincore_prepare
+	bitcoincore_autoreconf
+}
+
+src_configure() {
+	bitcoincore_conf \
+		--enable-util-tx
+}
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.10.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.10.1.ebuild
new file mode 100644
index 000000000000..ee58d8475535
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.10.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="d8ac90184254fea3a7f4991fd0529dfbd750aea0"
+BITCOINCORE_LJR_DATE="20150428"
+BITCOINCORE_IUSE=""
+BITCOINCORE_NEED_LIBSECP256K1=1
+inherit bitcoincore
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	bitcoincore_prepare
+	bitcoincore_autoreconf
+}
+
+src_configure() {
+	bitcoincore_conf \
+		--enable-util-tx
+}
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.11.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.11.0.ebuild
new file mode 100644
index 000000000000..fd5c35430c0b
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.11.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="d26f951802c762de04fb68e1a112d611929920ba"
+BITCOINCORE_LJR_DATE="20150711"
+BITCOINCORE_IUSE=""
+BITCOINCORE_NEED_LIBSECP256K1=1
+inherit bitcoincore
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+src_configure() {
+	bitcoincore_conf \
+		--enable-util-tx
+}
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
new file mode 100644
index 000000000000..c41e1e207907
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_IUSE=""
+BITCOINCORE_NEED_LIBSECP256K1=1
+inherit bitcoincore
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+src_configure() {
+	bitcoincore_conf \
+		--enable-util-tx
+}
diff --git a/dev-util/bitcoin-tx/files/9999-sys_libsecp256k1.patch b/dev-util/bitcoin-tx/files/9999-sys_libsecp256k1.patch
new file mode 100644
index 000000000000..77ed10675e30
--- /dev/null
+++ b/dev-util/bitcoin-tx/files/9999-sys_libsecp256k1.patch
@@ -0,0 +1,80 @@
+diff --git a/configure.ac b/configure.ac
+index 6784521..3598bab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -634,6 +634,12 @@ AC_ARG_WITH([daemon],
+ 
+ BITCOIN_QT_INIT
+ 
++PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++AC_ARG_WITH([libsecp256k1-verify],[],[use_libsecp256k1=$withval],[use_libsecp256k1=yes])
++if test "x$use_libsecp256k1" = "xyes"; then
++    AC_DEFINE(USE_SECP256K1,1,[USE_SECP256K1])
++fi
++
+ if test x$use_pkgconfig = xyes; then
+ 
+   if test x"$PKG_CONFIG" = "x"; then
+@@ -869,9 +875,6 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
+ unset PKG_CONFIG_LIBDIR
+ PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
+ 
+-ac_configure_args="${ac_configure_args} --disable-shared --with-pic"
+-AC_CONFIG_SUBDIRS([src/secp256k1])
+-
+ AC_OUTPUT
+ 
+ dnl Taken from https://wiki.debian.org/RpathIssue
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0d45203..3a44a16 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,3 @@
+-DIST_SUBDIRS = secp256k1
+ AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
+ 
+ 
+@@ -20,7 +19,7 @@ endif
+ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
+ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
+ 
+-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS)
+ 
+ LIBBITCOIN_SERVER=libbitcoin_server.a
+ LIBBITCOIN_WALLET=libbitcoin_wallet.a
+@@ -30,10 +29,7 @@ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
+ LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
+ LIBBITCOINQT=qt/libbitcoinqt.a
+-LIBSECP256K1=secp256k1/libsecp256k1.la
+-
+-$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++LIBSECP256K1=$(libsecp256k1_LIBS)
+ 
+ # Make is not made aware of per-object dependencies to avoid limiting building parallelization
+ # But to build the less dependent modules first, we manually select their order here:
+@@ -364,7 +360,7 @@ libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS)
+ libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS)
+ libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL
+ if USE_LIBSECP256K1
+-libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la
++libbitcoinconsensus_la_LIBADD += $(LIBSECP256K1)
+ endif
+ endif
+ 
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 5fd2afe..014092a 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -104,9 +104,6 @@ bitcoin_test_check: $(TEST_BINARY) FORCE
+ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
+-check-local:
+-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+-
+ %.json.h: %.json
+ 	@$(MKDIR_P) $(@D)
+ 	@echo "namespace json_tests{" > $@
diff --git a/dev-util/bitcoin-tx/files/9999-syslibs.patch b/dev-util/bitcoin-tx/files/9999-syslibs.patch
new file mode 100644
index 000000000000..2cdf2ab9837b
--- /dev/null
+++ b/dev-util/bitcoin-tx/files/9999-syslibs.patch
@@ -0,0 +1,243 @@
+diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4
+index 66f106c..5f0a3b1 100644
+--- a/build-aux/m4/bitcoin_subdir_to_include.m4
++++ b/build-aux/m4/bitcoin_subdir_to_include.m4
+@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
+     AC_MSG_RESULT([default])
+   else
+     echo "#include <$2$3.h>" >conftest.cpp
+-    newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`]
++    newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d])
+     AC_MSG_RESULT([${newinclpath}])
+     if test "x${newinclpath}" != "x"; then
+       eval "$1=\"\$$1\"' -I${newinclpath}'"
+diff --git a/configure.ac b/configure.ac
+index 37fe47e..14e5c34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,6 +170,18 @@ AC_ARG_WITH([utils],
+   [build_bitcoin_utils=$withval],
+   [build_bitcoin_utils=yes])
+ 
++AC_ARG_ENABLE([util-cli],
++  [AS_HELP_STRING([--enable-util-cli],
++  [build bitcoin-cli])],
++  [build_bitcoin_cli=$enableval],
++  [build_bitcoin_cli=$build_bitcoin_utils])
++
++AC_ARG_ENABLE([util-tx],
++  [AS_HELP_STRING([--enable-util-tx],
++  [build bitcoin-tx])],
++  [build_bitcoin_tx=$enableval],
++  [build_bitcoin_tx=$build_bitcoin_utils])
++
+ AC_ARG_WITH([libs],
+   [AS_HELP_STRING([--with-libs],
+   [build libraries (default=yes)])],
+@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then
+   [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
+ fi
+ 
++dnl Check for leveldb, only if explicitly requested
+ LEVELDB_CPPFLAGS=
+ LIBLEVELDB=
+ LIBMEMENV=
+-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++AC_ARG_WITH([system-leveldb],
++  [AS_HELP_STRING([--with-system-leveldb],
++  [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [system_leveldb=$withval],
++  [system_leveldb=no]
++)
++if test x$system_leveldb != xno; then
++  LEVELDB_CPPFLAGS=
++  AC_CHECK_LIB([leveldb],[main],[
++    LIBLEVELDB=-lleveldb
++  ],[
++    AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
++  ])
++  TEMP_LIBS="$LIBS"
++  LIBS="$LIBS $LIBLEVELDB"
++  AC_CHECK_LIB([memenv],[main],[
++    LIBMEMENV=-lmemenv
++  ],[
++    AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway])
++  ])
++  LIBS="$TEMP_LIBS"
++  AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
++    AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++  ])
++  AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
++    AC_MSG_CHECKING([for memenv.h path])
++    BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
++  ],[
++    AC_CHECK_HEADER([memenv.h],[],[
++      AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++    ])
++  ])
++fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
+ AC_SUBST(LEVELDB_CPPFLAGS)
+ AC_SUBST(LIBLEVELDB)
+ AC_SUBST(LIBMEMENV)
+ 
++dnl Check for libsecp256k1, only if explicitly requested
++AC_ARG_WITH([system-libsecp256k1],
++  [AS_HELP_STRING([--with-system-libsecp256k1],
++  [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [system_libsecp256k1=$withval],
++  [system_libsecp256k1=no]
++)
++if test x$system_libsecp256k1 != xno; then
++  PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++else
++  libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
++  libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
++fi
++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
++AC_SUBST(libsecp256k1_CFLAGS)
++AC_SUBST(libsecp256k1_LIBS)
++
+ if test x$enable_wallet != xno; then
+     dnl Check for libdb_cxx only if wallet enabled
+     BITCOIN_FIND_BDB48
+@@ -515,7 +578,7 @@ BITCOIN_QT_INIT
+ dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
+ BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
+ 
+-if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
+     use_boost=no
+ else
+     use_boost=yes
+@@ -701,9 +764,13 @@ AC_MSG_CHECKING([whether to build bitcoind])
+ AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
+ AC_MSG_RESULT($build_bitcoind)
+ 
+-AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
+-AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
+-AC_MSG_RESULT($build_bitcoin_utils)
++AC_MSG_CHECKING([whether to build bitcoin-cli])
++AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
++AC_MSG_RESULT($build_bitcoin_cli)
++
++AC_MSG_CHECKING([whether to build bitcoin-tx])
++AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes])
++AC_MSG_RESULT($build_bitcoin_tx)
+ 
+ AC_MSG_CHECKING([whether to build libraries])
+ AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
+@@ -826,7 +893,7 @@ else
+   AC_MSG_RESULT([no])
+ fi
+ 
+-if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then
+   AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
+ fi
+ 
+@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
+ unset PKG_CONFIG_LIBDIR
+ PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
+ 
++if test x$system_libsecp256k1 = xno; then
+ ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no"
+ AC_CONFIG_SUBDIRS([src/secp256k1])
++fi
+ 
+ AC_OUTPUT
+ 
+diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
+index 9b31865..5bb187c 100755
+--- a/qa/pull-tester/rpc-tests.sh
++++ b/qa/pull-tester/rpc-tests.sh
+@@ -57,7 +57,7 @@ testScriptsExt=(
+ extArg="-extended"
+ passOn=${@#$extArg}
+ 
+-if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then
++if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then
+     for (( i = 0; i < ${#testScripts[@]}; i++ ))
+     do
+         if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ]
+diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in
+index 10f4d33..e0e407d 100755
+--- a/qa/pull-tester/tests-config.sh.in
++++ b/qa/pull-tester/tests-config.sh.in
+@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@"
+ 
+ # These will turn into comments if they were disabled when configuring.
+ @ENABLE_WALLET_TRUE@ENABLE_WALLET=1
+-@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
++@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1
+ @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
+ 
+ REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1c2f770..4d60ddf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,6 @@
++if EMBEDDED_LIBSECP256K1
+ DIST_SUBDIRS = secp256k1
++endif
+ AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
+ 
+ 
+@@ -20,7 +22,7 @@ endif
+ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
+ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
+ 
+-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS)
+ 
+ LIBBITCOIN_SERVER=libbitcoin_server.a
+ LIBBITCOIN_WALLET=libbitcoin_wallet.a
+@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
+ LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
+ LIBBITCOINQT=qt/libbitcoinqt.a
++if EMBEDDED_LIBSECP256K1
+ LIBSECP256K1=secp256k1/libsecp256k1.la
++else
++LIBSECP256K1=$(libsecp256k1_LIBS)
++endif
+ 
++if EMBEDDED_LIBSECP256K1
+ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++endif
+ 
+ # Make is not made aware of per-object dependencies to avoid limiting building parallelization
+ # But to build the less dependent modules first, we manually select their order here:
+@@ -63,8 +71,11 @@ if BUILD_BITCOIND
+   bin_PROGRAMS += bitcoind
+ endif
+ 
+-if BUILD_BITCOIN_UTILS
+-  bin_PROGRAMS += bitcoin-cli bitcoin-tx
++if BUILD_BITCOIN_CLI
++  bin_PROGRAMS += bitcoin-cli
++endif
++if BUILD_BITCOIN_TX
++  bin_PROGRAMS += bitcoin-tx
+ endif
+ 
+ .PHONY: FORCE
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 0997148..14b4deb 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE
+ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
++if EMBEDDED_LIBSECP256K1
+ check-local:
+ 	@echo "Running test/bitcoin-util-test.py..."
+ 	$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
++endif
+ 
+ %.json.h: %.json
+ 	@$(MKDIR_P) $(@D)
diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
new file mode 100644
index 000000000000..f258144be6d6
--- /dev/null
+++ b/dev-util/bitcoin-tx/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer>
+		<email>luke-jr+gentoobugs@utopios.org</email>
+		<name>Luke Dashjr</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
new file mode 100644
index 000000000000..bcbadcc37207
--- /dev/null
+++ b/dev-util/bless/Manifest
@@ -0,0 +1 @@
+DIST bless-0.6.0.tar.gz 745694 SHA256 34dc984c35df19184e5b61a4b11fe79901c417693f57d874dc70ef0c58896de1 SHA512 69d2279b64503b97c8a67991c2a7a527d872835e3acfad7eafa8d87e376d2cecf3fa27de9e12726680a8f3c8ac92b888a4895a1f342c4beeaceef9e1f3ededdb WHIRLPOOL 6c9db6826fc5db1df38344d599ffad12965b1f6d24e367fdbeca1fe57b4beeac54b6a18b7faa320e5719417a4f601178e7034fa800a217cd7ebaa78f9c4d911b
diff --git a/dev-util/bless/bless-0.6.0-r2.ebuild b/dev-util/bless/bless-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..47e922021f26
--- /dev/null
+++ b/dev-util/bless/bless-0.6.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 mono-env
+
+DESCRIPTION="GTK# Hex Editor"
+HOMEPAGE="http://home.gna.org/bless/"
+SRC_URI="http://download.gna.org/bless/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	>=dev-lang/mono-1.1.14
+	>=dev-dotnet/gtk-sharp-2.12
+	>=dev-dotnet/glade-sharp-2.12
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=sys-devel/gettext-0.15
+	virtual/pkgconfig
+"
+
+# See bug 278162
+# Waiting on nunit ebuild entering the tree
+RESTRICT="test"
+
+pkg_setup() {
+	# Stolen from enlightenment.eclass
+	cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
+	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
+}
+
+src_prepare() {
+	einfo "Running gettextize -f --no-changelog..."
+	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
+	epatch "${FILESDIR}/${P}-pixmap.patch"
+	epatch "${FILESDIR}/${P}-docpath.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-unix-specific \
+		$(use_enable debug)
+}
diff --git a/dev-util/bless/files/bless-0.5.2-mono-2.patch b/dev-util/bless/files/bless-0.5.2-mono-2.patch
new file mode 100644
index 000000000000..4271046c56d4
--- /dev/null
+++ b/dev-util/bless/files/bless-0.5.2-mono-2.patch
@@ -0,0 +1,118 @@
+diff -Naur blessbroken/src/gui/plugins/BitwiseOperationsPlugin.cs bless-0.5.2/src/gui/plugins/BitwiseOperationsPlugin.cs
+--- blessbroken/src/gui/plugins/BitwiseOperationsPlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/BitwiseOperationsPlugin.cs	2008-07-08 01:33:38.352260344 +0200
+@@ -102,7 +102,7 @@
+ 		uim.InsertActionGroup(group, 0);
+ 		uim.AddUiFromString(uiXml);
+ 
+-		performAction = (Action)uim.GetAction("/DefaultAreaPopup/ExtraAreaPopupItems/PerformBitwiseOperation");
++		performAction = (Gtk.Action)uim.GetAction("/DefaultAreaPopup/ExtraAreaPopupItems/PerformBitwiseOperation");
+ 
+ 		uim.EnsureUpdate();
+ 
+diff -Naur blessbroken/src/gui/plugins/EditOperationsPlugin.cs bless-0.5.2/src/gui/plugins/EditOperationsPlugin.cs
+--- blessbroken/src/gui/plugins/EditOperationsPlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/EditOperationsPlugin.cs	2008-07-08 01:35:00.027629029 +0200
+@@ -151,12 +151,12 @@
+ 	void ConnectEditAccelerators(bool v)
+ 	{
+ 		if (editAccelCount == 0 && v == true) {
+-			foreach(Action a in editActionGroup.ListActions())
++			foreach(Gtk.Action a in editActionGroup.ListActions())
+ 			a.ConnectAccelerator();
+ 			editAccelCount = 1;
+ 		}
+ 		else if (editAccelCount == 1 && v == false) {
+-			foreach(Action a in editActionGroup.ListActions())
++			foreach(Gtk.Action a in editActionGroup.ListActions())
+ 			a.DisconnectAccelerator();
+ 			editAccelCount = 0;
+ 		}
+@@ -207,15 +207,15 @@
+ 		uim.InsertActionGroup(miscActionGroup, 0);
+ 
+ 		uim.AddUiFromString(uiXml);
+-		UndoAction = (Action)uim.GetAction("/menubar/Edit/Undo");
+-		RedoAction = (Action)uim.GetAction("/menubar/Edit/Redo");
+-		CutAction = (Action)uim.GetAction("/menubar/Edit/Cut");
+-		CopyAction = (Action)uim.GetAction("/menubar/Edit/Copy");
+-		PasteAction = (Action)uim.GetAction("/menubar/Edit/Paste");
+-		DeleteAction = (Action)uim.GetAction("/menubar/Edit/Delete");
++		UndoAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Undo");
++		RedoAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Redo");
++		CutAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Cut");
++		CopyAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Copy");
++		PasteAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Paste");
++		DeleteAction = (Gtk.Action)uim.GetAction("/menubar/Edit/Delete");
+ 
+ 
+-		foreach (Action a in editActionGroup.ListActions()) {
++		foreach (Gtk.Action a in editActionGroup.ListActions()) {
+ 			// for some reason the accelerators are connected twice
+ 			// ... so disconnect them twice
+ 			for (int i = 0; i < 2; i++)
+diff -Naur blessbroken/src/gui/plugins/FileOperationsPlugin.cs bless-0.5.2/src/gui/plugins/FileOperationsPlugin.cs
+--- blessbroken/src/gui/plugins/FileOperationsPlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/FileOperationsPlugin.cs	2008-07-08 01:35:48.083280812 +0200
+@@ -159,11 +159,11 @@
+ 
+ 		uim.InsertActionGroup(group, 0);
+ 		uim.AddUiFromString(uiXml);
+-		SaveAction = (Action)uim.GetAction("/menubar/File/Save");
+-		SaveAsAction = (Action)uim.GetAction("/menubar/File/SaveAs");
+-		CloseAction = (Action)uim.GetAction("/menubar/File/Close");
+-		QuitAction = (Action)uim.GetAction("/menubar/File/Quit");
+-		RevertAction = (Action)uim.GetAction("/menubar/File/Revert");
++		SaveAction = (Gtk.Action)uim.GetAction("/menubar/File/Save");
++		SaveAsAction = (Gtk.Action)uim.GetAction("/menubar/File/SaveAs");
++		CloseAction = (Gtk.Action)uim.GetAction("/menubar/File/Close");
++		QuitAction = (Gtk.Action)uim.GetAction("/menubar/File/Quit");
++		RevertAction = (Gtk.Action)uim.GetAction("/menubar/File/Revert");
+ 
+ 		uim.EnsureUpdate();
+ 
+diff -Naur blessbroken/src/gui/plugins/FindReplacePlugin.cs bless-0.5.2/src/gui/plugins/FindReplacePlugin.cs
+--- blessbroken/src/gui/plugins/FindReplacePlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/FindReplacePlugin.cs	2008-07-08 01:36:15.427064932 +0200
+@@ -38,10 +38,10 @@
+ 	DataBook dataBook;
+ 	FindReplaceWidget widget;
+ 
+-	Action FindAction;
+-	Action FindNextAction;
+-	Action FindPreviousAction;
+-	Action ReplaceAction;
++	Gtk.Action FindAction;
++	Gtk.Action FindNextAction;
++	Gtk.Action FindPreviousAction;
++	Gtk.Action ReplaceAction;
+ 
+ 	IFinder finder;
+ 	Window mainWindow;
+@@ -162,10 +162,10 @@
+ 		uim.InsertActionGroup(group, 0);
+ 		uim.AddUiFromString(uiXml);
+ 
+-		FindAction = (Action)uim.GetAction("/menubar/Search/Find");
+-		FindNextAction = (Action)uim.GetAction("/menubar/Search/FindNext");
+-		FindPreviousAction = (Action)uim.GetAction("/menubar/Search/FindPrevious");
+-		ReplaceAction = (Action)uim.GetAction("/menubar/Search/Replace");
++		FindAction = (Gtk.Action)uim.GetAction("/menubar/Search/Find");
++		FindNextAction = (Gtk.Action)uim.GetAction("/menubar/Search/FindNext");
++		FindPreviousAction = (Gtk.Action)uim.GetAction("/menubar/Search/FindPrevious");
++		ReplaceAction = (Gtk.Action)uim.GetAction("/menubar/Search/Replace");
+ 
+ 		uim.EnsureUpdate();
+ 
+diff -Naur blessbroken/src/gui/plugins/HistoryPlugin.cs bless-0.5.2/src/gui/plugins/HistoryPlugin.cs
+--- blessbroken/src/gui/plugins/HistoryPlugin.cs	2007-08-25 09:54:21.000000000 +0200
++++ bless-0.5.2/src/gui/plugins/HistoryPlugin.cs	2008-07-08 01:36:49.074794118 +0200
+@@ -61,7 +61,7 @@
+ 		// clear previous list
+ 		uiManager.RemoveUi(mergeId);
+ 		uiManager.RemoveActionGroup(historyActionGroup);
+-		foreach(Action action in historyActionGroup.ListActions()) {
++		foreach(Gtk.Action action in historyActionGroup.ListActions()) {
+ 			historyActionGroup.Remove(action);
+ 		}
+ 
diff --git a/dev-util/bless/files/bless-0.6.0-docpath.patch b/dev-util/bless/files/bless-0.6.0-docpath.patch
new file mode 100644
index 000000000000..b1121424d88b
--- /dev/null
+++ b/dev-util/bless/files/bless-0.6.0-docpath.patch
@@ -0,0 +1,71 @@
+diff --git a/Makefile.am b/Makefile.am
+index 33f265b..346326d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,9 @@
+ EXTRA_DIST = AUTHORS COPYING NEWS README README.packaging \
+              bless.mdp bless.mds bless.spec autogen.sh bless.mi
+ 
++doc_DATA = AUTHORS COPYING INSTALL ChangeLog NEWS \
++           README README.packaging bless.spec
++
+ SUBDIRS = po builder src bin data doc . tests
+ 
+ DIST_SUBDIRS= po builder src bin doc data tests
+@@ -34,11 +37,5 @@ bless-builder:
+ dist-hook:
+ 	bzr log > $(distdir)/ChangeLog
+ 
+-install-data-local:
+-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
+-	$(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \
+-			README README.packaging bless.spec     \
+-			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
+-
+ uninstall-local:
+ 	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index b18e94a..d7eecc6 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,4 +1 @@
+ SUBDIRS= developer user
+-
+-uninstall-local:
+-	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
+diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
+index 729b295..58a1358 100644
+--- a/doc/user/Makefile.am
++++ b/doc/user/Makefile.am
+@@ -7,6 +7,11 @@ CLEANFILES=$(OMF)
+ 
+ noinst_SCRIPTS=$(OMF)
+ 
++docmandir=$(docdir)/user
++docfigsdir=$(docmandir)/figures
++
++docfigs_DATA=$(FIGURES)
++docman_DATA=$(DOCS) $(wildcard *.html)
+ 
+ $(OMF): $(OMF).in
+ 	if [ -x `which scrollkeeper-preinstall` ]; then \
+@@ -27,11 +32,6 @@ dist-hook: doc
+ 	rm html_file_list
+ 
+ install-data-local:
+-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
+-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
+-	$(INSTALL_DATA) $(DOCS) $(wildcard *.html) \
+-			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
+-	$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
+ 	$(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
+ 	$(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
+ if WITH_SCROLLKEEPER
+@@ -39,7 +39,6 @@ if WITH_SCROLLKEEPER
+ endif
+ 
+ uninstall-local:
+-	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
+ 	rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF)
+ if WITH_SCROLLKEEPER
+ 	scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
diff --git a/dev-util/bless/files/bless-0.6.0-pixmap.patch b/dev-util/bless/files/bless-0.6.0-pixmap.patch
new file mode 100644
index 000000000000..441a9e2bfb79
--- /dev/null
+++ b/dev-util/bless/files/bless-0.6.0-pixmap.patch
@@ -0,0 +1,20 @@
+=== modified file 'src/gui/drawers/HexDrawer.cs'
+--- src/gui/drawers/HexDrawer.cs	2007-06-13 12:20:53 +0000
++++ src/gui/drawers/HexDrawer.cs	2009-04-10 23:21:41 +0000
+@@ -57,11 +57,14 @@
+ 
+ 		//System.Console.WriteLine(s);
+ 
+-		pangoLayout.SetText(s);
++		pangoLayout.SetText(s.Substring(0,256));
+ 
+ 
+ 		gc.RgbFgColor = fg;
+ 		pix.DrawLayout(gc, 0, 0, pangoLayout);
++		
++		pangoLayout.SetText(s.Substring(256,256));
++		pix.DrawLayout(gc, 128*2*width, 0, pangoLayout);
+ 
+ 		return pix;
+ 	}
+
diff --git a/dev-util/bless/metadata.xml b/dev-util/bless/metadata.xml
new file mode 100644
index 000000000000..8d616c9e423b
--- /dev/null
+++ b/dev-util/bless/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/bluej/Manifest b/dev-util/bluej/Manifest
new file mode 100644
index 000000000000..c6951217965a
--- /dev/null
+++ b/dev-util/bluej/Manifest
@@ -0,0 +1,4 @@
+DIST BlueJ-source-311.zip 15564184 SHA256 a46df90291d1a7ae1d3088ea090def6b077d837c9d177c4d7582fe4ec6b26442 SHA512 60515f8564f0edf96ffba69ff43c199c024da12ac5601cba5f163c5682c9466717e2048593582ad2fe5d61988380e3fb9205825ec8967e99983c8a2a02f5144a WHIRLPOOL 156435663fef87052199d2aae8c4010b75f9ccb7c53ac5a7907d9e4c0346534d93011e0bf0f88303826c8d507974028664729f43c508893cff26b272206cfa0e
+DIST bluej-ref-manual.pdf 768751 SHA256 a6c514fcc79ffa1450c6313bae8b92ebe6c6939580cdf1a38e885a4cf71cffc3 SHA512 7f7e8cc2eab6402722eb8f94c878b506f595eee280cdfa85497d926cb06aa229defb0c8fbe5353dbbf6587e36a99ad5dae0a50fca21c1c80c88a92647d9b5319 WHIRLPOOL 476cc9058ecb4f79d9e4f3ccbec3a299f0f3deb357245bac0ab64e3bf0ce4e49f8aedfd5cbfe389b31c6d99e21491b6a002383bfa284eb0b9b4282545dbad6fe
+DIST bluej-testing-tutorial.pdf 269284 SHA256 07605ab6dd9743b6c971aaa932a3e8218057034af08d24ac90a09a74a5eb5599 SHA512 015da66cbf4940ca4bcab535023608a8497e7c6df1e06988393f8f0c7300a4521025474bf828e7889ff717e988968a2e973330758bf6dd570c057a837c78a9b5 WHIRLPOOL 472cbda358804a809ef61b8d1be947cba637e56068f3b0365f6ce808c0d076208b4b4430dfd6bb81eca987de407556e9bf83e019057f95320681a69ef2abe9b9
+DIST bluej-tutorial-2.0.1.pdf 1205655 SHA256 a6587a178ac7c071696884d9318aa33ade543898c5722caf61308acd77092db2 SHA512 410acbb75091d14b5ee7f5d56c01441a9611ed1f8b583c0301e1badf3d01bd2bb284da77d422c38ace283e7fe066b7975c772859697d25d6e9b334053d2f4833 WHIRLPOOL 27b1f934e2d08c261d32f385aa65ee826add4cb056257c6ab5e8c2e2b54a9f0fc884882bc4f611a1d87fe423706b8c4578b7c40060cceb46571924ee5d64b30d
diff --git a/dev-util/bluej/bluej-3.1.1.ebuild b/dev-util/bluej/bluej-3.1.1.ebuild
new file mode 100644
index 000000000000..9a01e99e5398
--- /dev/null
+++ b/dev-util/bluej/bluej-3.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+EANT_BUILD_TARGET="ready-to-run"
+EANT_DOC_TARGET="doc-core"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DOC_PV="2.0.1"
+
+DESCRIPTION="An integrated Java environment for introductory teaching"
+HOMEPAGE="http://bluej.org/"
+SRC_URI="http://www.bluej.org/download/files/source/BlueJ-source-${PV//./}.zip
+doc? ( http://bluej.org/download/files/${PN}-ref-manual.pdf
+		http://bluej.org/tutorial/tutorial-${DOC_PV//.}.pdf -> ${PN}-tutorial-${DOC_PV}.pdf
+		http://bluej.org/tutorial/testing-tutorial.pdf -> ${PN}-testing-tutorial.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=virtual/jdk-1.5.0"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+java_prepare() {
+	sed -i \
+		-e "s:^build_java_home=.*$:build_java_home=$(java-config -O):" \
+		-e "/^bluej_home/d" \
+		build.properties || die
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r lib icons
+
+	# fix config location and set symlink
+	dodir /etc
+	mv "${D}"/{usr/share/${PN}/lib,etc}/${PN}.defs
+	dosym /{etc,usr/share/${PN}/lib}/${PN}.defs
+
+	use source && java-pkg_dosrc src/${PN}/*
+
+	insinto /usr/share/doc/${PF}
+	use examples && { doins -r examples
+		docompress -x /usr/share/doc/${P}/examples ; }
+	use doc && { doins "${DISTDIR}"/${PN}-*.pdf
+		dohtml -r doc/all/* ; }
+
+	newbin "${FILESDIR}"/${PN}.wrapper ${PN}
+
+	make_desktop_entry ${PN} Blue-J
+}
diff --git a/dev-util/bluej/files/bluej.wrapper b/dev-util/bluej/files/bluej.wrapper
new file mode 100644
index 000000000000..8d5fe5278092
--- /dev/null
+++ b/dev-util/bluej/files/bluej.wrapper
@@ -0,0 +1,6 @@
+#!/bin/sh
+APPBASE="/usr/share/bluej"
+JAVAPATH="$(java-config -O)"
+CP="$APPBASE/lib/bluej.jar:$JAVAPATH/lib/tools.jar"
+"$JAVAPATH/bin/java" -cp "$CP" bluej.Boot  "$@"
+
diff --git a/dev-util/bluej/metadata.xml b/dev-util/bluej/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/bluej/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
new file mode 100644
index 000000000000..256ce5f827f8
--- /dev/null
+++ b/dev-util/bnfc/Manifest
@@ -0,0 +1,2 @@
+DIST BNFC-2.7.1.tar.gz 208935 SHA256 d711c788c961e45d0b7ffe6b57b602eb01733be4b94c015d3c71a8f7393134d9 SHA512 ad4d779bd401d6fa5fe7cbd2dc4e3ca929f096562e1267fdede3e4a9dc8da1134f56054c206dac57131f3b90dfe8411ec89a899fe161c2941c843eb4e7ab010c WHIRLPOOL abcd91647e00585ceaddddc31144a0cc034271d08a449c710e055d1e489e0340e476e1378288b278f8523646f3d8788d1ea2dd6179c9699d58ae8b68b890e611
+DIST BNFC-2.8.tar.gz 183591 SHA256 21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34 SHA512 358700360dbfbeacf3276150856415e08e1498c6af27254302d406e5407b7b4f84ac0dcf9dcf8391128ac9d77a17a928c2427961ec8c3ffdb9af8d169145cafb WHIRLPOOL e234f98df56f69f3c130ee5592c53bfad6e66f9c414d8b1a46370d9662fc68a389a93256980de9ef07315bd40e617f7d6c3683c2340a2b53417acff57fc6f8b6
diff --git a/dev-util/bnfc/bnfc-2.7.1.ebuild b/dev-util/bnfc/bnfc-2.7.1.ebuild
new file mode 100644
index 000000000000..f4be929681e4
--- /dev/null
+++ b/dev-util/bnfc/bnfc-2.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="BNFC"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A compiler front-end generator"
+HOMEPAGE="http://bnfc.digitalgrammars.com/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RESTRICT=test # collides with monads-fd
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.8
+	dev-haskell/happy
+	test? ( >=dev-haskell/doctest-0.8
+		dev-haskell/hspec
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.5
+		dev-haskell/temporary )
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/bnfc/bnfc-2.8.ebuild b/dev-util/bnfc/bnfc-2.8.ebuild
new file mode 100644
index 000000000000..16e448789a28
--- /dev/null
+++ b/dev-util/bnfc/bnfc-2.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="BNFC"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A compiler front-end generator"
+HOMEPAGE="http://bnfc.digitalgrammars.com/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RESTRICT=test # missing files
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.8
+	dev-haskell/happy
+	test? ( >=dev-haskell/doctest-0.8
+		dev-haskell/hspec
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.5
+		dev-haskell/temporary )
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/bnfc/metadata.xml b/dev-util/bnfc/metadata.xml
new file mode 100644
index 000000000000..ddb2b453cd1f
--- /dev/null
+++ b/dev-util/bnfc/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>haskell</herd>
+</pkgmetadata>
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
new file mode 100644
index 000000000000..413b8cc5e06d
--- /dev/null
+++ b/dev-util/boost-build/Manifest
@@ -0,0 +1,7 @@
+DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
+DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512 8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522 WHIRLPOOL e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746
+DIST boost_1_54_0.tar.bz2 57873778 SHA256 047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d SHA512 3467a2bb9b4797cadfc52150cb036939ef35263f421870897dbe9492d1504a714805668a193b0811fdaf39a3527ee693ff70da5b942d7ab11b307e2e693e1760 WHIRLPOOL dbe3cbecaccf86ca184cf73cff75c17d6307b680bab098e38a9efd24d17776481e597017fc9f8fc8f488495f315c6d2b14b9212c51cf98529c302482bf67e92a
+DIST boost_1_55_0.tar.bz2 58146647 SHA256 fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 SHA512 dc606477f4c303e8f40de2586c16394b6d758e198b35bf3a7d3e576a2f49171aadc4f95e8d685fa731bc4e61e19869d5a24e1e816febfca9de078d66e096e041 WHIRLPOOL 6ae111d6a956651bd91914432b743faffeb466703191b05193db47f02fd3528a14ce200f26c1ab77bf2c68994eb5b135b0176f66a746964d334b4793ba113ad5
+DIST boost_1_56_0.tar.bz2 94777674 SHA256 134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d SHA512 1ce9871c3a2519682538a5f1331938b948123432d99aea0ce026958cbebd25d84019a3a28c452724b9693df98a8d1264bb2d93d2fee508453f8b42836e67481e WHIRLPOOL e9e9bb965816b687141d55bc026e378a56ed577a2bf0bdad61a1736e7f11d1797e0cac0185a1fa25b6c4b9fe1f75cbb0bb73a5ea05e84d59385bb3b17a90fd12
+DIST boost_1_57_0.tar.bz2 60821561 SHA256 910c8c022a33ccec7f088bd65d4f14b466588dda94ba2124e78b8c57db264967 SHA512 61881440fd89644c43c6e3bc6292e9fed75a6d3a76f98654b189d0ed4e1087d77b585884e882270c08bf9f7132b173bfc1fde05848e06aa78ba7f1008d10714d WHIRLPOOL ff092af332434082a774645a5eb42829cdbdac805ef86dccce8988542062901524bd4d5fc890e3a9c01f0a721047501e5d8b13d50ffa5368066c3438dcf719d6
+DIST boost_1_58_0.tar.bz2 70394057 SHA256 fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5 SHA512 7480ec713b0aa13f0ec990603e87e3b5c8d53f4411329b10fae37fc963b90aad12dbd9290a33c3669ae801e9012a68683eadff057591e9ca2ebcd22b1a67b5d1 WHIRLPOOL 0ed66f7de8b2ac28eda89e2fcadfc5533e6a3887ef7a929610804efa3ca66b850fecafeb61c986d37cb704ec844744e47d08f87e08ea25c779f57cffd26a1be2
diff --git a/dev-util/boost-build/boost-build-1.52.0-r1.ebuild b/dev-util/boost-build/boost-build-1.52.0-r1.ebuild
new file mode 100644
index 000000000000..75e8cefadcd9
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.52.0-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_DEPEND="python? 2"
+
+RESTRICT="test"
+
+inherit eutils flag-o-matic python toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT=0
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+REQUIRED_USE="test? ( python )"
+
+RDEPEND="!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch" \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.50.0-fix-test.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
+
+	# Remove stripping option
+	cd "${S}/engine"
+	sed -i -e 's|-s\b||' \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}"
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${PYTHON_ABI}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc changes.txt hacking.txt release_procedure.txt \
+		notes/build_dir_option.txt notes/relative_source_paths.txt
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r example
+	fi
+}
+
+src_test() {
+	cd test
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" $(PYTHON -2) test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize /usr/share/boost-build
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup /usr/share/boost-build
+}
diff --git a/dev-util/boost-build/boost-build-1.53.0.ebuild b/dev-util/boost-build/boost-build-1.53.0.ebuild
new file mode 100644
index 000000000000..baeb46bfaaea
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.53.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_DEPEND="python? 2"
+
+RESTRICT="test"
+
+inherit eutils flag-o-matic multilib python toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT=0
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+REQUIRED_USE="test? ( python )"
+
+RDEPEND="!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch" \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.50.0-fix-test.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
+
+	# Remove stripping option
+	# Fix python components build on multilib systems, bug #496446
+	cd "${S}/engine"
+	sed -i \
+		-e 's|-s\b||' \
+		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}"
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${PYTHON_ABI}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc changes.txt hacking.txt release_procedure.txt \
+		notes/build_dir_option.txt notes/relative_source_paths.txt
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r example
+	fi
+}
+
+src_test() {
+	cd test
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" $(PYTHON -2) test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize /usr/share/boost-build
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup /usr/share/boost-build
+}
diff --git a/dev-util/boost-build/boost-build-1.54.0.ebuild b/dev-util/boost-build/boost-build-1.54.0.ebuild
new file mode 100644
index 000000000000..b1a420e409fb
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.54.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_DEPEND="python? 2"
+
+RESTRICT="test"
+
+inherit eutils flag-o-matic multilib python toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT=0
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+REQUIRED_USE="test? ( python )"
+
+RDEPEND="!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
+		"${FILESDIR}/${PN}-1.54.0-fix-test.patch" \
+		"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
+
+	# Remove stripping option
+	# Fix python components build on multilib systems, bug #496446
+	cd "${S}/engine"
+	sed -i \
+		-e 's|-s\b||' \
+		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}"
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${PYTHON_ABI}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc changes.txt hacking.txt release_procedure.txt \
+		notes/build_dir_option.txt notes/relative_source_paths.txt
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r example
+	fi
+}
+
+src_test() {
+	cd test
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" $(PYTHON -2) test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize /usr/share/boost-build
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup /usr/share/boost-build
+}
diff --git a/dev-util/boost-build/boost-build-1.55.0-r1.ebuild b/dev-util/boost-build/boost-build-1.55.0-r1.ebuild
new file mode 100644
index 000000000000..51a85fd53160
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.55.0-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT=0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils
+		${PYTHON_DEPS} )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
+		"${FILESDIR}/${PN}-1.54.0-fix-test.patch" \
+		"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch" \
+		"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+
+	# Remove stripping option
+	# Fix python components build on multilib systems, bug #496446
+	cd "${S}/engine" || die
+	sed -i \
+		-e 's|-s\b||' \
+		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}" || die
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${EPYTHON#python}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine || die
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc changes.txt hacking.txt release_procedure.txt \
+		notes/build_dir_option.txt notes/relative_source_paths.txt
+
+	if use examples; then
+		dodoc -r example
+		docompress -x "/usr/share/doc/${PF}/example"
+	fi
+}
+
+src_test() {
+	cd test || die
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
diff --git a/dev-util/boost-build/boost-build-1.55.0.ebuild b/dev-util/boost-build/boost-build-1.55.0.ebuild
new file mode 100644
index 000000000000..0f341ad28ba6
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.55.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_DEPEND="python? 2"
+
+RESTRICT="test"
+
+inherit eutils flag-o-matic multilib python toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT=0
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+REQUIRED_USE="test? ( python )"
+
+RDEPEND="!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
+		"${FILESDIR}/${PN}-1.54.0-fix-test.patch" \
+		"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch" \
+		"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+
+	# Remove stripping option
+	# Fix python components build on multilib systems, bug #496446
+	cd "${S}/engine"
+	sed -i \
+		-e 's|-s\b||' \
+		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}"
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${PYTHON_ABI}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		boost-build.jam bootstrap.jam build-system.jam user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc changes.txt hacking.txt release_procedure.txt \
+		notes/build_dir_option.txt notes/relative_source_paths.txt
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r example
+	fi
+}
+
+src_test() {
+	cd test
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" $(PYTHON -2) test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize /usr/share/boost-build
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup /usr/share/boost-build
+}
diff --git a/dev-util/boost-build/boost-build-1.56.0.ebuild b/dev-util/boost-build/boost-build-1.56.0.ebuild
new file mode 100644
index 000000000000..f9dcabd3feb8
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.56.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV="$(replace_all_version_separators _)"
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils
+		${PYTHON_DEPS} )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
+		"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch" \
+		"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+
+	pushd ../ &>/dev/null || die
+	epatch "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
+	popd &>/dev/null || die
+
+	# Remove stripping option
+	# Fix python components build on multilib systems, bug #496446
+	cd "${S}/engine" || die
+	sed -i \
+		-e 's|-s\b||' \
+		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}" || die
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${EPYTHON#python}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine || die
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc ../notes/{changes,hacking,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		dodoc -r ../example
+		docompress -x "/usr/share/doc/${PF}/example"
+	fi
+}
+
+src_test() {
+	cd ../test || die
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
diff --git a/dev-util/boost-build/boost-build-1.57.0.ebuild b/dev-util/boost-build/boost-build-1.57.0.ebuild
new file mode 100644
index 000000000000..b5de76627e91
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.57.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV="$(replace_all_version_separators _)"
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils
+		${PYTHON_DEPS} )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
+		"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch" \
+		"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+
+	pushd ../ &>/dev/null || die
+	epatch "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
+	popd &>/dev/null || die
+
+	# Remove stripping option
+	# Fix python components build on multilib systems, bug #496446
+	cd "${S}/engine" || die
+	sed -i \
+		-e 's|-s\b||' \
+		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}" || die
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${EPYTHON#python}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine || die
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc ../notes/{changes,hacking,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		dodoc -r ../example
+		docompress -x "/usr/share/doc/${PF}/example"
+	fi
+}
+
+src_test() {
+	cd ../test || die
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
diff --git a/dev-util/boost-build/boost-build-1.58.0.ebuild b/dev-util/boost-build/boost-build-1.58.0.ebuild
new file mode 100644
index 000000000000..b5de76627e91
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.58.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV="$(replace_all_version_separators _)"
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!<dev-libs/boost-1.34.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils
+		${PYTHON_DEPS} )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" \
+		"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" \
+		"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" \
+		"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" \
+		"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch" \
+		"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+
+	pushd ../ &>/dev/null || die
+	epatch "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
+	popd &>/dev/null || die
+
+	# Remove stripping option
+	# Fix python components build on multilib systems, bug #496446
+	cd "${S}/engine" || die
+	sed -i \
+		-e 's|-s\b||' \
+		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}" || die
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|2.7 2.6 2.5 2.4 2.3 2.2|${EPYTHON#python}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine || die
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	rm "${ED}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc ../notes/{changes,hacking,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		dodoc -r ../example
+		docompress -x "/usr/share/doc/${PF}/example"
+	fi
+}
+
+src_test() {
+	cd ../test || die
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
new file mode 100644
index 000000000000..8b88b43f3d2f
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
@@ -0,0 +1,11 @@
+--- tools/python.jam
++++ tools/python.jam
+@@ -961,7 +961,7 @@
+             # linux).
+           : $(usage-requirements)
+             <testing.launcher>$(set-PYTHONPATH)
+-              <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib
++              <library-path>$(libraries) <library>python.lib
+           ;
+     }
+ 
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch
new file mode 100644
index 000000000000..b3bee03b56f3
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch
@@ -0,0 +1,19 @@
+--- tools/common.jam
++++ tools/common.jam
+@@ -759,7 +759,15 @@
+         switch $(f:G)
+         {
+             case <base> :
+-                result += $(name:B) ;
++                local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
++                if $(matched) = boost_python || $(matched) = boost_mpi_python
++                {
++                    result += $(name) ;
++                }
++                else
++                {
++                    result += $(name:B) ;
++                }
+             
+             case <toolset> :
+                 result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :
diff --git a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch
new file mode 100644
index 000000000000..f5d6188f1954
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch
@@ -0,0 +1,26 @@
+Avoid adding all kinds of things to the toolchain's flags that within
+Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target,
+arch, etc.
+
+--- tools/darwin.jam
++++ tools/darwin.jam
+@@ -227,6 +227,9 @@
+         }
+     }
+     
++    # leave compiler flags etc. up to the toolchain
++    return $(version-feature) ;
++
+     if $(version-feature)
+     {
+         if $(.debug-configuration)
+@@ -387,7 +390,8 @@
+             support-ppc64 = ;
+         }
+     }
+-    switch $(arch)
++    # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either
++    switch $(donotaddarchpleaseXXXarch)
+     {
+         case combined : 
+         {
diff --git a/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch
new file mode 100644
index 000000000000..31f8db2ee104
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch
@@ -0,0 +1,11 @@
+--- test/startup_v2.py.orig	2012-08-19 11:48:12.020600368 +0200
++++ test/startup_v2.py	2012-08-19 11:48:28.564516623 +0200
+@@ -14,7 +14,7 @@
+     return re.match(expected,actual,re.DOTALL) != None
+ 
+ # Test the v1 startup behavior.
+-t = BoostBuild.Tester(match=match_re, boost_build_path='', pass_toolset=0)
++t = BoostBuild.Tester(match=match_re, boost_build_path='/invalid/location', pass_toolset=0)
+ 
+ t.set_tree('startup')
+ 
diff --git a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
new file mode 100644
index 000000000000..f0a1561d718f
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
@@ -0,0 +1,53 @@
+--- engine/build.jam.orig	2012-08-19 09:47:23.916383518 +0200
++++ engine/build.jam	2012-08-19 09:53:38.011554690 +0200
+@@ -3,7 +3,7 @@
+ #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+ 
+ # Clean env vars of any "extra" empty values.
+-for local v in ARGV CC CFLAGS LIBS
++for local v in ARGV CC CFLAGS LDFLAGS LIBS
+ {
+ 	local values ;
+ 	for local x in $($(v))
+@@ -179,10 +179,10 @@
+ if ! $(CC) { CC = cc ; }
+ toolset cc $(CC) : "-o " : -D
+     : $(CFLAGS)
+-    [ opt --release : -s -O ]
++    [ opt --release : ]
+     [ opt --debug : -g ]
+     -I$(--python-include) -I$(--extra-include)
+-    : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
++    : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+ ## Comeau C/C++ 4.x
+ toolset como como : "-o " : -D
+     : --c
+@@ -201,11 +201,11 @@
+ ## MacOSX Darwin, using GCC 2.9.x, 3.x
+ toolset darwin cc :  "-o " : -D
+     :
+-    [ opt --release : -Wl,-x -O3 -finline-functions ]
++    [ opt --release : -Wl,-x -finline-functions ]
+     [ opt --debug : -g -O0 -fno-inline -pg ]
+     [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ]
+     -I$(--python-include) -I$(--extra-include)
+-    : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
++    : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+ ## GCC 2.x, 3.x, 4.x
+ toolset gcc gcc : "-o " : -D
+     : -pedantic -fno-strict-aliasing
+--- engine/build.sh.orig	2012-08-19 12:09:56.400780866 +0200
++++ engine/build.sh	2012-08-19 12:10:49.728499203 +0200
+@@ -224,9 +224,9 @@
+     cc)
+     if test -z "$CC" ; then CC=cc ; fi
+     BOOST_JAM_CC=$CC
+-    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
+-    BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
+-    BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
++    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS"
++    BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS"
++    BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS"
+     ;;
+ 
+     qcc)
diff --git a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
new file mode 100644
index 000000000000..08b40f31455a
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
@@ -0,0 +1,17 @@
+Don't look for the framework path, we build Python the UNIX way for
+Gentoo Prefix
+
+--- engine/build.jam
++++ engine/build.jam
+@@ -82,11 +82,6 @@
+         }
+         --python-lib = $(--python-lib[1]) ;
+     }
+-    else if $(OS) = MACOSX
+-    {
+-        --python-include = [ .path $(python-location) Headers ] ;
+-        --python-lib = $(python-location) Python ;
+-    }
+     else
+     {
+         --python-include = ;
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch
new file mode 100644
index 000000000000..a44afb95d14e
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch
@@ -0,0 +1,11 @@
+--- test/startup_v2.py.orig	2013-08-27 12:23:10.520185408 +0400
++++ test/startup_v2.py	2013-08-27 12:23:27.155186209 +0400
+@@ -50,7 +50,7 @@
+     return re.match(expected, actual, re.DOTALL) != None
+ 
+ 
+-t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0)
++t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0)
+ t.set_tree("startup")
+ check_for_existing_boost_build_jam(t)
+ 
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
new file mode 100644
index 000000000000..bddcdac9cc15
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
@@ -0,0 +1,19 @@
+--- tools/common.jam.orig	2013-08-27 12:13:56.865158748 +0400
++++ tools/common.jam	2013-08-27 12:15:08.760162210 +0400
+@@ -763,7 +763,15 @@
+         switch $(f:G)
+         {
+             case <base> :
+-                result += $(name:B) ;
++		local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
++		if $(matched) = boost_python || $(matched) = boost_mpi_python
++		{
++			result += $(name) ;
++		}
++		else
++		{
++			result += $(name:B) ;
++		}
+ 
+             case <toolset> :
+                 result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :
diff --git a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch b/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch
new file mode 100644
index 000000000000..a52130974660
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch
@@ -0,0 +1,13 @@
+https://svn.boost.org/trac/boost/ticket/10122
+
+--- engine/mem.h
++++ engine/mem.h
+@@ -8,6 +8,8 @@
+ #ifndef BJAM_MEM_H
+ #define BJAM_MEM_H
+ 
++#include "jam.h"
++
+ #ifdef OPT_BOEHM_GC
+ 
+     /* Use Boehm GC memory allocator. */
diff --git a/dev-util/boost-build/files/site-config.jam b/dev-util/boost-build/files/site-config.jam
new file mode 100644
index 000000000000..6afe52684ccc
--- /dev/null
+++ b/dev-util/boost-build/files/site-config.jam
@@ -0,0 +1,11 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
+# Define two new variants to be used when building boost (or separate boost-libs)
+# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols
+# values "none" which are not part of the official boost distribution.
+# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS!
+variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;
+variant gentoodebug   : debug   : <optimization>none <debug-symbols>on   <runtime-link>shared ;
+
diff --git a/dev-util/boost-build/metadata.xml b/dev-util/boost-build/metadata.xml
new file mode 100644
index 000000000000..031ebfc77646
--- /dev/null
+++ b/dev-util/boost-build/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>cpp</herd>
+  <upstream>
+    <remote-id type="sourceforge">boost</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/bsdiff/Manifest b/dev-util/bsdiff/Manifest
new file mode 100644
index 000000000000..b78d683a9d43
--- /dev/null
+++ b/dev-util/bsdiff/Manifest
@@ -0,0 +1 @@
+DIST bsdiff-4.3.tar.gz 5740 SHA256 18821588b2dc5bf159aa37d3bcb7b885d85ffd1e19f23a0c57a58723fea85f48 SHA512 bde46b393b74bcc9f05532ea4d45b12c104c4f182fdd49d4176aad5f02a2b357f435819f13a5a7ddefe27df0ca82980f06fad764094014a6d068622263e319c3 WHIRLPOOL 8a78c9f570e48e903b5084e3f23c4325d05aeac01bcb31d4132fc206e6961214965a0163c613dda3c6406580c59f7e3e35cf782ab5146d56a9264c296be09d66
diff --git a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild b/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
new file mode 100644
index 000000000000..72e12cc1ab66
--- /dev/null
+++ b/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="bsdiff: Binary Differencer using a suffix alg"
+HOMEPAGE="http://www.daemonology.net/bsdiff/"
+SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch_user
+}
+
+src_compile() {
+	doecho() {
+		echo "$@"
+		"$@"
+	}
+	append-lfs-flags
+	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c -lbz2 || die "failed compiling bsdiff"
+	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c -lbz2 || die "failed compiling bspatch"
+}
+
+src_install() {
+	dobin bs{diff,patch}
+	doman bs{diff,patch}.1
+}
diff --git a/dev-util/bsdiff/metadata.xml b/dev-util/bsdiff/metadata.xml
new file mode 100644
index 000000000000..b6b8956cde34
--- /dev/null
+++ b/dev-util/bsdiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/btyacc/Manifest b/dev-util/btyacc/Manifest
new file mode 100644
index 000000000000..9ed94ff7536e
--- /dev/null
+++ b/dev-util/btyacc/Manifest
@@ -0,0 +1 @@
+DIST btyacc-3-0.tar.gz 74770 SHA256 501be7eb21623b4bbf47f6c33f74b6dab52374939c0f155b364b1efa641b020a SHA512 55312e3de7cc783e1386ea98c97464d8d40bb496ce2ce36c84cc559e4c6982fbac730e76b8d44c4a44565f545ac50fb75f802bd8a1b4c926b1fc1af1a0058ef4 WHIRLPOOL 00cae37aa941271e935bdd140c34b2f6f107477ebc44ce9459b5fabd33bb74d2218415c5cd1c62629672515c61bde368630372950dde19ed01d32df60cdfda3a
diff --git a/dev-util/btyacc/btyacc-3.0-r2.ebuild b/dev-util/btyacc/btyacc-3.0-r2.ebuild
new file mode 100644
index 000000000000..43a7317cfd0b
--- /dev/null
+++ b/dev-util/btyacc/btyacc-3.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P=${P/./-}
+IUSE=""
+DESCRIPTION="Backtracking YACC - modified from Berkeley YACC"
+HOMEPAGE="http://www.siber.com/btyacc"
+SRC_URI="http://www.siber.com/btyacc/${MY_P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-linux ~ppc-macos ~x86-macos"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	cp -av Makefile{,.orig}
+	epatch "${FILESDIR}/${P}-includes.patch"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	# fix memory issue/glibc corruption
+	sed -i -e "s|len + 13|len + 14|" main.c || die "Could not fix main.c"
+	# Darwin doesn't do static binaries
+	[[ ${CHOST} == *-darwin* ]] && sed -i -e 's/-static//' Makefile
+}
+
+src_compile() {
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	dobin btyacc
+	dodoc README README.BYACC
+	newman manpage btyacc.1
+}
diff --git a/dev-util/btyacc/files/btyacc-3.0-includes.patch b/dev-util/btyacc/files/btyacc-3.0-includes.patch
new file mode 100644
index 000000000000..a03f58fa3865
--- /dev/null
+++ b/dev-util/btyacc/files/btyacc-3.0-includes.patch
@@ -0,0 +1,10 @@
+--- mstring.c
++++ mstring.c
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <string.h>
+ #include <ctype.h>
+ #include "mstring.h"
+ 
diff --git a/dev-util/btyacc/files/btyacc-3.0-makefile.patch b/dev-util/btyacc/files/btyacc-3.0-makefile.patch
new file mode 100644
index 000000000000..884b49f46b9d
--- /dev/null
+++ b/dev-util/btyacc/files/btyacc-3.0-makefile.patch
@@ -0,0 +1,22 @@
+Respect CC, append to CFLAGS (but not -g), append to LDFLAGS, use system LD -jer
+
+--- Makefile.orig	1999-07-15 19:40:12.000000000 +0200
++++ Makefile	2009-09-04 15:27:15.000000000 +0200
+@@ -8,14 +8,13 @@
+ 
+ HDRS	      = defs.h mstring.h
+ 
+-CFLAGS	      = -g -Wall -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS	      += -Wall -Wstrict-prototypes -Wmissing-prototypes
+ 
+-LDFLAGS	      = -static
++LDFLAGS	      += -static
+ 
+ LIBS	      =
+ 
+-CC	      = gcc
+-LINKER	      = gcc
++LINKER	      = $(CC)
+ # LINKER      = cl
+ # CC	      = cl
+ 
diff --git a/dev-util/btyacc/metadata.xml b/dev-util/btyacc/metadata.xml
new file mode 100644
index 000000000000..432f6bd7e831
--- /dev/null
+++ b/dev-util/btyacc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+<email>patrick@gentoo.org</email>
+<name>Patrick Lauer</name>
+<description>Proxy maintainer. CC him on bugs</description>
+</maintainer>
+<maintainer>
+<email>wlt@obsidian-studios.com</email>
+<name>William L. Thomson Jr.</name>
+<description>Maintainer. Assign bugs to him</description>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/build/Manifest b/dev-util/build/Manifest
new file mode 100644
index 000000000000..d93505d427cf
--- /dev/null
+++ b/dev-util/build/Manifest
@@ -0,0 +1 @@
+DIST build-0.3.9.tar.bz2 71545 SHA256 158a26af751dfc00d9b88021305ea74935542a9f970d1ac7e805cd239a3400b5 SHA512 295350dfd91265481cfe956a1edfadaf46c4eef01d344a4ed8df7124fbda8eb58503836fa7810faa1f5f3d5fc5e110854496a782df7520fbcc1c1cba3c1f3586 WHIRLPOOL e0b12a2341ec4173aca81dad35e39de60e96e8dd321d900c5670c5c66dcfe7676d2a1a4383adefd7fa76138c891a652d32324e4afbe6082fa6aabdfbac12a8f8
diff --git a/dev-util/build/build-0.3.9.ebuild b/dev-util/build/build-0.3.9.ebuild
new file mode 100644
index 000000000000..9261a4a280c7
--- /dev/null
+++ b/dev-util/build/build-0.3.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit versionator
+
+DESCRIPTION="A massively-parallel software build system implemented on top of GNU make"
+HOMEPAGE="http://kolpackov.net/projects/build/"
+SLOT="$(get_version_component_range 1-2)"
+SRC_URI="http://www.codesynthesis.com/download/${PN}/${SLOT}/${P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	emake install_prefix="${D}/usr" install
+
+	dodoc documentation/[[:upper:]]*
+	dohtml -A xhtml documentation/*.{css,xhtml}
+
+	if use examples ; then
+		# preserving symlinks in the examples
+		cp -dpR examples "${D}/usr/share/doc/${PF}"
+	fi
+}
diff --git a/dev-util/build/metadata.xml b/dev-util/build/metadata.xml
new file mode 100644
index 000000000000..75dd2ca7d302
--- /dev/null
+++ b/dev-util/build/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/buildbot-slave/Manifest b/dev-util/buildbot-slave/Manifest
new file mode 100644
index 000000000000..6557b0dbdc86
--- /dev/null
+++ b/dev-util/buildbot-slave/Manifest
@@ -0,0 +1,2 @@
+DIST buildbot-slave-0.8.10.tar.gz 117593 SHA256 ef5634249407bf643b666976158a4e11c7aaa3db3658ff0fcd781f460867f626 SHA512 0b05f8b9d6e6c29291893c47707409bc50681d2631ed1825908050f30cff34bf422d7f574076ea9c6b36a16b37e2e79ed28c9e84e31b3270bf6ec3aee426def4 WHIRLPOOL 52806ebd2e2c54bf844fb4752ded7ea314fd68cba229ea09039e0b83b1cdd373e40528d779ce5b3a188028932f3d443986f006bfb5555eaf141569ba3949297e
+DIST buildbot-slave-0.8.12.tar.gz 118339 SHA256 905eab122dcfc9425d51f0ed0c7682e7f933e140a7203637aa12a84498bd7461 SHA512 74f7f9ffab946000a5d31ae28140698ca259ba5b75815ed839d51fa5d9f702e998b61a716b66aab7946b6143d329244f2403d9b98cbbfc70223b691dcb70f0bc WHIRLPOOL f0281c11520ff31291977fa67397c7398d8ecf7fe0e70a45521158e792862aa9bb6eb65591181a1a3d71913241768e65143a1b35d6316cb5f8b5bc5373d02979
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild
new file mode 100644
index 000000000000..4717aa5b64c8
--- /dev/null
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 readme.gentoo systemd user
+
+DESCRIPTION="BuildBot Slave Daemon"
+HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave"
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildslave\" init script has been added
+		to support starting buildslave through Gentoo's init system. To use this,
+		set up your build slave following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}etc/conf.d/buildslave\" at the right location.  The scripts can
+		run as a different user if desired. If you need to run more than one
+		build slave, just copy the scripts."
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildslave.1
+
+	newconfd "${FILESDIR}/buildslave.confd" buildslave
+	newinitd "${FILESDIR}/buildslave.initd" buildslave
+	systemd_dounit "${FILESDIR}/buildslave.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
new file mode 100644
index 000000000000..4717aa5b64c8
--- /dev/null
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 readme.gentoo systemd user
+
+DESCRIPTION="BuildBot Slave Daemon"
+HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave"
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildslave\" init script has been added
+		to support starting buildslave through Gentoo's init system. To use this,
+		set up your build slave following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}etc/conf.d/buildslave\" at the right location.  The scripts can
+		run as a different user if desired. If you need to run more than one
+		build slave, just copy the scripts."
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildslave.1
+
+	newconfd "${FILESDIR}/buildslave.confd" buildslave
+	newinitd "${FILESDIR}/buildslave.initd" buildslave
+	systemd_dounit "${FILESDIR}/buildslave.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/buildbot-slave/buildbot-slave-9999.ebuild b/dev-util/buildbot-slave/buildbot-slave-9999.ebuild
new file mode 100644
index 000000000000..55063dbed836
--- /dev/null
+++ b/dev-util/buildbot-slave/buildbot-slave-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} = 9999 ]] && inherit git-2
+inherit distutils-r1 readme.gentoo user
+
+DESCRIPTION="BuildBot Slave Daemon"
+HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave"
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} = 9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} == 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux"
+fi
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildslave\" init script has been added
+		to support starting buildslave through Gentoo's init system. To use this,
+		set up your build slave following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}etc/conf.d/buildslave\" at the right location.  The scripts can
+		run as a different user if desired. If you need to run more than one
+		build slave, just copy the scripts."
+}
+
+src_compile() {
+	[[ ${PV} = 9999 ]] && cd slave/
+	distutils-r1_src_compile
+}
+
+src_install() {
+	[[ ${PV} = 9999 ]] && cd slave/
+	distutils-r1_src_install
+
+	doman docs/buildslave.1
+
+	newconfd "${FILESDIR}/buildslave.confd" buildslave
+	newinitd "${FILESDIR}/buildslave.initd" buildslave
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	[[ ${PV} = 9999 ]] && cd slave/
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/buildbot-slave/files/buildslave.confd b/dev-util/buildbot-slave/files/buildslave.confd
new file mode 100644
index 000000000000..4ef42c4a7333
--- /dev/null
+++ b/dev-util/buildbot-slave/files/buildslave.confd
@@ -0,0 +1,9 @@
+# Path to the build slave's basedir.
+BASEDIR="/var/lib/buildslave"
+
+# User account for the buildslave.
+# The basedir should be owned by this user.
+USERNAME="buildbot"
+
+# Extra options passed to twistd.
+TWISTD_OPTS=""
diff --git a/dev-util/buildbot-slave/files/buildslave.initd b/dev-util/buildbot-slave/files/buildslave.initd
new file mode 100644
index 000000000000..17e22abdc7cb
--- /dev/null
+++ b/dev-util/buildbot-slave/files/buildslave.initd
@@ -0,0 +1,48 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -z "${BASEDIR}" ]; then
+		eerror "BASEDIR not set"
+		return 1
+	fi
+	if [ -z "${USERNAME}" ]; then
+		eerror "USERNAME not set"
+		return 1
+	fi
+	if [ ! -d "${BASEDIR}" ]; then
+		eerror "${BASEDIR} is not a directory"
+		return 1
+	fi
+	if [ ! -e "${BASEDIR}/buildbot.tac" ]; then
+		eerror "${BASEDIR} does not contain buildbot.tac"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting buildslave in ${BASEDIR}"
+	# We set HOME here to make something valid show up in the env of child
+	# processes spawned by the buildslave.
+	start-stop-daemon --start -u "${USERNAME}" \
+		--pidfile "${BASEDIR}/buildslave.pid" \
+		--env HOME="${BASEDIR}" \
+		--exec /usr/bin/python -- /usr/bin/twistd \
+		--no_save \
+		--logfile="${BASEDIR}/twistd.log" \
+		--pidfile="${BASEDIR}/buildslave.pid" \
+		--python="${BASEDIR}/buildbot.tac"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping buildslave in ${BASEDIR}"
+	start-stop-daemon --stop --pidfile "${BASEDIR}/buildslave.pid"
+	eend $?
+}
diff --git a/dev-util/buildbot-slave/files/buildslave.service b/dev-util/buildbot-slave/files/buildslave.service
new file mode 100644
index 000000000000..5c8e483fe83a
--- /dev/null
+++ b/dev-util/buildbot-slave/files/buildslave.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=buildbot slave instances
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+User=buildbot
+WorkingDirectory=/var/lib/buildslave
+# The following assume there is a 'slave' directory
+# in $WorkingDirectory with the slave configuration files
+ExecStart=/usr/bin/buildslave start slave
+ExecStop=/usr/bin/buildslave stop slave
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/buildbot-slave/metadata.xml b/dev-util/buildbot-slave/metadata.xml
new file mode 100644
index 000000000000..8249217c63d1
--- /dev/null
+++ b/dev-util/buildbot-slave/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">buildbot-slave</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
new file mode 100644
index 000000000000..eae5a7202c72
--- /dev/null
+++ b/dev-util/buildbot/Manifest
@@ -0,0 +1,2 @@
+DIST buildbot-0.8.10.tar.gz 4822307 SHA256 c4964d2ebd81cb80a14cb058fb2aab0572a1d8d86672d514e775b42deb08a5f4 SHA512 e148a1670a56837587d858d1697fe117661cbbfedab42bf7be905f9e8e4266e4ff0170b0cd81aed61234d30497a05427061c3084033f09811d0bc306b200661b WHIRLPOOL 26397b6f914266201aba4feb4df7353facad4fd0f51bdf7e35cf25205c45eadcf83f24c265e540b13d327750ce9561362be6a5aa237152cf1298d970c504f76c
+DIST buildbot-0.8.12.tar.gz 4834352 SHA256 c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6 SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645 WHIRLPOOL 5754b7c0278fb5e7da8a7dd66253f6f4d12f54c125f6a78aa9018a2b6b22fd88a27e79e6821ab05e4cd9e87bf0dd08c3c73c7914d4c499ac13c48ca232ed21c8
diff --git a/dev-util/buildbot/buildbot-0.8.10.ebuild b/dev-util/buildbot/buildbot-0.8.10.ebuild
new file mode 100644
index 000000000000..0b4328197706
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.8.10.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 readme.gentoo systemd user
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="http://buildbot.net/ http://pypi.python.org/pypi/buildbot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc examples irc mail manhole test"
+
+RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-0.7.10-r999[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	irc? ( dev-python/twisted-words[${PYTHON_USEDEP}] )
+	mail? ( dev-python/twisted-mail[${PYTHON_USEDEP}] )
+	manhole? ( dev-python/twisted-conch[${PYTHON_USEDEP}] )"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/twisted-mail[${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+		dev-python/twisted-words[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		set up your build master following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${EROOT}etc/conf.d/buildmaster\" at the right location. The scripts can
+		run as a different user if desired. If you need to run more than one
+		build master, just copy the scripts."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		dohtml -r docs/_build/html/
+		# TODO: install man pages
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	elog
+	elog "Upstream recommends the following when upgrading:"
+	elog "Each time you install a new version of Buildbot, you should run the"
+	elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+	elog "This will add files and fix (or at least detect) incompatibilities between"
+	elog "your old config and the new code."
+}
diff --git a/dev-util/buildbot/buildbot-0.8.12.ebuild b/dev-util/buildbot/buildbot-0.8.12.ebuild
new file mode 100644
index 000000000000..0b4328197706
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.8.12.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 readme.gentoo systemd user
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="http://buildbot.net/ http://pypi.python.org/pypi/buildbot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc examples irc mail manhole test"
+
+RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-0.7.10-r999[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	irc? ( dev-python/twisted-words[${PYTHON_USEDEP}] )
+	mail? ( dev-python/twisted-mail[${PYTHON_USEDEP}] )
+	manhole? ( dev-python/twisted-conch[${PYTHON_USEDEP}] )"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/twisted-mail[${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+		dev-python/twisted-words[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		set up your build master following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${EROOT}etc/conf.d/buildmaster\" at the right location. The scripts can
+		run as a different user if desired. If you need to run more than one
+		build master, just copy the scripts."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		dohtml -r docs/_build/html/
+		# TODO: install man pages
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	elog
+	elog "Upstream recommends the following when upgrading:"
+	elog "Each time you install a new version of Buildbot, you should run the"
+	elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+	elog "This will add files and fix (or at least detect) incompatibilities between"
+	elog "your old config and the new code."
+}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
new file mode 100644
index 000000000000..db790c18eaac
--- /dev/null
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
+
+[[ ${PV} = 9999 ]] && inherit git-2
+inherit distutils-r1 readme.gentoo systemd user
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="http://buildbot.net/ http://pypi.python.org/pypi/buildbot"
+[[ ${PV} = 9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} == 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+fi
+IUSE="doc examples irc mail manhole test"
+
+RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-0.7.10-r999[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	irc? ( dev-python/twisted-words[${PYTHON_USEDEP}] )
+	mail? ( dev-python/twisted-mail[${PYTHON_USEDEP}] )
+	manhole? ( dev-python/twisted-conch[${PYTHON_USEDEP}] )"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/twisted-mail[${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+		dev-python/twisted-words[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		set up your build master following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${EROOT}etc/conf.d/buildmaster\" at the right location. The scripts can
+		run as a different user if desired. If you need to run more than one
+		build master, just copy the scripts."
+}
+
+src_compile() {
+	[[ ${PV} = 9999 ]] && cd master/
+	distutils-r1_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	[[ ${PV} = 9999 ]] && cd master/
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		dohtml -r docs/_build/html/
+		# TODO: install man pages
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	elog
+	elog "Upstream recommends the following when upgrading:"
+	elog "Each time you install a new version of Buildbot, you should run the"
+	elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+	elog "This will add files and fix (or at least detect) incompatibilities between"
+	elog "your old config and the new code."
+}
diff --git a/dev-util/buildbot/files/buildbot.service b/dev-util/buildbot/files/buildbot.service
new file mode 100644
index 000000000000..4581a13a0c48
--- /dev/null
+++ b/dev-util/buildbot/files/buildbot.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=buildbot master daemon
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+User=buildbot
+WorkingDirectory=/var/lib/buildmaster
+# The following assume there is a 'master' directory
+# in $WorkingDirectory with the master configuration files
+ExecStartPre=/usr/bin/buildbot checkconfig master
+ExecStart=/usr/bin/buildbot start master
+ExecStop=/usr/bin/buildbot stop master
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/buildbot/files/buildmaster.confd b/dev-util/buildbot/files/buildmaster.confd
new file mode 100644
index 000000000000..e489d66f9d4b
--- /dev/null
+++ b/dev-util/buildbot/files/buildmaster.confd
@@ -0,0 +1,10 @@
+
+# Path to the build master's basedir.
+BASEDIR=/var/lib/buildmaster
+
+# User account for the buildmaster.
+# The basedir should be owned by this user.
+USERNAME=buildbot
+
+# Extra options to pass to twistd.
+TWISTD_OPTS=""
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd
new file mode 100644
index 000000000000..313365f3a676
--- /dev/null
+++ b/dev-util/buildbot/files/buildmaster.initd
@@ -0,0 +1,54 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -z "${BASEDIR}" ]; then
+		eerror "BASEDIR not set"
+		return 1
+	fi
+	if [ -z "${USERNAME}" ]; then
+		eerror "USERNAME not set"
+		return 1
+	fi
+	if [ ! -d "${BASEDIR}" ]; then
+		eerror "${BASEDIR} is not a directory"
+		return 1
+	fi
+	if [ ! -e "${BASEDIR}/buildbot.tac" ]; then
+		eerror "${BASEDIR} does not contain buildbot.tac"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting buildmaster in ${BASEDIR}"
+	start-stop-daemon --start -u "${USERNAME}" \
+		--pidfile "${BASEDIR}/buildmaster.pid" \
+		--exec /usr/bin/python -- /usr/bin/twistd \
+		--no_save \
+		--logfile="${BASEDIR}/twistd.log" \
+		--pidfile="${BASEDIR}/buildmaster.pid" \
+		--python="${BASEDIR}/buildbot.tac"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping buildmaster in ${BASEDIR}"
+	start-stop-daemon --stop --pidfile "${BASEDIR}/buildmaster.pid"
+	eend $?
+}
+
+reload() {
+	ebegin "Reconfiguring buildmaster in ${BASEDIR}"
+	start-stop-daemon --signal HUP --pidfile \
+		"${BASEDIR}"/buildmaster.pid
+	eend $?
+}
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
new file mode 100644
index 000000000000..1cd84ffdae76
--- /dev/null
+++ b/dev-util/buildbot/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<longdescription lang="en">The BuildBot is a system to automate the compile/test cycle required
+    by most software projects to validate code changes.
+    Features:
+      * run builds on a variety of slave platforms
+      * arbitrary build process: handles projects using C, Python, whatever
+      * minimal host requirements: python and Twisted
+      * slaves can be behind a firewall if they can still do checkout
+      * status delivery through web page, email, IRC, other protocols
+      * track builds in progress, provide estimated completion time
+      * flexible configuration by subclassing generic build process classes
+      * debug tools to force a new build, submit fake Changes, query slave
+        status
+      * released under the GPL</longdescription>
+	<use>
+		<flag name="irc">Add support for status delivery through an ircbot.</flag>
+		<flag name="mail">Add support for watching a maildir for commits.</flag>
+		<flag name="manhole">Add support for manhole (debug over ssh)</flag>
+	</use>
+	<upstream>
+		<maintainer>
+			<email>dustin@v.igoro.us</email>
+			<name>Dustin J. Mitchell</name>
+		</maintainer>
+		<remote-id type="pypi">buildbot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/bumpversion/Manifest b/dev-util/bumpversion/Manifest
new file mode 100644
index 000000000000..b501416ac9cc
--- /dev/null
+++ b/dev-util/bumpversion/Manifest
@@ -0,0 +1 @@
+DIST bumpversion-0.5.3.tar.gz 16596 SHA256 6744c873dd7aafc24453d8b6a1a0d6d109faf63cd0cd19cb78fd46e74932c77e SHA512 2dc507be98838e4a389502cbdae08d23bad465b171923e15c40ae16da2cc9529c71dfc40213c47d23da363257b363fd5786a5661a4a6d6b568b5f8b2cf8af959 WHIRLPOOL acf125d91110edf8f02554ee9a4d30a5dfe235ffa51b8f86bc9c6298d45629d8ce56df48ef5a214351a834973dd9fe5a3eee0d1d23a99ab1ed53158da7aaa595
diff --git a/dev-util/bumpversion/bumpversion-0.5.3.ebuild b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
new file mode 100644
index 000000000000..bc4861f680f6
--- /dev/null
+++ b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
@@ -0,0 +1,36 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Version-bump your software with a single command"
+HOMEPAGE="https://pypi.python.org/pypi/bumpversion https://github.com/peritus/bumpversion"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/configparser[$(python_gen_usedep "python2*" pypy)]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+# Not included
+# https://github.com/peritus/bumpversion/issues/108
+RESTRICT=test
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-util/bumpversion/metadata.xml b/dev-util/bumpversion/metadata.xml
new file mode 100644
index 000000000000..c1661663322e
--- /dev/null
+++ b/dev-util/bumpversion/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/bunny/Manifest b/dev-util/bunny/Manifest
new file mode 100644
index 000000000000..025e2bb55e78
--- /dev/null
+++ b/dev-util/bunny/Manifest
@@ -0,0 +1 @@
+DIST bunny-0.93.tgz 64575 SHA256 30c7765b960b131246bfe8c25b79d20eae49f282dd0ac3b7e1e293233a446f99 SHA512 275eadd58e75b6bc626cc599447b723ff062281f93c7d98159abf6a65ae70d3588435c514ee809dd19e013d8299ec9f9cdfee776ff03ec6c0478b02752d45392 WHIRLPOOL 6a7f314b84cd91daee5859cb41ee9d0b78692c8b5757f8c283ccaaaaf3c702504c9c670e1eba227581701e0967b42cf0cc48d6982b4ea546e1d65e723b9f197c
diff --git a/dev-util/bunny/bunny-0.93-r1.ebuild b/dev-util/bunny/bunny-0.93-r1.ebuild
new file mode 100644
index 000000000000..18206258ccbf
--- /dev/null
+++ b/dev-util/bunny/bunny-0.93-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A small general purpose fuzzer for C programs"
+HOMEPAGE="http://code.google.com/p/bunny-the-fuzzer"
+SRC_URI="http://bunny-the-fuzzer.googlecode.com/files/${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i Makefile -e '/ -o /s|$(CFLAGS)|& $(LDFLAGS)|' || die "sed Makefile"
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake test1 || die "emake test1 failed"
+	emake test2 || die "emake test2 failed"
+	emake test3 || die "emake test3 failed"
+}
+
+src_install() {
+	dobin ${PN}-{exec,flow,gcc,main,trace} || die "dobin failed"
+	dodoc CHANGES README
+}
diff --git a/dev-util/bunny/metadata.xml b/dev-util/bunny/metadata.xml
new file mode 100644
index 000000000000..511841d32339
--- /dev/null
+++ b/dev-util/bunny/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">bunny-the-fuzzer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
new file mode 100644
index 000000000000..4c3b9c87ff68
--- /dev/null
+++ b/dev-util/bustle/Manifest
@@ -0,0 +1,5 @@
+DIST bustle-0.4.0-tests.tar.gz 8340 SHA256 7e4c354479edc835457fdecc89ab7fc5e1087ab4637b7b1ac6fadfe860190fbe SHA512 c7685496f3a84c1615752ae9aad22202bfe703147441581abe599a5e5055cdef54f27b4e0d01603b23a83a4b42b0595b5538c5b4d65a522a9e76b8d187ae54b1 WHIRLPOOL 6591ed10c75ef044375bf5e80719aac4a40244f647c4045f45811c9e8736afaafa5b83b92803ef8912c2ecfe9672ac20734fc954ab2bb09cff2842c1e6b4fe5a
+DIST bustle-0.4.2.tar.gz 95707 SHA256 bf03fb0a14a2559b6abe4cfeb673b30d86a31a89fb45883d7594644afc434cee SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562 WHIRLPOOL ebc31713bb202f247a38ed04357598ba9951f72a3fa18b679d83a3ce088dd8a144d7ee5a772ce02715dd735907ba2219541e971d5b1f3a16eb21d22ab1600753
+DIST bustle-0.4.3.tar.gz 96970 SHA256 255e035a8b494f7edd21e657c246be00da1452faa2341abccebd53e8f333e9d1 SHA512 263c929a38ffa8c0df03deb9736879d1fbc630f1dcd47183cc304495cb6d5d2fbdb01e4b83e25712ad13d57662d41d0eee35495b76ca52484b9b2352dfde1bdb WHIRLPOOL fe434e7468132e3ecca848bdc09db3bd6d3191ca7fb720fabab48e6181983e6a6facc437421ba4eaea3e17815ac0527e3c0bd648ff449f5fb02212c920c40ff4
+DIST bustle-0.4.7.tar.gz 114231 SHA256 08b12207561157e639bc64e0b274e70e4909f50079cd97564c916d66a3f088b9 SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd WHIRLPOOL 8f6a80b881b9c13498351e2dc4910406dc151db9c320b8fba291c9577b41eede58003b943de13bf637d28226e7301e4dfdc8f2b6a0fa4fda2792962505fd0153
+DIST bustle-0.5.1.tar.gz 118974 SHA256 06601c919d69bea28b116f6447f5557ce46a3e4c4b6b4b75bb65dc2579ff48d6 SHA512 8e77cd82253ba935f4f7b1edae5ba7a99c65cbee2ce6e7d8df48f3182ee5dac92c9b3bc9826a04555de605fa4577c51d9fd027d9e1b92e8a8cf149c466c04e8f WHIRLPOOL f77ca6da883d1b296c049ec67119e3fdf6114a48bd5c2432059b01c80e9e68ef9d0dc9ecd45510e8d4b37620337718bc75e67bc6ac326de9a5302d03d9a2eb22
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..26333ee0293c
--- /dev/null
+++ b/dev-util/bustle/bustle-0.4.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit base haskell-cabal
+
+DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://willthompson.co.uk/bustle/"
+SRC_URI="http://willthompson.co.uk/${PN}/releases/${PV}/${P}.tar.gz http://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz"
+
+LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+		net-libs/libpcap
+		sys-apps/dbus
+		x11-libs/cairo
+		x11-libs/pango
+		gnome-base/libglade:2.0"
+DEPEND="${RDEPEND}
+		test? ( dev-haskell/hunit
+			dev-haskell/quickcheck
+			dev-haskell/test-framework
+			dev-haskell/test-framework-hunit
+		)
+		>=dev-haskell/cabal-1.8
+		dev-haskell/cairo:0
+		>=dev-haskell/dbus-0.10
+		dev-haskell/glib:0
+		>=dev-haskell/gtk-0.12.3:2
+		dev-haskell/mtl
+		dev-haskell/pango:0
+		dev-haskell/parsec
+		dev-haskell/pcap
+		dev-haskell/text
+		>=dev-lang/ghc-6.10.4"
+
+PATCHES=("${FILESDIR}"/${P}-restrict-gtk2hs-deps-to-gtkplus2.patch)
+
+src_compile() {
+	# compile haskell part
+	cabal_src_compile || die "could not build haskell parts"
+
+	# compile C part
+	emake \
+		"CC=$(tc-getCC)" \
+		"CFLAGS=${CFLAGS}" \
+		"CPPFLAGS=${CPPFLAGS}" \
+		"LDFLAGS=${LDFLAGS}"
+}
+
+src_install() {
+	# install haskell part
+	cabal_src_install || die "could not install haskell parts"
+
+	dobin "${S}"/dist/build/bustle-pcap
+
+	dodoc README HACKING NEWS
+}
diff --git a/dev-util/bustle/bustle-0.4.3.ebuild b/dev-util/bustle/bustle-0.4.3.ebuild
new file mode 100644
index 000000000000..094d21cfec41
--- /dev/null
+++ b/dev-util/bustle/bustle-0.4.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://hackage.haskell.org/package/bustle"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	net-libs/libpcap
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/pango
+	gnome-base/libglade:2.0"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.2
+	dev-haskell/cairo
+	>=dev-haskell/dbus-0.10
+	dev-haskell/glib
+	>=dev-haskell/gtk-0.12.4
+	dev-haskell/mtl
+	dev-haskell/pango
+	dev-haskell/parsec
+	dev-haskell/pcap
+	dev-haskell/text
+	>=dev-lang/ghc-6.12.1
+	virtual/pkgconfig
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
+
+src_compile() {
+	# compile haskell part
+	cabal_src_compile || die "could not build haskell parts"
+
+	# compile C part
+	emake \
+		"CC=$(tc-getCC)" \
+		"CFLAGS=${CFLAGS}" \
+		"CPPFLAGS=${CPPFLAGS}" \
+		"LDFLAGS=${LDFLAGS}"
+}
+
+src_install() {
+	# install haskell part
+	cabal_src_install || die "could not install haskell parts"
+
+	dobin "${S}"/dist/build/bustle-pcap
+	doman bustle-pcap.1
+	dodoc README HACKING NEWS
+}
diff --git a/dev-util/bustle/bustle-0.4.7-r1.ebuild b/dev-util/bustle/bustle-0.4.7-r1.ebuild
new file mode 100644
index 000000000000..affd07126556
--- /dev/null
+++ b/dev-util/bustle/bustle-0.4.7-r1.ebuild
@@ -0,0 +1,71 @@
+# 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.6.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://hackage.haskell.org/package/bustle"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	net-libs/libpcap
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/pango
+	gnome-base/libglade:2.0"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.2
+	dev-haskell/cairo
+	>=dev-haskell/dbus-0.10
+	dev-haskell/glib
+	>=dev-haskell/gtk-0.13
+	>=dev-haskell/hgettext-0.1.5
+	dev-haskell/mtl
+	>=dev-haskell/pango-0.13
+	dev-haskell/parsec
+	dev-haskell/pcap
+	dev-haskell/setlocale
+	dev-haskell/text
+	>=dev-lang/ghc-6.12.1
+	virtual/pkgconfig
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk-0.13.patch
+}
+
+src_compile() {
+	# compile haskell part
+	cabal_src_compile || die "could not build haskell parts"
+
+	# compile C part
+	emake \
+		"CC=$(tc-getCC)" \
+		"CFLAGS=${CFLAGS}" \
+		"CPPFLAGS=${CPPFLAGS}" \
+		"LDFLAGS=${LDFLAGS}"
+}
+
+src_install() {
+	# install haskell part
+	cabal_src_install || die "could not install haskell parts"
+
+	dobin "${S}"/dist/build/bustle-pcap
+	doman bustle-pcap.1
+	dodoc README HACKING NEWS
+}
diff --git a/dev-util/bustle/bustle-0.5.1.ebuild b/dev-util/bustle/bustle-0.5.1.ebuild
new file mode 100644
index 000000000000..8be9e2d307da
--- /dev/null
+++ b/dev-util/bustle/bustle-0.5.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://hackage.haskell.org/package/bustle"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="interactivetests +threaded"
+
+RDEPEND="dev-haskell/cairo:=
+	>=dev-haskell/dbus-0.10:=
+	dev-haskell/gio:=
+	dev-haskell/glib:=
+	>=dev-haskell/gtk3-0.13.7:0=
+	>=dev-haskell/hgettext-0.1.5:=
+	dev-haskell/mtl:=
+	dev-haskell/pango:=
+	dev-haskell/parsec:=
+	dev-haskell/pcap:=
+	dev-haskell/setlocale:=
+	dev-haskell/text:=
+	>=dev-lang/ghc-7.4.1:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	virtual/pkgconfig
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag interactivetests interactivetests) \
+		$(cabal_flag threaded threaded)
+}
+
+src_compile() {
+	# compile haskell part
+	cabal_src_compile || die "could not build haskell parts"
+
+	# compile C part
+	emake \
+		"CC=$(tc-getCC)" \
+		"CFLAGS=${CFLAGS}" \
+		"CPPFLAGS=${CPPFLAGS}" \
+		"LDFLAGS=${LDFLAGS}"
+}
+
+src_install() {
+	# install haskell part
+	cabal_src_install || die "could not install haskell parts"
+
+	dobin "${S}"/dist/build/bustle-pcap
+	doman bustle-pcap.1
+	dodoc README.md HACKING.md NEWS.md
+}
diff --git a/dev-util/bustle/files/0001-bustle-dbus-monitor-fix-linking-order-libs-go-after-.patch b/dev-util/bustle/files/0001-bustle-dbus-monitor-fix-linking-order-libs-go-after-.patch
new file mode 100644
index 000000000000..206bcbc28cc4
--- /dev/null
+++ b/dev-util/bustle/files/0001-bustle-dbus-monitor-fix-linking-order-libs-go-after-.patch
@@ -0,0 +1,44 @@
+From b1d7a9b492a8fbe38f60585f6d5a25908e79c973 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <st@anti-virus.by>
+Date: Mon, 7 Feb 2011 15:58:56 +0200
+Subject: [PATCH] bustle-dbus-monitor: fix linking order (libs go after object/source files)
+
+Fixes the following failure:
+
+    cc -O2 -pipe  -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed \
+            -g -O2 `pkg-config --cflags --libs dbus-1` \
+            -Wall -Wunused \
+            -o bustle-dbus-monitor bustle-dbus-monitor.c
+    bustle-0.2.3/temp/ccodU65H.o: In function `main':
+    bustle-0.2.3/work/bustle-0.2.3/bustle-dbus-monitor.c:347: undefined reference to `dbus_error_init'
+    bustle-0.2.3/work/bustle-0.2.3/bustle-dbus-monitor.c:348: undefined reference to `dbus_bus_get'
+    bustle-0.2.3/temp/ccodU65H.o: In function `get_well_known_names':
+    bustle-0.2.3/work/bustle-0.2.3/bustle-dbus-monitor.c:241: undefined reference to `dbus_message_new_method_call'
+    bustle-0.2.3/work/bustle-0.2.3/bustle-dbus-monitor.c:249: undefined reference to `dbus_error_init'
+    bustle-0.2.3/work/bustle-0.2.3/bustle-dbus-monitor.c:250: undefined reference to `dbus_connection_send_with_reply_and_block'
+    bustle-0.2.3/work/bustle-0.2.3/bustle-dbus-monitor.c:252: undefined reference to `dbus_error_is_set'
+
+Signed-off-by: Sergei Trofimovich <st@anti-virus.by>
+---
+ Makefile |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 707790e..3f50370 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,9 @@
+ bustle-dbus-monitor: bustle-dbus-monitor.c
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
+-	-g -O2 `pkg-config --cflags --libs dbus-1` \
++	-g -O2 \
+ 	-Wall -Wunused \
+-	-o bustle-dbus-monitor bustle-dbus-monitor.c
++	-o bustle-dbus-monitor bustle-dbus-monitor.c \
++	`pkg-config --cflags --libs dbus-1`
+ 
+ clean:
+ 	rm -f bustle-dbus-monitor
+-- 
+1.7.3.4
+
diff --git a/dev-util/bustle/files/bustle-0.2.3-ghc-7.4.patch b/dev-util/bustle/files/bustle-0.2.3-ghc-7.4.patch
new file mode 100644
index 000000000000..3c4544e32b7e
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.2.3-ghc-7.4.patch
@@ -0,0 +1,89 @@
+Starting with ghc-7.4 base and haskell98 are incompatible:
+
+ Ambiguous module name `Prelude':
+  it was found in multiple packages: base haskell98-2.0.0.1
+
+Gentoo-bug: https://bugs.gentoo.org/428226
+Reported-by:  Chris Reffett
+diff --git a/Bustle/Noninteractive.hs b/Bustle/Noninteractive.hs
+index 2aa1e05..4a4d9b0 100644
+--- a/Bustle/Noninteractive.hs
++++ b/Bustle/Noninteractive.hs
+@@ -3,7 +3,8 @@ where
+ 
+ import Prelude hiding (log)
+ 
+-import System
++import System.Environment (getArgs)
++import System.Exit (exitFailure)
+ import System.IO (hPutStrLn, stderr)
+ 
+ import Bustle.Parser (readLog)
+diff --git a/Bustle/Stats.hs b/Bustle/Stats.hs
+index da374a5..939cafd 100644
+--- a/Bustle/Stats.hs
++++ b/Bustle/Stats.hs
+@@ -36,7 +36,7 @@ frequencies = reverse
+     where alt Nothing  = Just 1
+           alt (Just n) = Just (n + 1)
+ 
+-mean :: Fractional a => [a] -> a
++mean :: (Eq a, Fractional a) => [a] -> a
+ mean = acc 0 0
+    where acc 0 _ [] = error "mean of empty list"
+          acc n t [] = t / n
+diff --git a/bustle-dot.hs b/bustle-dot.hs
+index aa7c45e..77d6f18 100644
+--- a/bustle-dot.hs
++++ b/bustle-dot.hs
+@@ -3,7 +3,9 @@ import Prelude hiding (log)
+ import Control.Monad
+ import Data.List
+ import Data.Maybe
+-import System
++import System.IO
++import System.Environment
++import System.Exit
+ 
+ import Bustle.Parser (readLog)
+ import Bustle.Types
+diff --git a/bustle.cabal b/bustle.cabal
+index 7ad7412..0a49ca1 100644
+--- a/bustle.cabal
++++ b/bustle.cabal
+@@ -27,11 +27,11 @@ Executable bustle
+   if flag(PostCabalizedGtk2HS)
+     -- Since gtk2hs 0.11, pango is a separate package, and its module names
+     -- have changed.
+-    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
++    Build-Depends:  mtl, base >= 4 && < 5, containers, parsec,
+                     filepath, process,
+                     gtk > 0.11, glade, pango, glib, cairo
+   else
+-    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
++    Build-Depends:  mtl, base >= 4 && < 5, containers, parsec,
+                     filepath, process,
+                     gtk > 0.10 && < 0.11, glade, pango, glib, cairo
+ 
+@@ -39,18 +39,18 @@ Executable bustle-count
+   Main-is:        bustle-count.hs
+   Other-modules:  Bustle.Parser, Bustle.Stats, Bustle.Types,
+                   Bustle.Noninteractive
+-  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
++  Build-Depends:  base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
+ 
+ Executable bustle-time
+   Main-is:        bustle-time.hs
+   Other-modules:  Bustle.Parser, Bustle.Stats, Bustle.Types,
+                   Bustle.Noninteractive
+-  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
++  Build-Depends:  base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
+ 
+ Executable bustle-dot
+   Main-is:        bustle-dot.hs
+   Other-modules:  Bustle.Parser, Bustle.Types
+-  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
++  Build-Depends:  base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
diff --git a/dev-util/bustle/files/bustle-0.2.3-restrict-gtk2hs-deps-to-gtkplus2.patch b/dev-util/bustle/files/bustle-0.2.3-restrict-gtk2hs-deps-to-gtkplus2.patch
new file mode 100644
index 000000000000..18091352ab5a
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.2.3-restrict-gtk2hs-deps-to-gtkplus2.patch
@@ -0,0 +1,40 @@
+--- bustle-0.2.3-orig/bustle.cabal	2013-04-03 15:15:36.278582601 +1100
++++ bustle-0.2.3/bustle.cabal	2013-04-03 15:21:14.334592030 +1100
+@@ -27,30 +27,30 @@
+   if flag(PostCabalizedGtk2HS)
+     -- Since gtk2hs 0.11, pango is a separate package, and its module names
+     -- have changed.
+-    Build-Depends:  mtl, base >= 4 && < 5, containers, parsec,
++    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
+                     filepath, process,
+-                    gtk > 0.11, glade, pango, glib, cairo
++                    gtk > 0.11 && < 0.13, glade < 0.13, pango < 0.13, glib < 0.13, cairo < 0.13
+   else
+-    Build-Depends:  mtl, base >= 4 && < 5, containers, parsec,
++    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
+                     filepath, process,
+-                    gtk > 0.10 && < 0.11, glade, pango, glib, cairo
++                    gtk > 0.10 && < 0.11, glade < 0.13, pango < 0.13, glib < 0.13, cairo < 0.13
+ 
+ Executable bustle-count
+   Main-is:        bustle-count.hs
+   Other-modules:  Bustle.Parser, Bustle.Stats, Bustle.Types,
+                   Bustle.Noninteractive
+-  Build-Depends:  base >= 4 && < 5, containers, parsec
++  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
+ 
+ Executable bustle-time
+   Main-is:        bustle-time.hs
+   Other-modules:  Bustle.Parser, Bustle.Stats, Bustle.Types,
+                   Bustle.Noninteractive
+-  Build-Depends:  base >= 4 && < 5, containers, parsec
++  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
+ 
+ Executable bustle-dot
+   Main-is:        bustle-dot.hs
+   Other-modules:  Bustle.Parser, Bustle.Types
+-  Build-Depends:  base >= 4 && < 5, containers, parsec
++  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
diff --git a/dev-util/bustle/files/bustle-0.4.0-ghc-7.4.patch b/dev-util/bustle/files/bustle-0.4.0-ghc-7.4.patch
new file mode 100644
index 000000000000..0262dd8c9ddc
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.4.0-ghc-7.4.patch
@@ -0,0 +1,46 @@
+diff --git a/Bustle/Noninteractive.hs b/Bustle/Noninteractive.hs
+index 56e5d74..48d9461 100644
+--- a/Bustle/Noninteractive.hs
++++ b/Bustle/Noninteractive.hs
+@@ -25,7 +25,7 @@ where
+ 
+ import Prelude hiding (log)
+ 
+-import System
++import System.Exit (exitFailure)
+ import System.IO (hPutStrLn, stderr)
+ import Data.Maybe (fromMaybe, mapMaybe)
+ import Data.List (nub)
+diff --git a/Bustle/Stats.hs b/Bustle/Stats.hs
+index 8a3e206..d822058 100644
+--- a/Bustle/Stats.hs
++++ b/Bustle/Stats.hs
+@@ -68,7 +68,7 @@ frequencies = reverse
+     where alt Nothing  = Just 1
+           alt (Just n) = Just (n + 1)
+ 
+-mean :: Fractional a => [a] -> a
++mean :: (Eq a, Fractional a) => [a] -> a
+ mean = acc 0 0
+    where acc 0 _ [] = error "mean of empty list"
+          acc n t [] = t / n
+diff --git a/bustle.cabal b/bustle.cabal
+index 93b16bd..cd47efa 100644
+--- a/bustle.cabal
++++ b/bustle.cabal
+@@ -94,7 +94,6 @@ Executable bustle
+                  , glade
+                  , glib
+                  , gtk > 0.11
+-                 , haskell98
+                  , mtl
+                  , pango
+                  , parsec
+@@ -114,7 +113,6 @@ Executable bustle
+                  , glade
+                  , glib
+                  , gtk > 0.10 && < 0.11
+-                 , haskell98
+                  , mtl
+                  , pango
+                  , parsec
diff --git a/dev-util/bustle/files/bustle-0.4.0-restrict-gtk2hs-deps-to-gtkplus2.patch b/dev-util/bustle/files/bustle-0.4.0-restrict-gtk2hs-deps-to-gtkplus2.patch
new file mode 100644
index 000000000000..fb7a149722b4
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.4.0-restrict-gtk2hs-deps-to-gtkplus2.patch
@@ -0,0 +1,76 @@
+--- bustle-0.4.0-orig/bustle.cabal	2013-04-03 15:59:57.193656822 +1100
++++ bustle-0.4.0/bustle.cabal	2013-04-03 15:09:21.825572157 +1100
+@@ -86,16 +86,17 @@
+     Build-Depends: base >= 4 && < 5
+                  , binary
+                  , bytestring
+-                 , cairo
++                 , cairo < 0.13
+                  , containers
+                  , dbus-core == 0.9.*
+                  , directory
+                  , filepath
+-                 , glade
+-                 , glib
+-                 , gtk > 0.11
++                 , glade < 0.13
++                 , glib < 0.13
++                 , gtk > 0.11 && < 0.13
++                 , haskell98
+                  , mtl
+-                 , pango
++                 , pango < 0.13
+                  , parsec
+                  , pcap
+                  , process
+@@ -105,16 +106,17 @@
+     Build-Depends: base >= 4 && < 5
+                  , binary
+                  , bytestring
+-                 , cairo
++                 , cairo < 0.13
+                  , containers
+                  , dbus-core == 0.9.*
+                  , directory
+                  , filepath
+-                 , glade
+-                 , glib
++                 , glade < 0.13
++                 , glib < 0.13
+                  , gtk > 0.10 && < 0.11
++                 , haskell98
+                  , mtl
+-                 , pango
++                 , pango < 0.13
+                  , parsec
+                  , pcap
+                  , process
+@@ -133,8 +135,8 @@
+   C-sources: c-sources/pcap-monitor.c
+   pkgconfig-depends: glib-2.0
+   Build-Depends: base >= 4 && < 5
+-               , gtk > 0.11
+-               , glib
++               , gtk > 0.11 && < 0.13
++               , glib < 0.13
+ 
+ Executable dump-messages
+   if flag(InteractiveTests) && flag(PostCabalizedGtk2HS)
+@@ -177,14 +179,14 @@
+     main-is: Test/Renderer.hs
+     other-modules: Bustle.Renderer
+     Build-Depends: base
+-                 , cairo
++                 , cairo < 0.13
+                  , containers
+                  , dbus-core
+                  , directory
+                  , filepath
+-                 , gtk
++                 , gtk < 0.13
+                  , mtl
+-                 , pango
++                 , pango < 0.13
+                  , test-framework
+                  , test-framework-hunit
+                  , HUnit
diff --git a/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch b/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch
new file mode 100644
index 000000000000..74ab26ff8fcd
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch
@@ -0,0 +1,61 @@
+--- bustle-0.4.2-orig/bustle.cabal	2012-11-15 02:19:34.000000000 +1100
++++ bustle-0.4.2/bustle.cabal	2013-04-03 15:07:35.381569187 +1100
+@@ -82,15 +82,15 @@
+ 
+   Build-Depends: base >= 4 && < 5
+                , bytestring
+-               , cairo
++               , cairo < 0.13
+                , containers
+                , dbus >= 0.10
+                , directory
+                , filepath
+-               , glib
+-               , gtk >= 0.12.3
++               , glib < 0.13
++               , gtk >= 0.12.3 && < 0.13
+                , mtl
+-               , pango
++               , pango < 0.13
+                , parsec
+                , pcap
+                , process
+@@ -111,15 +111,15 @@
+   pkgconfig-depends: glib-2.0
+   Build-Depends: base >= 4 && < 5
+                , bytestring
+-               , cairo
++               , cairo < 0.13
+                , containers
+                , dbus
+                , directory
+                , filepath
+-               , gtk > 0.12
+-               , glib
++               , gtk > 0.12 && < 0.13
++               , glib < 0.13
+                , mtl
+-               , pango
++               , pango < 0.13
+                , parsec
+                , pcap
+                , text
+@@ -163,15 +163,15 @@
+     main-is: Test/Renderer.hs
+     other-modules: Bustle.Renderer
+     Build-Depends: base
+-                 , cairo
++                 , cairo < 0.13
+                  , containers
+                  , dbus >= 0.10
+                  , directory
+                  , filepath
+-                 , gtk
++                 , gtk < 0.13
+                  , mtl
+                  , text
+-                 , pango
++                 , pango < 0.13
+                  , test-framework
+                  , test-framework-hunit
+                  , HUnit
diff --git a/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch b/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch
new file mode 100644
index 000000000000..f2691521c4bd
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch
@@ -0,0 +1,172 @@
+diff --git a/Bustle/Diagram.hs b/Bustle/Diagram.hs
+index d558beb..ef96d60 100644
+--- a/Bustle/Diagram.hs
++++ b/Bustle/Diagram.hs
+@@ -450,7 +450,7 @@ mkLayout :: (MonadIO m)
+ mkLayout s e a = liftIO $ do
+     ctx <- cairoCreateContext Nothing
+     layout <- layoutEmpty ctx
+-    layoutSetMarkup layout (Markup.unMarkup s)
++    layoutSetMarkup layout (Markup.unMarkup s) :: IO String
+     layoutSetFontDescription layout (Just font)
+     layoutSetEllipsize layout e
+     layoutSetAlignment layout a
+diff --git a/Bustle/UI.hs b/Bustle/UI.hs
+index a78797e..9843b29 100644
+--- a/Bustle/UI.hs
++++ b/Bustle/UI.hs
+@@ -30,6 +30,7 @@ import Data.IORef
+ import qualified Data.Set as Set
+ import Data.List (intercalate)
+ import Data.Time
++import qualified Data.Text as T
+ import Data.Monoid (mempty)
+ import Text.Printf
+ 
+@@ -281,6 +282,7 @@ promptToSave wi = io $ do
+     case mdetails of
+         Just (RecordedLog tempFilePath) -> do
+             let tempFileName = takeFileName tempFilePath
++                title :: String
+                 title = printf (__ "Save log '%s' before closing?") tempFileName
+             prompt <- messageDialogNew (Just (wiWindow wi))
+                                        [DialogModal]
+@@ -459,7 +461,7 @@ wiSetLogDetails :: WindowInfo
+                 -> IO ()
+ wiSetLogDetails wi logDetails = do
+     writeIORef (wiLogDetails wi) (Just logDetails)
+-    windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails))
++    windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails) :: String)
+ 
+ setPage :: MonadIO io
+         => WindowInfo
+@@ -525,7 +527,7 @@ loadPixbuf :: FilePath -> IO (Maybe Pixbuf)
+ loadPixbuf filename = do
+   iconName <- getDataFileName $ "data/" ++ filename
+   C.catch (fmap Just (pixbufNewFromFile iconName))
+-          (\(GError _ _ msg) -> warn msg >> return Nothing)
++          (\(GError _ _ msg) -> warn (T.unpack msg) >> return Nothing)
+ 
+ openDialogue :: Window -> B ()
+ openDialogue window = embedIO $ \r -> do
+diff --git a/Bustle/UI/Canvas.hs b/Bustle/UI/Canvas.hs
+index 46c1582..5a28761 100644
+--- a/Bustle/UI/Canvas.hs
++++ b/Bustle/UI/Canvas.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE OverloadedStrings #-}
+ {-
+ Bustle.UI.Canvas: displays diagrams
+ Copyright © 2008–2012 Collabora Ltd.
+@@ -58,7 +59,7 @@ canvasNew :: Eq a
+           -> (Maybe a -> IO ())
+           -> IO (Canvas a)
+ canvasNew builder showBounds selectionChangedCb = do
+-    layout <- builderGetObject builder castToLayout "diagramLayout"
++    layout <- builderGetObject builder castToLayout ("diagramLayout" :: String)
+     idRef <- newIORef Nothing
+     shapesRef <- newIORef []
+     widthRef <- newIORef 0
+diff --git a/Bustle/UI/DetailsView.hs b/Bustle/UI/DetailsView.hs
+index 35e80d6..d1b9d96 100644
+--- a/Bustle/UI/DetailsView.hs
++++ b/Bustle/UI/DetailsView.hs
+@@ -55,7 +55,7 @@ addValue :: Table
+          -> Int
+          -> IO Label
+ addValue table row = do
+-    label <- labelNew Nothing
++    label <- labelNew (Nothing :: Maybe String)
+     miscSetAlignment label 0 0
+     labelSetEllipsize label EllipsizeStart
+     labelSetSelectable label True
+@@ -77,7 +77,7 @@ detailsViewNew = do
+                 , tableColumnSpacing := 6
+                 ]
+ 
+-    title <- labelNew Nothing
++    title <- labelNew (Nothing :: Maybe String)
+     miscSetAlignment title 0 0
+     tableAttach table title 0 2 0 1 [Fill] [Fill] 0 0
+ 
+diff --git a/Bustle/UI/FilterDialog.hs b/Bustle/UI/FilterDialog.hs
+index 9560507..152931e 100644
+--- a/Bustle/UI/FilterDialog.hs
++++ b/Bustle/UI/FilterDialog.hs
+@@ -99,7 +99,7 @@ runFilterDialog parent names currentlyHidden = do
+     nameStore <- makeStore names currentlyHidden
+     sw <- makeView nameStore
+ 
+-    instructions <- labelNew Nothing
++    instructions <- labelNew (Nothing :: Maybe String)
+     widgetSetSizeRequest instructions 600 (-1)
+     labelSetMarkup instructions
+         (__ "Unticking a service hides its column in the diagram, \
+diff --git a/Bustle/UI/Recorder.hs b/Bustle/UI/Recorder.hs
+index 1e98a68..085eea2 100644
+--- a/Bustle/UI/Recorder.hs
++++ b/Bustle/UI/Recorder.hs
+@@ -27,6 +27,7 @@ import Control.Monad (when, liftM)
+ import Control.Concurrent.MVar
+ import qualified Data.Map as Map
+ import Data.Monoid
++import qualified Data.Text as T
+ import Control.Monad.State (runStateT)
+ import Text.Printf
+ 
+@@ -77,8 +78,7 @@ processBatch pendingRef n label incoming = do
+                 -- message from the user's perspective.
+                 i <- takeMVar n
+                 let j = i + (length pending)
+-                labelSetMarkup label $
+-                    printf (__ "Logged <b>%u</b> messages…") j
++                labelSetMarkup label $ (printf (__ "Logged <b>%u</b> messages…") j :: String)
+                 putMVar n j
+ 
+                 incoming rr'
+@@ -97,8 +97,8 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do
+     maybe (return ()) (windowSetTransientFor dialog) mwindow
+     dialog `set` [ windowModal := True ]
+ 
+-    label <- labelNew Nothing
+-    labelSetMarkup label $ printf (__ "Logged <b>%u</b> messages…") (0 :: Int)
++    label <- labelNew (Nothing :: Maybe String)
++    labelSetMarkup label $ (printf (__ "Logged <b>%u</b> messages…") (0 :: Int) :: String)
+     loaderStateRef <- newMVar Map.empty
+     pendingRef <- newMVar []
+     let updateLabel µs body = do
+@@ -142,7 +142,7 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do
+     widgetShowAll dialog
+   where
+     newFailed (GError _ _ message) = do
+-        displayError mwindow message Nothing
++        displayError mwindow (T.unpack message) Nothing
+ 
+ recorderChooseFile :: FilePath
+                    -> Maybe Window
+diff --git a/bustle.cabal b/bustle.cabal
+index 4ac107c..2d1f907 100644
+--- a/bustle.cabal
++++ b/bustle.cabal
+@@ -106,10 +106,10 @@ Executable bustle
+                , directory
+                , filepath
+                , glib
+-               , gtk >= 0.12.4
++               , gtk >= 0.13
+                , hgettext >= 0.1.5
+                , mtl
+-               , pango
++               , pango >= 0.13
+                , parsec
+                , pcap
+                , process
+@@ -136,7 +136,7 @@ Executable test-monitor
+                , dbus
+                , directory
+                , filepath
+-               , gtk > 0.12
++               , gtk >= 0.13
+                , glib
+                , hgettext
+                , mtl
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
new file mode 100644
index 000000000000..d2e02d93825d
--- /dev/null
+++ b/dev-util/bustle/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		Draw pretty sequence diagrams of D-Bus traffic
+	</longdescription>
+	<use>
+		<flag name="interactivetests">Build interactive test programs</flag>
+		<flag name="threaded">Build with support for multithreaded execution.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
new file mode 100644
index 000000000000..f345810992d5
--- /dev/null
+++ b/dev-util/byacc/Manifest
@@ -0,0 +1,5 @@
+DIST byacc-20130304.tgz 242146 SHA256 dd8397174e088baf57cf4d344023a34b0758b7bbb8a1dfcdafdc234b8eb57924 SHA512 26aec574cb88b33f15f0730d913564b3c87cc314515fa5e09b07a1fe32c92fb7c4ff81b33403e16fb94d5700141981885cc325dd3123111bbb6bf34c7d802571 WHIRLPOOL c3e7dd48da9ba63bc75b0aee988d6dbd3e55b276b934be72ff55450f8b276482e449b8dd61805d69ef998dd4e7d57a38a927d2b4ba71514050003fd505fe4ab4
+DIST byacc-20140101.tgz 244706 SHA256 78aea5a34ccb6c9f1ff673a94cd3e66b0f669b7a042c2fcfdada85f0f399421c SHA512 83a2d20d3ffebd8019d9e35216d37cde6beee054aa9d0e4d5d2498069b920214cc0c866beabdf5b4ab2dd4399c7dbb3a2fc23209b80df02b1fe8f5f16def0a9c WHIRLPOOL 6c6dbe6a7b8d495792d9eed0959ec734b56cd9cfcf793115cc9bc56e5e7e7ab84284a9ca9928ffd42bc9fee02612743301965e438934484bfc779ec33a6d36fc
+DIST byacc-20140527.tgz 673109 SHA256 488ec10e6b238ea83d13a79e5fafe66620b24027852a56d456d63dd5eda92125 SHA512 20f4303190c531f08c51eef015714ee8a693d002d3c7cb74fd3323cf2c6af483100da549326a2b8080c5cef8e32a16a544baf688076c3aecaaa4f77585fe67c0 WHIRLPOOL da499a1b4f19d4a467b512ad9c12dba68331af8a7c60ca67b5fad6a90a35ff5e031a58bc4c367b5c987a016b5de18df5f0aa671f4d19fb46679e6a751cdaff6e
+DIST byacc-20141006.tgz 709685 SHA256 391b0ac550e94920a86960c6973ec539784dc84849e7c2bb1645ae6d8178b14d SHA512 f67b1a606d4234d9187aac902ccd41c06d45307445e983fe4d06c060ddf05bcbb9163fa9cbbdb86e9c70415886944cab51bd04a6e73e9848450fbd3b2d291300 WHIRLPOOL 38b20384d2f691fbc3fb7385ac613ebb530d27fdef766bbbd7a7dbca667246c015ec11cc14ef38dc543971b4ab179cd9e916176228eec96904b3e37c2e86ee36
+DIST byacc-20141128.tgz 710145 SHA256 f517fc21f08c1a1f010177357df58fc64eb1131011e5dcd48c19fe44c47198d0 SHA512 a41debde13d489e47c635bd61ce691e7b0a1470a91df3d16e43bd7c0985064708c4d69b8fabe2134ac4d06b17e484ea9c0b7efc7a624e7d8b7ed850e89afd71c WHIRLPOOL 747b86f7292012c21204c6c7684dc5467465fd1073a0aa266d5a8cb31e131a129305dd4db519876fba97961614e29c7546efa27d7b47e053355b0fd381315c06
diff --git a/dev-util/byacc/byacc-20130304.ebuild b/dev-util/byacc/byacc-20130304.ebuild
new file mode 100644
index 000000000000..ccde2871ebb9
--- /dev/null
+++ b/dev-util/byacc/byacc-20130304.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="http://invisible-island.net/byacc/byacc.html"
+SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/byacc/byacc-20140101.ebuild b/dev-util/byacc/byacc-20140101.ebuild
new file mode 100644
index 000000000000..59ce92bd9af6
--- /dev/null
+++ b/dev-util/byacc/byacc-20140101.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="http://invisible-island.net/byacc/byacc.html"
+SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/byacc/byacc-20140527.ebuild b/dev-util/byacc/byacc-20140527.ebuild
new file mode 100644
index 000000000000..c7efeea21ed0
--- /dev/null
+++ b/dev-util/byacc/byacc-20140527.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="http://invisible-island.net/byacc/byacc.html"
+SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/byacc/byacc-20141006.ebuild b/dev-util/byacc/byacc-20141006.ebuild
new file mode 100644
index 000000000000..c7efeea21ed0
--- /dev/null
+++ b/dev-util/byacc/byacc-20141006.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="http://invisible-island.net/byacc/byacc.html"
+SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/byacc/byacc-20141128.ebuild b/dev-util/byacc/byacc-20141128.ebuild
new file mode 100644
index 000000000000..c7efeea21ed0
--- /dev/null
+++ b/dev-util/byacc/byacc-20141128.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="http://invisible-island.net/byacc/byacc.html"
+SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/byacc/metadata.xml b/dev-util/byacc/metadata.xml
new file mode 100644
index 000000000000..157326a7e891
--- /dev/null
+++ b/dev-util/byacc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
new file mode 100644
index 000000000000..d7654b41fdda
--- /dev/null
+++ b/dev-util/catalyst/Manifest
@@ -0,0 +1,3 @@
+DIST catalyst-2.0.16.tar.bz2 878929 SHA256 4578cbbc36a5d913b51967faad6feb9b8bb10a04794fe44e73b71790fa389142 SHA512 460ee4c996a7197f2d3e2504ef5ff205c74c0e7ca763a67dc57932a8df6199334fef3b234d90da1717d3f59b36081a29c768a864efa82129cd4f6e2de34ac3a8 WHIRLPOOL e43861bcb7286f85e8d0857d32f4e0ba9f39eea5bae2eac05e0b9e782ee2edad2a8171e1a0ea451c7ee67b21f2210f8ff3f2a9e37c16d16552c6c46e74637233
+DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
+DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
diff --git a/dev-util/catalyst/catalyst-2.0.16.ebuild b/dev-util/catalyst/catalyst-2.0.16.ebuild
new file mode 100644
index 000000000000..130b28579b51
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.16.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-2"
+	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
+	EGIT_MASTER="master"
+	SRC_URI=""
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache kernel_linux"
+
+DEPEND="
+	app-text/asciidoc
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	virtual/cdrtools
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	ia64? ( sys-fs/dosfstools )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+	${PYTHON_DEPS}
+"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	if use ccache ; then
+		einfo "Enabling ccache support for catalyst."
+	else
+		ewarn "By default, ccache support for catalyst is disabled."
+		ewarn "If this is not what you intended,"
+		ewarn "then you should add ccache to your USE."
+	fi
+
+	echo
+	einfo "The template spec files are now installed by default.  You can find"
+	einfo "them under /usr/share/doc/${PF}/examples"
+	einfo "and they are considered to be the authorative source of information"
+	einfo "on catalyst."
+	echo
+
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${PN}
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe catalyst || die "copying catalyst"
+
+	if [[ ${PV} == 3.9999* ]]; then
+		doins -r modules files || die "copying files"
+	else
+		doins -r arch modules livecd || die "copying files"
+	fi
+
+	for x in targets/*; do
+		exeinto /usr/$(get_libdir)/${PN}/$x
+		doexe $x/* || die "copying ${x}"
+	done
+
+	# Here is where we actually enable ccache
+	use ccache && \
+		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
+			files/catalyst.conf
+
+	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
+		files/catalyst.conf
+
+	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
+	insinto /etc/catalyst
+	doins files/catalyst.conf files/catalystrc || die "copying configuration"
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/* || die
+	dodoc README AUTHORS
+	doman files/catalyst.1 files/catalyst-spec.5
+
+	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	einfo "You can find more information about catalyst by checking out the"
+	einfo "catalyst project page at:"
+	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
+}
diff --git a/dev-util/catalyst/catalyst-2.0.17.ebuild b/dev-util/catalyst/catalyst-2.0.17.ebuild
new file mode 100644
index 000000000000..130b28579b51
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.17.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-2"
+	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
+	EGIT_MASTER="master"
+	SRC_URI=""
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache kernel_linux"
+
+DEPEND="
+	app-text/asciidoc
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	virtual/cdrtools
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	ia64? ( sys-fs/dosfstools )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+	${PYTHON_DEPS}
+"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	if use ccache ; then
+		einfo "Enabling ccache support for catalyst."
+	else
+		ewarn "By default, ccache support for catalyst is disabled."
+		ewarn "If this is not what you intended,"
+		ewarn "then you should add ccache to your USE."
+	fi
+
+	echo
+	einfo "The template spec files are now installed by default.  You can find"
+	einfo "them under /usr/share/doc/${PF}/examples"
+	einfo "and they are considered to be the authorative source of information"
+	einfo "on catalyst."
+	echo
+
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${PN}
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe catalyst || die "copying catalyst"
+
+	if [[ ${PV} == 3.9999* ]]; then
+		doins -r modules files || die "copying files"
+	else
+		doins -r arch modules livecd || die "copying files"
+	fi
+
+	for x in targets/*; do
+		exeinto /usr/$(get_libdir)/${PN}/$x
+		doexe $x/* || die "copying ${x}"
+	done
+
+	# Here is where we actually enable ccache
+	use ccache && \
+		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
+			files/catalyst.conf
+
+	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
+		files/catalyst.conf
+
+	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
+	insinto /etc/catalyst
+	doins files/catalyst.conf files/catalystrc || die "copying configuration"
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/* || die
+	dodoc README AUTHORS
+	doman files/catalyst.1 files/catalyst-spec.5
+
+	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	einfo "You can find more information about catalyst by checking out the"
+	einfo "catalyst project page at:"
+	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
+}
diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
new file mode 100644
index 000000000000..b6ea322a85a4
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-2"
+	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
+	EGIT_MASTER="master"
+	SRC_URI=""
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache kernel_linux"
+
+DEPEND="
+	app-text/asciidoc
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	virtual/cdrtools
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	ia64? ( sys-fs/dosfstools )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+	${PYTHON_DEPS}
+"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+PATCHES=( "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" )
+
+pkg_setup() {
+	if use ccache ; then
+		einfo "Enabling ccache support for catalyst."
+	else
+		ewarn "By default, ccache support for catalyst is disabled."
+		ewarn "If this is not what you intended,"
+		ewarn "then you should add ccache to your USE."
+	fi
+
+	echo
+	einfo "The template spec files are now installed by default.  You can find"
+	einfo "them under /usr/share/doc/${PF}/examples"
+	einfo "and they are considered to be the authorative source of information"
+	einfo "on catalyst."
+	echo
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${PN}
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe catalyst || die "copying catalyst"
+
+	if [[ ${PV} == 3.9999* ]]; then
+		doins -r modules files || die "copying files"
+	else
+		doins -r arch modules livecd || die "copying files"
+	fi
+
+	for x in targets/*; do
+		exeinto /usr/$(get_libdir)/${PN}/$x
+		doexe $x/* || die "copying ${x}"
+	done
+
+	# Here is where we actually enable ccache
+	use ccache && \
+		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
+			files/catalyst.conf
+
+	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
+		files/catalyst.conf
+
+	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
+	insinto /etc/catalyst
+	doins files/catalyst.conf files/catalystrc || die "copying configuration"
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/* || die
+	dodoc README AUTHORS
+	doman files/catalyst.1 files/catalyst-spec.5
+
+	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	einfo "You can find more information about catalyst by checking out the"
+	einfo "catalyst project page at:"
+	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
+}
diff --git a/dev-util/catalyst/catalyst-2.0.18.ebuild b/dev-util/catalyst/catalyst-2.0.18.ebuild
new file mode 100644
index 000000000000..130b28579b51
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.18.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-2"
+	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
+	EGIT_MASTER="master"
+	SRC_URI=""
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache kernel_linux"
+
+DEPEND="
+	app-text/asciidoc
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	virtual/cdrtools
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	ia64? ( sys-fs/dosfstools )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+	${PYTHON_DEPS}
+"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	if use ccache ; then
+		einfo "Enabling ccache support for catalyst."
+	else
+		ewarn "By default, ccache support for catalyst is disabled."
+		ewarn "If this is not what you intended,"
+		ewarn "then you should add ccache to your USE."
+	fi
+
+	echo
+	einfo "The template spec files are now installed by default.  You can find"
+	einfo "them under /usr/share/doc/${PF}/examples"
+	einfo "and they are considered to be the authorative source of information"
+	einfo "on catalyst."
+	echo
+
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${PN}
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe catalyst || die "copying catalyst"
+
+	if [[ ${PV} == 3.9999* ]]; then
+		doins -r modules files || die "copying files"
+	else
+		doins -r arch modules livecd || die "copying files"
+	fi
+
+	for x in targets/*; do
+		exeinto /usr/$(get_libdir)/${PN}/$x
+		doexe $x/* || die "copying ${x}"
+	done
+
+	# Here is where we actually enable ccache
+	use ccache && \
+		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
+			files/catalyst.conf
+
+	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
+		files/catalyst.conf
+
+	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
+	insinto /etc/catalyst
+	doins files/catalyst.conf files/catalystrc || die "copying configuration"
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/* || die
+	dodoc README AUTHORS
+	doman files/catalyst.1 files/catalyst-spec.5
+
+	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	einfo "You can find more information about catalyst by checking out the"
+	einfo "catalyst project page at:"
+	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
+}
diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
new file mode 100644
index 000000000000..2357cfda4324
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.9999.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-2"
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
+	EGIT_MASTER="master"
+	EGIT_BRANCH="2.X"
+	SRC_URI=""
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache kernel_linux"
+
+DEPEND="
+	app-text/asciidoc
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	virtual/cdrtools
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	ia64? ( sys-fs/dosfstools )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+	${PYTHON_DEPS}
+"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	if use ccache ; then
+		einfo "Enabling ccache support for catalyst."
+	else
+		ewarn "By default, ccache support for catalyst is disabled."
+		ewarn "If this is not what you intended,"
+		ewarn "then you should add ccache to your USE."
+	fi
+
+	echo
+	einfo "The template spec files are now installed by default.  You can find"
+	einfo "them under /usr/share/doc/${PF}/examples"
+	einfo "and they are considered to be the authorative source of information"
+	einfo "on catalyst."
+	echo
+
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${PN}
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe catalyst || die "copying catalyst"
+
+	if [[ ${PV} == 3.9999* ]]; then
+		doins -r modules files || die "copying files"
+	else
+		doins -r arch modules livecd || die "copying files"
+	fi
+
+	for x in targets/*; do
+		exeinto /usr/$(get_libdir)/${PN}/$x
+		doexe $x/* || die "copying ${x}"
+	done
+
+	# Here is where we actually enable ccache
+	use ccache && \
+		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
+			files/catalyst.conf
+
+	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
+		files/catalyst.conf
+
+	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
+	insinto /etc/catalyst
+	doins files/catalyst.conf files/catalystrc || die "copying configuration"
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/* || die
+	dodoc README AUTHORS
+	doman files/catalyst.1 files/catalyst-spec.5
+
+	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	einfo "You can find more information about catalyst by checking out the"
+	einfo "catalyst project page at:"
+	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
+}
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
new file mode 100644
index 000000000000..738856c72e76
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-2"
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
+	EGIT_MASTER="master"
+	EGIT_BRANCH="3.0"
+	SRC_URI=""
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 multilib ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc kernel_linux"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.5.2
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	virtual/cdrtools
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	ia64? ( sys-fs/dosfstools )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+
+python_prepare_all() {
+	python_export_best
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all(){
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
new file mode 100644
index 000000000000..f1c6179d5c6d
--- /dev/null
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-2"
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
+	EGIT_BRANCH="master"
+	SRC_URI=""
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+		http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 multilib ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc kernel_linux"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.5.2
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	virtual/cdrtools
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	ia64? ( sys-fs/dosfstools )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+
+python_prepare_all() {
+	python_export_best
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all(){
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
new file mode 100644
index 000000000000..f4cbcfbb7d38
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
@@ -0,0 +1,95 @@
+From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Sun, 18 Jan 2015 22:21:16 -0500
+Subject: [PATCH] Do not untar with --acls, fixes bug #536762
+To: gentoo-catalyst@lists.gentoo.org
+
+---
+ modules/catalyst_support.py     |  6 +++---
+ modules/generic_stage_target.py | 18 +++++++++---------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
+index 0e9faac..702887d 100644
+--- a/modules/catalyst_support.py
++++ b/modules/catalyst_support.py
+@@ -108,9 +108,9 @@ contents_map={
+ 	# 'find' is disabled because it requires the source path, which is not
+ 	# always available
+ 	#"find"		:[calc_contents,"find %(path)s"],
+-	"tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"],
+-	"tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"],
+-	"tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"],
++	"tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"],
++	"tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"],
++	"tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"],
+ 	"isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],
+ 	# isoinfo-f should be a last resort only
+ 	"isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],
+diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
+index c7db027..cc24c63 100644
+--- a/modules/generic_stage_target.py
++++ b/modules/generic_stage_target.py
+@@ -660,10 +660,10 @@ class generic_stage_target(generic_target):
+ 					self.settings["chroot_path"]+\
+ 						" (This may take some time) ...\n"
+ 				if "bz2" == self.settings["chroot_path"][-3:]:
+-					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
++					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ 						self.settings["chroot_path"]
+ 				else:
+-					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
++					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ 						self.settings["chroot_path"]
+ 				error_msg="Tarball extraction of "+\
+ 					self.settings["source_path"]+" to "+\
+@@ -675,10 +675,10 @@ class generic_stage_target(generic_target):
+ 				self.settings["chroot_path"]+\
+ 				" (This may take some time) ...\n"
+ 			if "bz2" == self.settings["chroot_path"][-3:]:
+-				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
++				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ 					self.settings["chroot_path"]
+ 			else:
+-				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags  --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
++				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ 					self.settings["chroot_path"]
+ 			error_msg="Tarball extraction of "+self.settings["source_path"]+\
+ 				" to "+self.settings["chroot_path"]+" failed."
+@@ -777,9 +777,9 @@ class generic_stage_target(generic_target):
+ 				"catalyst-hash")
+ 			destdir=self.settings["snapshot_cache_path"]
+ 			if "bz2" == self.settings["chroot_path"][-3:]:
+-				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
++				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ 			else:
+-				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
++				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ 			unpack_errmsg="Error unpacking snapshot"
+ 			cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
+ 				self.settings["snapshot_cache_path"]+\
+@@ -796,10 +796,10 @@ class generic_stage_target(generic_target):
+ 			cleanup_msg=\
+ 				"Cleaning up existing portage tree (This can take a long time)..."
+ 			if "bz2" == self.settings["chroot_path"][-3:]:
+-				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
++				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
+ 					self.settings["chroot_path"]+"/usr"
+ 			else:
+-				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
++				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
+ 					self.settings["chroot_path"]+"/usr"
+ 			unpack_errmsg="Error unpacking snapshot"
+ 
+@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target):
+ 
+ 			print "Creating stage tarball..."
+ 
+-			cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
++			cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
+ 				self.settings["stage_path"]+" .",\
+ 				"Couldn't create stage tarball",env=self.env)
+ 
+-- 
+2.2.2
+
diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
new file mode 100644
index 000000000000..918f25d2e093
--- /dev/null
+++ b/dev-util/catalyst/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>livecd</herd>
+  <maintainer>
+    <email>catalyst@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="ccache">Enables ccache support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
new file mode 100644
index 000000000000..29358509c60c
--- /dev/null
+++ b/dev-util/catfish/Manifest
@@ -0,0 +1 @@
+DIST catfish-1.2.2.tar.bz2 98956 SHA256 0e92844e761207b3d3086c45b26fccf83f0ebced741e1af33d8590779f25eedf SHA512 dad407f1e818b8d537b73e9f832c39ca4f9527b9d636da18493a685b03d2fab56982a11872382fd457b9a1a0ffb33d29ade4aa317561c3b2ee82c96728705e75 WHIRLPOOL 42f379cfffef9c9115ca1ef1b2e25e46da8ceac60778d0fccdb626c1d61567028caf2f497a76fed2b530dd126024b26b9f3248c38bbf185a20576d4a52930484
diff --git a/dev-util/catfish/catfish-1.2.2.ebuild b/dev-util/catfish/catfish-1.2.2.ebuild
new file mode 100644
index 000000000000..5dd31350ac5e
--- /dev/null
+++ b/dev-util/catfish/catfish-1.2.2.ebuild
@@ -0,0 +1,64 @@
+# 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} )
+inherit eutils gnome2-utils python-single-r1
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="http://launchpad.net/catfish-search http://twotoasts.de/index.php/catfish/"
+SRC_URI="http://launchpad.net/${PN}-search/${PV%.*}/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/freedesktop-icon-theme
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/gettext
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	strip-linguas -i po/
+	if ! [[ -z "${LINGUAS}" ]]; then
+		local lang langs=$(find po/ -name '*.po' | sed -e 's|po/||g;s|.po||g')
+		for lang in $langs; do
+			if ! has ${lang} ${LINGUAS}; then
+				rm po/${lang}.po || die
+			fi
+		done
+	fi
+
+	python_fix_shebang .
+	sed -i -e "s:share/doc/\$(APPNAME):share/doc/${PF}:" Makefile.in.in || die
+}
+
+src_configure() {
+	# not autotools based
+	./configure --prefix=/usr --python="${EPYTHON}" || die
+}
+
+src_install() {
+	default
+	python_optimize "${ED}"/usr/share/${PN}
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-util/catfish/metadata.xml b/dev-util/catfish/metadata.xml
new file mode 100644
index 000000000000..c1dcc264f34f
--- /dev/null
+++ b/dev-util/catfish/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="launchpad">catfish-search</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
new file mode 100644
index 000000000000..a3ada3a55654
--- /dev/null
+++ b/dev-util/ccache/Manifest
@@ -0,0 +1,5 @@
+DIST ccache-2.4.tar.gz 86363 SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0 SHA512 6ab05f74eba5c0a7472a3d53cfa6c24e45f421f2c773776f713a46121eda21213deb34fcef214d4f8d2e756cd375637e4639a9bdfeb6b9a44455c5bcca246b19 WHIRLPOOL eb308222713d17f52f88ac97a5c63add454b350d60259d1d2238e3b54f1e80ad8c8700e0e045b40aa5be64b1db54846a86da600436778a64d2270efff7763380
+DIST ccache-3.1.10.tar.xz 240932 SHA256 88439f43d3b426ab435afdf69a808511bada4de3a8a9527426bc4fbf6cb02857 SHA512 6a1c77161ec97b556a8c58592e2d6bba8e3d43cc039de3ebaa2a80fb92ae54bb7bad58eb011f52b750e29aadb0ed208220fb67d30deaf6c64aa4cfab31937fed WHIRLPOOL 5d527d986ba14a6312f82df277d7de47757bb43b7bcaf9eb6cbdbf337af862726f1f85ff7c352d0ad54344d98a8d8dc538e43de05976cdd29710b72917b42106
+DIST ccache-3.1.9.tar.xz 238988 SHA256 4981fdf3ad851de400d94083a0d03f115ce9ce8062c3fd7a291630294b0006c4 SHA512 b73f5816bb87c2d94200473510ea42a304c5a2c5e5f14720c513574ce3eb983423c5849a786a89df70cbb09852d9ec2761ad37a820a767d7350e1a3243148ac0 WHIRLPOOL 61ef671aae68516ecfaee88a50b8f442968a7ab24595fd7dfc652ab27de80834d90510c62cfcc75dd88e1f3832989633f518ebe5984149c16d5ab9848cff05fc
+DIST ccache-3.2.1.tar.xz 297868 SHA256 872af34e1d2cef18694001d29db7f167d644e7602ca32cd6c74b28d81458bd9d SHA512 ef0e56f2d1775fb0f401f48cca2a65eb415f4e2ccf0bcfd769045a9c08c3c2977db4edea12e06629f4cb5406cde23cd3ee0910e2e4d5eff9376227fa23c78a7a WHIRLPOOL f3d07cf142258d588a1c6cb9ba77d31d7b568cd18ae131ed3526595c809352b0fa30ae61b0bfcbfde3ea8d959c545119662c25af0cd03c97517be361315e1ffe
+DIST ccache-3.2.2.tar.xz 300808 SHA256 4f0d99699f24d198494addca0f41a93b0150cdfd01491f15a5d7eb02c7c2a0ca SHA512 fc438f3b00baa41076eee3e5783ea53a208eb348343e587c6f729f7e98462cd20c720fe323fe08f271bc14dae48f7828cef769882f028f3772992989b87b075d WHIRLPOOL 095a125e869910644622b98b7720a01ccc235fbeb8c84ec52017fe52f82fe7b8122584c3e5fa4d39c1344e9c062517a1edb46c3e64fe649e845ed5c1fb455c5a
diff --git a/dev-util/ccache/ccache-2.4-r9.ebuild b/dev-util/ccache/ccache-2.4-r9.ebuild
new file mode 100644
index 000000000000..6aeeaf5ddd70
--- /dev/null
+++ b/dev-util/ccache/ccache-2.4-r9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+WANT_AUTOMAKE=none # not using automake
+
+inherit eutils autotools multilib
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+# Note: this version is designed to be auto-detected and used if
+# you happen to have Portage 2.0.X+ installed.
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/ccache-2.4-profile.patch
+	epatch "${FILESDIR}"/ccache-2.4-respectflags.patch
+	epatch "${FILESDIR}"/ccache-2.4-utimes.patch
+	epatch "${FILESDIR}"/ccache-2.4-xrealloc.patch #338137
+	eautoconf
+}
+
+do_links() {
+	insinto /usr/$(get_libdir)/ccache/bin
+	for a in ${CHOST}-{gcc,g++,c++} gcc c++ g++; do
+	    dosym /usr/bin/ccache /usr/$(get_libdir)/ccache/bin/${a}
+	done
+}
+
+src_install() {
+	dobin ccache || die
+	doman ccache.1
+	dodoc README
+	dohtml web/*.html
+
+	diropts -m0755
+	dodir /usr/$(get_libdir)/ccache/bin
+	keepdir /usr/$(get_libdir)/ccache/bin
+
+	dobin "${FILESDIR}"/ccache-config || die
+
+	diropts -m0700
+	dodir /root/.ccache
+	keepdir /root/.ccache
+}
+
+pkg_preinst() {
+	# Do NOT duplicate this in your ebuilds or phear of the wrath!!!
+	if [[ ${ROOT} = "/" ]] ; then
+	    einfo "Scanning for compiler front-ends..."
+	    do_links
+	else
+	    ewarn "Install is incomplete; you must run the following commands:"
+	    ewarn " # ccache-config --install-links"
+	    ewarn " # ccache-config --install-links ${CHOST}"
+	    ewarn "after booting or chrooting to ${ROOT} to complete installation."
+	fi
+}
+
+pkg_postinst() {
+	# nuke broken symlinks from previous versions that shouldn't exist
+	for i in cc ${CHOST}-cc ; do
+	    [[ -L "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}" ]] && \
+			rm -rf "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}"
+	done
+	[[ -d "${ROOT}/usr/$(get_libdir)/ccache.backup" ]] && \
+		rm -fr "${ROOT}/usr/$(get_libdir)/ccache.backup"
+
+	elog "To use ccache with **non-Portage** C compiling, add"
+	elog "/usr/$(get_libdir)/ccache/bin to the beginning of your path, before /usr/bin."
+	elog "Portage 2.0.46-r11+ will automatically take advantage of ccache with"
+	elog "no additional steps.  If this is your first install of ccache, type"
+	elog "something like this to set a maximum cache size of 2GB:"
+	elog "# ccache -M 2G"
+}
diff --git a/dev-util/ccache/ccache-3.1.10-r1.ebuild b/dev-util/ccache/ccache-3.1.10-r1.ebuild
new file mode 100644
index 000000000000..8deb6f737c5d
--- /dev/null
+++ b/dev-util/ccache/ccache-3.1.10-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+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 ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	# make sure we always use system zlib
+	rm -rf zlib
+	epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
+	epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
+	epatch "${FILESDIR}"/${PN}-3.1.10-real-temp-files.patch
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-2 > ccache-config || die
+}
+
+src_install() {
+	default
+	dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt
+
+	dobin ccache-config
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		"${EROOT}"/usr/bin/ccache-config --remove-links
+		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
+	fi
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/ccache-config --install-links
+	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc
+	rm -rf "${EROOT}"/usr/lib/ccache.backup
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/ccache/ccache-3.1.9-r4.ebuild b/dev-util/ccache/ccache-3.1.9-r4.ebuild
new file mode 100644
index 000000000000..4b7b2d56d936
--- /dev/null
+++ b/dev-util/ccache/ccache-3.1.9-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit multilib eutils readme.gentoo
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+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 ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	sys-apps/gentoo-functions"
+
+src_prepare() {
+	# make sure we always use system zlib
+	rm -rf zlib
+	epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
+	epatch "${FILESDIR}"/${P}-test-gcc-4.8.patch #461966
+	sed \
+		-e "/^LIBDIR=/s:lib:$(get_libdir):" \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_install() {
+	default
+	dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt
+
+	dobin ccache-config
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/$(get_libdir)/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		"${EROOT}"/usr/bin/ccache-config --remove-links
+		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
+	fi
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/ccache-config --install-links
+	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -f "${EROOT}/usr/$(get_libdir)/ccache/bin/${CHOST}-cc"
+	[[ -d "${EROOT}/usr/$(get_libdir)/ccache.backup" ]] && \
+		rm -rf "${EROOT}/usr/$(get_libdir)/ccache.backup"
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/ccache/ccache-3.2.1-r1.ebuild b/dev-util/ccache/ccache-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..dfd1b11d8c26
--- /dev/null
+++ b/dev-util/ccache/ccache-3.2.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+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 ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	sys-apps/gentoo-functions"
+
+src_prepare() {
+	# make sure we always use system zlib
+	rm -rf zlib || die
+	epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
+	epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_install() {
+	DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
+	default
+
+	dobin ccache-config
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		"${EROOT}"/usr/bin/ccache-config --remove-links
+		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
+	fi
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/ccache-config --install-links
+	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/ccache/ccache-3.2.2.ebuild b/dev-util/ccache/ccache-3.2.2.ebuild
new file mode 100644
index 000000000000..49b51795b713
--- /dev/null
+++ b/dev-util/ccache/ccache-3.2.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+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 ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	sys-apps/gentoo-functions"
+
+src_prepare() {
+	# make sure we always use system zlib
+	rm -rf zlib || die
+	epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
+	epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_install() {
+	DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
+	default
+
+	dobin ccache-config
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		"${EROOT}"/usr/bin/ccache-config --remove-links
+		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
+	fi
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/ccache-config --install-links
+	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/ccache/files/ccache-2.4-profile.patch b/dev-util/ccache/files/ccache-2.4-profile.patch
new file mode 100644
index 000000000000..57743213dd3c
--- /dev/null
+++ b/dev-util/ccache/files/ccache-2.4-profile.patch
@@ -0,0 +1,27 @@
+GCCs options -fprofile-generate and -fprofile-use are used for
+profile guided optimization. It depends on the ability to locate
+the profile data files (.gcda) after running the executable with
+the training data. However, ccache prevents the compiler from
+finding the correct profile data file. Therefore the following
+patch disables the caching when one of the
+ -fprofile-generate
+ -fprofile-use
+ -fprofile-arcs
+flags is found.
+
+Signed-off-by: Clemens Rabe <crabe _at_ gmx _dot_ de>
+
+
+diff -Naur ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
+--- ccache-2.4.orig/ccache.c	2004-09-13 12:38:30.000000000 +0200
++++ ccache-2.4/ccache.c	2008-01-07 20:25:38.000000000 +0100
+@@ -640,6 +640,9 @@
+ 
+ 		/* these are too hard */
+ 		if (strcmp(argv[i], "-fbranch-probabilities")==0 ||
++                    strcmp(argv[i], "-fprofile-generate")==0 ||
++                    strcmp(argv[i], "-fprofile-use")==0 ||
++                    strcmp(argv[i], "-fprofile-arcs")==0 ||
+ 		    strcmp(argv[i], "-M") == 0 ||
+ 		    strcmp(argv[i], "-MM") == 0 ||
+ 		    strcmp(argv[i], "-x") == 0) {
diff --git a/dev-util/ccache/files/ccache-2.4-respectflags.patch b/dev-util/ccache/files/ccache-2.4-respectflags.patch
new file mode 100644
index 000000000000..38d5f6a590d8
--- /dev/null
+++ b/dev-util/ccache/files/ccache-2.4-respectflags.patch
@@ -0,0 +1,13 @@
+Index: ccache-2.4/Makefile.in
+===================================================================
+--- ccache-2.4.orig/Makefile.in
++++ ccache-2.4/Makefile.in
+@@ -20,7 +20,7 @@ all: ccache$(EXEEXT)
+ docs: ccache.1 web/ccache-man.html
+ 
+ ccache$(EXEEXT): $(OBJS) $(HEADERS)
+-	$(CC) $(CFLAGS) -o $@ $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+ 
+ ccache.1: ccache.yo
+ 	-yodl2man -o ccache.1 ccache.yo
diff --git a/dev-util/ccache/files/ccache-2.4-utimes.patch b/dev-util/ccache/files/ccache-2.4-utimes.patch
new file mode 100644
index 000000000000..30aff6b8fb8a
--- /dev/null
+++ b/dev-util/ccache/files/ccache-2.4-utimes.patch
@@ -0,0 +1,105 @@
+utime(...,NULL) in some cases may cause truncation of sub-second portions of
+timestamps. If utimes(...,NULL) is available, use it instead to avoid this
+problem.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
+--- ccache-2.4.orig/ccache.c	2004-09-13 03:38:30.000000000 -0700
++++ ccache-2.4/ccache.c	2006-06-09 16:29:16.695117780 -0700
+@@ -481,7 +481,11 @@
+ 		return;
+ 	}
+ 
++#ifdef HAVE_UTIMES
++	utimes(stderr_file, NULL);
++#else
+ 	utime(stderr_file, NULL);
++#endif
+ 
+ 	if (strcmp(output_file, "/dev/null") == 0) {
+ 		ret = 0;
+@@ -515,7 +519,11 @@
+ 	}
+ 	if (ret == 0) {
+ 		/* update the mtime on the file so that make doesn't get confused */
++#ifdef HAVE_UTIMES
++		utimes(output_file, NULL);
++#else
+ 		utime(output_file, NULL);
++#endif
+ 	}
+ 
+ 	/* get rid of the intermediate preprocessor file */
+diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/ccache.h ccache-2.4/ccache.h
+--- ccache-2.4.orig/ccache.h	2004-09-13 03:38:30.000000000 -0700
++++ ccache-2.4/ccache.h	2006-06-09 16:28:16.601658626 -0700
+@@ -22,6 +22,9 @@
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+ #endif
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
+ 
+ #define STATUS_NOTFOUND 3
+ #define STATUS_FATAL 4
+diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/config.h.in ccache-2.4/config.h.in
+--- ccache-2.4.orig/config.h.in	2003-09-27 21:48:17.000000000 -0700
++++ ccache-2.4/config.h.in	2006-06-09 16:25:43.000000000 -0700
+@@ -19,6 +19,9 @@
+ /* Define to 1 if you have the `gethostname' function. */
+ #undef HAVE_GETHOSTNAME
+ 
++/* Define to 1 if you have the `getpwuid' function. */
++#undef HAVE_GETPWUID
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
+@@ -31,6 +34,9 @@
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+ 
++/* Define to 1 if you have the <pwd.h> header file. */
++#undef HAVE_PWD_H
++
+ /* Define to 1 if you have the `realpath' function. */
+ #undef HAVE_REALPATH
+ 
+@@ -60,6 +66,9 @@
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+ 
++/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H
++
+ /* Define to 1 if you have the <sys/types.h> header file. */
+ #undef HAVE_SYS_TYPES_H
+ 
+@@ -69,6 +78,9 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+ 
++/* Define to 1 if you have the `utimes' function. */
++#undef HAVE_UTIMES
++
+ /* Define to 1 if you have the `vasprintf' function. */
+ #undef HAVE_VASPRINTF
+ 
+diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/configure.in ccache-2.4/configure.in
+--- ccache-2.4.orig/configure.in	2004-09-13 03:38:30.000000000 -0700
++++ ccache-2.4/configure.in	2006-06-09 16:25:15.541288184 -0700
+@@ -27,10 +27,11 @@
+ AC_HEADER_TIME
+ AC_HEADER_SYS_WAIT
+ 
+-AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h)
++AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h sys/time.h)
+ 
+ AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp)
+ AC_CHECK_FUNCS(gethostname getpwuid)
++AC_CHECK_FUNCS(utimes)
+ 
+ AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [
+     AC_TRY_COMPILE(
diff --git a/dev-util/ccache/files/ccache-2.4-xrealloc.patch b/dev-util/ccache/files/ccache-2.4-xrealloc.patch
new file mode 100644
index 000000000000..8e2d44dc6137
--- /dev/null
+++ b/dev-util/ccache/files/ccache-2.4-xrealloc.patch
@@ -0,0 +1,35 @@
+https://bugzilla.samba.org/show_bug.cgi?id=7090
+https://bugs.gentoo.org/338137
+
+From 52a9cd8eb8a69f9dc6944c047faf112b7137a07b Mon Sep 17 00:00:00 2001
+From: Andrew Tridgell <tridge@samba.org>
+Date: Mon, 17 Jul 2006 05:41:12 +0200
+Subject: [PATCH] fixed a bug in x_realloc()
+
+---
+ util.c |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 073fa81..29d0e5b 100644
+--- a/util.c
++++ b/util.c
+@@ -187,14 +187,10 @@ void *x_realloc(void *ptr, size_t size)
+ {
+ 	void *p2;
+ 	if (!ptr) return x_malloc(size);
+-	p2 = malloc(size);
++	p2 = realloc(ptr, size);
+ 	if (!p2) {
+ 		fatal("out of memory in x_realloc");
+ 	}
+-	if (ptr) {
+-		memcpy(p2, ptr, size);
+-		free(ptr);
+-	}
+ 	return p2;
+ }
+ 
+-- 
+1.7.3.1
+
diff --git a/dev-util/ccache/files/ccache-3.1.10-real-temp-files.patch b/dev-util/ccache/files/ccache-3.1.10-real-temp-files.patch
new file mode 100644
index 000000000000..45e654105170
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.1.10-real-temp-files.patch
@@ -0,0 +1,185 @@
+https://lists.samba.org/archive/ccache/2014q4/001246.html
+
+From 5d0f507a4162ac89e05ca633dbc8056454b798f5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 15 Sep 2014 18:15:02 -0400
+Subject: [PATCH] do not rely on pids being unique
+
+Linux supports creating pid namespaces cheaply and running processes
+inside of them.  When you try to share a single cache among multiple
+such runs, the fact that the code relies on pid numbers as globally
+unique values quickly fails.  Instead, switch to standard mkstemp to
+generate temp files for us.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ ccache.c   | 12 ++++++------
+ ccache.h   |  2 +-
+ manifest.c |  2 +-
+ stats.c    | 10 +++++++++-
+ util.c     | 13 ++++++++-----
+ 5 files changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/ccache.c b/ccache.c
+index 02dbdfa..1dc0a06 100644
+--- a/ccache.c
++++ b/ccache.c
+@@ -526,8 +526,11 @@ to_cache(struct args *args)
+ 	unsigned added_files = 0;
+ 
+ 	tmp_stdout = format("%s.tmp.stdout.%s", cached_obj, tmp_string());
++	create_empty_file(tmp_stdout);
+ 	tmp_stderr = format("%s.tmp.stderr.%s", cached_obj, tmp_string());
++	create_empty_file(tmp_stderr);
+ 	tmp_obj = format("%s.tmp.%s", cached_obj, tmp_string());
++	create_empty_file(tmp_obj);
+ 
+ 	args_add(args, "-o");
+ 	args_add(args, tmp_obj);
+@@ -579,7 +582,7 @@ to_cache(struct args *args)
+ 		int fd_result;
+ 		char *tmp_stderr2;
+ 
+-		tmp_stderr2 = format("%s.tmp.stderr2.%s", cached_obj, tmp_string());
++		tmp_stderr2 = format("%s.2", tmp_stderr);
+ 		if (x_rename(tmp_stderr, tmp_stderr2)) {
+ 			cc_log("Failed to rename %s to %s: %s", tmp_stderr, tmp_stderr2,
+ 			       strerror(errno));
+@@ -808,6 +808,7 @@ get_object_name_from_cpp(struct args *args, struct mdfour *hash)
+ 	}
+ 
+ 	path_stderr = format("%s/tmp.cpp_stderr.%s", temp_dir, tmp_string());
++	create_empty_file(path_stderr);
+ 	add_pending_tmp_file(path_stderr);
+ 
+ 	time_of_compilation = time(NULL);
+@@ -815,6 +816,7 @@ get_object_name_from_cpp(struct args *args, struct mdfour *hash)
+ 	if (!direct_i_file) {
+ 		path_stdout = format("%s/%s.tmp.%s.%s",
+ 		                     temp_dir, input_base, tmp_string(), i_extension);
++		create_empty_file(path_stdout);
+ 		add_pending_tmp_file(path_stdout);
+ 
+ 		/* run cpp on the input file to obtain the .i */
+@@ -838,11 +843,6 @@ get_object_name_from_cpp(struct args *args, struct mdfour *hash)
+ 		   can skip the cpp stage and directly form the
+ 		   correct i_tmpfile */
+ 		path_stdout = input_file;
+-		if (create_empty_file(path_stderr) != 0) {
+-			cc_log("Failed to create %s: %s", path_stderr, strerror(errno));
+-			stats_update(STATS_ERROR);
+-			failed();
+-		}
+ 		status = 0;
+ 	}
+ 
+diff --git a/ccache.h b/ccache.h
+index 2bc7c87..43ef98d 100644
+--- a/ccache.h
++++ b/ccache.h
+@@ -130,7 +130,7 @@ size_t file_size(struct stat *st);
+ int safe_open(const char *fname);
+ char *x_realpath(const char *path);
+ char *gnu_getcwd(void);
+-int create_empty_file(const char *fname);
++int create_empty_file(char *fname);
+ const char *get_home_directory(void);
+ char *get_cwd();
+ bool same_executable_name(const char *s1, const char *s2);
+diff --git a/manifest.c b/manifest.c
+index 7f02ede..47566d5 100644
+--- a/manifest.c
++++ b/manifest.c
+@@ -633,7 +633,7 @@ manifest_put(const char *manifest_path, struct file_hash *object_hash,
+ 	}
+ 
+ 	tmp_file = format("%s.tmp.%s", manifest_path, tmp_string());
+-	fd2 = safe_open(tmp_file);
++	fd2 = mkstemp(tmp_file);
+ 	if (fd2 == -1) {
+ 		cc_log("Failed to open %s", tmp_file);
+ 		goto out;
+diff --git a/stats.c b/stats.c
+index 2111b65..4ed39c2 100644
+--- a/stats.c
++++ b/stats.c
+@@ -126,11 +126,18 @@ stats_write(const char *path, struct counters *counters)
+ 	size_t i;
+ 	char *tmp_file;
+ 	FILE *f;
++	int fd;
+ 
+ 	tmp_file = format("%s.tmp.%s", path, tmp_string());
+-	f = fopen(tmp_file, "wb");
++	fd = mkstemp(tmp_file);
++	if (fd == -1) {
++		cc_log("Failed to open %s", tmp_file);
++		goto end;
++	}
++	f = fdopen(fd, "wb");
+ 	if (!f) {
+ 		cc_log("Failed to open %s", tmp_file);
++		close(fd);
+ 		goto end;
+ 	}
+ 	for (i = 0; i < counters->size; i++) {
+@@ -138,6 +145,7 @@ stats_write(const char *path, struct counters *counters)
+ 			fatal("Failed to write to %s", tmp_file);
+ 		}
+ 	}
++	/* This also implicitly closes the fd. */
+ 	fclose(f);
+ 	x_rename(tmp_file, path);
+ 
+diff --git a/util.c b/util.c
+index 3b472de..cc630a6 100644
+--- a/util.c
++++ b/util.c
+@@ -195,7 +195,7 @@ copy_file(const char *src, const char *dest, int compress_dest)
+ 	struct stat st;
+ 	int errnum;
+ 
+-	tmp_name = format("%s.%s.XXXXXX", dest, tmp_string());
++	tmp_name = format("%s.%s", dest, tmp_string());
+ 	cc_log("Copying %s to %s via %s (%s)",
+ 	       src, dest, tmp_name, compress_dest ? "compressed": "uncompressed");
+ 
+@@ -427,7 +427,7 @@ tmp_string(void)
+ 	static char *ret;
+ 
+ 	if (!ret) {
+-		ret = format("%s.%u", get_hostname(), (unsigned)getpid());
++		ret = format("%s.%u.XXXXXX", get_hostname(), (unsigned)getpid());
+ 	}
+ 
+ 	return ret;
+@@ -884,12 +884,13 @@ gnu_getcwd(void)
+ 
+ /* create an empty file */
+ int
+-create_empty_file(const char *fname)
++create_empty_file(char *fname)
+ {
+ 	int fd;
+ 
+-	fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666);
++	fd = mkstemp(fname);
+ 	if (fd == -1) {
++		cc_log("Failed to create %s: %s", fname, strerror(errno));
+ 		return -1;
+ 	}
+ 	close(fd);
+@@ -1134,7 +1135,9 @@ x_unlink(const char *path)
+ 		goto out;
+ 	}
+ 	if (unlink(tmp_name) == -1) {
+-		result = -1;
++		/* If it was released in a race, that's OK. */
++		if (errno != ENOENT)
++			result = -1;
+ 	}
+ out:
+ 	free(tmp_name);
+-- 
+2.1.2
+
diff --git a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch b/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
new file mode 100644
index 000000000000..5e502912bfa2
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/56178
+
+stick to the size of files on disk rather than their byte size.
+this func is only used for stats management, so this should be safe.
+
+--- a/util.c
++++ b/util.c
+@@ -845,12 +845,7 @@ file_size(struct stat *st)
+ #ifdef _WIN32
+ 	return (st->st_size + 1023) & ~1023;
+ #else
+-	size_t size = st->st_blocks * 512;
+-	if ((size_t)st->st_size > size) {
+-		/* probably a broken stat() call ... */
+-		size = (st->st_size + 1023) & ~1023;
+-	}
+-	return size;
++	return st->st_blocks * 512;
+ #endif
+ }
+ 
diff --git a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
new file mode 100644
index 000000000000..5abd15e1aaff
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
@@ -0,0 +1,15 @@
+avoid weak perl usage in tests
+
+https://bugs.gentoo.org/421609
+
+--- a/test.sh
++++ b/test.sh
+@@ -1466,7 +1466,7 @@
+     mkdir -p $dir
+     i=0
+     while [ $i -lt 10 ]; do
+-        perl -e 'print "A" x 4017' >$dir/result$i-4017.o
++        printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
+         touch $dir/result$i-4017.stderr
+         touch $dir/result$i-4017.d
+         if [ $i -gt 5 ]; then
diff --git a/dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch b/dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch
new file mode 100644
index 000000000000..2a28baf02984
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch
@@ -0,0 +1,156 @@
+https://bugs.gentoo.org/461966
+
+fix from upstream
+
+From b5d63f81c1a83fd4c50b769a96a04f581b7db70c Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl <joel@rosdahl.net>
+Date: Wed, 20 Mar 2013 22:18:16 +0100
+Subject: [PATCH] Fix test suite failure on GCC 4.8
+
+GCC 4.8 includes /usr/include/stdc-predef.h implicitly, and this shows up
+in generated .d files.
+---
+ test.sh | 35 +++++++++++++++++++----------------
+ 1 file changed, 19 insertions(+), 16 deletions(-)
+
+diff --git a/test.sh b/test.sh
+index 3ed9069..3e38387 100755
+--- a/test.sh
++++ b/test.sh
+@@ -3,7 +3,7 @@
+ # A simple test suite for ccache.
+ #
+ # Copyright (C) 2002-2007 Andrew Tridgell
+-# Copyright (C) 2009-2012 Joel Rosdahl
++# Copyright (C) 2009-2013 Joel Rosdahl
+ #
+ # This program is free software; you can redistribute it and/or modify it under
+ # the terms of the GNU General Public License as published by the Free Software
+@@ -562,6 +562,9 @@ int test3;
+ EOF
+     backdate test1.h test2.h test3.h
+ 
++    $COMPILER -c -Wp,-MD,expected.d test.c
++    expected_d_content=`cat expected.d`
++
+     ##################################################################
+     # First compilation is a miss.
+     testname="first compilation"
+@@ -677,7 +680,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     rm -f other.d
+ 
+@@ -685,7 +688,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     rm -f other.d
+ 
+@@ -760,7 +763,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     rm -f test.d
+ 
+@@ -768,7 +771,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     ##################################################################
+     # Check the scenario of running a ccache with direct mode on a cache
+@@ -780,7 +783,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     rm -f test.d
+ 
+@@ -788,7 +791,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 1
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     rm -f test.d
+ 
+@@ -796,7 +799,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 2
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     rm -f test.d
+ 
+@@ -804,7 +807,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 2
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     ##################################################################
+     # Check that -MF works.
+@@ -815,7 +818,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     rm -f other.d
+ 
+@@ -823,7 +826,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     ##################################################################
+     # Check that a missing .d file in the cache is handled correctly.
+@@ -835,13 +838,13 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     $CCACHE $COMPILER -c -MD test.c
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     find $CCACHE_DIR -name '*.d' -exec rm -f '{}' \;
+ 
+@@ -849,7 +852,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 1
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     ##################################################################
+     # Check that stderr from both the preprocessor and the compiler is emitted
+-- 
+1.8.1.2
+
diff --git a/dev-util/ccache/files/ccache-config b/dev-util/ccache/files/ccache-config
new file mode 100644
index 000000000000..a7dc4a04a76e
--- /dev/null
+++ b/dev-util/ccache/files/ccache-config
@@ -0,0 +1,100 @@
+#!/bin/sh
+#
+# ccache-config - helper script for ccache and its ebuild
+#
+# Copyright 2003-2014 Superlucidity Services, LLC
+# This program licensed under the GNU GPL version 2.
+#
+# This script developed by Zachary T Welch at Superlucidity Services, LLC
+#  it was cloned from the distcc-config script
+#
+# Additional features to come; this provides a starting point
+
+. /etc/init.d/functions.sh 2>/dev/null || {
+	ebegin() { echo " * $* ..."; }
+	eend() {
+		local r=${1:-$?}
+		[ ${r} -eq 0 ] && echo " [ OK ]" || echo " [ !! ]"
+		return $r
+	}
+}
+
+LIBDIR="lib"
+
+# this should be getopt'd someday (override with CC_QUIET=1)
+CC_VERBOSE=1
+unset _CC_QUIET
+c_quiet() {
+	[ -n "${CC_QUIET:-${_CC_QUIET}}" ] || [ -z "${CC_VERBOSE}" ]
+}
+
+c_ebegin() { c_quiet || ebegin "$@" ; }
+c_eend()   { c_quiet || eend "$@" ; }
+
+###
+# the following functions manage the ccache symlinks
+#  they allow the user or other scripts (namely gcc-config) to
+#  automatically update ccache's links when upgrading toolchains
+#
+cc_path() {
+	echo ${ROOT%/}/usr/${LIBDIR}/ccache/bin/$1
+}
+cc_remove_link() {
+	local t=$(cc_path "$1")
+	if [ -L ${t} ]; then
+		c_ebegin "Removing ${t}"
+		rm -f "${t}"
+		c_eend
+
+		# Trim the empty dir if possible. #517242
+		t=${t%/*}
+		if rmdir "${t}" 2>/dev/null; then
+			rmdir "${t%/*}" 2>/dev/null
+		fi
+		:
+	fi
+}
+cc_install_link() {
+	# Search the PATH for the specified compiler
+	#  then create shadow link in /usr/lib/ccache/bin to ccache
+
+	if [ -n "$(type -p ${1})" ]; then
+		# first be sure any old link is removed
+		_CC_QUIET=1
+		cc_remove_link "${1}"
+		unset _CC_QUIET
+
+		# then create the new link
+		local t=$(cc_path "$1")
+		c_ebegin "Creating ccache shadow link ${t}"
+		mkdir -p -m 0755 "${t%/*}" && ln -s /usr/bin/ccache "${t}"
+		c_eend
+	fi
+}
+cc_links() {
+	local a
+	for a in gcc cc c++ g++ ; do
+		if [ -n "${2}" ] ; then
+			# gcc-config doesnt install ${CHOST}-cc, so until
+			# it does, don't install a ccache symlink for it
+			[ "${a}" = "cc" ] && continue
+			a="${2}-${a}"
+		fi
+		"cc_${1}_link" "${a}"
+	done
+}
+
+###
+# main routine
+
+case "${1}" in
+	--install-links )
+		cc_links install "${2}"
+		;;
+	--remove-links )
+		cc_links remove "${2}"
+		;;
+	* )
+		echo "usage: ${0} {--install-links|--remove-links} [ CHOST ]"
+		;;
+esac
diff --git a/dev-util/ccache/files/ccache-config-2 b/dev-util/ccache/files/ccache-config-2
new file mode 100644
index 000000000000..914f09500a37
--- /dev/null
+++ b/dev-util/ccache/files/ccache-config-2
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# ccache-config - helper script for ccache and its ebuild
+#
+# Copyright 2003-2014 Superlucidity Services, LLC
+# Copyright 2013-2014 Gentoo Foundation
+# This program licensed under the GNU GPL version 2.
+#
+# This script developed by Zachary T Welch at Superlucidity Services, LLC
+#  it was cloned from the distcc-config script
+#
+# Additional features to come; this provides a starting point
+
+EPREFIX=''
+
+. "${EPREFIX}"/etc/init.d/functions.sh 2>/dev/null || {
+	ebegin() { echo " * $* ..."; }
+	eend() {
+		local r=${1:-$?}
+		[ ${r} -eq 0 ] && echo " [ OK ]" || echo " [ !! ]"
+		return $r
+	}
+}
+
+LIBDIR="lib"
+
+# this should be getopt'd someday (override with CC_QUIET=1)
+CC_VERBOSE=1
+unset _CC_QUIET
+c_quiet() {
+	[ -n "${CC_QUIET:-${_CC_QUIET}}" ] || [ -z "${CC_VERBOSE}" ]
+}
+
+c_ebegin() { c_quiet || ebegin "$@" ; }
+c_eend()   { c_quiet || eend "$@" ; }
+
+###
+# the following functions manage the ccache symlinks
+#  they allow the user or other scripts (namely gcc-config) to
+#  automatically update ccache's links when upgrading toolchains
+#
+cc_path() {
+	echo ${ROOT%/}${EPREFIX}/usr/${LIBDIR}/ccache/bin/$1
+}
+cc_remove_link() {
+	local t=$(cc_path "$1")
+	if [ -L ${t} ]; then
+		c_ebegin "Removing ${t}"
+		rm -f "${t}"
+		c_eend
+
+		# Trim the empty dir if possible. #517242
+		t=${t%/*}
+		if rmdir "${t}" 2>/dev/null; then
+			rmdir "${t%/*}" 2>/dev/null
+		fi
+		:
+	fi
+}
+cc_install_link() {
+	# Search the PATH for the specified compiler
+	#  then create shadow link in /usr/lib/ccache/bin to ccache
+
+	if command -v "$1" >/dev/null ; then
+		# first be sure any old link is removed
+		_CC_QUIET=1
+		cc_remove_link "$1"
+		unset _CC_QUIET
+
+		# then create the new link
+		local t=$(cc_path "$1")
+		c_ebegin "Creating ccache shadow link ${t}"
+		mkdir -p -m 0755 "${t%/*}" && ln -s "${EPREFIX}"/usr/bin/ccache "${t}"
+		c_eend
+	fi
+}
+cc_links() {
+	local a
+	for a in gcc cc c++ g++ icc icpc clang clang++ ; do
+		"cc_${1}_link" "${2}${2:+-}${a}"
+	done
+}
+
+###
+# main routine
+
+case $1 in
+	--install-links )
+		cc_links install "$2"
+		;;
+	--remove-links )
+		cc_links remove "$2"
+		;;
+	* )
+		echo "usage: $0 {--install-links|--remove-links} [ CHOST ]"
+		;;
+esac
diff --git a/dev-util/ccache/files/ccache-config-3 b/dev-util/ccache/files/ccache-config-3
new file mode 100644
index 000000000000..7f604f0016ef
--- /dev/null
+++ b/dev-util/ccache/files/ccache-config-3
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# ccache-config - helper script for ccache and its ebuild
+#
+# Copyright 2003-2014 Superlucidity Services, LLC
+# Copyright 2013-2014 Gentoo Foundation
+# This program licensed under the GNU GPL version 2.
+#
+# This script developed by Zachary T Welch at Superlucidity Services, LLC
+#  it was cloned from the distcc-config script
+#
+# Additional features to come; this provides a starting point
+
+EPREFIX=''
+
+. "${EPREFIX}"/lib/gentoo/functions.sh 2>/dev/null || {
+	ebegin() { echo " * $* ..."; }
+	eend() {
+		local r=${1:-$?}
+		[ ${r} -eq 0 ] && echo " [ OK ]" || echo " [ !! ]"
+		return $r
+	}
+}
+
+LIBDIR="lib"
+
+# this should be getopt'd someday (override with CC_QUIET=1)
+CC_VERBOSE=1
+unset _CC_QUIET
+c_quiet() {
+	[ -n "${CC_QUIET:-${_CC_QUIET}}" ] || [ -z "${CC_VERBOSE}" ]
+}
+
+c_ebegin() { c_quiet || ebegin "$@" ; }
+c_eend()   { c_quiet || eend "$@" ; }
+
+###
+# the following functions manage the ccache symlinks
+#  they allow the user or other scripts (namely gcc-config) to
+#  automatically update ccache's links when upgrading toolchains
+#
+cc_path() {
+	echo ${ROOT%/}${EPREFIX}/usr/${LIBDIR}/ccache/bin/$1
+}
+cc_remove_link() {
+	local t=$(cc_path "$1")
+	if [ -L ${t} ]; then
+		c_ebegin "Removing ${t}"
+		rm -f "${t}"
+		c_eend
+
+		# Trim the empty dir if possible. #517242
+		t=${t%/*}
+		if rmdir "${t}" 2>/dev/null; then
+			rmdir "${t%/*}" 2>/dev/null
+		fi
+		:
+	fi
+}
+cc_install_link() {
+	# Search the PATH for the specified compiler
+	#  then create shadow link in /usr/lib/ccache/bin to ccache
+
+	if command -v "$1" >/dev/null ; then
+		# first be sure any old link is removed
+		_CC_QUIET=1
+		cc_remove_link "$1"
+		unset _CC_QUIET
+
+		# then create the new link
+		local t=$(cc_path "$1")
+		c_ebegin "Creating ccache shadow link ${t}"
+		mkdir -p -m 0755 "${t%/*}" && ln -s "${EPREFIX}"/usr/bin/ccache "${t}"
+		c_eend
+	fi
+}
+cc_links() {
+	local a
+	for a in gcc cc c++ g++ icc icpc clang clang++ ; do
+		"cc_${1}_link" "${2}${2:+-}${a}"
+	done
+}
+
+###
+# main routine
+
+case $1 in
+	--install-links )
+		cc_links install "$2"
+		;;
+	--remove-links )
+		cc_links remove "$2"
+		;;
+	* )
+		echo "usage: $0 {--install-links|--remove-links} [ CHOST ]"
+		;;
+esac
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
new file mode 100644
index 000000000000..a1113ba3300a
--- /dev/null
+++ b/dev-util/ccache/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>toolchain</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+		ccache acts as a caching pre-processor to C/C++ compilers, improving
+		compilation time when recompiling previously compiled source.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest
new file mode 100644
index 000000000000..6f70191c212e
--- /dev/null
+++ b/dev-util/cccc/Manifest
@@ -0,0 +1 @@
+DIST cccc-3.1.4.tar.gz 632007 SHA256 27b3eca9a83a66799332363a80cc4bcd6db9869eddbda1a59a25cdace3ff4dbf SHA512 54b8838e228cd435497bac1fd3f1fe3bf2043871fe1046dd80b4382b08a7b249009aa5b06d5318868bbded31c31b45ec705c70abf3969f02b9680c3adb72a231 WHIRLPOOL bc432ad8247bf2da146db7d7a58af1c7344f5701198d8d9da8bc6e0491aa18fa901e70bb009aceb0356dc52059959d0045c848ec8f3bfe30aeb09cff973e18e2
diff --git a/dev-util/cccc/cccc-3.1.4.ebuild b/dev-util/cccc/cccc-3.1.4.ebuild
new file mode 100644
index 000000000000..0385935adbda
--- /dev/null
+++ b/dev-util/cccc/cccc-3.1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A code counter for C and C++"
+HOMEPAGE="http://cccc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+
+	sed -i -e "/^CFLAGS/s|=|+=|" pccts/antlr/makefile
+	sed -i -e "/^CFLAGS/s|=|+=|" pccts/dlg/makefile
+	sed -i -e "/^CFLAGS/s|=|+=|" \
+			-e "/^LD_OFLAG/s|-o|-o |" \
+			-e "/^LDFLAGS/s|=|+=|" cccc/posixgcc.mak
+	#LD_OFLAG: ld on Darwin needs a space after -o
+}
+
+src_compile() {
+	emake CCC="$(tc-getCXX)" LD="$(tc-getCXX)" pccts
+	emake CCC="$(tc-getCXX)" LD="$(tc-getCXX)" cccc
+}
+
+src_install() {
+	dodoc readme.txt changes.txt
+	dohtml cccc/*.html
+	cd install || die
+	dodir /usr
+	emake -f install.mak INSTDIR="${ED}"/usr/bin
+}
diff --git a/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch b/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch
new file mode 100644
index 000000000000..dcbe7aa26b47
--- /dev/null
+++ b/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch
@@ -0,0 +1,11 @@
+--- cccc/cccc_tbl.cc
++++ cccc/cccc_tbl.cc
+@@ -96,7 +96,7 @@
+   typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
+   if(value_iterator!=map_t::end())
+     {
+-      erase(value_iterator);
++      this->erase(value_iterator);
+       retval=true;
+     }
+   return retval;
diff --git a/dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch b/dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch
new file mode 100644
index 000000000000..d5fed684df0f
--- /dev/null
+++ b/dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch
@@ -0,0 +1,47 @@
+--- cccc/posixgcc.mak
++++ cccc/posixgcc.mak
+@@ -24,9 +24,11 @@
+ 
+ PATHSEP=/
+ 
++PCCTS_INC = /usr/include/pccts/
++
+ CCC=g++
+ LD=g++
+-CFLAGS=-c -I../pccts/h $(CFLAGS_DEBUG) -x c++ 
++CFLAGS=-c -I$(PCCTS_INC) $(CFLAGS_DEBUG) -x c++ 
+ C_OFLAG=-o
+ LDFLAGS=$(LDFLAGS_DEBUG)
+ LD_OFLAG=-o
+
+--- cccc/rules.mak
++++ cccc/rules.mak
+@@ -39,8 +39,8 @@
+ 
+ # locations and flags for antlr and dlg (don't change the flags unless you 
+ # understand PCCTS)
+-ANTLR =         $(PCCTS_BIN)$(PATHSEP)antlr
+-DLG =           $(PCCTS_BIN)$(PATHSEP)dlg
++ANTLR =         antlr
++DLG =           dlg
+ # Flags for ANTLR:
+ # -CC       = generate C++ output
+ # -k 2      = use at least 2 tokens of lookahead
+@@ -164,14 +164,14 @@
+ # to cover this is to add explicit rules for the three
+ # PCCTS support files which give rise to linkable object
+ # files.
+-AParser.$(OBJEXT): $(PCCTS_H)$(PATHSEP)AParser.cpp
+-	$(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)AParser.cpp $(C_OFLAG)$*.$(OBJEXT)
++AParser.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)AParser.cpp
++	$(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)AParser.cpp $(C_OFLAG)$*.$(OBJEXT)
+ 
+-DLexerBase.$(OBJEXT): $(PCCTS_H)$(PATHSEP)DLexerBase.cpp
+-	$(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)DLexerBase.cpp $(C_OFLAG)$*.$(OBJEXT)
++DLexerBase.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)DLexerBase.cpp
++	$(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)DLexerBase.cpp $(C_OFLAG)$*.$(OBJEXT)
+ 
+-ATokenBuffer.$(OBJEXT): $(PCCTS_H)$(PATHSEP)ATokenBuffer.cpp
+-	$(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)ATokenBuffer.cpp $(C_OFLAG)$*.$(OBJEXT)
++ATokenBuffer.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)ATokenBuffer.cpp
++	$(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)ATokenBuffer.cpp $(C_OFLAG)$*.$(OBJEXT)
diff --git a/dev-util/cccc/metadata.xml b/dev-util/cccc/metadata.xml
new file mode 100644
index 000000000000..b2c5f531058e
--- /dev/null
+++ b/dev-util/cccc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cccc</remote-id>
+		<bugs-to>http://sourceforge.net/tracker/?group_id=7763</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/ccglue/Manifest b/dev-util/ccglue/Manifest
new file mode 100644
index 000000000000..ea0ae9a4e000
--- /dev/null
+++ b/dev-util/ccglue/Manifest
@@ -0,0 +1,2 @@
+DIST ccglue-release-0.3.1.tar.gz 101529 SHA256 9954bb2af56e8bc313820081f4d45c564b34804978c5a7682846ae98a941b332 SHA512 bbe4c9ff84869696dac80f801fa54df4f60bbe7615d3cd587713f7cd8c58f056db95a003c47879e0ca4fbd3956f97a4b3d31c6d04f49aecca9db2c5ccfaae4b7 WHIRLPOOL 6275b62ea62fcc9911daf3be7a5cd66a6ce9f9dd75df46389a6d728f29069b7c39d0a587435747bb44e98eb24c427975223793b90e43246b9c05fbe37460bd77
+DIST ccglue-release-0.6.0.tar.bz2 220918 SHA256 04b0d83deebf84bee3d18c376891f6f913ed8a053d3f309d8574cb8b1b5abefb SHA512 695983741049d460cac3ae906fddd75380a498062373461efb49b976b958b181301c6a028cc76643bee7fe3b59664aa432d1fb0d43446019a116224ff15107aa WHIRLPOOL 8809b9c95a50c610dfcdb2fb789d4657e61ba266a88e44667aea7cfb0cfc6e205627b233dd5f8571a7c2e7fb6da21f766c62b30020e77d8bb743593b4734cc0a
diff --git a/dev-util/ccglue/ccglue-0.3.1.ebuild b/dev-util/ccglue/ccglue-0.3.1.ebuild
new file mode 100644
index 000000000000..fe123eccc0c7
--- /dev/null
+++ b/dev-util/ccglue/ccglue-0.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Produce cross-reference files from cscope and ctags for use with app-vim/cctree"
+HOMEPAGE="http://ccglue.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-release-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/release-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
+}
diff --git a/dev-util/ccglue/ccglue-0.6.0.ebuild b/dev-util/ccglue/ccglue-0.6.0.ebuild
new file mode 100644
index 000000000000..6f14bd92d6ef
--- /dev/null
+++ b/dev-util/ccglue/ccglue-0.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Produce cross-reference files from cscope and ctags for use with app-vim/cctree"
+HOMEPAGE="http://ccglue.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-release-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.1-cflags.patch
+	eautoreconf
+}
diff --git a/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch b/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch
new file mode 100644
index 000000000000..5f2e5e34c5b5
--- /dev/null
+++ b/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch
@@ -0,0 +1,11 @@
+--- release-0.3.1/src/Makefile.am.orig
++++ release-0.3.1/src/Makefile.am
+@@ -1,6 +1,4 @@
+ bin_PROGRAMS = ccglue
+ ccglue_SOURCES = cscoperdr.c seqfile.c sym_mgr.c digraph.c options.c main.c c_glue.c
+-INCLUDES = `pkg-config --cflags glib-2.0`
+-AM_LDFLAGS = `pkg-config --libs glib-2.0`
+-
+-
++AM_CFLAGS = $(GLIB_CFLAGS)
++ccglue_LDADD = $(GLIB_LIBS)
diff --git a/dev-util/ccglue/files/ccglue-0.5.1-cflags.patch b/dev-util/ccglue/files/ccglue-0.5.1-cflags.patch
new file mode 100644
index 000000000000..5d0b294f4ca4
--- /dev/null
+++ b/dev-util/ccglue/files/ccglue-0.5.1-cflags.patch
@@ -0,0 +1,13 @@
+--- ccglue_v0.5.1/configure.in
++++ ccglue_v0.5.1/configure.in
+@@ -19,10 +19,7 @@
+                      [want_debug="$enableval"], [want_debug=no])
+ 
+ if test "x$want_debug" = "xyes"; then
+-    CXXFLAGS="$CXXFLAGS -O0 -ggdb"
+     AC_DEFINE([DEBUG], 1, [Define for debugging])
+-else
+-    CXXFLAGS="$CXXFLAGS -O2"
+ fi
+ 
+ AC_CXX_HAVE_SSTREAM
diff --git a/dev-util/ccglue/metadata.xml b/dev-util/ccglue/metadata.xml
new file mode 100644
index 000000000000..53a503e1fe5d
--- /dev/null
+++ b/dev-util/ccglue/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>vim</herd>
+	<longdescription lang="en">
+		ccglue (ctags-cscope glue) is intended to be the interfacing app between cscope
+		and ctags. It can generate cross-reference tag files that can be interfaced
+		with the Vim CCTree plugin.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ccglue</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/ccmalloc/Manifest b/dev-util/ccmalloc/Manifest
new file mode 100644
index 000000000000..d0aca833eab2
--- /dev/null
+++ b/dev-util/ccmalloc/Manifest
@@ -0,0 +1 @@
+DIST ccmalloc-0.4.0.tar.gz 57917 SHA256 b4953cf8c2f4477ec2a5e8884308393826793df072aeef9edf2bac8d24a33bd3 SHA512 927389c08da02d4c67bbdb5121fba30d1f16e20f682ce67fdc350bc0446b058ccf92915c0c969a0055898fef3cd56de73ab0384c4e2e9af4d0faf3ab1af15086 WHIRLPOOL 0ab3c0c98d921fe7a8ae31e1c1af143b796c7d6674fda7cd1cf5e526acd4977f9ead8ded50f1c916d350b25e7677fd89c0418b30ecdf65778b241fc36691b7ad
diff --git a/dev-util/ccmalloc/ccmalloc-0.4.0-r2.ebuild b/dev-util/ccmalloc/ccmalloc-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..528afbffa4f3
--- /dev/null
+++ b/dev-util/ccmalloc/ccmalloc-0.4.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="A easy-to-use memory debugging library"
+HOMEPAGE="http://www.inf.ethz.ch/personal/biere/projects/ccmalloc/"
+SRC_URI="http://www.inf.ethz.ch/personal/biere/projects/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Respect CFLAGS #240274
+	sed -i \
+		-e "s/CFLAGS=/CFLAGS+=/" \
+		Makefile.in || die "sed in Makefile.in failed"
+}
+
+src_compile() {
+	tc-export CC
+	local myconf
+	use debug && myconf="${myconf} --debug"
+	# Not a standard configure script.
+	./configure --prefix=/usr ${myconf} || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr install || die "emake install failed"
+	dodoc BUGS FEATURES NEWS README TODO USAGE VERSION || die "dodoc failed"
+}
diff --git a/dev-util/ccmalloc/metadata.xml b/dev-util/ccmalloc/metadata.xml
new file mode 100644
index 000000000000..4514939928da
--- /dev/null
+++ b/dev-util/ccmalloc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    If you want to remove memory leaks from your C or C++ programs or you
+    experience strange bugs, probably due to pointer access to freed data,
+    then ccmalloc may be the right tool for you. In general it can help you
+    to track down memory related problems with C and C++ programs. It does
+    not replace more sophistacted tools such as purify or valgrind, since it
+    can not detect illegal memory reads, at least not all type of memory reads.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-util/cdecl/Manifest b/dev-util/cdecl/Manifest
new file mode 100644
index 000000000000..4589744ae56c
--- /dev/null
+++ b/dev-util/cdecl/Manifest
@@ -0,0 +1 @@
+DIST cdecl-2.5.tar.gz 21435 SHA256 b74caef08407a2195d6f1facf103e5af29253f67d599486164241b14ee42a936 SHA512 15495f5a794d11f964297c1f39f2f62f89778cd2e791b93f7e6cf16f321a71205a1f9366960f62b030022699e8abacaa5b402a304fb2eab8c00c83b9a4d0b419 WHIRLPOOL b9a3cc84689e2c60db6e733de0a3d428be4e5537908c132f69f2d27618ed8f4064faeb2faae7d20b9811088c7adf33838185eee2102710e4a9906638391883f9
diff --git a/dev-util/cdecl/cdecl-2.5-r2.ebuild b/dev-util/cdecl/cdecl-2.5-r2.ebuild
new file mode 100644
index 000000000000..ebeaff48b22f
--- /dev/null
+++ b/dev-util/cdecl/cdecl-2.5-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Turn English phrases to C or C++ declarations"
+SRC_URI="ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/${P}.tar.gz"
+HOMEPAGE="http://www.boutell.com/lsm/lsmbyid.cgi/002103"
+
+KEYWORDS="amd64 ~mips ppc x86"
+LICENSE="public-domain"
+SLOT="0"
+
+RDEPEND="readline? (
+			sys-libs/ncurses
+			sys-libs/readline
+			)"
+
+DEPEND="${RDEPEND}
+		|| (
+			dev-util/yacc
+			sys-devel/bison
+			)
+		!<dev-util/cutils-1.6-r2"
+
+IUSE="readline"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+	epatch "${FILESDIR}/${P}-implicit-pointer.patch"
+}
+
+src_compile() {
+	if use readline; then
+		CFLAGS="${CFLAGS} -DUSE_READLINE"
+		LIBS="${LIBS} -lreadline -lncurses"
+	fi
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" || die
+}
+
+src_install() {
+	dobin cdecl
+	dohard /usr/bin/cdecl /usr/bin/c++decl
+	dodoc README
+	doman *.1
+}
diff --git a/dev-util/cdecl/files/cdecl-2.5-implicit-pointer.patch b/dev-util/cdecl/files/cdecl-2.5-implicit-pointer.patch
new file mode 100644
index 000000000000..ee4949beb6ed
--- /dev/null
+++ b/dev-util/cdecl/files/cdecl-2.5-implicit-pointer.patch
@@ -0,0 +1,12 @@
+Index: cdecl-2.5/cdecl.c
+===================================================================
+--- cdecl-2.5.orig/cdecl.c
++++ cdecl-2.5/cdecl.c
+@@ -204,6 +204,7 @@ int DebugFlag = 0;		/* -d, output debugg
+ #define ANSI	4	/* combo not allowed anymore in ANSI compiler */
+ #define A	ANSI
+ 
++extern char **completion_matches PARAMS((char *, rl_compentry_func_t *));
+ /* This is an lower left triangular array. If we needed */
+ /* to save 9 bytes, the "long" row can be removed. */
+ char crosscheck[9][9] = {
\ No newline at end of file
diff --git a/dev-util/cdecl/files/cdecl-2.5.patch b/dev-util/cdecl/files/cdecl-2.5.patch
new file mode 100644
index 000000000000..ed04d59abc74
--- /dev/null
+++ b/dev-util/cdecl/files/cdecl-2.5.patch
@@ -0,0 +1,71 @@
+--- cdecl.c
++++ cdecl.c.new
+@@ -67,6 +67,7 @@
+ # include <stddef.h>
+ # include <string.h>
+ # include <stdarg.h>
++# include <errno.h>
+ #else
+ # ifndef NOVARARGS
+ #  include <varargs.h>
+@@ -124,7 +125,6 @@
+ 
+ #if __STDC__
+   char *ds(char *), *cat(char *, ...), *visible(int);
+-  int getopt(int,char **,char *);
+   int main(int, char **);
+   int yywrap(void);
+   int dostdin(void);
+
+--- cdecl.c	2009-07-07 13:20:37.000000000 +0200
++++ cdecl.c.new	2009-07-07 13:25:00.000000000 +0200
+@@ -91,7 +91,7 @@
+ #ifdef USE_READLINE
+ # include <readline/readline.h>
+   /* prototypes for functions related to readline() */
+-  char * getline();
++  char * mygetline();
+   char ** attempt_completion(char *, int, int);
+   char * keyword_completion(char *, int);
+   char * command_completion(char *, int);
+@@ -375,7 +375,7 @@
+ static char *line_read = NULL;
+ 
+ /* Read a string, and return a pointer to it.  Returns NULL on EOF. */
+-char * getline ()
++char * mygetline ()
+ {
+   /* If the buffer has already been allocated, return the memory
+      to the free pool. */
+@@ -887,7 +887,7 @@
+ 
+ 	if (!quiet) (void) printf("Type `help' or `?' for help\n");
+ 	ret = 0;
+-	while ((line = getline())) {
++	while ((line = mygetline())) {
+ 	    if (!strcmp(line, "quit") || !strcmp(line, "exit")) {
+ 		free(line);
+ 		return ret;
+--- Makefile.old	2010-08-26 22:06:28.000000000 +0200
++++ Makefile	2010-08-26 22:11:42.000000000 +0200
+@@ -15,9 +15,9 @@
+ #
+ # add -DUSE_READLINE	To compile in support for the GNU readline library.
+ 
+-CFLAGS= -s -O2 -DUSE_READLINE
++
+ CC= gcc
+-LIBS= -lreadline -ltermcap
++
+ ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
+ BINDIR= /usr/bin
+ MANDIR= /usr/man/man1
+@@ -29,7 +29,7 @@
+ 	ln c++decl cdecl
+ 
+ c++decl: cdgram.c cdlex.c cdecl.c
+-	$(CC) $(CFLAGS) -o c++decl cdecl.c $(LIBS)
++	$(CC) $(CFLAGS) ${LDFLAGS} -o c++decl cdecl.c $(LIBS)
+ 	rm -f cdecl
+ 
+ cdlex.c: cdlex.l
diff --git a/dev-util/cdecl/metadata.xml b/dev-util/cdecl/metadata.xml
new file mode 100644
index 000000000000..ff62877c67ae
--- /dev/null
+++ b/dev-util/cdecl/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
new file mode 100644
index 000000000000..f51d6d16dd1f
--- /dev/null
+++ b/dev-util/cdiff/Manifest
@@ -0,0 +1,2 @@
+DIST cdiff-0.9.6.tar.gz 30751 SHA256 a2fe898344f80ff5ecfd1d4bea7908422aeb0193f58b7669b485b8f7f978ae1b SHA512 8ae4d3dd26a53ba806f750736d7fcdddcae435d9492045e7ec57fa4b818125d0fe0f015d23910f393fa729b1c010ba3bf7bc5144f4794fe178a8a3e25d830480 WHIRLPOOL b799956392ea7b650b14d7073248a7a436281b5bbe6f11a53fe1c792543b46b279da24c795fb9bc49d1b4b35bee8518fd97e4486cc6cde3c8f932f828b2d35ce
+DIST cdiff-0.9.7.tar.gz 32061 SHA256 63b7f1037cbcf5ce76b56cd4e5643751e25e0c2a124bcd382af827651d81ca90 SHA512 2f2bf77ecc6e369325753c5d1c6fd23279138e8ae6a4d11cd102b5674d5c7e089e7f2613bbd39d68a00b0db16c589df64af14746228e38065556d0eb11b1e0cd WHIRLPOOL c26cb5df0b02b3567fa334ab2fe131ee99742b782d1bc8e83a4f06476c03d8242bbdc8489cec07ffb49ada0f5404c192c69765e3d9835fdf5feb944f8bb0e703
diff --git a/dev-util/cdiff/cdiff-0.9.6.ebuild b/dev-util/cdiff/cdiff-0.9.6.ebuild
new file mode 100644
index 000000000000..251fa11f3f55
--- /dev/null
+++ b/dev-util/cdiff/cdiff-0.9.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+if [[ "${PV}" != *"9999"* ]] ; then
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+else
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
+	inherit git-r3
+fi
+
+DESCRIPTION="Colored, side-by-side diff terminal viewer"
+HOMEPAGE="https://github.com/ymattw/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="
+	!<app-misc/colordiff-1.0.13-r1
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
+
+DOCS=( CHANGES.rst README.rst )
+
+python_test() {
+	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
+
+	./tests/regression.sh || die "Regression tests failed."
+}
diff --git a/dev-util/cdiff/cdiff-0.9.7.ebuild b/dev-util/cdiff/cdiff-0.9.7.ebuild
new file mode 100644
index 000000000000..e867540dd43f
--- /dev/null
+++ b/dev-util/cdiff/cdiff-0.9.7.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+if [[ "${PV}" != *"9999"* ]] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+else
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
+	inherit git-r3
+fi
+
+DESCRIPTION="Colored, side-by-side diff terminal viewer"
+HOMEPAGE="https://github.com/ymattw/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="
+	!<app-misc/colordiff-1.0.13-r1
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
+
+DOCS=( CHANGES.rst README.rst )
+
+python_test() {
+	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
+
+	./tests/regression.sh || die "Regression tests failed."
+}
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
new file mode 100644
index 000000000000..8bbe3dd2c8cc
--- /dev/null
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+if [[ "${PV}" != *"9999"* ]] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+else
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
+	inherit git-r3
+fi
+
+DESCRIPTION="Colored, side-by-side diff terminal viewer"
+HOMEPAGE="https://github.com/ymattw/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="
+	!<app-misc/colordiff-1.0.13-r1
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
+
+DOCS=( CHANGES.rst README.rst )
+
+python_test() {
+	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
+
+	./tests/regression.sh || die "Regression tests failed."
+}
diff --git a/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch b/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
new file mode 100644
index 000000000000..50b00cc5a46e
--- /dev/null
+++ b/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
@@ -0,0 +1,11 @@
+--- a/tests/test_cdiff.py	2013-03-24 15:08:00.000000000 +0100
++++ b/tests/test_cdiff.py	2013-06-23 01:17:20.560520188 +0200
+@@ -737,7 +737,7 @@
+         os.chdir(self._non_ws)
+         ret = cdiff.main()
+         os.chdir(self._cwd)
+-        self.assertNotEqual(ret, 0)
++#        self.assertNotEqual(ret, 0)
+ 
+     def test_read_log(self):
+         sys.argv = [sys.argv[0], '--log']
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
new file mode 100644
index 000000000000..72bbf530e00f
--- /dev/null
+++ b/dev-util/cdiff/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+  <longdescription>
+    Colored, side-by-side diff terminal viewer.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">cdiff</remote-id>
+    <remote-id type="github">ymattw/cdiff</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/cflow/Manifest b/dev-util/cflow/Manifest
new file mode 100644
index 000000000000..4af7b60eec75
--- /dev/null
+++ b/dev-util/cflow/Manifest
@@ -0,0 +1 @@
+DIST cflow-1.4.tar.bz2 634862 SHA256 037e39d6048ea91c68a5f3a561e10f22fd085d1f7641643e19c831a94ec26bca SHA512 b8f8bd0e75e9ad0ba112313c576766b7cf72ef1e29ad0b0a2ce233f43b4196e311077be2134ff6e0fa0bb18375469ca6a969307fa7565a63ab60dec20400ee03 WHIRLPOOL fb1b7ef812c18b0732126a3a624cfba6de6abbdc419717c4d1dc403717e6200dfe85f3189d65547391679f846c6044a7407bde1339201596c67f61023d307255
diff --git a/dev-util/cflow/cflow-1.4.ebuild b/dev-util/cflow/cflow-1.4.ebuild
new file mode 100644
index 000000000000..f3524abf2f46
--- /dev/null
+++ b/dev-util/cflow/cflow-1.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit elisp-common eutils
+
+DESCRIPTION="C function call hierarchy analyzer"
+HOMEPAGE="http://www.gnu.org/software/cflow/"
+SRC_URI="ftp://download.gnu.org.ua/pub/release/cflow/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug emacs nls"
+
+RDEPEND="emacs? ( virtual/emacs )
+	nls? ( virtual/libintl virtual/libiconv )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-info-direntry.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		EMACS=no
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		elisp-compile elisp/cflow-mode.el
+	fi
+}
+
+src_install() {
+	default
+	doinfo doc/cflow.info
+
+	if use emacs; then
+		elisp-install ${PN} elisp/cflow-mode.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cflow/files/50cflow-gentoo.el b/dev-util/cflow/files/50cflow-gentoo.el
new file mode 100644
index 000000000000..56a2c8c5d775
--- /dev/null
+++ b/dev-util/cflow/files/50cflow-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; cflow site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cflow-mode "cflow-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.cflow\\'" . cflow-mode))
diff --git a/dev-util/cflow/files/cflow-1.4-info-direntry.patch b/dev-util/cflow/files/cflow-1.4-info-direntry.patch
new file mode 100644
index 000000000000..ab7e4956425f
--- /dev/null
+++ b/dev-util/cflow/files/cflow-1.4-info-direntry.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/cflow.texi b/doc/cflow.texi
+index dfb1fdf..5dc1d48 100644
+--- a/doc/cflow.texi
++++ b/doc/cflow.texi
+@@ -21,7 +21,7 @@
+ @end direntry
+ @dircategory Emacs
+ @direntry
+-* cflow mode: (cflow)cflow mode.  Major mode for visiting cflow charts.
++* cflow mode: (cflow)Emacs.      Major mode for visiting cflow charts.
+ @end direntry
+ @end ifinfo
+ 
diff --git a/dev-util/cflow/metadata.xml b/dev-util/cflow/metadata.xml
new file mode 100644
index 000000000000..1db3f11c8577
--- /dev/null
+++ b/dev-util/cflow/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dev-zero@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		GNU cflow analyzes a collection of C source files and prints a graph,
+		charting control flow within the program.
+
+		GNU cflow is able to produce both direct and inverted flowgraphs for C
+		sources. Optionally a cross-reference listing can be generated. Two
+		output formats are implemented: POSIX and GNU (extended).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
new file mode 100644
index 000000000000..4f9abaa67900
--- /dev/null
+++ b/dev-util/cgdb/Manifest
@@ -0,0 +1,2 @@
+DIST cgdb-0.6.6.tar.gz 954789 SHA256 cf9e9f60f6a4fcc93509dfeebbad86617fcd6788ff93e0392a30cc3b23415745 SHA512 9efd4e60f07f6e189fe3c91ef52c1b3c8d70623b11d08bac6d78c36e8f8f549071448212db973974b9604f84aafc73697d9d1305c3d9691fb5f19346d2e04e8f WHIRLPOOL 4e74e53cf760deaa9c5eabb0d5502ecfbffcf2c047bb157a986a8cc47b9c31f93017a4674a0917cf091d662d5d22f6e4b9717d6784e8dc76403102169aa8091d
+DIST cgdb-0.6.7.tar.gz 674132 SHA256 074ed31d1e827a04574add8c27d391447d75313e85ff938005d8ec939499fda9 SHA512 0a9d1cc3fb00c3cdaeb060d20d3312dd738b617ff1b188db33a074e2790f9721ca58e924ecc9929b84832c3ca22a334d7a66294439341a9b6868eef1baafca3e WHIRLPOOL 77eab90e1e71efb6dbcbad61b200cc75a7674cc76dbe2779e2e52b395a2d7e67f47958a293b7b1431dc39cfa5272dea7026fc3e459b2d615ef509988b3a06720
diff --git a/dev-util/cgdb/cgdb-0.6.6.ebuild b/dev-util/cgdb/cgdb-0.6.6.ebuild
new file mode 100644
index 000000000000..a94139115be2
--- /dev/null
+++ b/dev-util/cgdb/cgdb-0.6.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A curses front-end for GDB, the GNU debugger"
+HOMEPAGE="http://cgdb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cgdb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
+IUSE=""
+
+DEPEND="sys-libs/ncurses
+	>=sys-libs/readline-5.1-r2"
+RDEPEND="${DEPEND}
+	sys-devel/gdb"
diff --git a/dev-util/cgdb/cgdb-0.6.7.ebuild b/dev-util/cgdb/cgdb-0.6.7.ebuild
new file mode 100644
index 000000000000..612d748becce
--- /dev/null
+++ b/dev-util/cgdb/cgdb-0.6.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="A curses front-end for GDB, the GNU debugger"
+HOMEPAGE="http://cgdb.github.io/"
+SRC_URI="http://cgdb.me/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="sys-libs/ncurses
+	>=sys-libs/readline-5.1-r2"
+RDEPEND="${DEPEND}
+	sys-devel/gdb"
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
new file mode 100644
index 000000000000..028d1cef3af8
--- /dev/null
+++ b/dev-util/cgdb/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>dev-tools</herd>
+</pkgmetadata>
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
new file mode 100644
index 000000000000..86e9ad7cf440
--- /dev/null
+++ b/dev-util/cgvg/Manifest
@@ -0,0 +1 @@
+DIST cgvg-1.6.2.tar.gz 41790 SHA256 5f1871bb1b2176247aaa9cdbecd915d84c9829ef0f2d90d6c23a9c905ee5550f SHA512 b2b4ec973515a4282c7b5d4ac1009682ac64f632509717fda88c3fa91ee59c21c950b085b86c551d8f2fd75539a319eec0c8837655ad025042cbf6e101c92173 WHIRLPOOL 3ba6a0ac42b35e58df8d33019af0655986e49df0e488277f775ec69623be835fde50a6bee398d4c0deef96a8b3528a4736ce73c6ffc37929c9252329fa1dbf10
diff --git a/dev-util/cgvg/cgvg-1.6.2.ebuild b/dev-util/cgvg/cgvg-1.6.2.ebuild
new file mode 100644
index 000000000000..e7876bed414c
--- /dev/null
+++ b/dev-util/cgvg/cgvg-1.6.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A tiny version of cscope that is much more useful in certian instances"
+HOMEPAGE="http://uzix.org/cgvg.html"
+SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README TODO
+}
diff --git a/dev-util/cgvg/metadata.xml b/dev-util/cgvg/metadata.xml
new file mode 100644
index 000000000000..8f41419457d1
--- /dev/null
+++ b/dev-util/cgvg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>gregkh@gentoo.org</email>
+  <name>Greg Kroah-Hartman</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
new file mode 100644
index 000000000000..53a626e8bf5c
--- /dev/null
+++ b/dev-util/checkbashisms/Manifest
@@ -0,0 +1 @@
+DIST checkbashisms-2.0.0.2 21258 SHA256 4da61b7f08b55609e80c648d215f0201aa9b5f1df53aab6252129537a7f7a0ee SHA512 cd9376f4c34773aba79f81b8bb129d912844102e91e363480b9983092efd36c4827e0447242aecfcdb3cfd4cc50e19e105cc645368e8c9735f49c8e381964dd4 WHIRLPOOL 94adf80badc7b484119df3723968965057ddfc365b59e52a7444e4476396f3c82d72aa43f049a397f5e762948dad0f4e3b679a547682401a469c7b8b587a9db5
diff --git a/dev-util/checkbashisms/checkbashisms-2.0.0.2-r2.ebuild b/dev-util/checkbashisms/checkbashisms-2.0.0.2-r2.ebuild
new file mode 100644
index 000000000000..c8b092327af3
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.0.0.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+# "checkbaskisms" is not a typo, it's the actual upstream SF project name.
+HOMEPAGE="http://sourceforge.net/projects/checkbaskisms/"
+SRC_URI="mirror://sourceforge/checkbaskisms/${PV}/${PN} -> ${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${P} ${PN}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-export.patch #458392
+	epatch "${FILESDIR}"/${P}-kill.patch #458392
+	epatch "${FILESDIR}"/${P}-version.patch
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/dev-util/checkbashisms/checkbashisms-2.0.0.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.0.0.2.ebuild
new file mode 100644
index 000000000000..a578750fa0c9
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.0.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+# "checkbaskisms" is not a typo, it's the actual upstream SF project name.
+HOMEPAGE="http://sourceforge.net/projects/checkbaskisms/"
+SRC_URI="mirror://sourceforge/checkbaskisms/${PV}/${PN} -> ${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S=${WORKDIR}
+
+src_install() {
+	newbin "${DISTDIR}"/${P} ${PN}
+}
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-export.patch b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-export.patch
new file mode 100644
index 000000000000..2ce8a183c8f9
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-export.patch
@@ -0,0 +1,16 @@
+`export foor=bar` is valid in POSIX
+
+https://sourceforge.net/p/checkbaskisms/checkbashisms/9/
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#export
+https://bugs.gentoo.org/458392
+
+--- a/checkbashisms
++++ b/checkbashisms
+@@ -512,7 +512,6 @@
+ 	$LEADIN . qr'disown\s' =>         q<disown>,
+ 	$LEADIN . qr'enable\s' =>         q<enable>,
+         $LEADIN . qr'export\s+-[^p]' =>  q<export only takes -p as an option>,
+-        $LEADIN . qr'export\s+.+=' => q<export foo=bar should be foo=bar; export foo>,
+ 	$LEADIN . qr'mapfile\s' =>        q<mapfile>,
+ 	$LEADIN . qr'readarray\s' =>      q<readarray>,
+ 	$LEADIN . qr'readonly\s+-[af]' => q<readonly -[af]>,
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-kill.patch b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-kill.patch
new file mode 100644
index 000000000000..7ddb94a5ae1a
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-kill.patch
@@ -0,0 +1,20 @@
+`kill -HUP` is valid in POSIX
+
+we could extend the check to look for valid signal names, but that seems like
+it's not worth the effort (when the # of signals is >30).  if the code uses a
+wrong signal name, then it'll hit a runtime error regardless of shell.
+
+https://sourceforge.net/p/checkbaskisms/checkbashisms/5/
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/kill.html
+https://bugs.gentoo.org/458392
+
+--- a/checkbashisms
++++ b/checkbashisms
+@@ -496,7 +496,6 @@
+ 	qr'\&>' =>	               q<should be \>word 2\>&1>,
+ 	qr'(<\&|>\&)\s*((-|\d+)[^\s;|)}`&\\\\]|[^-\d\s]+(?<!\$)(?!\d))' =>	
+ 				       q<should be \>word 2\>&1>,
+-	$LEADIN . qr'kill\s+-[^sl]\w*' => q<kill -[0-9] or -[A-Z]>,
+ 	$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*[1-9]' => q<trap with signal numbers>,
+ 	$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*ERR' => q<trap ERR>,
+ 	qr'\[\[(?!:)' => q<alternative test command ([[ foo ]] should be [ foo ])>,
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-version.patch b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-version.patch
new file mode 100644
index 000000000000..14dc79e06b96
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-version.patch
@@ -0,0 +1,13 @@
+https://sourceforge.net/p/checkbaskisms/checkbashisms/1/
+
+--- a/checkbashisms
++++ b/checkbashisms
+@@ -30,7 +30,7 @@
+ EOF
+ 
+ my $version = <<"EOF";
+-This is $progname version 2.0.0.1
++This is $progname version 2.0.0.2
+ (C) Copyright 1998-2003 Richard Braakman, Josip Rodin and Julian Gilbey
+ Additional programming by Mark Hobley
+ EOF
diff --git a/dev-util/checkbashisms/metadata.xml b/dev-util/checkbashisms/metadata.xml
new file mode 100644
index 000000000000..72d3cb691534
--- /dev/null
+++ b/dev-util/checkbashisms/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">checkbaskisms</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
new file mode 100644
index 000000000000..1480612111db
--- /dev/null
+++ b/dev-util/checkstyle/Manifest
@@ -0,0 +1,4 @@
+DIST checkstyle-5.4-maven-build.xml.tar.bz2 3236 SHA256 4b286857c265b765fcf71deb8684cdd1bb7d1264fd0ee45a924d91031652d590 SHA512 23cfcb519984fd9d7a59d8534c712d69c02aabc28e9f6eb7abff948728361cc208bf84d19f30dc81ae8870f6b361ca0382be60c4ab7b7b0298e59a175197138e WHIRLPOOL 32992aa00d228be5f0819e856f13752eba9694cf46e98b3c9229c5ef45a7c37c1c6367a1457487ec5ab63f9d808b1470727f44e5b7d194961520a34b55253f72
+DIST checkstyle-5.4-src.tar.gz 731222 SHA256 2c8b04a914a7835eaa355c058f7a4c52af308f8190d07fb3cbf9943cf751b8a8 SHA512 4f20fe8c48ea638c3390b07d94a54180663d939dce455b492ae19397ddf81e617f36e9aa4700e88c5081b7369a0e03d0d59bf2ee988325f15565fd66faadb5e6 WHIRLPOOL 5cd60912a4acf125c5a44ba35ed60d4e5acd7e48dfcd084195dbe30910d37f42b272f670c0e7f25406fdd95f9befd5c5cd42a27bfd2a7e62c7faa07b2bf612af
+DIST checkstyle-5.5-src.tar.gz 744584 SHA256 0de571f2769b4ded9c681c9b1e51c7f783aca7fb7f47467f1f39c38bd1717aa1 SHA512 2327e14fc6fe9516d9518e4cbccb2e0f41e50bf891b7a3655dd29601b5eb3d2895d7df841f394d08d7dfac7ab774a01e22f98226259dc28a210d478699ea5c9a WHIRLPOOL e29303b656090a2f617850d2edb7f3f41db912399d334d6d8a7f7c50a96c7cfdb8134e46b65cec762ce565b1709de98a870880cdd8e18af03f594b9a2141609a
+DIST checkstyle-src-4.4.tar.gz 2567907 SHA256 7081074124e2dde062b06cbb489a1338e04623b986094e9b63f31c50be2f9f38 SHA512 4cce16b70e901bdcee0d3ac864f51cef54965d37223a11e59b7b9d34603b404da0cc8207431481feb5f0e649b5f55a5ef05aebfceeb37f938246f8722867174d WHIRLPOOL ae3b1f3161caac22235d20b018b035b4bf1e042f5fb930b620b6eae8692a1825fe382649a3d360794a8cb3d48135ea1e3e8597865ed10c0e868d9440e9287240
diff --git a/dev-util/checkstyle/checkstyle-4.4.ebuild b/dev-util/checkstyle/checkstyle-4.4.ebuild
new file mode 100644
index 000000000000..08c1e5018608
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-4.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+WANT_ANT_TASKS="ant-antlr ant-nodeps"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard"
+HOMEPAGE="http://checkstyle.sourceforge.net"
+SRC_URI="mirror://sourceforge/checkstyle/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+COMMON_DEP=">=dev-java/antlr-2.7.7:0[java]
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-cli:1
+	dev-java/commons-logging:0
+	dev-java/commons-collections:0"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND="!test? ( >=virtual/jdk-1.4 )
+	test? ( >=virtual/jdk-1.5 )
+	${COMMON_DEP}
+	test? (
+		dev-java/ant-junit
+		dev-java/ant-trax
+		dev-java/emma:0
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# So that we can generate 1.4 bytecode for dist
+# and 1.5 for tests
+JAVA_PKG_BSFIX="off"
+
+java_prepare() {
+	cd "${S}/lib"
+	rm -v *.jar || die
+	java-pkg_jar-from antlr
+	java-pkg_jar-from commons-beanutils-1.7
+	java-pkg_jar-from commons-cli-1
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from commons-collections
+}
+
+src_compile() {
+	eant compile.checkstyle $(use_doc)
+	jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle . || die "jar failed"
+}
+
+src_test() {
+	java-pkg_jar-from --build-only --into lib junit
+	java-pkg_jar-from --build-only --into lib emma
+	ANT_TASKS="emma ant-nodeps ant-junit ant-trax" eant run.tests
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	dodoc README RIGHTS.antlr || die
+	use doc && java-pkg_dojavadoc target/docs/api
+	use source && java-pkg_dosrc src/${PN}/com
+
+	# Install check files
+	insinto /usr/share/checkstyle/checks
+	for file in *.xml; do
+		[[ "${file}" != build.xml ]] && doins ${file}
+	done
+
+	# Install extra files
+	insinto  /usr/share/checkstyle/contrib
+	doins -r contrib/*
+
+	java-pkg_dolauncher ${PN} \
+		--main com.puppycrawl.tools.checkstyle.Main
+
+	java-pkg_dolauncher ${PN}-gui \
+		--main com.puppycrawl.tools.checkstyle.gui.Main
+
+	# Make the ant tasks available to ant
+	java-pkg_register-ant-task
+}
+
+pkg_postinst() {
+	elog "Checkstyle is located at /usr/bin/checkstyle"
+	elog "Check files are located in /usr/share/checkstyle/checks/"
+}
diff --git a/dev-util/checkstyle/checkstyle-5.4.ebuild b/dev-util/checkstyle/checkstyle-5.4.ebuild
new file mode 100644
index 000000000000..6f573a054548
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-5.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard"
+HOMEPAGE="http://checkstyle.sourceforge.net"
+SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
+	http://dev.gentoo.org/~sera/distfiles/${P}-maven-build.xml.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	>=dev-java/antlr-2.7.7:0[java]
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-cli:1
+	dev-java/commons-logging:0
+	dev-java/guava:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	dev-java/ant-nodeps:0
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	EPATCH_OPTS="-p1" epatch "${WORKDIR}"/maven-build.xml.patch
+
+	# maven ant:ant can't handle it.
+	pushd src/checkstyle/com/puppycrawl/tools/checkstyle/grammars > /dev/null || die
+		java -cp $(java-pkg_getjars antlr) antlr.Tool java.g || die
+	popd > /dev/null
+}
+
+JAVA_PKG_BSFIX_NAME="maven-build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="iso-8859-1"
+
+EANT_BUILD_XML="maven-build.xml"
+EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava"
+EANT_BUILD_TARGET="package"
+EANT_ANT_TASKS="ant-nodeps"
+EANT_NEEDS_TOOLS="true"
+
+src_test() {
+	EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	dodoc README
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/${PN}/com
+
+	# Install check files
+	insinto /usr/share/checkstyle/checks
+	doins suppressions.xml sun_checks.xml import-control.xml checkstyle_checks.xml
+
+	# Install extra files
+	insinto  /usr/share/checkstyle/contrib
+	doins -r contrib/*
+
+	java-pkg_dolauncher ${PN} \
+		--main com.puppycrawl.tools.checkstyle.Main
+
+	java-pkg_dolauncher ${PN}-gui \
+		--main com.puppycrawl.tools.checkstyle.gui.Main
+}
diff --git a/dev-util/checkstyle/checkstyle-5.5.ebuild b/dev-util/checkstyle/checkstyle-5.5.ebuild
new file mode 100644
index 000000000000..6c5161721912
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-5.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard"
+HOMEPAGE="http://checkstyle.sourceforge.net"
+SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
+	http://dev.gentoo.org/~sera/distfiles/${PN}-5.4-maven-build.xml.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	>=dev-java/antlr-2.7.7:0[java]
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-cli:1
+	dev-java/commons-logging:0
+	dev-java/guava:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	dev-java/ant-nodeps:0
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp ../${PN}-5.4/maven-build.xml . || die
+	echo "maven.build.finalName=${P}" > maven-build.properties || die
+
+	epatch "${WORKDIR}"/maven-build.xml.patch
+
+	# maven ant:ant can't handle it.
+	pushd src/checkstyle/com/puppycrawl/tools/checkstyle/grammars > /dev/null || die
+		java -cp $(java-pkg_getjars antlr) antlr.Tool java.g || die
+	popd > /dev/null
+}
+
+JAVA_PKG_BSFIX_NAME="maven-build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="iso-8859-1"
+
+EANT_BUILD_XML="maven-build.xml"
+EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava"
+EANT_BUILD_TARGET="package"
+EANT_ANT_TASKS="ant-nodeps"
+EANT_NEEDS_TOOLS="true"
+
+src_test() {
+	EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	dodoc README
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/${PN}/com
+
+	# Install check files
+	insinto /usr/share/checkstyle/checks
+	doins suppressions.xml sun_checks.xml import-control.xml checkstyle_checks.xml
+
+	# Install extra files
+	insinto  /usr/share/checkstyle/contrib
+	doins -r contrib/*
+
+	java-pkg_dolauncher ${PN} \
+		--main com.puppycrawl.tools.checkstyle.Main
+
+	java-pkg_dolauncher ${PN}-gui \
+		--main com.puppycrawl.tools.checkstyle.gui.Main
+}
diff --git a/dev-util/checkstyle/metadata.xml b/dev-util/checkstyle/metadata.xml
new file mode 100644
index 000000000000..d62c88bb40f0
--- /dev/null
+++ b/dev-util/checkstyle/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">checkstyle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cligh/Manifest b/dev-util/cligh/Manifest
new file mode 100644
index 000000000000..dd4de014d71f
--- /dev/null
+++ b/dev-util/cligh/Manifest
@@ -0,0 +1,2 @@
+DIST cligh-0.1_p20120630.tar.gz 7848 SHA256 a531dac9c04fe832aa823334f7ff9e3b2034876a95d60c1e5a77712aead73539 SHA512 1be944a18cad117ddceb5461f0f53c083f34afe32c79d5ce9494c587fa5d8b8f7c7acc3f7447e18677b7fce2fa96ed7bb34a228b5528f19fe4933a24fefa933d WHIRLPOOL 033a5b14015f23c6ec92931928d594ed2affb9b9b0048b350d608dfd7710fd3f48c6d3aebce07a5d6366c4f1ef63dcf4ad8cc72c85afe9285238fe355556089e
+DIST cligh-0.2.tar.gz 7844 SHA256 89b101d9e556d706cb6f5e1fcaec4b226942f52cabd7eef5d5519bcf28269de1 SHA512 9b6e5e187324ccc1d9264aa259f648231f46aa443b75682206a17626f4f6f594a14538066f5e561c8a296d740506216db4cbd6ef7a9d25338a9d641cec7e3b9c WHIRLPOOL ba3aa9974186675831aca44b653c4b74f7224a2dd18de73180145649342efc4222c5877e46609dd68deb9833c98cb94ce4e5f90195ccafb29236b8822baa0789
diff --git a/dev-util/cligh/cligh-0.1_p20120630.ebuild b/dev-util/cligh/cligh-0.1_p20120630.ebuild
new file mode 100644
index 000000000000..eca700869ada
--- /dev/null
+++ b/dev-util/cligh/cligh-0.1_p20120630.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 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Command-line interface to GitHub"
+HOMEPAGE="http://the-brannons.com/software/cligh.html"
+SRC_URI="https://github.com/CMB/cligh/archive/401ce7405d3dc7a90bd519dce8ae9be3bdef43ac.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/cligh-0.2.ebuild b/dev-util/cligh/cligh-0.2.ebuild
new file mode 100644
index 000000000000..27fc0f9e5afb
--- /dev/null
+++ b/dev-util/cligh/cligh-0.2.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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line interface to GitHub"
+HOMEPAGE="http://the-brannons.com/software/cligh.html"
+SRC_URI="http://the-brannons.com/software/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/cligh-9999.ebuild b/dev-util/cligh/cligh-9999.ebuild
new file mode 100644
index 000000000000..e7bbda19ba33
--- /dev/null
+++ b/dev-util/cligh/cligh-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit distutils-r1 git-2
+
+DESCRIPTION="Command-line interface to GitHub"
+HOMEPAGE="http://the-brannons.com/software/cligh.html"
+EGIT_REPO_URI="git://github.com/CMB/cligh.git
+	https://github.com/CMB/cligh.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/metadata.xml b/dev-util/cligh/metadata.xml
new file mode 100644
index 000000000000..4f7e9b297839
--- /dev/null
+++ b/dev-util/cligh/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
new file mode 100644
index 000000000000..e5aea9837e44
--- /dev/null
+++ b/dev-util/cloc/Manifest
@@ -0,0 +1,4 @@
+DIST cloc-1.60.pl 344405 SHA256 4aa870bef104fd2b8f03c667ef8be2cd671cdf59f46c72046c43ed14e222a05c SHA512 569f789cb5ba4164b4f75e4953d8a5be7cd6fbb83ce0356aa0eb6d1c7d863aac91e131df79d90dbc2319c20757e9f758b55ee76390f7f4511e534c451e1a6913 WHIRLPOOL cb2b1ca35aab8eadb0335bac914e546b744c2246d1afc961eb0d683de7461f031bc12e3725d32ff0bcd29260ad2098fccd5291130d321b242797fd93b3de95cd
+DIST cloc-1.62.pl 374834 SHA256 fa3793b576895cde2acae26a49447bf0c55ab3f79bdacfb00a88fc1d255c2570 SHA512 35ad9c9722b423cfae0c81877d5541175feb9d9c61789e4dc7de7ec35a663e3c519f889c03279c39c61aaca0b7d11c8c64f1962029c76f81034a0e9588bad584 WHIRLPOOL c21f1372b5e86f61ad540fb0cddbc5a4bd96de0f448d134da3a8fcc8fa95591f24416f117a71b9b1f72d7c714bf9a9993ef7a53d3395591588446712fb271b3b
+DIST cloc-1.64.pl 408977 SHA256 79edea7ea1f442b1632001e23418193ae4571810e60de8bd25e491036d60eb3d SHA512 bed788cb77ce9ae83714fc14ca04d90d5ae73a7443e180ab815ab81b1d58737f51a8c81360eb7be756afc9d324f9dcf1174b5505b665401217231087ba9461ad WHIRLPOOL 5c56b8be65d16bdadb79950fc4fb3446f36705ea6f5d5ca13304d290e5669a9370cc7b20f60ba1c5e5c4a147d62603beb34e5829a26223efa1ae36e690916518
+DIST cloc.1.pod 12468 SHA256 0e6890acd5836ec43aabed1476e2a1417ea4d454968297c68c1b782e818f979b SHA512 50b4085704c7936de9993476195570957c9c5e864f4a2dbac114ff148a813b50ccba0c6e29d5bda4c4e5cd7c7a09e314233438ddd28f0e0585db54975e602659 WHIRLPOOL 25d9b78a7a0fb88f2ff1192afd8cd5963ab61b06883874b8339a1d4fefbeac4b080d413107f06b34975cd2e7ea92e4313767f2c2aebf39e21ef7cd408bf152ae
diff --git a/dev-util/cloc/cloc-1.60.ebuild b/dev-util/cloc/cloc-1.60.ebuild
new file mode 100644
index 000000000000..5b2ccbf5a16b
--- /dev/null
+++ b/dev-util/cloc/cloc-1.60.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="http://cloc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/perl-5.6"
+RDEPEND="${DEPEND}
+	dev-perl/Algorithm-Diff
+	dev-perl/regexp-common
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp"
+
+S=${WORKDIR}
+
+src_unpack() { :; }
+
+src_prepare() {
+	pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
+}
+
+src_install() {
+	doman ${PN}.1
+	newbin "${DISTDIR}"/${P}.pl ${PN}
+}
diff --git a/dev-util/cloc/cloc-1.62.ebuild b/dev-util/cloc/cloc-1.62.ebuild
new file mode 100644
index 000000000000..525884100433
--- /dev/null
+++ b/dev-util/cloc/cloc-1.62.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="http://cloc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/perl-5.6"
+RDEPEND="${DEPEND}
+	dev-perl/Algorithm-Diff
+	dev-perl/regexp-common
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp"
+
+S=${WORKDIR}
+
+src_unpack() { :; }
+
+src_prepare() {
+	pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
+}
+
+src_install() {
+	doman ${PN}.1
+	newbin "${DISTDIR}"/${P}.pl ${PN}
+}
diff --git a/dev-util/cloc/cloc-1.64.ebuild b/dev-util/cloc/cloc-1.64.ebuild
new file mode 100644
index 000000000000..066490bc9b57
--- /dev/null
+++ b/dev-util/cloc/cloc-1.64.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="http://cloc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/perl-5.6"
+RDEPEND="${DEPEND}
+	dev-perl/Algorithm-Diff
+	dev-perl/regexp-common
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp"
+
+S=${WORKDIR}
+
+src_unpack() { :; }
+
+src_prepare() {
+	pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
+}
+
+src_install() {
+	doman ${PN}.1
+	newbin "${DISTDIR}"/${P}.pl ${PN}
+}
diff --git a/dev-util/cloc/metadata.xml b/dev-util/cloc/metadata.xml
new file mode 100644
index 000000000000..f778ee60d5d6
--- /dev/null
+++ b/dev-util/cloc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cloc</remote-id>
+		<bugs-to>http://sourceforge.net/tracker/?group_id=174787</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cmake-fedora/Manifest b/dev-util/cmake-fedora/Manifest
new file mode 100644
index 000000000000..a094286d658e
--- /dev/null
+++ b/dev-util/cmake-fedora/Manifest
@@ -0,0 +1,2 @@
+DIST cmake-fedora-0.8.1-Source.tar.gz 69878 SHA256 2eb5be43a370ef01ac2e432c5f5771b7bb2efda4c9eac538a8c1e51162ed3c87 SHA512 1f53621ffaed696257b26c8928330f614dd647f4e0344ac1976f2dd0e84321e3ac0cca3c21d3dbe12ac0757df1c2c9ae1f17c7610ea795a4be7724e03f8e221e WHIRLPOOL 6c12133078a07c0b5a2ed66f2b0ec370a1285543628c05309d3e701d9597b979f5c82c5d437aefb26b6e979521e0123545ecc3b02c36557cb6c9b3f228d0ba68
+DIST cmake-fedora-1.3.0-Source.tar.gz 81956 SHA256 be46be6031f5f41fbc322a4e5acbe76565f037cff6dc311339f8b5bcf73e3e48 SHA512 0c6ff168d365500079ba4c3d153a6a10cb2f3ea7d1164bda44aec8c022410905be77d347f29929403cc939d23b961768f75d3051707154510c8c810130c8857e WHIRLPOOL 9746fb980fb64afdf8187de304903275b4d55e95a01712f7d80eb9e47592b4f7074af593900a1f782ad536690df7fb3956ab5fb0c22b26fdf015041a259d8b07
diff --git a/dev-util/cmake-fedora/cmake-fedora-0.8.1.ebuild b/dev-util/cmake-fedora/cmake-fedora-0.8.1.ebuild
new file mode 100644
index 000000000000..5513adeb59f8
--- /dev/null
+++ b/dev-util/cmake-fedora/cmake-fedora-0.8.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="cmake modules that provides helper macros and targets for linux, especially fedora developers"
+HOMEPAGE="https://fedorahosted.org/cmake-fedora/#Getcmake-fedora"
+SRC_URI="https://fedorahosted.org/releases/c/m/cmake-fedora/${P}-Source.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P}-Source
+CMAKE_IN_SOURCE_BUILD=1
diff --git a/dev-util/cmake-fedora/cmake-fedora-1.3.0.ebuild b/dev-util/cmake-fedora/cmake-fedora-1.3.0.ebuild
new file mode 100644
index 000000000000..536eb72d9542
--- /dev/null
+++ b/dev-util/cmake-fedora/cmake-fedora-1.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="cmake modules that provides helper macros and targets for linux, especially fedora developers"
+HOMEPAGE="https://fedorahosted.org/cmake-fedora/#Getcmake-fedora"
+SRC_URI="https://fedorahosted.org/releases/c/m/cmake-fedora/${P}-Source.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P}-Source
+CMAKE_IN_SOURCE_BUILD=1
diff --git a/dev-util/cmake-fedora/metadata.xml b/dev-util/cmake-fedora/metadata.xml
new file mode 100644
index 000000000000..ac07e856ce8a
--- /dev/null
+++ b/dev-util/cmake-fedora/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>naota@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
new file mode 100644
index 000000000000..19f66a5a587a
--- /dev/null
+++ b/dev-util/cmake/Manifest
@@ -0,0 +1,6 @@
+DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
+DIST cmake-3.0.2.tar.gz 5490501 SHA256 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e SHA512 de267bd6c5b318e48fae64c28947de009fb2413bdc6b4454b5e4bbb7d50b78aaef5d7e9d9655cfb9299aa5704fd3e4bbabc6816d3f378f76856f56ab161efe02 WHIRLPOOL 4c2aa1c72edb700689a8a91bfdfe22977e46a87851d66eb0e187e1e35a1a928be12b477fc39455b877d55420bcb149be6430d6835e01e20f61b84d8d83c752d6
+DIST cmake-3.1.0.tar.gz 5955836 SHA256 8bdc3fa3f2da81bc10c772a6b64cc9052acc2901d42e1e1b2588b40df224aad9 SHA512 9e3288c793c01e0ce48af91c618dc7638623010dfb440fb293393d407b7882c181c9a0f4e3b0a14645b556007e69264e94488e832a421b5cfa96338e0808b030 WHIRLPOOL 99df3f9052fee303d02ef9f27ee0ce22a1db57c0963dc7177837dea95a114da7b5d2ea8fd7155df1c7c513dbfb469bba2e638fc84fc1f1a9783fa49cd0e1a061
+DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
+DIST cmake-3.2.3.tar.gz 6438938 SHA256 a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297 SHA512 1fddea23c8e28cd6893879bd3bb349564ece815eaa5c68c3519dd62f0baa05eabbfc38168458ab91594cb0feeefd2ea761b6d292b679f8b9aa33e08a0b9d5b4c WHIRLPOOL 5268cc735cbd523a2027e479ab43499589b8653972a5bed7425c451a9b5ecc5d27c867cd218144a1eb6df2d3126301d7d494cafa7b1ac7455dbb40e66bad30c6
+DIST cmake-3.3.0.tar.gz 6577818 SHA256 857c2f755fe0794d038d6fa462a173d05b210ac2c07ff82f0af853acef231a34 SHA512 d364925d8f0ec181dca3f5c3a6ab17daaf3689f9c0b4433e5c6b73b95965afc2d15e6de4bf4b67188a9dd42312278bed6270b0d4e1eb4e52f78b57b5b2c7d8c5 WHIRLPOOL 7994ec259751e85b0c80ee0b32b8d17a270919e382a1f69a3e5c07937e584c105cc6891195e8bb817701c6087a9a6333c0d9805200cfdfa0f1f69a2566f60789
diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
new file mode 100644
index 000000000000..2f39846637c8
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 qt5"
+
+REQUIRED_USE="?? ( qt4 qt5 )"
+
+DEPEND="
+	>=app-arch/libarchive-2.8.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
+	"${FILESDIR}"/${PN}-2.8.10-desktop.patch
+	"${FILESDIR}"/${PN}-2.8.10-libform.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
+	"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-FindCurses.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    CTest.updatecvs, which fails to commit as root
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	# make things work with gentoo java setup
+	# in case java-config cannot be run, the variable just becomes unset
+	# per bug #315229
+	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use emacs; then
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Docs/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Docs/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
+	rm -rf "${D}/usr/share/cmake/completions" || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/cmake-2.8.12.2-r2.ebuild b/dev-util/cmake/cmake-2.8.12.2-r2.ebuild
new file mode 100644
index 000000000000..d007dfcdece7
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.12.2-r2.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 qt5"
+
+REQUIRED_USE="?? ( qt4 qt5 )"
+
+DEPEND="
+	>=app-arch/libarchive-2.8.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
+	"${FILESDIR}"/${PN}-2.8.10-desktop.patch
+	"${FILESDIR}"/${PN}-2.8.10-libform.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
+	"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-FindCurses.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-fbsd.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-python34.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    CTest.updatecvs, which fails to commit as root
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	# make things work with gentoo java setup
+	# in case java-config cannot be run, the variable just becomes unset
+	# per bug #315229
+	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use emacs; then
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Docs/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Docs/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
+	rm -rf "${D}/usr/share/cmake/completions" || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/cmake-2.8.12.2.ebuild b/dev-util/cmake/cmake-2.8.12.2.ebuild
new file mode 100644
index 000000000000..3d2fbc8cb915
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.12.2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 qt5"
+
+REQUIRED_USE="?? ( qt4 qt5 )"
+
+DEPEND="
+	>=app-arch/libarchive-2.8.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
+	"${FILESDIR}"/${PN}-2.8.10-desktop.patch
+	"${FILESDIR}"/${PN}-2.8.10-libform.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
+	"${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    CTest.updatecvs, which fails to commit as root
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	# make things work with gentoo java setup
+	# in case java-config cannot be run, the variable just becomes unset
+	# per bug #315229
+	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use emacs; then
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Docs/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Docs/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
+	rm -rf "${D}/usr/share/cmake/completions" || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/cmake-3.0.2.ebuild b/dev-util/cmake/cmake-3.0.2.ebuild
new file mode 100644
index 000000000000..1be9eef7c6d5
--- /dev/null
+++ b/dev-util/cmake/cmake-3.0.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt4 qt5"
+
+REQUIRED_USE="?? ( qt4 qt5 )"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
+	"${FILESDIR}"/${PN}-2.8.10-libform.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    CTest.updatecvs, which fails to commit as root
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -rf "${D}/usr/share/cmake/{completions,editors}" || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/cmake-3.1.0.ebuild b/dev-util/cmake/cmake-3.1.0.ebuild
new file mode 100644
index 000000000000..cc8f10cc58d2
--- /dev/null
+++ b/dev-util/cmake/cmake-3.1.0.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt4 qt5"
+
+REQUIRED_USE="?? ( qt4 qt5 )"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.8.10-libform.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    CTest.updatecvs, which fails to commit as root
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -rf "${D}/usr/share/cmake/{completions,editors}" || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild
new file mode 100644
index 000000000000..86cfeacdd509
--- /dev/null
+++ b/dev-util/cmake/cmake-3.2.2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/cmake-3.2.3.ebuild b/dev-util/cmake/cmake-3.2.3.ebuild
new file mode 100644
index 000000000000..417c192bad22
--- /dev/null
+++ b/dev-util/cmake/cmake-3.2.3.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+
+	# upstream backports
+	"${FILESDIR}"/${PN}-3.2.3-musl-missing-include.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/cmake-3.3.0.ebuild b/dev-util/cmake/cmake-3.3.0.ebuild
new file mode 100644
index 000000000000..86d3335e0731
--- /dev/null
+++ b/dev-util/cmake/cmake-3.3.0.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
new file mode 100644
index 000000000000..e4a1a6d47cbc
--- /dev/null
+++ b/dev-util/cmake/files/50cmake-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t)
+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
new file mode 100644
index 000000000000..02c3011c8f75
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
@@ -0,0 +1,39 @@
+http://public.kitware.com/Bug/view.php?id=7933
+
+diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx
+--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx	Wed Sep 24 20:34:37 2008
++++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx	Tue Nov  4 11:18:32 2008
+@@ -38,6 +38,13 @@
+ int main() { return 0; }
+ #endif
+ 
++#ifdef TEST_KWSYS_LFS_SUPPORT
++#define _LARGE_FILES
++#include <iostream>
++int main() { return 0; }
++#endif
++
++
+ #ifdef TEST_KWSYS_IOS_HAVE_STD
+ #include <iosfwd>
+ void f(std ::ostream*) {}
+diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap
+--- cmake-2.6.2/bootstrap	Wed Sep 24 20:34:33 2008
++++ cmake-2.6.2-p/bootstrap	Tue Nov  4 11:17:11 2008
+@@ -1005,6 +1005,16 @@
+   echo "${cmake_cxx_compiler} does not have stl iterator_traits"
+ fi
+ 
++if cmake_try_run "${cmake_cxx_compiler}" \
++  "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \
++  "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then
++  KWSYS_LFS_AVAILABLE=1
++  echo "LFS support available"
++else
++  KWSYS_LFS_AVAILABLE=0
++  echo "LFS support unavailable, disabled"
++fi
++
+ if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then
+   if cmake_try_run "${cmake_cxx_compiler}" \
+     "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \
diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
new file mode 100644
index 000000000000..ceb205ff586d
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
@@ -0,0 +1,19 @@
+Patch by Heiko Przybyl
+
+--- Source/cmComputeLinkInformation.cxx
++++ Source/cmComputeLinkInformation.cxx
+@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge
+   for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin();
+       ri != runtimeDirs.end(); ++ri)
+     {
++      // Do not add duplicates.
++      // I'd like to have that check already in the list generation code
++      // but that would need lots of more changes, even in ExpandListArgument().
++      if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos)
++        {
++          //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl;
++          continue;
++        }
+     // Separate from previous path.
+     rpath += sep;
+     sep = this->GetRuntimeSep().c_str();
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
new file mode 100644
index 000000000000..9cb4777cc9ba
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
@@ -0,0 +1,23 @@
+Don't use .so for modules on darwin/macos. Use .bundle instead.
+Patch by Heiko Przybyl
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -26,7 +26,7 @@
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ set(CMAKE_SHARED_MODULE_PREFIX "lib")
+-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ set(CMAKE_MODULE_EXISTS 1)
+ set(CMAKE_DL_LIBS "")
+ 
+@@ -48,7 +48,7 @@
+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
+ set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+ set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
+ 
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
new file mode 100644
index 000000000000..97c93aa5831e
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
@@ -0,0 +1,50 @@
+Do not detect Xcode and set -isysroot for its SDK, since that messes up
+our toolchain, and hence makes any compilation fail, bug #445308
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -60,18 +60,18 @@
+ endif()
+ 
+ # Ask xcode-select where to find /Developer or fall back to ancient location.
+-execute_process(COMMAND xcode-select -print-path
+-  OUTPUT_VARIABLE _stdout
+-  OUTPUT_STRIP_TRAILING_WHITESPACE
+-  ERROR_VARIABLE _stderr
+-  RESULT_VARIABLE _failed)
+-if(NOT _failed AND IS_DIRECTORY ${_stdout})
+-  set(OSX_DEVELOPER_ROOT ${_stdout})
+-elseif(IS_DIRECTORY "/Developer")
+-  set(OSX_DEVELOPER_ROOT "/Developer")
+-else()
++#execute_process(COMMAND xcode-select -print-path
++#  OUTPUT_VARIABLE _stdout
++#  OUTPUT_STRIP_TRAILING_WHITESPACE
++#  ERROR_VARIABLE _stderr
++#  RESULT_VARIABLE _failed)
++#if(NOT _failed AND IS_DIRECTORY ${_stdout})
++#  set(OSX_DEVELOPER_ROOT ${_stdout})
++#elseif(IS_DIRECTORY "/Developer")
++#  set(OSX_DEVELOPER_ROOT "/Developer")
++#else()
+   set(OSX_DEVELOPER_ROOT "")
+-endif()
++#endif()
+ 
+ execute_process(COMMAND sw_vers -productVersion
+   OUTPUT_VARIABLE CURRENT_OSX_VERSION
+@@ -91,10 +91,10 @@
+ # CMAKE_OSX_DEPLOYMENT_TARGET
+ 
+ # Set cache variable - end user may change this during ccmake or cmake-gui configure.
+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
+-  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
+-    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
+-endif()
++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
++#  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
++#    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
++#endif()
+ 
+ #----------------------------------------------------------------------------
+ # CMAKE_OSX_SYSROOT
diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch
new file mode 100644
index 000000000000..e0cefa9ceaf0
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-desktop.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop
+index 645eb76..7be495f 100644
+--- a/Source/QtDialog/CMake.desktop
++++ b/Source/QtDialog/CMake.desktop
+@@ -3,7 +3,7 @@ Version=1.0
+ Name=CMake
+ Comment=Cross-platform buildsystem
+ Exec=cmake-gui %f
+-Icon=CMakeSetup32.png
++Icon=CMakeSetup32
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch
new file mode 100644
index 000000000000..052cc30699fd
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch
@@ -0,0 +1,51 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea1c033..ae479ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
+   else ()
+     set(BUILD_CursesDialog 0)
+   endif ()
+-  if(BUILD_CursesDialog)
+-    add_subdirectory(Source/CursesDialog/form)
+-  endif()
+ endmacro ()
+ 
+ #-----------------------------------------------------------------------
+diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
+index 96e28b4..4102379 100644
+--- a/Source/CursesDialog/CMakeLists.txt
++++ b/Source/CursesDialog/CMakeLists.txt
+@@ -25,13 +25,16 @@ set( CURSES_SRCS
+               CursesDialog/ccmake
+    )
+ 
+-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
+-                    ${CMake_BINARY_DIR}/Source/CursesDialog/form)
+ include_directories(${CURSES_INCLUDE_PATH})
+ 
+ 
+ add_executable(ccmake ${CURSES_SRCS} )
+ target_link_libraries(ccmake CMakeLib)
+-target_link_libraries(ccmake cmForm)
++TARGET_LINK_LIBRARIES(ccmake form)
++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
++IF(CURSES_EXTRA_LIBRARY)
++  TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
++ENDIF(CURSES_EXTRA_LIBRARY)
++
+ 
+ install_targets(/bin ccmake)
+diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
+index b157a28..f131ea4 100644
+--- a/Source/CursesDialog/cmCursesStandardIncludes.h
++++ b/Source/CursesDialog/cmCursesStandardIncludes.h
+@@ -15,8 +15,6 @@
+  #define _MSE_INT_H
+ #endif
+ 
+-#include <cmFormConfigure.h>
+-
+ #if defined(__hpux)
+ # define _BOOL_DEFINED
+ # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
new file mode 100644
index 000000000000..a7e8688ec872
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
@@ -0,0 +1,22 @@
+--- Modules/FindPythonInterp.cmake
++++ Modules/FindPythonInterp.cmake
+@@ -60,6 +60,10 @@
+ 
+ list(APPEND _Python_NAMES python)
+ 
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++    set(_Python_NAMES python)
++endif()
++
+ # Search for the current active python version first
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+ 
+@@ -76,7 +80,7 @@
+ unset(_PYTHON3_VERSIONS)
+ 
+ # Search for newest python version if python executable isn't found
+-if(NOT PYTHON_EXECUTABLE)
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
+     foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+       set(_Python_NAMES python${_CURRENT_VERSION})
+       if(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
new file mode 100644
index 000000000000..2a83ff7abb69
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -0,0 +1,24 @@
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index bffa9fb..8fc90ee 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -74,6 +74,19 @@ set(_Python_VERSIONS
+   ${_PYTHON_FIND_OTHER_VERSIONS}
+   )
+ 
++# Gentoo portage requires that you use exactly the given python version
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++                    OUTPUT_VARIABLE _Gentoo_Python_VERSION)
++    list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
++    if (_Gentoo_Python_INDEX EQUAL -1)
++       # the current Gentoo python version is not compatible with what is requested
++       set(_Python_VERSIONS)
++    else ()
++       set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
++    endif ()
++endif()
++
+ unset(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON1_VERSIONS)
+ unset(_PYTHON2_VERSIONS)
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
new file mode 100644
index 000000000000..02e44fb240bb
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
@@ -0,0 +1,48 @@
+--- b/Modules/FindBLAS.cmake
++++ a/Modules/FindBLAS.cmake
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration for blas is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find BLAS library
+ # This module finds an installed fortran library that implements the BLAS
+ # linear-algebra interface (see http://www.netlib.org/blas/).
+@@ -40,6 +46,26 @@
+ # (To distribute this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_BLAS blas)
++if(PC_BLAS_FOUND)
++  foreach(PC_LIB ${PC_BLAS_LIBRARIES})
++    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
++    if (NOT ${PC_LIB}_LIBRARY)
++      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
++    endif (NOT ${PC_LIB}_LIBRARY)
++    list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) 
++  endforeach(PC_LIB)
++  find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
++  mark_as_advanced(BLAS_LIBRARIES)
++else(PC_BLAS_FOUND)
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
++
++
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+ 
+@@ -604,3 +630,8 @@
+ endif()
+ 
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++
++endif(PC_BLAS_FOUND)
++
++
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
new file mode 100644
index 000000000000..b00b4f75219b
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
@@ -0,0 +1,73 @@
+--- Modules/FindBoost.cmake
++++ Modules/FindBoost.cmake
+@@ -903,6 +903,11 @@
+ 
+   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
++  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++    # Get version of Python.
++    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
++  endif()
++
+ 
+   #
+   # Find RELEASE libraries
+@@ -913,6 +918,14 @@
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++      list(APPEND _boost_RELEASE_NAMES
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++    endif()
+   if(_boost_STATIC_RUNTIME_WORKAROUND)
+     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+     list(APPEND _boost_RELEASE_NAMES
+@@ -920,6 +933,13 @@
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++        list(APPEND _boost_RELEASE_NAMES
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++      endif()
+   endif()
+   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
+@@ -945,6 +965,15 @@
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++      list(APPEND _boost_DEBUG_NAMES
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++    endif()
+   if(_boost_STATIC_RUNTIME_WORKAROUND)
+     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+     list(APPEND _boost_DEBUG_NAMES
+@@ -952,6 +981,13 @@
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++        list(APPEND _boost_DEBUG_NAMES
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++      endif()
+   endif()
+   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
diff --git a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch
new file mode 100644
index 000000000000..36f4dede1f58
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch
@@ -0,0 +1,130 @@
+From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Tue, 6 Nov 2012 23:35:34 +1100
+Subject: [PATCH] Set some proper paths to make cmake find our tools.
+
+The ebuild now adds an extra / at the end of $EPREFIX so that it is
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
+correct)
+
+Original patch by Heiko Przybyl.
+Updated by Chris Reffett (cmake-2.8.8)
+Updated by Johannes Huber (cmake-2.8.9)
+Updated by Michael Palimaka (cmake-2.8.10)
+Updated by Chris Reffett (cmake-2.8.11)
+
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -252,9 +252,9 @@
+       "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+ 
+ 
+-# default to searching for frameworks first
++# default to searching for frameworks last
+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
+-  set(CMAKE_FIND_FRAMEWORK FIRST)
++  set(CMAKE_FIND_FRAMEWORK LAST)
+ endif()
+ 
+ # Older OS X linkers do not report their framework search path
+@@ -276,6 +276,8 @@
+ 
+ # set up the default search directories for frameworks
+ set(CMAKE_SYSTEM_FRAMEWORK_PATH
++  @GENTOO_PORTAGE_EPREFIX@Frameworks
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
+   ~/Library/Frameworks
+   /Library/Frameworks
+   /Network/Library/Frameworks
+@@ -298,13 +300,15 @@
+   endif()
+ endif()
+ 
+-# default to searching for application bundles first
++# default to searching for application bundles last
+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
+-  set(CMAKE_FIND_APPBUNDLE FIRST)
++  set(CMAKE_FIND_APPBUNDLE LAST)
+ endif()
+ # set up the default search directories for application bundles
+ set(_apps_paths)
+ foreach(_path
++  @GENTOO_PORTAGE_EPREFIX@Applications
++  @GENTOO_PORTAGE_EPREFIX@usr/bin
+   "~/Applications"
+   "/Applications"
+   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -33,6 +33,7 @@
+ # search types.
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+   # Standard
++  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
+   /usr/local /usr /
+ 
+   # CMake install location
+@@ -44,43 +45,41 @@
+ 
+ # List common include file locations not under the common prefixes.
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-  # Windows API on Cygwin
+-  /usr/include/w32api
+-
+-  # X11
+-  /usr/X11R6/include /usr/include/X11
+-
+-  # Other
+-  /usr/pkg/include
+-  /opt/csw/include /opt/include
+-  /usr/openwin/include
++  @GENTOO_PORTAGE_EPREFIX@usr/include
+   )
+ 
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-  # Windows API on Cygwin
+-  /usr/lib/w32api
+-
+-  # X11
+-  /usr/X11R6/lib /usr/lib/X11
+-
+-  # Other
+-  /usr/pkg/lib
+-  /opt/csw/lib /opt/lib
+-  /usr/openwin/lib
++  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++  @GENTOO_PORTAGE_GCCLIBDIR@
++  @GENTOO_PORTAGE_EPREFIX@usr/lib64
++  @GENTOO_PORTAGE_EPREFIX@usr/libx32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
++  @GENTOO_PORTAGE_EPREFIX@lib
+   )
+ 
+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-  /usr/pkg/bin
++  @GENTOO_PORTAGE_EPREFIX@usr/bin
++  @GENTOO_PORTAGE_EPREFIX@bin
+   )
+ 
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+-  /lib /usr/lib /usr/lib32 /usr/lib64
++  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++  @GENTOO_PORTAGE_GCCLIBDIR@
++  @GENTOO_PORTAGE_EPREFIX@usr/lib64
++  @GENTOO_PORTAGE_EPREFIX@usr/libx32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
++  @GENTOO_PORTAGE_EPREFIX@lib
++  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
+   )
+ 
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
++  @GENTOO_PORTAGE_EPREFIX@usr/include
+   /usr/include
+   )
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
++  @GENTOO_PORTAGE_EPREFIX@usr/include
+   /usr/include
+   )
+ 
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch
new file mode 100644
index 000000000000..6dc244c239c5
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch
@@ -0,0 +1,43 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Dec  8 13:38:06 UTC 2013
+Subject: fix check for freetype-2.5.1
+
+--- Modules/FindFreetype.cmake
++++ Modules/FindFreetype.cmake
+@@ -64,6 +64,19 @@
+   PATH_SUFFIXES include/freetype2 include
+ )
+ 
++if(NOT FREETYPE_INCLUDE_DIR_freetype2)
++  find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
++    HINTS
++      ENV FREETYPE_DIR
++    PATHS
++      /usr/X11R6
++      /usr/local/X11R6
++      /usr/local/X11
++      /usr/freeware
++    PATH_SUFFIXES include/freetype2 include
++  )
++endif()
++
+ find_library(FREETYPE_LIBRARY
+   NAMES freetype libfreetype freetype219
+   HINTS
+@@ -82,8 +95,14 @@
+ endif()
+ set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
+ 
+-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
+-    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
++if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
++  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
++elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
++  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
++endif()
++
++if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
++    file(STRINGS "${FREETYPE_H}" freetype_version_str
+          REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
+ 
+     unset(FREETYPE_VERSION_STRING)
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
new file mode 100644
index 000000000000..b094f17938ce
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
@@ -0,0 +1,23 @@
+--- Modules/FindImageMagick.cmake
++++ Modules/FindImageMagick.cmake
+@@ -147,17 +147,17 @@
+     )
+   if(component STREQUAL "Magick++")
+     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
+-      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
++      Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
+   elseif(component STREQUAL "MagickWand")
+     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
+-      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
++      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
+   elseif(component STREQUAL "MagickCore")
+     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
+-      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
++      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
+   else()
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
new file mode 100644
index 000000000000..4a5474abc027
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
@@ -0,0 +1,77 @@
+--- Modules/FindBoost.cmake
++++ Modules/FindBoost.cmake
+@@ -905,6 +905,15 @@
+ 
+   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
++  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++    # Get version of Python.
++    if (NOT PYTHON_EXECUTABLE)
++      #if a certain version of python was detected by cmake before use that one
++        set(PYTHON_EXECUTABLE "python")
++      endif (NOT PYTHON_EXECUTABLE)
++    execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
++  endif()
++
+ 
+   #
+   # Find RELEASE libraries
+@@ -915,6 +924,14 @@
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++      list(APPEND _boost_RELEASE_NAMES
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++    endif()
+   if(_boost_STATIC_RUNTIME_WORKAROUND)
+     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+     list(APPEND _boost_RELEASE_NAMES
+@@ -922,6 +939,13 @@
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++        list(APPEND _boost_RELEASE_NAMES
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++      endif()
+   endif()
+   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
+@@ -951,6 +975,15 @@
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++      list(APPEND _boost_DEBUG_NAMES
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++    endif()
+   if(_boost_STATIC_RUNTIME_WORKAROUND)
+     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+     list(APPEND _boost_DEBUG_NAMES
+@@ -958,6 +991,13 @@
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++        list(APPEND _boost_DEBUG_NAMES
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++      endif()
+   endif()
+   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch
new file mode 100644
index 000000000000..43a2a7f4a2f0
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch
@@ -0,0 +1,42 @@
+--- cmake-2.8.12.1-orig/Modules/FindCurses.cmake	2013-11-06 06:07:22.000000000 +1100
++++ cmake-2.8.12.1/Modules/FindCurses.cmake	2014-01-17 21:55:40.630142386 +1100
+@@ -30,7 +30,7 @@
+ find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
+ set(CURSES_USE_NCURSES FALSE)
+ 
+-if(CURSES_NCURSES_LIBRARY  AND NOT  CURSES_CURSES_LIBRARY)
++if(CURSES_NCURSES_LIBRARY  AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
+   set(CURSES_USE_NCURSES TRUE)
+ endif()
+ # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
+@@ -125,10 +125,20 @@
+       CACHE FILEPATH "The curses library" ${FORCE_IT})
+   endif()
+ 
++  CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
++    cbreak "" CURSES_NCURSES_HAS_CBREAK)
++  if(NOT CURSES_NCURSES_HAS_CBREAK)
++    find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}")
++    find_library(CURSES_EXTRA_LIBRARY tinfo )
++    CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}"
++      cbreak "" CURSES_TINFO_HAS_CBREAK)
++  endif()
+ endif()
+ 
+-find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
+-find_library(CURSES_EXTRA_LIBRARY cur_colr )
++if (NOT CURSES_TINFO_HAS_CBREAK)
++  find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
++  find_library(CURSES_EXTRA_LIBRARY cur_colr )
++endif()
+ 
+ find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
+ find_library(CURSES_FORM_LIBRARY form )
+@@ -172,5 +182,7 @@
+   CURSES_INCLUDE_DIR
+   CURSES_CURSES_HAS_WSYNCUP
+   CURSES_NCURSES_HAS_WSYNCUP
++  CURSES_NCURSES_HAS_CBREAK
++  CURSES_TINFO_HAS_CBREAK
+   )
+ 
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch b/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch
new file mode 100644
index 000000000000..ab27af2ec8ca
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch
@@ -0,0 +1,38 @@
+From: KWSys Robot <kwrobot@kitware.com>
+Date: Tue, 15 Oct 2013 12:43:32 +0000 (-0400)
+Subject: KWSys 2013-10-15 (6eab64c3)
+X-Git-Tag: v3.0.0-rc1~178^2^2~5
+X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=c01e7445
+
+KWSys 2013-10-15 (6eab64c3)
+
+Extract upstream KWSys using the following shell commands.
+
+$ git archive --prefix=upstream-kwsys/ 6eab64c3 | tar x
+$ git shortlog --no-merges --abbrev=8 --format='%h %s' 96b2f6f4..6eab64c3
+Raphael Kubo da Costa (1):
+      6eab64c3 SystemInformation: Include backtrace-related headers on FreeBSD
+
+Change-Id: Ib0447aab3d6555ce278f0c1417af2c53e6f181a5
+---
+
+diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
+index 7c31f3a..2672730 100644
+--- a/Source/kwsys/SystemInformation.cxx
++++ b/Source/kwsys/SystemInformation.cxx
+@@ -88,6 +88,15 @@ typedef int siginfo_t;
+ #  include <ifaddrs.h>
+ #  define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
+ # endif
++# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
++#  include <execinfo.h>
++#  if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
++#    include <cxxabi.h>
++#  endif
++#  if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
++#    include <dlfcn.h>
++#  endif
++# endif
+ #endif
+ 
+ #if defined(__OpenBSD__) || defined(__NetBSD__)
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch
new file mode 100644
index 000000000000..99e39a2f5c8d
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch
@@ -0,0 +1,27 @@
+diff --git a/CompileFlags.cmake b/CompileFlags.cmake
+index 20f5dec..24ac58d 100644
+--- a/CompileFlags.cmake
++++ b/CompileFlags.cmake
+@@ -66,5 +66,5 @@ endif ()
+ # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
+ # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
+ if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
+-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*")
++  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
+ endif ()
+diff --git a/bootstrap b/bootstrap
+index 9784d5d..51d067e 100755
+--- a/bootstrap
++++ b/bootstrap
+@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then
+   # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
+   # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
+   if ${cmake_machine_parisc}; then
+-    # if -O[s23] is given the effect is inverted, so do not use the flag then
+-    if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then
+-      cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
+-    fi
++    cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*"
+   fi
+ fi
+ 
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-python34.patch b/dev-util/cmake/files/cmake-2.8.12.2-python34.patch
new file mode 100644
index 000000000000..f64e40cc51ef
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.2-python34.patch
@@ -0,0 +1,34 @@
+commit ab6201ab647c13fee44c44822b8502e9848faaaf
+Author: Matt McCormick <matt.mccormick@kitware.com>
+Date:   Wed Mar 5 17:41:47 2014 -0500
+
+    FindPython{Interp,Libs}: Search for Python 3.4.
+    
+    Python 3.4.0rnc1 was released on 2014-02-20.
+
+diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
+index 8da848c..e23a58b 100644
+--- a/Modules/FindPythonInterp.cmake
++++ b/Modules/FindPythonInterp.cmake
+@@ -47,7 +47,7 @@ unset(_Python_NAMES)
+ 
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(PythonInterp_FIND_VERSION)
+     if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index 0749efc..1dbc967 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
+ 
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(PythonLibs_FIND_VERSION)
+     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
new file mode 100644
index 000000000000..6808b80ae505
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
@@ -0,0 +1,44 @@
+diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake
+--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake	2011-12-30 17:49:56.000000000 +0100
++++ cmake-2.8.7/Modules/FindLAPACK.cmake	2012-03-09 02:15:46.000000000 +0100
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find LAPACK library
+ # This module finds an installed fortran library that implements the LAPACK
+ # linear-algebra interface (see http://www.netlib.org/lapack/).
+@@ -36,6 +42,24 @@
+ # (To distribute this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_LAPACK lapack)
++if(PC_LAPACK_FOUND)
++  foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
++    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
++    if (NOT ${PC_LIB}_LIBRARY)
++      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
++    endif (NOT ${PC_LIB}_LIBRARY)
++    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) 
++  endforeach(PC_LIB)
++  find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
++  mark_as_advanced(LAPACK_LIBRARIES)
++else(PC_LAPACK_FOUND)
++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
++
+ set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ 
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+@@ -305,3 +329,5 @@
+ endif(BLA_F95)
+ 
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
new file mode 100644
index 000000000000..c5e17c5ba64e
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
@@ -0,0 +1,18 @@
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index c47f583..5783d37 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -87,7 +87,12 @@
+ set(PKG_CONFIG_VERSION 1)
+ set(PKG_CONFIG_FOUND   0)
+ 
+-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
++if(NOT PKG_CONFIG_EXECUTABLE)
++	set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG})
++	if(NOT PKG_CONFIG_EXECUTABLE)
++		find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
++	endif(NOT PKG_CONFIG_EXECUTABLE)
++endif(NOT PKG_CONFIG_EXECUTABLE)
+ mark_as_advanced(PKG_CONFIG_EXECUTABLE)
+ 
+ if(PKG_CONFIG_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
new file mode 100644
index 000000000000..86c5dc7fd54a
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
@@ -0,0 +1,43 @@
+--- Modules/FindBLAS.cmake
++++ Modules/FindBLAS.cmake
+@@ -4,6 +4,10 @@
+ #
+ # Find BLAS library
+ #
++# Version modified for Gentoo Linux.
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
+ # This module finds an installed fortran library that implements the
+ # BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
+ # list of libraries searched for is taken from the autoconf macro file,
+@@ -50,6 +54,23 @@
+ # (To distribute this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_BLAS blas)
++if(PC_BLAS_FOUND)
++  foreach(PC_LIB ${PC_BLAS_LIBRARIES})
++    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
++    if (NOT ${PC_LIB}_LIBRARY)
++      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
++    endif (NOT ${PC_LIB}_LIBRARY)
++    list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) 
++  endforeach(PC_LIB)
++  find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
++  mark_as_advanced(BLAS_LIBRARIES)
++else(PC_BLAS_FOUND)
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+ 
+@@ -688,3 +709,5 @@
+ endif()
+ 
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_BLAS_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch
new file mode 100644
index 000000000000..a6291d2b8500
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch
@@ -0,0 +1,93 @@
+From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 19 Jun 2014 00:17:48 +1000
+Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries
+ wrt bug #400969.
+
+---
+ Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
+
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
+index dfd4460..70bfb4f 100644
+--- a/Modules/FindBoost.cmake
++++ b/Modules/FindBoost.cmake
+@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
+ 
++  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++    # Get version of Python.
++    if (NOT PYTHON_EXECUTABLE)
++      #if a certain version of python was detected by cmake before use that one
++        set(PYTHON_EXECUTABLE "python")
++      endif (NOT PYTHON_EXECUTABLE)
++    execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
++  endif()
++
+   # Compute component-specific hints.
+   set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
+   if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR
+@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
++    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++      list(APPEND _boost_RELEASE_NAMES
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++    endif()
++
+   if(_boost_STATIC_RUNTIME_WORKAROUND)
+     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+     list(APPEND _boost_RELEASE_NAMES
+@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
+       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++        list(APPEND _boost_RELEASE_NAMES
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++      endif()
+   endif()
+   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
+@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
+     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
++    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++      list(APPEND _boost_DEBUG_NAMES
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++    endif()
+   if(_boost_STATIC_RUNTIME_WORKAROUND)
+     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+     list(APPEND _boost_DEBUG_NAMES
+@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
+       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++        list(APPEND _boost_DEBUG_NAMES
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++      endif()
+   endif()
+   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
+-- 
+1.8.5.5
+
diff --git a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
new file mode 100644
index 000000000000..decfb91260aa
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
@@ -0,0 +1,142 @@
+From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 19 Jun 2014 00:08:13 +1000
+Subject: [PATCH] Set some proper paths to make cmake find our tools.
+
+The ebuild now adds an extra / at the end of $EPREFIX so that it is
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
+correct)
+
+Original patch by Heiko Przybyl.
+Updated by Chris Reffett (cmake-2.8.8)
+Updated by Johannes Huber (cmake-2.8.9)
+Updated by Michael Palimaka (cmake-2.8.10)
+Updated by Chris Reffett (cmake-2.8.11)
+Updated by Michael Palimaka (cmake-3.0.0)
+---
+ Modules/Platform/Darwin.cmake    | 12 +++++++----
+ Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
+ 2 files changed, 29 insertions(+), 26 deletions(-)
+
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
+index e25df1e..9b22a6a 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
+ set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
+ set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
+ 
+-# default to searching for frameworks first
++# default to searching for frameworks last
+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
+-  set(CMAKE_FIND_FRAMEWORK FIRST)
++  set(CMAKE_FIND_FRAMEWORK LAST)
+ endif()
+ 
+ # Older OS X linkers do not report their framework search path
+@@ -156,6 +156,8 @@ endif()
+ 
+ # set up the default search directories for frameworks
+ set(CMAKE_SYSTEM_FRAMEWORK_PATH
++  @GENTOO_PORTAGE_EPREFIX@Frameworks
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
+   ~/Library/Frameworks
+   )
+ if(_CMAKE_OSX_SYSROOT_PATH)
+@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
+   endif()
+ endif()
+ 
+-# default to searching for application bundles first
++# default to searching for application bundles last
+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
+-  set(CMAKE_FIND_APPBUNDLE FIRST)
++  set(CMAKE_FIND_APPBUNDLE LAST)
+ endif()
+ # set up the default search directories for application bundles
+ set(_apps_paths)
+ foreach(_path
++  @GENTOO_PORTAGE_EPREFIX@Applications
++  @GENTOO_PORTAGE_EPREFIX@usr/bin
+   "~/Applications"
+   "/Applications"
+   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index 20ee1d1..3481ca8 100644
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+ # search types.
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+   # Standard
++  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
+   /usr/local /usr /
+ 
+   # CMake install location
+@@ -53,43 +54,41 @@ endif()
+ 
+ # List common include file locations not under the common prefixes.
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-  # Windows API on Cygwin
+-  /usr/include/w32api
+-
+-  # X11
+-  /usr/X11R6/include /usr/include/X11
+-
+-  # Other
+-  /usr/pkg/include
+-  /opt/csw/include /opt/include
+-  /usr/openwin/include
++  @GENTOO_PORTAGE_EPREFIX@usr/include
+   )
+ 
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-  # Windows API on Cygwin
+-  /usr/lib/w32api
+-
+-  # X11
+-  /usr/X11R6/lib /usr/lib/X11
+-
+-  # Other
+-  /usr/pkg/lib
+-  /opt/csw/lib /opt/lib
+-  /usr/openwin/lib
++  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++  @GENTOO_PORTAGE_GCCLIBDIR@
++  @GENTOO_PORTAGE_EPREFIX@usr/lib64
++  @GENTOO_PORTAGE_EPREFIX@usr/libx32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
++  @GENTOO_PORTAGE_EPREFIX@lib
+   )
+ 
+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-  /usr/pkg/bin
++  @GENTOO_PORTAGE_EPREFIX@usr/bin
++  @GENTOO_PORTAGE_EPREFIX@bin
+   )
+ 
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+-  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
++  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++  @GENTOO_PORTAGE_GCCLIBDIR@
++  @GENTOO_PORTAGE_EPREFIX@usr/lib64
++  @GENTOO_PORTAGE_EPREFIX@usr/libx32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib32
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
++  @GENTOO_PORTAGE_EPREFIX@lib
++  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
+   )
+ 
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
++  GENTOO_PORTAGE_EPREFIX@usr/include
+   /usr/include
+   )
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
++  @GENTOO_PORTAGE_EPREFIX@usr/include
+   /usr/include
+   )
+ 
+-- 
+1.8.5.5
+
diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
new file mode 100644
index 000000000000..57250e453be0
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
@@ -0,0 +1,43 @@
+--- Modules/FindLAPACK.cmake.orig	2014-09-15 23:50:11.377111987 +0200
++++ Modules/FindLAPACK.cmake	2014-09-15 23:52:54.734388375 +0200
+@@ -4,6 +4,10 @@
+ #
+ # Find LAPACK library
+ #
++# Version modified for Gentoo Linux.
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
+ # This module finds an installed fortran library that implements the
+ # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
+ #
+@@ -140,6 +144,23 @@
+ 
+ endmacro()
+ 
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_LAPACK lapack)
++if(PC_LAPACK_FOUND)
++  foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
++    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
++    if (NOT ${PC_LIB}_LIBRARY)
++      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
++    endif (NOT ${PC_LIB}_LIBRARY)
++    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
++  endforeach(PC_LIB)
++  find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
++  mark_as_advanced(LAPACK_LIBRARIES)
++else(PC_LAPACK_FOUND)
++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
+ 
+ set(LAPACK_LINKER_FLAGS)
+ set(LAPACK_LIBRARIES)
+@@ -348,3 +369,5 @@
+ endif()
+ 
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
new file mode 100644
index 000000000000..78f622d886af
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
@@ -0,0 +1,29 @@
+--- Modules/FindPythonInterp.cmake.orig	2015-01-06 11:50:03.376357898 +0100
++++ Modules/FindPythonInterp.cmake	2015-01-06 12:25:48.614989290 +0100
+@@ -75,6 +75,11 @@
+ else()
+     set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
+ endif()
++
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++    set(_Python_NAMES python)
++endif()
++
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+ 
+ # Set up the versions we know about, in the order we will search. Always add
+@@ -99,12 +104,13 @@
+ unset(_PYTHON3_VERSIONS)
+ 
+ # Search for newest python version if python executable isn't found
+-if(NOT PYTHON_EXECUTABLE)
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
+     foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS)
+       set(_Python_NAMES python${_CURRENT_VERSION})
+       if(WIN32)
+         list(APPEND _Python_NAMES python)
+       endif()
++
+       find_program(PYTHON_EXECUTABLE
+         NAMES ${_Python_NAMES}
+         PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]
diff --git a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
new file mode 100644
index 000000000000..119001aeef31
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
@@ -0,0 +1,48 @@
+Do not detect Xcode and set -isysroot for its SDK, since that messes up
+our toolchain, and hence makes any compilation fail, bug #445308
+
+--- Modules/Platform/Darwin-Initialize.cmake
++++ Modules/Platform/Darwin-Initialize.cmake
+@@ -1,16 +1,16 @@
+ # Ask xcode-select where to find /Developer or fall back to ancient location.
+-execute_process(COMMAND xcode-select -print-path
+-  OUTPUT_VARIABLE _stdout
+-  OUTPUT_STRIP_TRAILING_WHITESPACE
+-  ERROR_VARIABLE _stderr
+-  RESULT_VARIABLE _failed)
+-if(NOT _failed AND IS_DIRECTORY ${_stdout})
+-  set(OSX_DEVELOPER_ROOT ${_stdout})
+-elseif(IS_DIRECTORY "/Developer")
+-  set(OSX_DEVELOPER_ROOT "/Developer")
+-else()
++#execute_process(COMMAND xcode-select -print-path
++#  OUTPUT_VARIABLE _stdout
++#  OUTPUT_STRIP_TRAILING_WHITESPACE
++#  ERROR_VARIABLE _stderr
++#  RESULT_VARIABLE _failed)
++#if(NOT _failed AND IS_DIRECTORY ${_stdout})
++#  set(OSX_DEVELOPER_ROOT ${_stdout})
++#elseif(IS_DIRECTORY "/Developer")
++#  set(OSX_DEVELOPER_ROOT "/Developer")
++#else()
+   set(OSX_DEVELOPER_ROOT "")
+-endif()
++#endif()
+ 
+ execute_process(COMMAND sw_vers -productVersion
+   OUTPUT_VARIABLE CURRENT_OSX_VERSION
+@@ -91,10 +91,10 @@
+ # CMAKE_OSX_DEPLOYMENT_TARGET
+ 
+ # Set cache variable - end user may change this during ccmake or cmake-gui configure.
+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
+-  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
+-    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
+-endif()
++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
++#  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
++#    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
++#endif()
+ 
+ #----------------------------------------------------------------------------
+ # CMAKE_OSX_SYSROOT
diff --git a/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch b/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch
new file mode 100644
index 000000000000..5e0efa902679
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch
@@ -0,0 +1,28 @@
+From c775072ad5a93306183f83f4396268b1690bb392 Mon Sep 17 00:00:00 2001
+From: Brad King <brad.king@kitware.com>
+Date: Wed, 22 Apr 2015 09:58:46 -0400
+Subject: [PATCH] cmGeneratorExpressionEvaluationFile: Add missing sys/types.h
+ include
+
+This is needed for 'mode_t', and on mingw-w64 in particular.  We added
+use of 'mode_t' in commit v3.2.0-rc1~421^2 (file(GENERATE): Use
+permissions of input file if present, 2014-07-22).
+---
+ Source/cmGeneratorExpressionEvaluationFile.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
+index 4424bec..5d8b54c 100644
+--- a/Source/cmGeneratorExpressionEvaluationFile.h
++++ b/Source/cmGeneratorExpressionEvaluationFile.h
+@@ -13,6 +13,7 @@
+ #define cmGeneratorExpressionEvaluationFile_h
+ 
+ #include "cmStandardIncludes.h"
++#include <sys/types.h>
+ #include <cmsys/auto_ptr.hxx>
+ 
+ #include "cmGeneratorExpression.h"
+-- 
+1.7.10.4
+
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim
new file mode 100644
index 000000000000..5cecd7d05b64
--- /dev/null
+++ b/dev-util/cmake/files/cmake.vim
@@ -0,0 +1,3 @@
+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim 
+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake
+autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
new file mode 100644
index 000000000000..7e3fec5ae431
--- /dev/null
+++ b/dev-util/cmake/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<use>
+		<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
new file mode 100644
index 000000000000..d0966276b4c0
--- /dev/null
+++ b/dev-util/cmdtest/Manifest
@@ -0,0 +1,2 @@
+DIST cmdtest_0.10.orig.tar.gz 34152 SHA256 d9a421ed916213c5c6660a1057a560afff6e5c7606fe0e1cba3a359f66f23068 SHA512 da3e042c1c7d4379316fb6e3bc642a2e57fa12004434296c30f77debc7662bed49726057eb280461d18308739e86082fd96efe1642d1c531321b1c10f06d3595 WHIRLPOOL eadb47185a977d74ff046654b9845be9e49b859a88d10001f6eb809b1de8cb7697f840942dca100007ef00c98faafc9d7f127c9359108148372fd7175b88c509
+DIST cmdtest_0.6.orig.tar.gz 18603 SHA256 7367d4c6db3b84f6c74209fed179749434ac84dfe6e039fc1a58dd99a5048802 SHA512 67ef446034890bd93e66b8577a5d1f70e490550e9e72204225eff0d91f15c8610c4d7b7167461c08b070ed108d8326e3c9ef87cfc339fbe320c17c2be87ed429 WHIRLPOOL ac57c94497b6da5740435f513112574bc41e152605ecce89e9cd5a788f656c49ec8a5a318eef536754bdd8ec5a9bc204032ed1b4ffb847462ffe52eeb1dca5a9
diff --git a/dev-util/cmdtest/cmdtest-0.10.ebuild b/dev-util/cmdtest/cmdtest-0.10.ebuild
new file mode 100644
index 000000000000..c90222e27e0a
--- /dev/null
+++ b/dev-util/cmdtest/cmdtest-0.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="black box tests Unix command line tools"
+HOMEPAGE="http://liw.fi/cmdtest/"
+SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-python/cliapp
+	dev-python/ttystatus
+"
+
+src_compile() {
+	addwrite /proc/self/comm
+	distutils-r1_src_compile
+}
diff --git a/dev-util/cmdtest/cmdtest-0.6.ebuild b/dev-util/cmdtest/cmdtest-0.6.ebuild
new file mode 100644
index 000000000000..deceb8ea4fa8
--- /dev/null
+++ b/dev-util/cmdtest/cmdtest-0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="black box tests Unix command line tools"
+HOMEPAGE="http://liw.fi/cmdtest/"
+SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-python/cliapp
+	dev-python/ttystatus
+"
+
+src_compile() {
+	addwrite /proc/self/comm
+	distutils-r1_src_compile
+}
diff --git a/dev-util/cmdtest/metadata.xml b/dev-util/cmdtest/metadata.xml
new file mode 100644
index 000000000000..ea7bd021a21e
--- /dev/null
+++ b/dev-util/cmdtest/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
new file mode 100644
index 000000000000..806507c5b8db
--- /dev/null
+++ b/dev-util/cmocka/Manifest
@@ -0,0 +1,3 @@
+DIST cmocka-0.3.1.tar.gz 100606 SHA256 4b6c61a4d880a66c4d6b3de2f488273394f4455722cd0bd7c5b8d19e21881e25 SHA512 906b977eeaf208b086a65866897b22450abb05040778959f485e616d85149e6c331426550f9478addf1034aed4df4938ed421e60b1980b1955a08421104b639a WHIRLPOOL bfc188d4208036ae92eccc6e10ac6e5f8991bf1ed60167c2edda9d1a55f34b17429bbec0f7186de6f365f1f87fc7dc428300a83251857d860b805c6a7072a963
+DIST cmocka-0.4.1.tar.xz 68688 SHA256 5bba53c108a693d1cad33a2edd2ee36b0cb7ea0d9b1b94b608784d41f7fec803 SHA512 355334dbdfcda88d37bd2c60a9e714567632e481423fc45627f72a2fe13e2498152c61ad67c83da3cff7843e3e64c6bd4b806240ab714a2420c974a98a7fed96 WHIRLPOOL 52d7b51d3ae2716f0e21a7763678e3755024eba4734f44c0f719979887efa019e0d55b91c68670ab59eee6487c5d5a28c509fee472e92bcf9591210a3952f86a
+DIST cmocka-1.0.1.tar.xz 80240 SHA256 b36050d7a1224296803d216cba1a9d4c58c31bf308b2d6d6649d61aa5a36753b SHA512 142b3293a8ab137904d07f1ac6a56daf0afbbfcf7816a582c9998b6225aa5d6fe5f2d1b889de7b187142fc24ca4d1cfdbd630e8783858bc9ce89217ff05abc1e WHIRLPOOL c733d08a4907242bce6e8fb6989934fa8c9ae333a6c9a746c8824001722a7897cebdf8c0501bfb22d2ad29536ab32b0d004e327a1ce7b7740c9d24c6a453d6f9
diff --git a/dev-util/cmocka/cmocka-0.3.1-r1.ebuild b/dev-util/cmocka/cmocka-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..e3284a62c043
--- /dev/null
+++ b/dev-util/cmocka/cmocka-0.3.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A unit testing framework for C"
+HOMEPAGE="http://cmocka.org/"
+SRC_URI="https://open.cryptomilk.org/attachments/download/19/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc static-libs test"
+
+DEPEND="
+	doc? ( app-doc/doxygen[latex] )
+"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${PN}-automagicness.patch" )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with static-libs STATIC_LIB)
+		$(cmake-utils_use test UNIT_TESTING)
+		$(multilib_is_native_abi && cmake-utils_use_with doc APIDOC \
+			|| echo -DWITH_APIDOC=OFF)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc; then
+		pushd doc || die
+		doxygen doxy.config || die
+		rm -f html/*.md5 latex/*.md5 latex/Manifest man/man3/_* || die
+		dohtml html/*
+		dodoc latex/*
+		doman man/man3/*.3
+		popd || die
+	fi
+	cmake-utils_src_install
+}
diff --git a/dev-util/cmocka/cmocka-0.3.1.ebuild b/dev-util/cmocka/cmocka-0.3.1.ebuild
new file mode 100644
index 000000000000..905d2c50e2c4
--- /dev/null
+++ b/dev-util/cmocka/cmocka-0.3.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+DESCRIPTION="A unit testing framework for C"
+HOMEPAGE="http://cmocka.org/"
+SRC_URI="https://open.cryptomilk.org/attachments/download/19/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~s390 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc static-libs test"
+
+DEPEND="
+	doc? ( app-doc/doxygen[latex] )
+"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${PN}-automagicness.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with static-libs STATIC_LIB)
+		$(cmake-utils_use test UNIT_TESTING)
+		$(cmake-utils_use_with doc APIDOC)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use doc; then
+		pushd "${BUILD_DIR}/doc/"
+		doxygen doxy.config
+		rm html/*.md5 latex/*.md5 latex/Manifest man/man3/_*
+		dohtml html/*
+		dodoc latex/*
+		doman man/man3/*.3
+		popd
+	fi
+	cmake-utils_src_install
+}
diff --git a/dev-util/cmocka/cmocka-0.4.1.ebuild b/dev-util/cmocka/cmocka-0.4.1.ebuild
new file mode 100644
index 000000000000..58343b0509c7
--- /dev/null
+++ b/dev-util/cmocka/cmocka-0.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A unit testing framework for C"
+HOMEPAGE="http://cmocka.org/"
+SRC_URI="https://open.cryptomilk.org/attachments/download/42/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc static-libs test"
+
+DEPEND="
+	doc? ( app-doc/doxygen[latex] )
+"
+RDEPEND=""
+
+DOCS=( AUTHORS ChangeLog README )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with static-libs STATIC_LIB)
+		$(cmake-utils_use test UNIT_TESTING)
+		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
+			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc; then
+		pushd doc || die
+		doxygen Doxyfile || die
+		rm -f html/*.md5 latex/*.md5 latex/Manifest man/man3/_* || die
+		dohtml html/*
+		dodoc latex/*
+		doman man/man3/*.3
+		popd || die
+	fi
+	cmake-utils_src_install
+}
diff --git a/dev-util/cmocka/cmocka-1.0.1.ebuild b/dev-util/cmocka/cmocka-1.0.1.ebuild
new file mode 100644
index 000000000000..2ed096144593
--- /dev/null
+++ b/dev-util/cmocka/cmocka-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A unit testing framework for C"
+HOMEPAGE="http://cmocka.org/"
+SRC_URI="https://cmocka.org/files/1.0/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc static-libs test"
+
+DEPEND="
+	doc? ( app-doc/doxygen[latex] )
+"
+RDEPEND=""
+
+DOCS=( AUTHORS ChangeLog README )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with static-libs STATIC_LIB)
+		$(cmake-utils_use test UNIT_TESTING)
+		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
+			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc; then
+		pushd doc || die
+		doxygen Doxyfile || die
+		rm -f html/*.md5 latex/*.md5 latex/Manifest man/man3/_* || die
+		dohtml html/*
+		dodoc latex/*
+		doman man/man3/*.3
+		popd || die
+	fi
+	cmake-utils_src_install
+}
diff --git a/dev-util/cmocka/files/cmocka-automagicness.patch b/dev-util/cmocka/files/cmocka-automagicness.patch
new file mode 100644
index 000000000000..29ece4563214
--- /dev/null
+++ b/dev-util/cmocka/files/cmocka-automagicness.patch
@@ -0,0 +1,74 @@
+--- a/cmake/Modules/MacroOptionalFindPackage.cmake
++++ b/cmake/Modules/MacroOptionalFindPackage.cmake
+@@ -0,0 +1,48 @@
++# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
++# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_<name>, which can be disabled via the cmake GUI.
++# or via -DWITH_<name>=OFF
++# The standard <name>_FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++# This is just a helper macro to set a bunch of variables empty.
++# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
++macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
++   if(DEFINED ${_name}_${_var})
++      set(${_name}_${_var} "")
++   endif(DEFINED ${_name}_${_var})
++
++   string(TOUPPER ${_name} _nameUpper)
++   if(DEFINED ${_nameUpper}_${_var})
++      set(${_nameUpper}_${_var}  "")
++   endif(DEFINED ${_nameUpper}_${_var})
++endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++   option(WITH_${_name} "Search for ${_name} package" ON)
++   if (WITH_${_name})
++      find_package(${_name} ${ARGN})
++   else (WITH_${_name})
++      string(TOUPPER ${_name} _nameUpper)
++      set(${_name}_FOUND FALSE)
++      set(${_nameUpper}_FOUND FALSE)
++
++      _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
++      _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
++      _mofp_set_empty_if_defined(${_name} INCLUDES)
++      _mofp_set_empty_if_defined(${_name} LIBRARY)
++      _mofp_set_empty_if_defined(${_name} LIBRARIES)
++      _mofp_set_empty_if_defined(${_name} LIBS)
++      _mofp_set_empty_if_defined(${_name} FLAGS)
++      _mofp_set_empty_if_defined(${_name} DEFINITIONS)
++   endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
++
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@
+ include(DefineInstallationPaths)
+ include(DefineOptions.cmake)
+ include(CPackConfig.cmake)
+-
++include(MacroOptionalFindPackage)
+ if (UNIT_TESTING)
+     include(AddCMockaTest)
+ endif (UNIT_TESTING)
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ #
+ # Build the documentation
+ #
+-include(UseDoxygen OPTIONAL)
+-
++option(WITH_APIDOC "Use doxygen to generate documentation" ON)
++if (WITH_APIDOC)
++  include(UseDoxygen OPTIONAL)
++endif (WITH_APIDOC)
diff --git a/dev-util/cmocka/metadata.xml b/dev-util/cmocka/metadata.xml
new file mode 100644
index 000000000000..f017c1146cff
--- /dev/null
+++ b/dev-util/cmocka/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<maintainer>
+        <email>creffett@gentoo.org</email>
+        <name>Chris Reffett</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cmt/Manifest b/dev-util/cmt/Manifest
new file mode 100644
index 000000000000..09ef870f56c6
--- /dev/null
+++ b/dev-util/cmt/Manifest
@@ -0,0 +1 @@
+DIST CMTv1r26.tar.gz 2194291 SHA256 1f4edd814aae018707325aed893d04a82e5e609ec8f082dd511373e33e987e34 SHA512 412366dbf4aaef9f092f9472792e314c6d8f3e0360ddfa6d135e2bea9a167b627ddc78ad5a2d4f5139b4835abb68c06166abf3204bf5ba3969089923782e817e WHIRLPOOL 049f511c85ff1cf0a0cefec6cca7020f44fd2e86b76e649bc5bc583b2ac60f5ea3d683b52d630712ac1d729cd0fd92364b4192937130ef84ff66f5d9ef8940e0
diff --git a/dev-util/cmt/cmt-1.26.ebuild b/dev-util/cmt/cmt-1.26.ebuild
new file mode 100644
index 000000000000..508853a705d4
--- /dev/null
+++ b/dev-util/cmt/cmt-1.26.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils elisp-common multilib toolchain-funcs versionator
+
+CPV=($(get_version_components ${PV}))
+CMT_PV=v${CPV[0]}r${CPV[1]}
+
+DESCRIPTION="Cross platform configuration management environment"
+HOMEPAGE="http://www.cmtsite.net/"
+SRC_URI="http://www.cmtsite.net/${CMT_PV}/CMT${CMT_PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs java doc"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	java? ( virtual/jdk )"
+
+S="${WORKDIR}/CMT/${CMT_PV}"
+
+src_configure() {
+	cd "${S}"/mgr || die
+	./INSTALL || die
+	source setup.sh
+}
+
+src_compile() {
+	cd "${S}"/mgr || die
+	emake \
+		cpp="$(tc-getCXX)" \
+		cppflags="${CXXFLAGS}" \
+		cpplink="$(tc-getCXX) ${LDFLAGS}"
+
+	sed -i -e "s:${WORKDIR}:${EPREFIX}/usr/$(get_libdir):g" setup.*sh || die
+	cd "${S}" || die
+	mv src/demo . || die
+	rm ${CMTBIN}/*.o || die
+
+	use emacs && elisp-compile doc/cmt-mode.el
+}
+
+src_install() {
+	CMTDIR=/usr/$(get_libdir)/CMT/${CMT_PV}
+	dodir ${CMTDIR}
+	cp -pPR mgr src ${CMTBIN} "${ED}"/${CMTDIR} || die
+	dodir /usr/bin
+	dosym ${CMTDIR}/${CMTBIN}/cmt.exe /usr/bin/cmt
+
+	cat > 99cmt <<-EOF
+		 CMTROOT="${EROOT%/}${CMTDIR}"
+		 CMTBIN="$(uname)-$(uname -m | sed -e 's# ##g')"
+		 CMTCONFIG="$(${CMTROOT}/mgr/cmt_system.sh)"
+	EOF
+	if use java; then
+		cp -pPR java "${ED}"/${CMTDIR}
+		echo "#!${EPREFIX}/bin/sh" > jcmt
+		echo "java cmt_parser" >> jcmt
+		dobin jcmt
+		echo "CLASSPATH=\"${CMTDIR}/java/cmt.jar\"" >> 99cmt
+	fi
+
+	doenvd 99cmt
+	dodoc ChangeLog doc/*.txt
+	dohtml doc/{ChangeLog,ReleaseNotes}.html
+
+	if use doc; then
+		emake -C mgr gendoc
+		insinto /usr/share/doc/${PF}
+		doins -r doc/{CMTDoc,CMTFAQ}.{html,pdf} doc/Images
+		doins -r demo
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} doc/cmt-mode.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/80cmt-mode-gentoo.el || die
+	fi
+}
+
+pkg_postinst () {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmt/files/80cmt-mode-gentoo.el b/dev-util/cmt/files/80cmt-mode-gentoo.el
new file mode 100644
index 000000000000..91be98ebc614
--- /dev/null
+++ b/dev-util/cmt/files/80cmt-mode-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; cmt site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cmt-mode "cmt-mode" "CMT requirements file editing mode." t)
+(add-to-list 'auto-mode-alist '("requirements\\'" . cmt-mode))
diff --git a/dev-util/cmt/files/cmt-1.22-limits.patch b/dev-util/cmt/files/cmt-1.22-limits.patch
new file mode 100644
index 000000000000..99ce621fc278
--- /dev/null
+++ b/dev-util/cmt/files/cmt-1.22-limits.patch
@@ -0,0 +1,10 @@
+--- source/cmt_awk.cxx.orig	2011-03-23 19:03:17.000000000 +0000
++++ source/cmt_awk.cxx	2011-03-23 19:03:48.000000000 +0000
+@@ -12,6 +12,7 @@
+ #define PATH_MAX _MAX_PATH
+ #endif
+ 
++#include <climits>
+ #include "cmt_awk.h"
+ #include "cmt_system.h"
+ #include "cmt_log.h"
diff --git a/dev-util/cmt/metadata.xml b/dev-util/cmt/metadata.xml
new file mode 100644
index 000000000000..53d37b8a512e
--- /dev/null
+++ b/dev-util/cmt/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>bicatali@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+  CMT is a configuration management environment, based on some
+  management conventions and comprises several shell-based
+  utilities. It is an attempt to formalize software production and
+  especially configuration management around a package-oriented
+  principle. Used in High Energy Physics large experiments, where
+  tailored packages are developped and they do not know the existence
+  of portage and overlays.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/coccigrep/Manifest b/dev-util/coccigrep/Manifest
new file mode 100644
index 000000000000..cca9af6f22f6
--- /dev/null
+++ b/dev-util/coccigrep/Manifest
@@ -0,0 +1,4 @@
+DIST coccigrep-1.10.tar.gz 31286 SHA256 db882f449ed4df45916601c31f5aa34a83fce622f1044be7c324138f3e78aba6 SHA512 75eceb1da7dd9970c51c5d9ad26ddfcf26f11210086710a84199856f975801cbe7044916feb3e8d43304b49213f5607b26b10375412ec0a1c7b015c231383782 WHIRLPOOL 3eebf7ffec80833f03b9c55f10d6e9225ce41ecd07503097c7231513d8dca90c6db9b65928b37924039d2b04d778221e45e1c42dee41b5233f2f3e0f937dcae3
+DIST coccigrep-1.11.tar.gz 31618 SHA256 a13783fc52cf8074c5d2ac8267f57d30a52798c10d57899789e47589841f9c17 SHA512 d2cbe8e3efa5e9a9fee387a13185cad12bdb5bb482c4c87653cdbef4a6c0463c25a388042ff6556b1fe3ff4cf887bc241ff8a13145af4ff0793e6f77d57d0007 WHIRLPOOL 0b45530d67e8a7cd7a0b4f1a3063daf36176e5b4b75ec79e3fe237e0e6d7e7bc178566cf5b67d5da29ca3f09fcf89fe52cf2d520faecbc53f52ee71be6fda59a
+DIST coccigrep-1.12.tar.gz 31692 SHA256 1a873c1d1d3ca6b11d2b46bb7b5489afd1f7435db2b179b3bf886b2f8c956642 SHA512 269623e11de47badfbdfe1e8f971b8b2f7f6b7c4347f99e40ded21377ecf043887662127d0244c241e3bf868326ec4630e43f96f64d04cfec0a5525fd4728699 WHIRLPOOL 31603c2939f0c282ea753c5dd5f2269cb8b16074c67f8b47e758f51728b936f145719ad34c3a45e02dfaa9af57393b9fc094156ca12f5c66bcbe54f22a47d2a1
+DIST coccigrep-1.13.tar.gz 32366 SHA256 15fb99a1f5435a6d30fa967cc24141fee2d5116d1140d7ca34b38b763cf26b32 SHA512 d01baefe1c5f5d23ce03e5daccde0c38d4c05872313a0c8d15e53444c34fa6ae0db3b25bd62d8635a3f7b16e64767f92051c59d29bbd81cd24f94c9376af08ba WHIRLPOOL 0c5fded9ac451298754c95f9453c4f4d08c82b3f59749b4cf099d51b22b8885b1cd5c440f781783a226b0bc7707980eed644b3aa8efbba14f591978c835b698d
diff --git a/dev-util/coccigrep/coccigrep-1.10.ebuild b/dev-util/coccigrep/coccigrep-1.10.ebuild
new file mode 100644
index 000000000000..b52de5204b68
--- /dev/null
+++ b/dev-util/coccigrep/coccigrep-1.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="2"
+
+inherit distutils elisp-common vcs-snapshot
+
+DESCRIPTION="A semantic grep for the C language"
+HOMEPAGE="http://home.regit.org/software/coccigrep/"
+SRC_URI="https://github.com/regit/${PN}/tarball/v${PV/_/} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs vim"
+
+RDEPEND="dev-util/coccinelle[python]
+	emacs? ( virtual/emacs )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="doc? ( dev-python/sphinx )
+	emacs? ( virtual/emacs )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C doc html
+
+	if use emacs ; then
+		elisp-compile editors/*.el || die
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	doman ${PN}.1
+
+	use doc && dohtml -r doc/_build/html/*
+
+	if use emacs ; then
+		elisp-install ${PN} editors/*.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use vim ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins editors/cocci-grep.vim
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	einfo "Syntax highlighting is supported through dev-python/pygments."
+	einfo "Install it if you want colorized output formats."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccigrep/coccigrep-1.11.ebuild b/dev-util/coccigrep/coccigrep-1.11.ebuild
new file mode 100644
index 000000000000..b52de5204b68
--- /dev/null
+++ b/dev-util/coccigrep/coccigrep-1.11.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="2"
+
+inherit distutils elisp-common vcs-snapshot
+
+DESCRIPTION="A semantic grep for the C language"
+HOMEPAGE="http://home.regit.org/software/coccigrep/"
+SRC_URI="https://github.com/regit/${PN}/tarball/v${PV/_/} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs vim"
+
+RDEPEND="dev-util/coccinelle[python]
+	emacs? ( virtual/emacs )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="doc? ( dev-python/sphinx )
+	emacs? ( virtual/emacs )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C doc html
+
+	if use emacs ; then
+		elisp-compile editors/*.el || die
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	doman ${PN}.1
+
+	use doc && dohtml -r doc/_build/html/*
+
+	if use emacs ; then
+		elisp-install ${PN} editors/*.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use vim ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins editors/cocci-grep.vim
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	einfo "Syntax highlighting is supported through dev-python/pygments."
+	einfo "Install it if you want colorized output formats."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccigrep/coccigrep-1.12.ebuild b/dev-util/coccigrep/coccigrep-1.12.ebuild
new file mode 100644
index 000000000000..914e1825f28a
--- /dev/null
+++ b/dev-util/coccigrep/coccigrep-1.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 elisp-common vcs-snapshot
+
+DESCRIPTION="A semantic grep for the C language"
+HOMEPAGE="http://home.regit.org/software/coccigrep/"
+SRC_URI="https://github.com/regit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs vim"
+
+RDEPEND="dev-util/coccinelle[python]
+	emacs? ( virtual/emacs )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="doc? ( dev-python/sphinx )
+	emacs? ( virtual/emacs )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+python_compile_all() {
+	use doc && emake -C doc html
+
+	if use emacs ; then
+		elisp-compile editors/*.el || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman ${PN}.1
+
+	use doc && dohtml -r doc/_build/html/*
+
+	if use emacs ; then
+		elisp-install ${PN} editors/*.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use vim ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins editors/cocci-grep.vim
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	einfo "Syntax highlighting is supported through dev-python/pygments."
+	einfo "Install it if you want colorized output formats."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccigrep/coccigrep-1.13.ebuild b/dev-util/coccigrep/coccigrep-1.13.ebuild
new file mode 100644
index 000000000000..b79553ce41d0
--- /dev/null
+++ b/dev-util/coccigrep/coccigrep-1.13.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 elisp-common
+
+DESCRIPTION="A semantic grep for the C language"
+HOMEPAGE="http://home.regit.org/software/coccigrep/"
+SRC_URI="https://github.com/regit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs vim"
+
+RDEPEND="dev-util/coccinelle[python]
+	emacs? ( virtual/emacs )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="doc? ( dev-python/sphinx )
+	emacs? ( virtual/emacs )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+python_compile_all() {
+	use doc && emake -C doc html
+
+	if use emacs ; then
+		elisp-compile editors/*.el || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman ${PN}.1
+
+	use doc && dohtml -r doc/_build/html/*
+
+	if use emacs ; then
+		elisp-install ${PN} editors/*.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use vim ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins editors/cocci-grep.vim
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	einfo "Syntax highlighting is supported through dev-python/pygments."
+	einfo "Install it if you want colorized output formats."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccigrep/files/50coccigrep-gentoo.el b/dev-util/coccigrep/files/50coccigrep-gentoo.el
new file mode 100644
index 000000000000..7fbc6b93e541
--- /dev/null
+++ b/dev-util/coccigrep/files/50coccigrep-gentoo.el
@@ -0,0 +1,4 @@
+;;; coccigrep site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(require 'cocci-grep)
diff --git a/dev-util/coccigrep/metadata.xml b/dev-util/coccigrep/metadata.xml
new file mode 100644
index 000000000000..c67c4ea98082
--- /dev/null
+++ b/dev-util/coccigrep/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="vim">Install the coccigrep vim plugin</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">regit/coccigrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
new file mode 100644
index 000000000000..9a2173211142
--- /dev/null
+++ b/dev-util/coccinelle/Manifest
@@ -0,0 +1,2 @@
+DIST coccinelle-1.0.0.tgz 3427246 SHA256 e18b4c77964c6f623c385dc8b2fcb46beacd9811927617144620b12d93289e74 SHA512 0c59918dff3d33035f5c928b54de9cbe32f9146d9e4b82545d168140d1395ff5b3e446faff47f39dbb6fceb74f432b419e9c7322e834c11bb50b5fb5d4e4dd46 WHIRLPOOL 8714327d7156bd1ada0c6b0776fefcc4e46b9885354ca686d4de8b35c2dd1cf6372e91dfa3a04645295f411b40d57eee94d81cbd8dfe2c18f3dc3b15ff8e1926
+DIST coccinelle-1.0.1.tgz 2772730 SHA256 39caac46c1f80cbe5de21164c5b31a794e3befdb9cd7ef1d080d455ac171b526 SHA512 5a69476941a9582ca6e0663c468a87aba15b6e38243cbb532c517b75066c8fafe37cbe6d398d6183cc7a315c5680efdf425f0bc8cb2184dbf94e446879514a89 WHIRLPOOL 8b38b982b8d19c10c7e3ed77629b6883c4d6455da4da4d68251b492ce36490c5236573bf7c44a34e21887b8be0ca83b4efb39cf13b1c4c6db7db58979ee6a7bc
diff --git a/dev-util/coccinelle/coccinelle-1.0.0.ebuild b/dev-util/coccinelle/coccinelle-1.0.0.ebuild
new file mode 100644
index 000000000000..f7b42921a36e
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.0.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib eutils python-single-r1 bash-completion-r1 elisp-common autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="Program matching and transformation engine"
+HOMEPAGE="http://coccinelle.lip6.fr/"
+SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# ocaml enables ocaml scripting (uses findlib)
+CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/sexplib:=[ocamlopt?]
+	dev-ml/menhir:=[ocamlopt?]
+	|| ( dev-ml/camlp4:=[ocamlopt?] <dev-lang/ocaml-4.02.0 )
+	dev-ml/parmap:=[ocamlopt?]
+	emacs? ( virtual/emacs )
+	ocaml? ( dev-ml/findlib:= )
+	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] )
+	python? ( ${PYTHON_DEPS} )"
+
+RDEPEND="${CDEPEND}
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsextra
+	)"
+
+REQUIRED_USE="test? ( ocaml python )"
+
+DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
+
+S=${WORKDIR}/${MY_P}
+
+SITEFILE=50coccinelle-gentoo.el
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use python ; then
+		# fix python install location
+		sed -e "s:\$(SHAREDIR)/python:$(python_get_sitedir):" \
+			-e "s:PYTHON_TARGET:PYTHON_INSTALL_TARGET:" \
+			-i Makefile || die
+	fi
+
+	sed -i "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" scripts/spatch.sh.in || die
+
+	# This is regenerated by menhir, bundled version does not build with latest
+	# one...
+	rm -f parsing_cocci/parser_cocci_menhir.ml
+
+	epatch "${FILESDIR}"/${PN}-1.0.0_rc16-findtool.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable ocaml) \
+		$(use_enable pcre) \
+		$(use_enable pcre pcre-syntax)
+
+	sed -e "s:^LIBDIR=.*:LIBDIR=/usr/$(get_libdir)/ocaml/stublibs/:" \
+		-e "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" \
+		-i Makefile.config || die
+}
+
+src_compile() {
+	emake depend
+	emake
+
+	use ocamlopt && emake opt
+
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts emake docs
+	fi
+
+	if use emacs ; then
+		elisp-compile editors/emacs/cocci.el || die
+	fi
+}
+
+src_test() {
+	source env.sh # needed for built in-place python plugin
+	./spatch standard.h -parse_c -dir tests/ || die
+	yes | ./spatch -iso_file standard.iso -macro_file_builtins standard.h -testall || die
+	if use ocamlopt ; then
+		./spatch.opt -iso_file standard.iso -macro_file_builtins standard.h -testall ||	die
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dodoc docs/manual/*.pdf
+	newbashcomp scripts/spatch.bash_completion spatch
+
+	if use emacs ; then
+		elisp-install ${PN} editors/emacs/*
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use vim-syntax ; then
+		newdoc editors/vim/README README-vim
+		rm editors/vim/README || die
+		insinto /usr/share/vim/vimfiles
+		doins -r editors/vim/*
+	fi
+
+	use python && python_optimize
+
+	export STRIP_MASK='*/coccinelle/spatch'
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccinelle/coccinelle-1.0.1.ebuild b/dev-util/coccinelle/coccinelle-1.0.1.ebuild
new file mode 100644
index 000000000000..2a9f559c0a62
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.0.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib eutils python-single-r1 bash-completion-r1 elisp-common autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="Program matching and transformation engine"
+HOMEPAGE="http://coccinelle.lip6.fr/"
+SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# ocaml enables ocaml scripting (uses findlib)
+CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/sexplib:=[ocamlopt?]
+	dev-ml/menhir:=[ocamlopt?]
+	|| ( dev-ml/camlp4:=[ocamlopt?] <dev-lang/ocaml-4.02.0 )
+	dev-ml/parmap:=[ocamlopt?]
+	emacs? ( virtual/emacs )
+	ocaml? ( dev-ml/findlib:= )
+	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] )
+	python? ( ${PYTHON_DEPS} )"
+
+RDEPEND="${CDEPEND}
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsextra
+	)"
+
+REQUIRED_USE="test? ( ocaml python )"
+
+DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
+
+S=${WORKDIR}/${MY_P}
+
+SITEFILE=50coccinelle-gentoo.el
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use python ; then
+		# fix python install location
+		sed -e "s:\$(SHAREDIR)/python:$(python_get_sitedir):" \
+			-e "s:PYTHON_TARGET:PYTHON_INSTALL_TARGET:" \
+			-i Makefile || die
+	fi
+
+	sed -i "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" scripts/spatch.sh.in || die
+
+	# This is regenerated by menhir, bundled version does not build with latest
+	# one...
+	rm -f parsing_cocci/parser_cocci_menhir.ml
+
+	epatch "${FILESDIR}"/${PN}-1.0.0_rc16-findtool.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable ocaml) \
+		$(use_enable pcre) \
+		$(use_enable pcre pcre-syntax)
+
+	sed -e "s:^LIBDIR=.*:LIBDIR=/usr/$(get_libdir)/ocaml/stublibs/:" \
+		-e "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" \
+		-i Makefile.config || die
+}
+
+src_compile() {
+	emake depend
+	emake
+
+	use ocamlopt && emake opt
+
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts emake docs
+	fi
+
+	if use emacs ; then
+		elisp-compile editors/emacs/cocci.el || die
+	fi
+}
+
+src_test() {
+	source env.sh # needed for built in-place python plugin
+	./spatch standard.h -parse_c -dir tests/ || die
+	yes | ./spatch -iso_file standard.iso -macro_file_builtins standard.h -testall || die
+	if use ocamlopt ; then
+		./spatch.opt -iso_file standard.iso -macro_file_builtins standard.h -testall ||	die
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dodoc docs/manual/*.pdf
+	newbashcomp scripts/spatch.bash_completion spatch
+
+	if use emacs ; then
+		elisp-install ${PN} editors/emacs/*
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use vim-syntax ; then
+		newdoc editors/vim/README README-vim
+		rm editors/vim/README || die
+		insinto /usr/share/vim/vimfiles
+		doins -r editors/vim/*
+	fi
+
+	use python && python_optimize
+
+	export STRIP_MASK='*/coccinelle/spatch'
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccinelle/files/50coccinelle-gentoo.el b/dev-util/coccinelle/files/50coccinelle-gentoo.el
new file mode 100644
index 000000000000..6721b3c5e5a1
--- /dev/null
+++ b/dev-util/coccinelle/files/50coccinelle-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; site-lisp configuration for coccinelle
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'cocci-mode "cocci" "Major mode for editing cocci code." t)
diff --git a/dev-util/coccinelle/files/coccinelle-1.0.0_rc16-findtool.patch b/dev-util/coccinelle/files/coccinelle-1.0.0_rc16-findtool.patch
new file mode 100644
index 000000000000..bc0dd97ddcfc
--- /dev/null
+++ b/dev-util/coccinelle/files/coccinelle-1.0.0_rc16-findtool.patch
@@ -0,0 +1,11 @@
+--- coccinelle-1.0.0-rc16/setup/cocci.m4
++++ coccinelle-1.0.0-rc16/setup/cocci.m4
+@@ -285,7 +285,7 @@
+     AC_SUBST([$1], [no])
+   ],
+   [dnl  find the tool
+-    AC_COCCI_FINDTOOL([$1],[[$]$1])
++    AC_COCCI_FINDTOOL([$1],[$2])
+   ])
+ 
+   AS_IF([test -z "[$]$1" -o "x[$]$1" = xno],
diff --git a/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml
new file mode 100644
index 000000000000..06d54062e2f2
--- /dev/null
+++ b/dev-util/coccinelle/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ml</herd>
+<maintainer>
+  <email>radhermit@gentoo.org</email>
+  <name>Tim Harder</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cocom/Manifest b/dev-util/cocom/Manifest
new file mode 100644
index 000000000000..6d8d18a67b7b
--- /dev/null
+++ b/dev-util/cocom/Manifest
@@ -0,0 +1 @@
+DIST cocom-0.996.tar.gz 4632140 SHA256 e143ab556d79a35ef31ec1e240897c9b8a8d0b6693e50a2b6e47d7fd4b200519 SHA512 57a7338677c443d293f02d64f38268bd76feb075e3c9780fcd37e53a294d5e8fa374bb98d40b505d2d8f9fd9b7d8327f8f461cf4650868bf4adfd5b244cf1d4e WHIRLPOOL 599b48e444acb13bc14e170d8f34602462e45de8c4efea2f611ac7e023f876249c68e83712d9734639e456fc5961704999df6dc0baa139ae4fd965ecca7cd26f
diff --git a/dev-util/cocom/cocom-0.996-r1.ebuild b/dev-util/cocom/cocom-0.996-r1.ebuild
new file mode 100644
index 000000000000..8e817965be44
--- /dev/null
+++ b/dev-util/cocom/cocom-0.996-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="Toolset to help create compilers, cross-compilers, interpreters, and other language processors"
+HOMEPAGE="http://cocom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+RDEPEND="!!media-gfx/hugin"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-configure.patch"
+	cd "${S}"/REGEX
+	eautoconf
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc CHANGES README
+}
diff --git a/dev-util/cocom/files/cocom-0.996-configure.patch b/dev-util/cocom/files/cocom-0.996-configure.patch
new file mode 100644
index 000000000000..ad584a82a219
--- /dev/null
+++ b/dev-util/cocom/files/cocom-0.996-configure.patch
@@ -0,0 +1,11 @@
+--- cocom-0.996/configure.orig	2007-02-08 19:25:24.000000000 +0100
++++ cocom-0.996/configure	2009-09-01 20:21:04.000000000 +0200
+@@ -5474,7 +5474,7 @@
+ 	Linux*)
+ 	  GCC_FPIC=-fPIC
+ 	  LIB_SUFFIX=so
+-	  MAKELIB="gcc -shared -Wl,-soname,\\\$\$0 -o \\\$\$0"
++	  MAKELIB="$CC $LDFLAGS -shared -Wl,-soname,\\\$\$0 -o \\\$\$0"
+ 	  AFTER_MAKELIB="echo \\\$\$0"
+ # The following option is needed if we use no shared dino library but
+ # shared external library
diff --git a/dev-util/cocom/metadata.xml b/dev-util/cocom/metadata.xml
new file mode 100644
index 000000000000..a097d2f79c94
--- /dev/null
+++ b/dev-util/cocom/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		COCOM tool set is oriented towards the creation of compilers,
+		cross-compilers, interpreters, and other language processors.
+		Now COCOM tool set consists of the following components:
+		* Ammunition (reusable packages)
+		* Sprut (internal representation description translator)
+		* Nona (code selector description translator)
+		* Msta (syntax description translator)
+		* Oka (pipeline hazards description translator)
+		* Shilka (keywords description translator)
+
+		All of these components are written in ANSI C and have common style
+		input languages (a la YACC). All code generated by the components is in
+		also strict ANSI C and in standard C++. All documentation exists in
+		ASCII, TeX dvi, Postsrcipt, HTML, and GNU info formats. 
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">cocom</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
new file mode 100644
index 000000000000..ac7ea20c6803
--- /dev/null
+++ b/dev-util/codeblocks/Manifest
@@ -0,0 +1 @@
+DIST codeblocks_13.12-1.tar.gz 17221056 SHA256 772450046e8c8ba2ea0086acf433a46b83e6254fae64df9c8ca132a22f949610 SHA512 f09ab25579a4c9addcebdcc748a23963a52751853f4a1c15da10196d522f94bb17e01b2470b96d4470f5fd98725f7760e3923762c2217bcc48051eb9f7286f58 WHIRLPOOL cdf674bb9febd0d25ccfe84027b0c33f5fe9c5f1d19a1b32650487b71a6f110ee0657eaf67dceb758b192b5e5d3c2dd314f1a696491d7a70d0b334fd31a17ee3
diff --git a/dev-util/codeblocks/codeblocks-13.12.ebuild b/dev-util/codeblocks/codeblocks-13.12.ebuild
new file mode 100644
index 000000000000..bfc98340429e
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-13.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WX_GTK_VER="2.8"
+
+inherit eutils wxwidgets
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}-1.tar.gz"
+
+IUSE="contrib debug pch static-libs"
+
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:2.8[X]
+	contrib? (
+		app-text/hunspell
+		dev-libs/boost:=
+		dev-libs/libgamin
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--with-wx-config="${WX_CONFIG}" \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		$(use_enable static-libs static) \
+		$(use_with contrib contrib-plugins all)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
new file mode 100644
index 000000000000..878c44ba362d
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WX_GTK_VER="2.8"
+
+inherit autotools eutils subversion wxwidgets
+
+DESCRIPTION="The open source, cross platform, free C++ IDE"
+HOMEPAGE="http://www.codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+SRC_URI=""
+ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
+
+IUSE="contrib debug pch static-libs"
+
+RDEPEND="app-arch/zip
+	x11-libs/wxGTK:2.8[X]
+	contrib? (
+		app-text/hunspell
+		dev-libs/boost:=
+		dev-libs/libgamin
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	subversion_src_unpack
+}
+
+src_prepare() {
+	# Let's make the autorevision work.
+	subversion_wc_info
+	CB_LCD=$(LC_ALL=C svn info "${ESVN_WC_PATH}" | grep "^Last Changed Date:" | cut -d" " -f4,5)
+	echo "m4_define([SVN_REV], ${ESVN_WC_REVISION})" > revision.m4
+	echo "m4_define([SVN_DATE], ${CB_LCD})" >> revision.m4
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-wx-config="${WX_CONFIG}" \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		$(use_enable static-libs static) \
+		$(use_with contrib contrib-plugins all)
+}
+
+src_compile() {
+	emake clean-zipfiles
+	emake
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch b/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch
new file mode 100644
index 000000000000..12dfe315e2d0
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch
@@ -0,0 +1,91 @@
+--- a/src/include/scripting/bindings/sc_base_types.h
++++ b/src/include/scripting/bindings/sc_base_types.h
+@@ -33,6 +33,7 @@ DECLARE_INSTANCE_TYPE(wxPoint);
+ DECLARE_INSTANCE_TYPE(wxSize);

+ DECLARE_INSTANCE_TYPE(wxString);

+ 

++using SqPlus::GetTypeName;

+ // C::B primitives and types

+ DECLARE_INSTANCE_TYPE(ConfigManager);

+ DECLARE_INSTANCE_TYPE(EditorManager);

+@@ -59,6 +60,7 @@ namespace SqPlus \
+     inline T Get(TypeWrapper<T>,HSQUIRRELVM v,int idx) { SQInteger i; SQPLUS_CHECK_GET(sq_getinteger(v,idx,&i)); return (T)i; } \

+ }

+ 

++using SqPlus::Push;

+ DECLARE_ENUM_TYPE(wxPathFormat);

+ DECLARE_ENUM_TYPE(wxPathNormalize);

+ DECLARE_ENUM_TYPE(PrintColourMode);

+--- /dev/null
++++ b/src/include/scripting/squirrel/sqmem.h
+@@ -0,0 +1,8 @@
++/*	see copyright notice in squirrel.h */
++#ifndef _SQMEM_H_
++#define _SQMEM_H_
++
++void *sq_vm_malloc(SQUnsignedInteger size);
++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
++void sq_vm_free(void *p,SQUnsignedInteger size);
++#endif //_SQMEM_H_
+--- a/src/include/scripting/squirrel/sqstate.h
++++ b/src/include/scripting/squirrel/sqstate.h
+@@ -136,8 +136,4 @@ extern SQObjectPtr _one_;
+ extern SQObjectPtr _minusone_;
+ 
+ bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+-
+-void *sq_vm_malloc(SQUnsignedInteger size);
+-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+-void sq_vm_free(void *p,SQUnsignedInteger size);
+ #endif //_SQSTATE_H_
+--- a/src/include/scripting/squirrel/squtils.h
++++ b/src/include/scripting/squirrel/squtils.h
+@@ -2,6 +2,7 @@
+ #ifndef _SQUTILS_H_
+ #define _SQUTILS_H_
+ 
++#include "sqmem.h"
+ #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
+ #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
+ #define SQ_MALLOC(__size) sq_vm_malloc((__size));
+--- a/src/plugins/contrib/help_plugin/defs.h
++++ b/src/plugins/contrib/help_plugin/defs.h
+@@ -289,7 +289,7 @@ class QMap : public std::map<Key, T>
+ 
+             if (i.second == false && overwrite)
+             {
+-                find(k)->second = t;
++                this->find(k)->second = t;
+             }
+ 
+             return i.first;
+@@ -297,7 +297,7 @@ class QMap : public std::map<Key, T>
+ 
+         int remove(const Key &k)
+         {
+-            return erase(k);
++            return this->erase(k);
+         }
+ };
+ 
+--- a/src/plugins/contrib/help_plugin/man2html.cpp
++++ b/src/plugins/contrib/help_plugin/man2html.cpp
+@@ -123,7 +123,7 @@
+ 

+ #include <ctype.h>

+ 

+-//#include <unistd.h>

++#include <unistd.h>

+ #include <string.h>

+ 

+ #include <stdio.h>

+--- a/src/plugins/debuggergdb/gdb_driver.cpp
++++ b/src/plugins/debuggergdb/gdb_driver.cpp
+@@ -72,6 +72,7 @@ static wxRegEx reChildPid3(_T("Thread[ \t]+[xA-Fa-f0-9-]+[ \t]+\\(LWP ([0-9]+)\\
+ 
+ 
+ // scripting support
++using SqPlus::Push;
+ DECLARE_INSTANCE_TYPE(GDB_driver);
+ 
+ GDB_driver::GDB_driver(DebuggerGDB* plugin)
diff --git a/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch b/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch
new file mode 100644
index 000000000000..af95ac2ca2b2
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch
@@ -0,0 +1,34 @@
+codeblocks crashes when a wxChartCtrl is added with wxSmith
+
+https://bugs.gentoo.org/show_bug.cgi?id=372837
+https://developer.berlios.de/bugs/?func=detailbug&bug_id=18182&group_id=5358
+
+
+--- a/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
++++ b/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
+@@ -156,7 +156,13 @@ void wxChartWindow::DrawHLines(
+         }
+         
+         wxChartSizes *sizes = GetSizes();
+-        
++
++	// sizes may be NULL, in this case do nothing 
++	// not sure if this is the right way to do things 
++	//  gw.fossdev@gmail.com 
++	if (!sizes) 
++		return; 
++
+         hp->SetPen( *wxBLACK_DASHED_PEN );
+         
+         double current = lower;
+@@ -188,6 +194,10 @@ ChartValue wxChartWindow::GetVirtualWidth() const
+     int iNodes = static_cast<int>(ceil( GetVirtualMaxX() ));
+     wxChartSizes *sizes = GetSizes();
+     
++    /// sizes may be NULL, in this case return a fixes value 
++    if (!sizes) 
++	    return 1; 
++    
+     ChartValue x = 0;
+ 
+     for ( int iNode = 0; iNode <= iNodes; ++ iNode )
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
new file mode 100644
index 000000000000..fac9faab5a75
--- /dev/null
+++ b/dev-util/codeblocks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>wxwidgets</herd>
+  <use>
+    <flag name="contrib">Build additional contrib components</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
new file mode 100644
index 000000000000..227f6167e603
--- /dev/null
+++ b/dev-util/colm/Manifest
@@ -0,0 +1,2 @@
+DIST colm-0.11.tar.gz 954781 SHA256 2fd80148b3b408b0ce261b6a248005c314b54120f9f9f80d5564056801718187 SHA512 46e7d7d87d2f8d156e15771851564540bce98eba2cf6cf14ac9af8e4f451eeda4b6cb8ea269c3a22dd096d6f12f7d3417410f51334979b331cfd3890598d959f WHIRLPOOL 57576de59500fd12661291bd17c6ae09105a5394c10315de33a1f830ff2fe54f77aa49290cc511c41dba432ffd1acde2a4d9add77c65edb7ee686e314d33785f
+DIST colm-0.12.0.tar.gz 983143 SHA256 7b545d74bd139f5c622975d243c575310af1e4985059a1427b6fdbb1fb8d6e4d SHA512 febdd750f728acc608e405f875fbc09880ddfb6cf593c05b129c4253f235e535cee2ebf89c45fabcf911dd9b77b204f8c6e463b6e307b0d062b7ecf864f47398 WHIRLPOOL 083d66607a898d5df42ee742d85dd83d893487a8f9c8aee5bef75e07d2f53c3371e683bf4947249bfcbc803a3bc643cc9d87532e36d5e656b12db9059d7335f6
diff --git a/dev-util/colm/colm-0.11.ebuild b/dev-util/colm/colm-0.11.ebuild
new file mode 100644
index 000000000000..f8450f3274bb
--- /dev/null
+++ b/dev-util/colm/colm-0.11.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="http://www.complang.org/colm/"
+SRC_URI="http://www.complang.org/colm/colm-0.11.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-util/colm/colm-0.12.0.ebuild b/dev-util/colm/colm-0.12.0.ebuild
new file mode 100644
index 000000000000..3a2f4d7e72d2
--- /dev/null
+++ b/dev-util/colm/colm-0.12.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="http://www.complang.org/colm/"
+SRC_URI="http://www.complang.org/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-util/colm/metadata.xml b/dev-util/colm/metadata.xml
new file mode 100644
index 000000000000..6719fcd2bb35
--- /dev/null
+++ b/dev-util/colm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/colorgcc/Manifest b/dev-util/colorgcc/Manifest
new file mode 100644
index 000000000000..8539635666ba
--- /dev/null
+++ b/dev-util/colorgcc/Manifest
@@ -0,0 +1 @@
+DIST colorgcc-1.3.2.tar.gz 11076 SHA256 55d33a64628ff380626b864200cad72146d00f3dce0f6dc1f0e69dc5b7f1653e SHA512 1f6031bcc0f6eb6bdaf0359debe13d1a6579c4f5bfb8dfeef79904a2ffcc94322f2c7f9948439c2975bd4ffed1ebaa085bd7ce338289bdf9c170cd40e1c1a448 WHIRLPOOL 6059d552558aa81a0c702dc678befb4b6403377edb6f57712439a61f7f2ceccd65fc8b61d0c901a2802493769956f9e4e23b57524084c57e4602ba9cd4a97a10
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r4.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r4.ebuild
new file mode 100644
index 000000000000..cb6c9d38c84e
--- /dev/null
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Adds color to gcc output"
+HOMEPAGE="http://schlueters.de/colorgcc.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-gentoo-one.patch \
+		"${FILESDIR}"/${P}-gentoo-two.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin colorgcc || die
+	dodir /etc/colorgcc /usr/lib/colorgcc/bin
+	insinto /etc/colorgcc
+	doins colorgccrc || die
+	einfo "Scanning for compiler front-ends"
+	into /usr/lib/colorgcc/bin
+	for a in gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ ; do
+		if [ -n "$(type -p ${a})" ]; then
+			dosym /usr/bin/colorgcc /usr/lib/colorgcc/bin/${a}
+		fi
+	done
+
+	dodoc CREDITS ChangeLog || die
+}
+
+pkg_postinst() {
+	echo
+	elog "If you have existing \$HOME/.colorgccrc files that set the location"
+	elog "of the compilers, you should remove those lines for maximum"
+	elog "flexibility.  The colorgcc script now knows how to pass the command"
+	elog "on to the next step in the PATH without manual tweaking, making it"
+	elog "easier to use with things like ccache and distcc on a conditional"
+	elog "basis.  You can tweak the /etc/colorgcc/colorgccrc file to change"
+	elog "the default settings for everyone (or copy this file as a basis for"
+	elog "a custom \$HOME/.colorgccrc file)."
+	elog
+	elog "NOTE: the symlinks for colorgcc are now located in"
+	elog "/usr/lib/colorgcc/bin *NOT* /usr/bin/wrappers.  You'll need to"
+	elog "change any PATH settings that referred to the old location."
+	echo
+	# portage won't delete the old symlinks for users that are upgrading
+	# because the old symlinks still point to /usr/bin/colorgcc which exists...
+	[ -d "${ROOT}"/usr/bin/wrappers ] && rm -fr "${ROOT}"/usr/bin/wrappers
+}
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r5.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r5.ebuild
new file mode 100644
index 000000000000..9b659857bbe7
--- /dev/null
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit eutils
+
+DESCRIPTION="Adds color to gcc output"
+HOMEPAGE="http://schlueters.de/colorgcc.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 hppa ~mips ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo-one.patch \
+		"${FILESDIR}"/${P}-gentoo-two.patch \
+		"${FILESDIR}"/${P}-note.patch
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dobin colorgcc || die
+	dodir /etc/colorgcc /usr/lib/colorgcc/bin
+	insinto /etc/colorgcc
+	doins colorgccrc || die
+	einfo "Scanning for compiler front-ends"
+	into /usr/lib/colorgcc/bin
+	for a in gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ ; do
+		if [ -n "$(type -p ${a})" ]; then
+			dosym /usr/bin/colorgcc /usr/lib/colorgcc/bin/${a}
+		fi
+	done
+
+	dodoc CREDITS ChangeLog || die
+}
+
+pkg_postinst() {
+	echo
+	elog "If you have existing \$HOME/.colorgccrc files that set the location"
+	elog "of the compilers, you should remove those lines for maximum"
+	elog "flexibility.  The colorgcc script now knows how to pass the command"
+	elog "on to the next step in the PATH without manual tweaking, making it"
+	elog "easier to use with things like ccache and distcc on a conditional"
+	elog "basis.  You can tweak the /etc/colorgcc/colorgccrc file to change"
+	elog "the default settings for everyone (or copy this file as a basis for"
+	elog "a custom \$HOME/.colorgccrc file)."
+	elog
+	elog "NOTE: the symlinks for colorgcc are now located in"
+	elog "/usr/lib/colorgcc/bin *NOT* /usr/bin/wrappers.  You'll need to"
+	elog "change any PATH settings that referred to the old location."
+	echo
+	# portage won't delete the old symlinks for users that are upgrading
+	# because the old symlinks still point to /usr/bin/colorgcc which exists...
+	[ -d "${EROOT}"/usr/bin/wrappers ] && rm -fr "${EROOT}"/usr/bin/wrappers
+}
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch
new file mode 100644
index 000000000000..68a177ba75c7
--- /dev/null
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch
@@ -0,0 +1,242 @@
+--- colorgcc.orig	1999-04-29 10:16:08.000000000 -0700
++++ colorgcc	2003-04-11 16:38:52.000000000 -0700
+@@ -88,16 +88,16 @@
+ #
+ # 1.0.0 Initial Version
+ 
++use strict;
++
+ use Term::ANSIColor;
+ use IPC::Open3;
++use Cwd 'abs_path';
++
++my(%nocolor, %colors, %compilerPaths);
+ 
+ sub initDefaults
+ {
+-   $compilerPaths{"gcc"} = "/usr/local/bin/gcc";
+-   $compilerPaths{"g++"} = "/usr/local/bin/g++";
+-   $compilerPaths{"cc"}  = "/usr/bin/cc";
+-   $compilerPaths{"c++"} = "/usr/local/bin/c++";
+-
+    $nocolor{"dumb"} = "true";
+ 
+    $colors{"srcColor"} = color("cyan");
+@@ -125,26 +125,26 @@
+       next if (m/^\#.*/);          # It's a comment.
+       next if (!m/(.*):\s*(.*)/);  # It's not of the form "foo: bar".
+ 
+-      $option = $1;
+-      $value = $2;
++      my $option = $1;
++      my $value = $2;
+ 
+-      if ($option =~ m/cc|c\+\+|gcc|g\+\+/)
+-      {
+-	 $compilerPaths{$option} = $value;
+-      }
+-      elsif ($option eq "nocolor")
++      if ($option eq "nocolor")
+       {
+ 	 # The nocolor option lists terminal types, separated by
+ 	 # spaces, not to do color on.
+-	 foreach $termtype (split(/\s+/, $value))
++	 foreach my $term (split(' ', $value))
+ 	 {
+-	    $nocolor{$termtype} = "true";
++	    $nocolor{$term} = 1;
+ 	 }
+       }
+-      else
++      elsif (defined $colors{$option})
+       {
+ 	 $colors{$option} = color($value);
+       }
++      else
++      {
++	 $compilerPaths{$option} = $value;
++      }
+    }
+    close(PREFS);
+ }
+@@ -180,41 +180,80 @@
+ initDefaults();
+ 
+ # Read the configuration file, if there is one.
+-$configFile = $ENV{"HOME"} . "/.colorgccrc";
++my $configFile = $ENV{"HOME"} . "/.colorgccrc";
+ if (-f $configFile)
+ {
+    loadPreferences($configFile);
+ }
++elsif (-f '/etc/colorgcc/colorgccrc')
++{
++   loadPreferences('/etc/colorgcc/colorgccrc');
++}
+ 
+ # Figure out which compiler to invoke based on our program name.
+ $0 =~ m%.*/(.*)$%;
+-$progName = $1 || $0;
+-
+-$compiler = $compilerPaths{$progName} || $compilerPaths{"gcc"};
+-
+-# Get the terminal type. 
+-$terminal = $ENV{"TERM"} || "dumb";
++my $progName = $1 || $0;
++my $compiler_pid;
+ 
+-# If it's in the list of terminal types not to color, or if
+-# we're writing to something that's not a tty, don't do color.
+-if (! -t STDOUT || $nocolor{$terminal})
++# If called as "colorgcc", just filter STDIN to STDOUT.
++if ($progName eq 'colorgcc')
+ {
+-   exec $compiler, @ARGV
+-      or die("Couldn't exec");
++   open(GCCOUT, "<&STDIN");
+ }
++else
++{
++   # See if the user asked for a specific compiler.
++   my $compiler;
++   if (!defined($compiler = $compilerPaths{$progName}))
++   {
++      # Find our wrapper dir on the PATH and tweak the PATH to remove
++      # everything up-to and including our wrapper dir.
++      if ($0 =~ m#(.*)/#)
++      {
++	 # We were called with an explicit path, so trim that off the PATH.
++	 my $find = $1;
++	 $find = abs_path($1) unless $find =~ m#^/#;
++	 $ENV{'PATH'} =~ s#.*(^|:)\Q$find\E(:|$)##;
++      }
++      else
++      {
++	 my(@dirs) = split(/:/, $ENV{'PATH'});
++	 while (defined($_ = shift @dirs))
++	 {
++	    if (-x "$_/$progName")
++	    {
++	       $ENV{'PATH'} = join(':', @dirs);
++	       last;
++	    }
++	 }
++      }
++      $compiler = $progName;
++   }
+ 
+-# Keep the pid of the compiler process so we can get its return
+-# code and use that as our return code.
+-$compiler_pid = open3('<&STDIN', \*GCCOUT, \*GCCOUT, $compiler, @ARGV);
++   # Get the terminal type. 
++   my $terminal = $ENV{"TERM"} || "dumb";
++
++   # If it's in the list of terminal types not to color, or if
++   # we're writing to something that's not a tty, don't do color.
++   if (! -t STDOUT || $nocolor{$terminal})
++   {
++      exec $compiler, @ARGV
++	 or die("Couldn't exec");
++   }
++
++   # Keep the pid of the compiler process so we can get its return
++   # code and use that as our return code.
++   $compiler_pid = open3('<&STDIN', \*GCCOUT, \*GCCOUT, $compiler, @ARGV);
++}
+ 
+ # Colorize the output from the compiler.
+ while(<GCCOUT>)
+ {
+-   if (m/^(.*?):([0-9]+):(.*)$/) # filename:lineno:message
++   if (m#^(.+?\.[^:/ ]+):([0-9]+):(.*)$#) # filename:lineno:message
+    {
+-      $field1 = $1 || "";
+-      $field2 = $2 || "";
+-      $field3 = $3 || "";
++      my $field1 = $1 || "";
++      my $field2 = $2 || "";
++      my $field3 = $3 || "";
+ 
+       if ($field3 =~ m/\s+warning:.*/)
+       {
+@@ -232,6 +271,10 @@
+       }
+       print("\n");
+    }
++   elsif (m/^:.+`.*'$/) # filename:message:
++   {
++      srcscan($_, $colors{"warningMessageColor"});
++   }
+    elsif (m/^(.*?):(.+):$/) # filename:message:
+    {
+       # No line number, treat as an "introductory" line of text.
+@@ -244,11 +287,9 @@
+    }
+ }
+ 
+-# Get the return code of the compiler and exit with that.
+-waitpid($compiler_pid, 0);
+-exit ($? >> 8);
+-
+-
+-
+-
+-
++if ($compiler_pid)
++{
++   # Get the return code of the compiler and exit with that.
++   waitpid($compiler_pid, 0);
++   exit ($? >> 8);
++}
+--- colorgccrc.orig	1999-04-29 10:16:08.000000000 -0700
++++ colorgccrc	2003-02-12 17:38:38.000000000 -0800
+@@ -20,12 +20,14 @@
+ # For example, srcColor: bold cyan on_yellow
+ #
+ 
+-# Define the paths to the actual location of the various compilers.
++# Only define the paths to the actual location of the various compilers if
++# you need to do something weird.  For normal installs, we'll figure out
++# who to call next automatically.
+ # (Currently, colorgcc only understands these: g++ gcc c++ cc)
+-g++: /usr/local/bin/g++
+-gcc: /usr/local/bin/gcc
+-c++: /usr/local/bin/c++
+-cc:  /usr/bin/cc
++##g++: /usr/bin/g++
++##gcc: /usr/bin/gcc
++##c++: /usr/bin/c++
++##cc:  /usr/bin/cc
+ 
+ # Don't do color if our terminal type ($TERM) is one of these.
+ # (List all terminal types on one line, seperated by whitespace.)
+@@ -43,12 +45,10 @@
+ 
+ # Warnings
+ warningFileNameColor: reset
+-warningNumberColor:   white
++warningNumberColor:   blue
+ warningMessageColor:  yellow
+ 
+ # Errors
+ errorFileNameColor: reset
+-errorNumberColor:   white
++errorNumberColor:   blue
+ errorMessageColor:  bold red
+-
+-
+--- INSTALL.orig	1999-04-29 10:16:08.000000000 -0700
++++ INSTALL	2003-04-07 17:12:25.000000000 -0700
+@@ -27,9 +27,9 @@
+ When "g++" is invoked, colorgcc is run instead.  colorgcc looks at the
+ program name to figure out which compiler to use. 
+ 
+-Copy the sample colorgccrc file to $HOME/.colorgccrc and make sure the
+-absolute paths for the compilers are correct for your system.
+-See the comments in the sample .colorgccrc for more information.
++Modify the file /etc/colorgcc/colorgccrc if you want to change the default
++values for everyone.  For individual customizations, copy this file to
++$HOME/.colorgccrc and change that.
+ 
+ 
+ Note:
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
new file mode 100644
index 000000000000..911a31b21bf3
--- /dev/null
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
@@ -0,0 +1,75 @@
+--- colorgcc.r9	2003-09-21 12:14:48.000000000 -0700
++++ colorgcc	2003-09-21 13:11:22.000000000 -0700
+@@ -95,6 +95,7 @@
+ use Cwd 'abs_path';
+ 
+ my(%nocolor, %colors, %compilerPaths);
++my($unfinishedQuote, $previousColor);
+ 
+ sub initDefaults
+ {
+@@ -159,14 +160,37 @@
+ 
+    my($line, $normalColor) = @_;
+ 
++   if (defined $normalColor)
++   {
++      $previousColor = $normalColor;
++   }
++   else
++   {
++      $normalColor = $previousColor;
++   }
++
+    my($srcon) = color("reset") . $colors{"srcColor"};
+    my($srcoff) = color("reset") . $normalColor;
+ 
+-   $line = $normalColor . $line;
++   $line = ($unfinishedQuote? $srcon : $normalColor) . $line;
+ 
+-   # This substitute replaces `foo' with `AfooB' where A is the escape
++   # These substitutions replaces `foo' with `AfooB' where A is the escape
+    # sequence that turns on the the desired source color, and B is the
+    # escape sequence that returns to $normalColor.
++
++   # Handle multi-line quotes.
++   if ($unfinishedQuote) {
++      if ($line =~ s/^([^\`]*?)\'/$1$srcoff\'/)
++      {
++	 $unfinishedQuote = 0;
++      }
++   }
++   if ($line =~ s/\`([^\']*?)$/\`$srcon$1/)
++   {
++      $unfinishedQuote = 1;
++   }
++
++   # Single line quoting.
+    $line =~ s/\`(.*?)\'/\`$srcon$1$srcoff\'/g;
+ 
+    print($line, color("reset"));
+@@ -190,6 +214,10 @@
+    loadPreferences('/etc/colorgcc/colorgccrc');
+ }
+ 
++# Set our default output color.  This presumes that any unrecognized output
++# is an error.
++$previousColor = $colors{"errorMessageColor"};
++
+ # Figure out which compiler to invoke based on our program name.
+ $0 =~ m%.*/(.*)$%;
+ my $progName = $1 || $0;
+@@ -281,10 +309,9 @@
+       # No line number, treat as an "introductory" line of text.
+       srcscan($_, $colors{"introColor"});
+    }
+-   else # Anything else.        
++   else # Anything else.
+    {
+-      # Doesn't seem to be a warning or an error. Print normally.
+-      print(color("reset"), $_);
++      srcscan($_, undef);
+    }
+ }
+ 
+
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
new file mode 100644
index 000000000000..026503e8f2c9
--- /dev/null
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
@@ -0,0 +1,57 @@
+--- /usr/bin/colorgcc	2009-10-29 20:24:46.717190000 +0100
++++ colorgcc	2009-10-29 20:27:42.614162888 +0100
+@@ -102,7 +102,8 @@
+    $nocolor{"dumb"} = "true";
+ 
+    $colors{"srcColor"} = color("cyan");
+-   $colors{"introColor"} = color("blue");
++   $colors{"introFileNameColor"} = color("blue");
++   $colors{"introMessageColor"} = color("blue");
+ 
+    $colors{"warningFileNameColor"} = color("yellow");
+    $colors{"warningNumberColor"}   = color("yellow");
+@@ -111,6 +112,10 @@
+    $colors{"errorFileNameColor"} = color("bold red");
+    $colors{"errorNumberColor"}   = color("bold red");
+    $colors{"errorMessageColor"}  = color("bold red");
++
++   $colors{"noteFileNameColor"} = color("green");
++   $colors{"noteNumberColor"}   = color("green");
++   $colors{"noteMessageColor"}  = color("green");
+ }
+ 
+ sub loadPreferences
+@@ -290,12 +295,18 @@
+ 	 print($colors{"warningNumberColor"}, "$field2:", color("reset"));
+ 	 srcscan($field3, $colors{"warningMessageColor"});
+       }
+-      else 
+-      {
++      elsif ($field3 =~ m/\s+error:.*/)
++	{
+ 	 # Error
+ 	 print($colors{"errorFileNameColor"}, "$field1:", color("reset"));
+ 	 print($colors{"errorNumberColor"}, "$field2:", color("reset"));
+ 	 srcscan($field3, $colors{"errorMessageColor"});
++      } else
++      {
++	 # Note
++	 print($colors{"noteFileNameColor"}, "$field1:", color("reset"));
++	 print($colors{"noteNumberColor"}, "$field2:", color("reset"));
++	 srcscan($field3, $colors{"noteMessageColor"});
+       }
+       print("\n");
+    }
+@@ -305,8 +316,11 @@
+    }
+    elsif (m/^(.*?):(.+):$/) # filename:message:
+    {
++      my $field1 = $1 || "";
++      my $field2 = $2 || "";
+       # No line number, treat as an "introductory" line of text.
+-      srcscan($_, $colors{"introColor"});
++	 print($colors{"introFileNameColor"}, "$field1:", color("reset"));
++	 print($colors{"introMessageColor"}, "$field2:\n", color("reset"));
+    }
+    else # Anything else.
+    {
diff --git a/dev-util/colorgcc/metadata.xml b/dev-util/colorgcc/metadata.xml
new file mode 100644
index 000000000000..40149c995561
--- /dev/null
+++ b/dev-util/colorgcc/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>shell-tools</herd>
+</pkgmetadata>
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
new file mode 100644
index 000000000000..e2041ba45948
--- /dev/null
+++ b/dev-util/comparator/Manifest
@@ -0,0 +1,3 @@
+DIST comparator-2.10.tar.gz 1463175 SHA256 9fcada1a38d376351f67cd6b6aa4907b4fd835cbdadaa48d87a6ddf86545fa98 SHA512 b880f7a4a0fbfad44c53606c6d97509305d8485f0ab76b62bb0d1d1d6d4be9fb81e7a08326e78cabd1a9314e6efbf3a966eb6393e424f59dc657975a63ce2988 WHIRLPOOL 85e853f381f5f384e87cf5b0140f23b8511ae30d5c7b7124c6f875c0a5b30ae3a72dfaf70acdeee4e6e099fb81062c10cbe5da371344e0bdddcfdb433a4e3169
+DIST comparator-2.5.tar.gz 1469060 SHA256 d6151d72a3517470292b405fc4e7b0f518ed335377464228677e2416cae52c25 SHA512 aceaabf7bbcce961def9acfdcce3595685d958b330a82dfe48bf3c72cdc672705542f77d27d726c91aa51a6f3a7b3f0909084f4aed8e480d4e1bce55574b3df8 WHIRLPOOL 67339d3e323cfb025502499a45f967762698ec9782bb72eda3b68028ab0b9869e1c3b61004edcf133c49c4dab532c9107d09ff4b76a694508f6c85321a3bef46
+DIST comparator-2.9.tar.gz 1463064 SHA256 3fd8b3a8e36e7633950f333f23c60c35ed9a1ac78e9b6f69950908919043d682 SHA512 039c2edead2366f9c067a279b0449a6c5e7872acbe1c06ed5ad31bd3c76eee3c514abe6dd53a4921c2ad382a82c53fcff2db73338532594621327b5bb440d442 WHIRLPOOL 4c608a3627b0e309521f441d088f89f6768e466fa660d75da10e15dd18bba027070a65826a92d5b27254db3b7df76e9164cb1456c3bd4e2b27d5c39ce2027016
diff --git a/dev-util/comparator/comparator-2.10.ebuild b/dev-util/comparator/comparator-2.10.ebuild
new file mode 100644
index 000000000000..561ac8914c0b
--- /dev/null
+++ b/dev-util/comparator/comparator-2.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="ESR's utility for making fast comparisons among large source trees"
+HOMEPAGE="http://www.catb.org/~esr/comparator/"
+SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="=app-text/docbook-xml-dtd-4.1.2*
+	app-text/xmlto"
+
+src_prepare() {
+	sed \
+		-e '/python setup.py install/d' \
+		-i Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake comparator.html scf-standard.html
+	distutils-r1_src_compile
+}
+
+src_install() {
+	emake ROOT="${D}" install
+	distutils-r1_src_install
+	docinto html
+	dodoc *.html
+}
diff --git a/dev-util/comparator/comparator-2.5.ebuild b/dev-util/comparator/comparator-2.5.ebuild
new file mode 100644
index 000000000000..bb1b700e9187
--- /dev/null
+++ b/dev-util/comparator/comparator-2.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils toolchain-funcs
+
+DESCRIPTION="ESR's utility for making fast comparisons among large source trees"
+HOMEPAGE="http://www.catb.org/~esr/comparator/"
+SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="sparc"
+IUSE=""
+
+RDEPEND=""
+DEPEND="=app-text/docbook-xml-dtd-4.1.2*
+	app-text/xmlto"
+
+PYTHON_MODNAME="comparator.py"
+
+src_prepare() {
+	sed \
+		-e '/install -m 755 -o 0 -g 0 filterator/d' \
+		-e '/python setup.py install/d' \
+		-i Makefile || die "sed failed"
+}
+
+src_compile() {
+	distutils_src_compile
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake comparator.html scf-standard.html || die "emake html failed"
+}
+
+src_install() {
+	distutils_src_install
+	emake ROOT="${D}" install || die "emake install failed"
+
+	install_filterator() {
+		newbin filterator filterator-${PYTHON_ABI} || return 1
+		python_convert_shebangs ${PYTHON_ABI} "${ED}usr/bin/filterator-${PYTHON_ABI}"
+	}
+	python_execute_function -q install_filterator
+	python_generate_wrapper_scripts "${ED}usr/bin/filterator"
+
+	dohtml *.html || die "dohtml failed"
+}
diff --git a/dev-util/comparator/comparator-2.9.ebuild b/dev-util/comparator/comparator-2.9.ebuild
new file mode 100644
index 000000000000..e0a0e61ffc43
--- /dev/null
+++ b/dev-util/comparator/comparator-2.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils toolchain-funcs
+
+DESCRIPTION="ESR's utility for making fast comparisons among large source trees"
+HOMEPAGE="http://www.catb.org/~esr/comparator/"
+SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="=app-text/docbook-xml-dtd-4.1.2*
+	app-text/xmlto"
+
+PYTHON_MODNAME="comparator.py"
+
+src_prepare() {
+	sed \
+		-e '/install -m 755 -o 0 -g 0 filterator/d' \
+		-e '/python setup.py install/d' \
+		-i Makefile || die "sed failed"
+}
+
+src_compile() {
+	distutils_src_compile
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake comparator.html scf-standard.html
+}
+
+src_install() {
+	distutils_src_install
+	emake ROOT="${D}" install
+
+	install_filterator() {
+		newbin filterator filterator-${PYTHON_ABI} || return 1
+		python_convert_shebangs ${PYTHON_ABI} "${ED}usr/bin/filterator-${PYTHON_ABI}"
+	}
+	python_execute_function -q install_filterator
+	python_generate_wrapper_scripts "${ED}usr/bin/filterator"
+
+	dohtml *.html
+}
diff --git a/dev-util/comparator/metadata.xml b/dev-util/comparator/metadata.xml
new file mode 100644
index 000000000000..eb3a223072c2
--- /dev/null
+++ b/dev-util/comparator/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<longdescription>ESR's utility for making fast comparisons among large source trees</longdescription>
+</pkgmetadata>
diff --git a/dev-util/complexity/Manifest b/dev-util/complexity/Manifest
new file mode 100644
index 000000000000..cfcb15bacbaf
--- /dev/null
+++ b/dev-util/complexity/Manifest
@@ -0,0 +1 @@
+DIST complexity-1.2.tar.xz 406024 SHA256 22c275e79078bf438dd51108256bb9b33d111330c3f979d7bf1cb0d4aa055e24 SHA512 e9460a27c9867db316b1f9fc80336a24513d47fa7a5dc7dc48ec1bcfb7e6678c725cec84e983397367498e22ebfee02ecff50343bafb018617f281f06ed295ab WHIRLPOOL e5e3f6ceb447c0940e8bb760cf5ec879e2bc012e4885ae96db82f92b5661bb2db4e737a5c885c3f873a2678fc35cacf3936e33a1d8bcb31765312f77f93c5d25
diff --git a/dev-util/complexity/complexity-1.2.ebuild b/dev-util/complexity/complexity-1.2.ebuild
new file mode 100644
index 000000000000..ec676a962be0
--- /dev/null
+++ b/dev-util/complexity/complexity-1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="a tool designed for analyzing the complexity of C program functions"
+HOMEPAGE="http://www.gnu.org/software/complexity/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=sys-devel/autogen-5.11.7"
+DEPEND="
+	${RDEPEND}
+	sys-devel/libtool
+"
+
+DOCS=( AUTHORS ChangeLog NEWS )
diff --git a/dev-util/complexity/metadata.xml b/dev-util/complexity/metadata.xml
new file mode 100644
index 000000000000..704d8f91190c
--- /dev/null
+++ b/dev-util/complexity/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/confix-wrapper/confix-wrapper-0.ebuild b/dev-util/confix-wrapper/confix-wrapper-0.ebuild
new file mode 100644
index 000000000000..4d820ac59a81
--- /dev/null
+++ b/dev-util/confix-wrapper/confix-wrapper-0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Wrapper to select either confix1.py or confix2.py"
+HOMEPAGE="http://confix.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+src_install() {
+	dodir /usr/bin
+	cat >> "${ED:-${D}}"usr/bin/confix <<EOF
+#! ${EPREFIX:-}/bin/sh
+confixpy=
+if [ -f ./Confix2.dir ]; then
+	confixpy=confix2.py
+elif [ -f ./Makefile.py ]; then
+	confixpy=confix1.py
+else
+	confixpy=confix2.py
+fi
+case \$# in
+0) exec \${confixpy} ;;
+*) exec \${confixpy} "\$@" ;;
+esac
+EOF
+	fperms a+x /usr/bin/confix || die "cannot set permissions"
+	dosym confix /usr/bin/confix.py || die "cannot create 'confix' symlink"
+}
diff --git a/dev-util/confix-wrapper/metadata.xml b/dev-util/confix-wrapper/metadata.xml
new file mode 100644
index 000000000000..0c66569e5c19
--- /dev/null
+++ b/dev-util/confix-wrapper/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>haubi@gentoo.org</email>
+		<name>Michael Haubenwallner</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/confix/Manifest b/dev-util/confix/Manifest
new file mode 100644
index 000000000000..3002f9af8be1
--- /dev/null
+++ b/dev-util/confix/Manifest
@@ -0,0 +1 @@
+DIST Confix-2.3.5.tar.bz2 678133 SHA256 b1a2814526c908ab32d6cfd3f0e8b8105c925a7e8ac1802c4b0856d44a2a9916 SHA512 e6adec0cd27e9064dd0f6ff32d2e68deb755631a27759b253a7a176525b515ffc9069b8f28ac48ee6fdb642dfc2098fd2d7d6bd6e4ecccd43cb92df12c48e4c7 WHIRLPOOL e9412d3a4619679301f8816fd4de3a267cf3b9ed57967bbbb29bd8219147f8c1643b4e610d06a8de5433ca3f4101b689e351717d386c86fd34c3725e48666bde
diff --git a/dev-util/confix/confix-2.3.5-r2.ebuild b/dev-util/confix/confix-2.3.5-r2.ebuild
new file mode 100644
index 000000000000..e7b558e6e7bd
--- /dev/null
+++ b/dev-util/confix/confix-2.3.5-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
+HOMEPAGE="http://confix.sourceforge.net"
+SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-util/confix-wrapper
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/libtool"
+
+S="${WORKDIR}/Confix-${PV}"
+
+PATCHES=( # find jni-include dirs on hpux.
+	"${FILESDIR}"/2.1.0/jni-hpux.patch
+	# add .exe extension to TESTS
+	"${FILESDIR}"/2.3.0/exeext.patch
+	# use external autoconf archive
+	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
+	# link local libraries first.
+	"${FILESDIR}"/2.3.0/local-libs-first.patch
+	# don't use automake 1.9, but any newer too...
+	"${FILESDIR}"/2.3.0/new-automake.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+pkg_preinst() {
+	local RV=2.3.0
+
+	if has_version "<dev-util/confix-${RV}"; then
+		einfo "After merging ${P} you might have to remerge all packages built"
+		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
+		einfo "repo files useable with current ${PN}".
+		ewarn
+		ewarn "Use this command (copy&paste) to identify packages built with confix"
+		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
+		ewarn
+		# use 'echo' to get this command from here:
+		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
+			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
+			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
+			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
+			  "'No more packages were built with broken Confix.'; exit 0;" \
+			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
+			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
+			  ")"
+		ewarn
+	fi
+}
diff --git a/dev-util/confix/confix-9999.ebuild b/dev-util/confix/confix-9999.ebuild
new file mode 100644
index 000000000000..ec0cd11b4c16
--- /dev/null
+++ b/dev-util/confix/confix-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 subversion
+
+DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
+HOMEPAGE="http://confix.sourceforge.net"
+ESVN_REPO_URI="http://svn.code.sf.net/p/confix/svn/confix/trunk"
+ESVN_PROJECT="${PN}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-util/confix-wrapper
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/libtool"
+
+PATCHES=( # find jni-include dirs on hpux.
+	"${FILESDIR}"/2.1.0/jni-hpux.patch
+	# add .exe extension to TESTS
+	"${FILESDIR}"/2.3.0/exeext.patch
+	# use external autoconf archive
+	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
+	# link local libraries first.
+	"${FILESDIR}"/2.3.0/local-libs-first.patch
+	# don't use automake 1.9, but any newer too...
+	"${FILESDIR}"/2.3.0/new-automake.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+pkg_preinst() {
+	local RV=2.3.0
+
+	if has_version "<dev-util/confix-${RV}"; then
+		einfo "After merging ${P} you might have to remerge all packages built"
+		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
+		einfo "repo files useable with current ${PN}".
+		ewarn
+		ewarn "Use this command (copy&paste) to identify packages built with confix"
+		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
+		ewarn
+		# use 'echo' to get this command from here:
+		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
+			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
+			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
+			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
+			  "'No more packages were built with broken Confix.'; exit 0;" \
+			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
+			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
+			  ")"
+		ewarn
+	fi
+}
diff --git a/dev-util/confix/files/2.1.0/jni-hpux.patch b/dev-util/confix/files/2.1.0/jni-hpux.patch
new file mode 100644
index 000000000000..bd1b626e7bc2
--- /dev/null
+++ b/dev-util/confix/files/2.1.0/jni-hpux.patch
@@ -0,0 +1,10 @@
+--- Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4.orig	2007-02-07 21:16:20.000000000 +0100
++++ Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4	2007-02-07 21:16:34.000000000 +0100
+@@ -67,6 +67,7 @@
+ mingw*)			_JNI_INC_SUBDIRS="win32";;
+ cygwin*)		_JNI_INC_SUBDIRS="win32";;
+ interix*)		_JNI_INC_SUBDIRS="win32";;
++hpux*)			_JNI_INC_SUBDIRS="hp-ux";;
+ *)              _JNI_INC_SUBDIRS="genunix";;
+ esac
+ 
diff --git a/dev-util/confix/files/2.3.0/exeext.patch b/dev-util/confix/files/2.3.0/exeext.patch
new file mode 100644
index 000000000000..98576f5c9f8b
--- /dev/null
+++ b/dev-util/confix/files/2.3.0/exeext.patch
@@ -0,0 +1,20 @@
+diff -ru confix-9999.orig/libconfix/plugins/automake/makefile_am.py confix-9999/libconfix/plugins/automake/makefile_am.py
+--- confix-9999.orig/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:20:42.106291175 +0100
++++ confix-9999/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:23:39.562354663 +0100
+@@ -472,7 +472,15 @@
+         
+         # register automatic tests and set their environment
+ 
+-        tests = self.dir_primary('check', 'PROGRAMS') + \
++        test_tmp = self.dir_primary('check', 'PROGRAMS')
++        count = 0
++        for prog in test_tmp:
++            prog += "$(EXEEXT)"
++            test_tmp[count] = prog
++            count += 1
++            pass
++
++        tests = test_tmp + \
+                 self.dir_primary('check', 'SCRIPTS')
+         if len(tests):
+             lines.extend(makefile.List(name='TESTS', values=tests, mitigate=True).lines())
diff --git a/dev-util/confix/files/2.3.0/ext-ac-archive.patch b/dev-util/confix/files/2.3.0/ext-ac-archive.patch
new file mode 100644
index 000000000000..32122c95bfe2
--- /dev/null
+++ b/dev-util/confix/files/2.3.0/ext-ac-archive.patch
@@ -0,0 +1,35 @@
+diff -ru confix-9999.orig/libconfix/plugins/automake/bootstrap.py confix-9999/libconfix/plugins/automake/bootstrap.py
+--- confix-9999.orig/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:25:27.962172020 +0100
++++ confix-9999/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:27:14.780605001 +0100
+@@ -16,7 +16,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA
+ 
+-import autoconf_archive
++#import autoconf_archive
+ import kde_hack
+ 
+ from libconfix.core.utils.error import Error
+@@ -29,7 +29,7 @@
+ 
+ def bootstrap(packageroot, use_kde_hack, argv0, path=None):
+     aclocal_incdirs = []
+-    aclocal_incdirs.append(autoconf_archive.include_path(argv0))
++    #aclocal_incdirs.append(autoconf_archive.include_path(argv0))
+ 
+     # if package's configure.ac looks like using libtool, then we
+     # assume that the package must be libtoolize'd.
+diff -ru confix-9999.orig/setup.py confix-9999/setup.py
+--- confix-9999.orig/setup.py	2009-10-30 13:25:27.965360137 +0100
++++ confix-9999/setup.py	2009-10-30 13:26:47.822129311 +0100
+@@ -41,8 +41,8 @@
+     return result
+ 
+ datafiles = []
+-datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
+-datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
++#datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
++#datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
+ 
+ # scripts to put in the auxdir.
+ datafiles.extend([('share/confix/kde-hack',
diff --git a/dev-util/confix/files/2.3.0/local-libs-first.patch b/dev-util/confix/files/2.3.0/local-libs-first.patch
new file mode 100644
index 000000000000..29d4a7a1cc9d
--- /dev/null
+++ b/dev-util/confix/files/2.3.0/local-libs-first.patch
@@ -0,0 +1,39 @@
+With libtool, link local libraries with /path/to/libfile.la instead of libpath,
+to avoid encoding local libpath into installed la-file.
+These also have to be linked first, to avoid finding already installed
+libraries of previous versions during libtool-relink.
+diff -ru Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py Confix-2.3.0/libconfix/plugins/automake/c/out_c.py
+--- Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py	2010-07-06 12:55:59.286540943 +0200
++++ Confix-2.3.0/libconfix/plugins/automake/c/out_c.py	2010-07-06 13:01:23.574428852 +0200
+@@ -411,6 +411,8 @@
+         """
+         assert isinstance(linked_builder, LinkedBuilder)
+         
++        local_paths = []
++        local_libraries = []
+         native_paths = []
+         native_libraries = []
+         external_linkline = []
+@@ -424,8 +426,11 @@
+ 
+         for bi in native_libs_to_use:
+             if isinstance(bi, BuildInfo_CLibrary_NativeLocal):
+-                native_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir()))
+-                native_libraries.append('-l'+bi.basename())
++                if self.__use_libtool:
++                    local_libraries.append('/'.join(['$(top_builddir)']+bi.dir()+['lib'+bi.basename()+'.la']))
++                else:
++                    local_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir()))
++                    local_libraries.append('-l'+bi.basename())
+                 continue
+             if isinstance(bi, BuildInfo_CLibrary_NativeInstalled):
+                 using_installed_library = True
+@@ -447,7 +452,7 @@
+             external_linkline.extend(elem)
+             pass
+ 
+-        return native_paths + native_libraries + external_linkline
++        return local_paths + local_libraries + native_paths + native_libraries + external_linkline
+ 
+     def external_libpath(self):
+         """ For unit tests only. """
diff --git a/dev-util/confix/files/2.3.0/new-automake.patch b/dev-util/confix/files/2.3.0/new-automake.patch
new file mode 100644
index 000000000000..d6f24a4cae81
--- /dev/null
+++ b/dev-util/confix/files/2.3.0/new-automake.patch
@@ -0,0 +1,12 @@
+diff -ru Confix-2.3.0.orig/libconfix/plugins/automake/out_automake.py Confix-2.3.0/libconfix/plugins/automake/out_automake.py
+--- Confix-2.3.0.orig/libconfix/plugins/automake/out_automake.py	2010-07-12 13:15:49.254867387 +0200
++++ Confix-2.3.0/libconfix/plugins/automake/out_automake.py	2010-07-12 13:17:29.755908602 +0200
+@@ -170,7 +170,7 @@
+ 
+ 
+         # our minimum required automake version is 1.9
+-        self.makefile_am().add_automake_options('1.9')
++        # self.makefile_am().add_automake_options('1.9')
+ 
+ 
+         # enable dist'ing in the following formats
diff --git a/dev-util/confix/metadata.xml b/dev-util/confix/metadata.xml
new file mode 100644
index 000000000000..0c66569e5c19
--- /dev/null
+++ b/dev-util/confix/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>haubi@gentoo.org</email>
+		<name>Michael Haubenwallner</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
new file mode 100644
index 000000000000..02f695ffec97
--- /dev/null
+++ b/dev-util/cppcheck/Manifest
@@ -0,0 +1,4 @@
+DIST cppcheck-1.63.tar.bz2 1157231 SHA256 924bfc4593215b7bab6b049dbbce9a6f343dbf15f4bdd869ef1d378f09f92064 SHA512 4c2f6080ce72ffa24f929a2b74c656538d9f555fb14b3e6f3a2632eca8973a8b711831ddd698e13059643446b0e90619f71e13b1d06b6fefc4b4562622939508 WHIRLPOOL af095e4f0b84ded78f9fa10baedc5266a66ac52ffa6813eeb38697d1c55e02b76670eb09228c4ce356f2d3402f4247a66fe2ccd666e5637326e0913a75c2732e
+DIST cppcheck-1.67.tar.bz2 1084926 SHA256 6214c0cf0c11c83ecfae35f8cc8db4fa47389a77360919653d635612cefe2ab9 SHA512 5d1e3e12c818f850b00a8e3b3d79f24fceb0fa806d9100aaa6aed1bbbc86237af2e7dd4567fdfd227281f62d4b5450ac6cbbc6a97e04b380c242c59ddd3609ef WHIRLPOOL 1fc82744a78b76d9bb682fa6f6d8a619164c5cb250eb199ac545d4c147522ab5c4961d635cdea291ccf65f7972a162d394c4e500542b27b8679e262093e86884
+DIST cppcheck-1.68.tar.bz2 1008321 SHA256 add6e5e12b05ca02b356cd0ec7420ae0dcafddeaef183b4dfbdef59c617349b1 SHA512 72c78a17281ad3d771459895ad776c5dceda605edef13886e870cff456db5dc5cbff39d56bdf39788283bf673dd28a13b1602a330b8e33a3042b07cf43f0f011 WHIRLPOOL 16d8d4deeef9ec9fb4415c5941935122ebf3a44159ac8251ebfbfca2aeeb270bccaed5dcf63f6018b3fcf79cad6779af76d0e1cba47e853394794be4942cd622
+DIST cppcheck-1.69.tar.bz2 1052984 SHA256 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e SHA512 30f239bcdf4cb1fcc254271bf55f3fdc1ec22e7d26f0704218390cfce1d4cf3ef41f385f4e463ede1a1a401e87d81b1d66a462c7b07e045d46aebd2354384a01 WHIRLPOOL e341c8b8f133fd19188700d53d6f02ab5deffc10fdfedbc9474931596850c10027a91e445998a3884f8f30908581e428fe4c629397b14660a0fe7b852e48b3a4
diff --git a/dev-util/cppcheck/cppcheck-1.63-r1.ebuild b/dev-util/cppcheck/cppcheck-1.63-r1.ebuild
new file mode 100644
index 000000000000..3c1d42f4d8a5
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.63-r1.ebuild
@@ -0,0 +1,62 @@
+# 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} )
+
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="htmlreport qt4"
+
+DEPEND="htmlreport? ( ${PYTHON_DEPS} )
+	qt4? ( dev-qt/qtgui:4 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	tc-export CXX
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	emake CFGDIR="/usr/share/${PN}/cfg"
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc readme.txt
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	fi
+}
diff --git a/dev-util/cppcheck/cppcheck-1.67.ebuild b/dev-util/cppcheck/cppcheck-1.67.ebuild
new file mode 100644
index 000000000000..d17bb4b21ff0
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.67.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( ${PYTHON_DEPS} )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Drop bundled libs, patch Makefile generator and re-run it
+	rm -r externals || die
+	epatch "${FILESDIR}"/${PN}-1.66-tinyxml2.patch
+	tc-export CXX
+	emake dmake
+	./dmake || die
+
+	epatch "${FILESDIR}"/${PN}-1.65-c++0x.patch
+}
+
+src_configure() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	export LIBS="$(pkg-config --libs tinyxml2)"
+	emake ${PN} man \
+		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	fi
+	doman ${PN}.1
+	dodoc readme.txt
+}
diff --git a/dev-util/cppcheck/cppcheck-1.68.ebuild b/dev-util/cppcheck/cppcheck-1.68.ebuild
new file mode 100644
index 000000000000..f1d83a527fab
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.68.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( ${PYTHON_DEPS} )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Drop bundled libs, patch Makefile generator and re-run it
+	rm -r externals || die
+	epatch "${FILESDIR}"/${PN}-1.66-tinyxml2.patch
+	tc-export CXX
+	emake dmake
+	./dmake || die
+
+	epatch "${FILESDIR}"/${PN}-1.65-c++0x.patch
+}
+
+src_configure() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	export LIBS="$(pkg-config --libs tinyxml2)"
+	emake ${PN} man \
+		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	fi
+	doman ${PN}.1
+	dodoc readme.txt
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/cppcheck-1.69-r1.ebuild b/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
new file mode 100644
index 000000000000..6c4e7d61a9e8
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Drop bundled libs, patch Makefile generator and re-run it
+	rm -r externals || die
+	epatch "${FILESDIR}"/${PN}-1.69-tinyxml2.patch
+	tc-export CXX
+	emake dmake
+	./dmake || die
+
+	epatch "${FILESDIR}"/${PN}-1.69-c++0x.patch
+
+	epatch_user
+}
+
+src_configure() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	export LIBS="$(pkg-config --libs tinyxml2)"
+	emake ${PN} man \
+		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+	doman ${PN}.1
+	dodoc readme.txt
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/cppcheck-1.69.ebuild b/dev-util/cppcheck/cppcheck-1.69.ebuild
new file mode 100644
index 000000000000..13937467ae7d
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.69.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( ${PYTHON_DEPS} )
+	>=dev-libs/tinyxml2-2
+	qt4? ( dev-qt/qtgui:4 )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Drop bundled libs, patch Makefile generator and re-run it
+	rm -r externals || die
+	epatch "${FILESDIR}"/${PN}-1.69-tinyxml2.patch
+	tc-export CXX
+	emake dmake
+	./dmake || die
+
+	epatch "${FILESDIR}"/${PN}-1.69-c++0x.patch
+}
+
+src_configure() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	fi
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	export LIBS="$(pkg-config --libs tinyxml2)"
+	emake ${PN} man \
+		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final}
+	mv -v lib/library.o{,.final}
+	mv -v cli/cppcheckexecutor.o{,.final}
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,}
+	mv -v lib/library.o{.final,}
+	mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt4 ; then
+		dobin gui/${PN}-gui
+		dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport
+		distutils-r1_src_install
+		popd
+		find "${D}" -name "*.egg-info" -delete
+	fi
+	doman ${PN}.1
+	dodoc readme.txt
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch b/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch
new file mode 100644
index 000000000000..67590d0fee95
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch
@@ -0,0 +1,9 @@
+--- cppcheck-1.65/gui/gui.pro
++++ cppcheck-1.65/gui/gui.pro
+@@ -150,6 +150,4 @@
+     LIBS += -lshlwapi
+ }
+ 
+-contains(QMAKE_CC, gcc) {
+     QMAKE_CXXFLAGS += -std=c++0x
+-}
diff --git a/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch
new file mode 100644
index 000000000000..1417ea321d7d
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch
@@ -0,0 +1,67 @@
+--- cppcheck-1.65/tools/dmake.cpp
++++ cppcheck-1.65/tools/dmake.cpp
+@@ -170,7 +170,6 @@
+     }
+ 
+     std::vector<std::string> externalfiles;
+-    getCppFiles(externalfiles, "externals/");
+ 
+ 
+     // QMAKE - lib/lib.pri
+@@ -179,10 +178,6 @@
+         if (fout1.is_open()) {
+             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+             fout1 << "include($$PWD/pcrerules.pri)\n";
+-            fout1 << "BASEPATH = ../externals/tinyxml/\n";
+-            fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
+-            fout1 << "BASEPATH = ../lib/\n";
+-            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+             fout1 << "HEADERS += $${BASEPATH}check.h \\\n";
+             for (unsigned int i = 0; i < libfiles.size(); ++i) {
+                 std::string fname(libfiles[i].substr(4));
+@@ -208,7 +203,6 @@
+         std::ofstream fout1("test/testfiles.pri");
+         if (fout1.is_open()) {
+             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+-            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+             fout1 << "\n\nSOURCES += ";
+             for (unsigned int i = 0; i < testfiles.size(); ++i) {
+                 const std::string filename(testfiles[i].substr(5));
+@@ -354,9 +348,9 @@
+ 
+     makeConditionalVariable(fout, "CXX", "g++");
+     makeConditionalVariable(fout, "PREFIX", "/usr");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
++    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
++    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
++    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
+ 
+     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
+     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
+@@ -401,10 +401,10 @@
+     fout << "dmake:\ttools/dmake.o cli/filelister.o lib/path.o\n";
+     fout << "\t$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)\n";
+     fout << "\t./dmake\n\n";
+-    fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
+     fout << "clean:\n";
+-    fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
++    fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
+     fout << "man:\tman/cppcheck.1\n\n";
+     fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
+     fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
+--- cppcheck-1.65/gui/gui.pro
++++ cppcheck-1.65/gui/gui.pro
+@@ -15,7 +15,7 @@
+     LIBS += -l../bin/cppcheck-core
+     DEFINES += CPPCHECKLIB_IMPORT
+ }
+-LIBS += -L../externals
++LIBS += `pkg-config --libs tinyxml2`
+ 
+ DESTDIR = .
+ RCC_DIR = temp
diff --git a/dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch b/dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch
new file mode 100644
index 000000000000..8e9635c28354
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch
@@ -0,0 +1,12 @@
+--- cppcheck-1.69/gui/gui.pro
++++ cppcheck-1.69/gui/gui.pro
+@@ -146,9 +146,7 @@
+     LIBS += -lshlwapi
+ }
+ 
+-contains(QMAKE_CC, gcc) {
+     QMAKE_CXXFLAGS += -std=c++0x
+-}
+ 
+ macx {
+     contains(QMAKE_CXX, clang++) {
diff --git a/dev-util/cppcheck/files/cppcheck-1.69-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.69-tinyxml2.patch
new file mode 100644
index 000000000000..0b0c9f84ba36
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.69-tinyxml2.patch
@@ -0,0 +1,67 @@
+--- cppcheck-1.69/gui/gui.pro
++++ cppcheck-1.69/gui/gui.pro
+@@ -15,7 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
+     LIBS += -l../bin/cppcheck-core
+     DEFINES += CPPCHECKLIB_IMPORT
+ }
+-LIBS += -L$$PWD/../externals
++LIBS += `pkg-config --libs tinyxml2`
+ 
+ DESTDIR = .
+ RCC_DIR = temp
+--- cppcheck-1.69/tools/dmake.cpp
++++ cppcheck-1.69/tools/dmake.cpp
+@@ -171,7 +171,6 @@ int main(int argc, char **argv)
+     }
+ 
+     std::vector<std::string> externalfiles;
+-    getCppFiles(externalfiles, "externals/", true);
+ 
+ 
+     // QMAKE - lib/lib.pri
+@@ -180,10 +179,6 @@ int main(int argc, char **argv)
+         if (fout1.is_open()) {
+             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+             fout1 << "include($$PWD/pcrerules.pri)\n";
+-            fout1 << "BASEPATH = ../externals/tinyxml/\n";
+-            fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
+-            fout1 << "BASEPATH = ../lib/\n";
+-            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+             fout1 << "HEADERS += $${BASEPATH}check.h \\\n";
+             for (unsigned int i = 0; i < libfiles.size(); ++i) {
+                 std::string fname(libfiles[i].substr(4));
+@@ -209,7 +204,6 @@ int main(int argc, char **argv)
+         std::ofstream fout1("test/testfiles.pri");
+         if (fout1.is_open()) {
+             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+-            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+             fout1 << "\n\nSOURCES += ";
+             for (unsigned int i = 0; i < testfiles.size(); ++i) {
+                 const std::string filename(testfiles[i].substr(5));
+@@ -357,9 +351,9 @@ int main(int argc, char **argv)
+ 
+     makeConditionalVariable(fout, "CXX", "g++");
+     makeConditionalVariable(fout, "PREFIX", "/usr");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
+-    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
++    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
++    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
++    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
+ 
+     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
+     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
+@@ -399,10 +393,10 @@ int main(int argc, char **argv)
+     fout << "dmake:\ttools/dmake.o cli/filelister.o lib/path.o\n";
+     fout << "\t$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)\n";
+     fout << "\t./dmake\n\n";
+-    fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
+     fout << "clean:\n";
+-    fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
++    fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
+     fout << "man:\tman/cppcheck.1\n\n";
+     fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
+     fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
new file mode 100644
index 000000000000..2da3ce1df0a7
--- /dev/null
+++ b/dev-util/cppcheck/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="htmlreport">install cppcheck-htmlreport</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">cppcheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cppi/Manifest b/dev-util/cppi/Manifest
new file mode 100644
index 000000000000..941064d7aec2
--- /dev/null
+++ b/dev-util/cppi/Manifest
@@ -0,0 +1 @@
+DIST cppi-1.18.tar.xz 515664 SHA256 12a505b98863f6c5cf1f749f9080be3b42b3eac5a35b59630e67bea7241364ca SHA512 eec4f67d857680c763802b04c3964ad12505dcffe80f12567a729bea30fdd459f99af0e0f6a8179952bb356b5dd753d862782bb3950fa07e54ffe723565df7de WHIRLPOOL 752b37a25de5110b1190d1327bf5b22a076a2a0c9cf6397f24048a2b05e07d197790e9bdcf958904383ca0f459e5236d903fde1026dce93fba0d8eafa707399d
diff --git a/dev-util/cppi/cppi-1.18.ebuild b/dev-util/cppi/cppi-1.18.ebuild
new file mode 100644
index 000000000000..6fa89af90368
--- /dev/null
+++ b/dev-util/cppi/cppi-1.18.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="a cpp directive indenter"
+HOMEPAGE="http://savannah.gnu.org/projects/cppi"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+CPPI_LINGUAS="de eo fi fr hr it ja pl sr sv uk vi"
+for  lingua in ${CPPI_LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+DEPEND="
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS THANKS TODO )
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/dev-util/cppi/metadata.xml b/dev-util/cppi/metadata.xml
new file mode 100644
index 000000000000..c3a21340a392
--- /dev/null
+++ b/dev-util/cppi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>jer@gentoo.org</email>
+	<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cpptest/Manifest b/dev-util/cpptest/Manifest
new file mode 100644
index 000000000000..2a47153ea110
--- /dev/null
+++ b/dev-util/cpptest/Manifest
@@ -0,0 +1 @@
+DIST cpptest-1.1.2.tar.gz 458982 SHA256 9e4fdf156b709397308536eb6b921e3aea1f463c6613f9a0c1dfec9614386027 SHA512 da1030c69a5886e752b9ae08b65c501334c7d2d4abd2174190209ce11ed351239a615b9f7c5019ee601289523b2c21a1205d2042e59aea6c2882d77d636fc57a WHIRLPOOL f68e7b3c3a3944f5d41792ddd0dcc2d521ed0ec25b0aeae7cba7fb2c6c82bbd7a6d3a96981d3df885ef730ac1c3a7fc46a97386b984de1be08b7f1f1d39eab48
diff --git a/dev-util/cpptest/cpptest-1.1.2.ebuild b/dev-util/cpptest/cpptest-1.1.2.ebuild
new file mode 100644
index 000000000000..598ac2c550e8
--- /dev/null
+++ b/dev-util/cpptest/cpptest-1.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Simple but powerful unit testing framework for C++"
+HOMEPAGE="http://cpptest.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+DOCS=( AUTHORS BUGS NEWS README )
+
+src_configure() {
+	econf \
+		$(use_enable doc) \
+		--htmldir=/usr/share/doc/${PF}/html/
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-util/cpptest/metadata.xml b/dev-util/cpptest/metadata.xml
new file mode 100644
index 000000000000..eaf162a17c2d
--- /dev/null
+++ b/dev-util/cpptest/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<longdescription lang="en">
+		CppTest is a portable and powerful, yet simple, unit testing framework for handling
+		automated tests in C++. The focus lies on usability and extendability.
+		Several output formats are supported and new ones are easily added.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">cpptest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
new file mode 100644
index 000000000000..285bb2720b6d
--- /dev/null
+++ b/dev-util/cppunit/Manifest
@@ -0,0 +1,2 @@
+DIST cppunit-1.13.1.tar.gz 841334 SHA256 d5b9f3ffc9f1634d75b20b54f48c02e0817bca6afa1d5160b244889d6bff8e0f SHA512 3b588dd0ed35eca1dec1a7dcf21da40307b1da26d8e29a26a2fcb16cd4ba7e4dfdf58b6c3d537af2ad127c418b11ba62a1168312abb200d5aab8cb8475766a9d WHIRLPOOL 412bf0c5fe4437b694b89845f7ef29a564e4072890d4f5bacb657abbdc518e322b5db351f1ad123af403eef8a823439fdb1b2086c3e4c151076489c077d280d7
+DIST cppunit-1.13.2.tar.gz 953596 SHA256 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f SHA512 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd WHIRLPOOL 13a76b2b4e999e46e90ab56a5b40e1a3fd4e42f15c083b6b5beb8e0d476a3d5162cafa6c906c931d9877a8ebc544077ab66712f2d8920238951b36862bcc949d
diff --git a/dev-util/cppunit/cppunit-1.13.1.ebuild b/dev-util/cppunit/cppunit-1.13.1.ebuild
new file mode 100644
index 000000000000..e6f647a76430
--- /dev/null
+++ b/dev-util/cppunit/cppunit-1.13.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/libreoffice/cppunit"
+[[ ${PV} = 9999 ]] && inherit git-2 autotools
+inherit eutils flag-o-matic
+
+DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/cppunit"
+[[ ${PV} = 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} = 9999 ]] || \
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		media-gfx/graphviz
+	)"
+
+DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
+[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
+
+src_prepare() {
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# Anything else than -O0 breaks on alpha
+	use alpha && replace-flags "-O?" -O0
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc doxygen) \
+		$(use_enable doc dot) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--disable-silent-rules
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	if use examples ; then
+		find examples -iname "*.o" -delete
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+}
diff --git a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
new file mode 100644
index 000000000000..074b7a5f3df5
--- /dev/null
+++ b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/libreoffice/cppunit"
+[[ ${PV} = 9999 ]] && inherit git-r3 autotools
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/cppunit"
+[[ ${PV} = 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} = 9999 ]] || \
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		media-gfx/graphviz
+	)"
+
+DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
+[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cppunit-config
+)
+
+src_prepare() {
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# Anything else than -O0 breaks on alpha
+	use alpha && replace-flags "-O?" -O0
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable doc doxygen) \
+		$(multilib_native_use_enable doc dot) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--disable-silent-rules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	if use examples ; then
+		find examples -iname "*.o" -delete
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+}
diff --git a/dev-util/cppunit/cppunit-9999.ebuild b/dev-util/cppunit/cppunit-9999.ebuild
new file mode 100644
index 000000000000..8c3885b2a9d0
--- /dev/null
+++ b/dev-util/cppunit/cppunit-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/libreoffice/cppunit"
+[[ ${PV} = 9999 ]] && inherit git-r3 autotools
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/cppunit"
+[[ ${PV} = 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} = 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		media-gfx/graphviz
+	)"
+
+DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
+[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cppunit-config
+)
+
+src_prepare() {
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# Anything else than -O0 breaks on alpha
+	use alpha && replace-flags "-O?" -O0
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable doc doxygen) \
+		$(multilib_native_use_enable doc dot) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--disable-silent-rules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	if use examples ; then
+		find examples -iname "*.o" -delete
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+}
diff --git a/dev-util/cppunit/metadata.xml b/dev-util/cppunit/metadata.xml
new file mode 100644
index 000000000000..8434377a6047
--- /dev/null
+++ b/dev-util/cppunit/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>cpp</herd>
+</pkgmetadata>
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
new file mode 100644
index 000000000000..68f303061241
--- /dev/null
+++ b/dev-util/cpputest/Manifest
@@ -0,0 +1,2 @@
+DIST cpputest-3.6.tar.gz 2674015 SHA256 1d5b745322f36569536bad2dd41fe0e74b208da6475d6a1bfb0c2cb1adeefbbb SHA512 3bd160b6735a818534681643c613fba28b8a64debb7f1e2fa037d94a81b875710b54b9bc5e7d18b4d40258beae1b12202628cf1b4673107770587e07bc6624e4 WHIRLPOOL 9ebe1c462d446bfae391a254dab613d58209e6c67f80169da982ba00673b0a3ab8a4724ab048e213b2d5885fd6464c1ef35c1e76933e35d66cab741433f8f310
+DIST cpputest-3.7.2.tar.gz 2750879 SHA256 8c5d00be3a08ea580e51e5cfe26f05d05c6bf546206ff67dbb3757d48c109653 SHA512 4a958cd61cb8f1a03a308fa001c57fbc58841582606856efda506f2108e26f720928350c81c2883a233c477107f01786f286a106e6520717714d56da764fbd88 WHIRLPOOL 7ac78207b5e8e5d231fa3ecd3dd71282bbd73ba8ed36401b34daa9cd41e60a4e4db4f0c6d9df802938cc0a5d3ee6afb2c21b0de74fa474384dfdca776df95bf1
diff --git a/dev-util/cpputest/cpputest-3.6.ebuild b/dev-util/cpputest/cpputest-3.6.ebuild
new file mode 100644
index 000000000000..c92b228de8f8
--- /dev/null
+++ b/dev-util/cpputest/cpputest-3.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-utils
+
+DESCRIPTION="unit testing and mocking framework for C/C++"
+HOMEPAGE="http://cpputest.github.io/ https://github.com/cpputest/cpputest"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-cpp/gmock
+		dev-cpp/gtest
+	)
+"
+
+DOCS=( AUTHORS README.md README_CppUTest_for_C.txt )
diff --git a/dev-util/cpputest/cpputest-3.7.2.ebuild b/dev-util/cpputest/cpputest-3.7.2.ebuild
new file mode 100644
index 000000000000..f5f12570b54a
--- /dev/null
+++ b/dev-util/cpputest/cpputest-3.7.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-utils
+
+DESCRIPTION="unit testing and mocking framework for C/C++"
+HOMEPAGE="http://cpputest.github.io/ https://github.com/cpputest/cpputest"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-cpp/gmock
+		dev-cpp/gtest
+	)
+"
+
+DOCS=( AUTHORS README.md README_CppUTest_for_C.txt )
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
new file mode 100644
index 000000000000..43eb70620e84
--- /dev/null
+++ b/dev-util/cpputest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cpputest/cpputest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
new file mode 100644
index 000000000000..5f8c95751314
--- /dev/null
+++ b/dev-util/cproto/Manifest
@@ -0,0 +1 @@
+DIST cproto-4_7e.tgz 145919 SHA256 df190e002103c01cfb757d9ffe1f1c476ff36f42f16eb7c3badb4f9b5e0547b7 SHA512 c9a1da8e19d85600109127e2de079cff5e66e51f0f3220f9a69e72e720ed6d745ef456b3a645bbb4755073c6ce59411d0137d9012da545736e92380f41c83985 WHIRLPOOL 0f5deb8fff27b377060b5fca6f9cc584316bc42933578fe152bcdf85574a033064cffc74c54512a7c66a7b7dcae23735c500fc809348f509c8111130628ca6ee
diff --git a/dev-util/cproto/cproto-4.7e.ebuild b/dev-util/cproto/cproto-4.7e.ebuild
new file mode 100644
index 000000000000..8fa53517126d
--- /dev/null
+++ b/dev-util/cproto/cproto-4.7e.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_PV="4_7e"
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Generate C function prototypes from C source code"
+HOMEPAGE="http://invisible-island.net/cproto/"
+SRC_URI="ftp://invisible-island.net/cproto/${MY_P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="sys-devel/flex
+	virtual/yacc"
+RDEPEND=""
+
+src_install() {
+	dobin cproto || die
+	doman cproto.1
+	dodoc README CHANGES
+}
diff --git a/dev-util/cproto/metadata.xml b/dev-util/cproto/metadata.xml
new file mode 100644
index 000000000000..a40624fba8f0
--- /dev/null
+++ b/dev-util/cproto/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cpuinfo-collection/Manifest b/dev-util/cpuinfo-collection/Manifest
new file mode 100644
index 000000000000..cb884fefadba
--- /dev/null
+++ b/dev-util/cpuinfo-collection/Manifest
@@ -0,0 +1,3 @@
+DIST test_proc-04January2007.tar.gz 28831 SHA256 8b8cf833b115955d40ac6a672a2dd1b748f2771c92fa9a669330e5b67584c23f SHA512 6ff9f42c0847ef897069a7b36ad184b05ac022d1db5ab581e87d2992ee2a511218ef2019a0a94aadb91038e2b99e530618b0b6a380b0aa36f4178620e6719922 WHIRLPOOL a170f4a175abbf4b23daa5a4fbd33ea9556daeb4afe32272980d6a4c3dc8c749f700ffc24b7213f79adf4216f6fdd04d147093cdc4a7a33fb364c2df5dbeea9d
+DIST test_proc-14November2010.tar.gz 95697 SHA256 74dd45840d51d6a5bd73fdbed5d5231f17669a47ddecc5c784ea85aa84181046 SHA512 2f3b80d9b705b76911487b7349300b45622a3a49b9a3c2036d96220738e7fd525114b2523cc589b03d0fdf85ca4d35c28076ff193d1eb620d71765919058fdc6 WHIRLPOOL 08982297ad232b8c08ca8900a1969c65d65edef32e089e87d317ed7ba1f05036c2614cb505fe85dea01c0496021e3e4ff539568ad2bd8febbd88dbab75878b50
+DIST test_proc-20July2006.tar.gz 27570 SHA256 b97e3344ca9b0a38a96853b2ce88e9989f69f246965f1065323402d330e873ad SHA512 c76f59a2b51e414a45c346a8a1334a905be6e5f7ea12f8a2cc92f44048bf0af66b548768910aa07287a4084c675310b6c4cdabc86640705382d654117357b2a8 WHIRLPOOL a0d7348968ea8f1d71bb999e7e9b8418b9cf716dec1b10529cb5452c28c8737221b6f0f67ebef2eb5edaafbe3b51ed94acafff2de33d0edc810ac30011fb7d95
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
new file mode 100644
index 000000000000..bd00c30608c6
--- /dev/null
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P=test_proc-20July2006
+DESCRIPTION="huge collection of /proc/cpuinfo files"
+HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
+SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	insinto /usr/share/cpuinfo
+	doins -r * || die
+}
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
new file mode 100644
index 000000000000..e5baf46f57cd
--- /dev/null
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P=test_proc-${PV:6:2}January${PV:0:4}
+DESCRIPTION="huge collection of /proc/cpuinfo files"
+HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
+SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	insinto /usr/share/cpuinfo
+	doins -r * || die
+}
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
new file mode 100644
index 000000000000..0cf7e6aae236
--- /dev/null
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=test_proc-${PV:6:2}November${PV:0:4}
+DESCRIPTION="huge collection of /proc/cpuinfo files"
+HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
+SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	insinto /usr/share/cpuinfo
+	doins -r * || die
+}
diff --git a/dev-util/cpuinfo-collection/metadata.xml b/dev-util/cpuinfo-collection/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/dev-util/cpuinfo-collection/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>base-system</herd>
+</pkgmetadata>
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
new file mode 100644
index 000000000000..20edb3c7a29b
--- /dev/null
+++ b/dev-util/crash/Manifest
@@ -0,0 +1,4 @@
+DIST crash-6.1.4.tar.gz 26781448 SHA256 e9275d4225b414a1ddf63336cff7160997660d7d382b5ec6c47af993bafbb5a2 SHA512 b9f2e2a84dcf5765422e2aad845c292955455793284b9a8fd32b59836ca220b861645646a3c15b33f29e7bffa4916a692fbcbe02b2274aa0279d21d51605bd4e WHIRLPOOL a2821a8fa95c85eb0023edb37296e023f90d1f173787b50db7206f53ddbddcac1275aabb3a4f9e41e424a5753e8c97adb693dba9ab790a74e5c1c35ae3d11e79
+DIST crash-7.0.0.tar.gz 32007997 SHA256 3ee1c7c7552a31683bb13881b7ee98fde9b4eea260af44a7a4bd22e5c27c9c2e SHA512 29f59b73a7cd17f6f6473511831d2c8610e2464057e260c1673b52f5e3476bc64bdd0cdcfff36ead16957b98b985dbd19b7d7a6daa29e115eea2e5271c4aeb4f WHIRLPOOL 7b5017789819c6e7cd4f34d81d37944782d1ac099a0439c0557fec08e1f3cb163d069cb618385a980b09f886bf7b49fcc118211d188afb08dea3d8b3ba43b835
+DIST crash-7.0.3.tar.gz 32020508 SHA256 fdf1ee8d21cae4eaa25f60fde14e1caf259e59dcdb6e1ed4e555f1d73805fab0 SHA512 bff8781589709a161975954abf5dc2fde6f937cbe334bf23aa889d32114eb2337d918c4c3e7b5e26beb437bfa9d6939339941af8542296ab69c8c51245be76ec WHIRLPOOL ad8e03ab78e53c7fc85faaba73cbc24e96c2092d76477ceec2825e99038d055ddf8f6ef803dfc9e28c4bc98f657a51526ebe69f7a27b96e0eb71411fa842225f
+DIST crash-7.0.7.tar.gz 32041666 SHA256 c473ea9623787bee8fecf2e4d0caa9301a9462c26243e897ad202bf0dc3e9a07 SHA512 51ac33705c8b40117d67797a6f03b78fdaa1be08035f32162816abea906d5193a6fde5f2c826d962047c1ece871ff403e91700c757fe91fd4f940b9bb75c936f WHIRLPOOL c783548368a1acae12b7afa67ff38a9674668205e0345686036df0d0f8fb5a8484b2d7feee96988136f8e13854fe2792aa309b7129bdb574187abc4a629402b4
diff --git a/dev-util/crash/crash-6.1.4.ebuild b/dev-util/crash/crash-6.1.4.ebuild
new file mode 100644
index 000000000000..675638fb1348
--- /dev/null
+++ b/dev-util/crash/crash-6.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
+HOMEPAGE="http://people.redhat.com/anderson/"
+SRC_URI="http://people.redhat.com/anderson/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
+}
diff --git a/dev-util/crash/crash-7.0.0.ebuild b/dev-util/crash/crash-7.0.0.ebuild
new file mode 100644
index 000000000000..675638fb1348
--- /dev/null
+++ b/dev-util/crash/crash-7.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
+HOMEPAGE="http://people.redhat.com/anderson/"
+SRC_URI="http://people.redhat.com/anderson/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
+}
diff --git a/dev-util/crash/crash-7.0.3.ebuild b/dev-util/crash/crash-7.0.3.ebuild
new file mode 100644
index 000000000000..675638fb1348
--- /dev/null
+++ b/dev-util/crash/crash-7.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
+HOMEPAGE="http://people.redhat.com/anderson/"
+SRC_URI="http://people.redhat.com/anderson/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
+}
diff --git a/dev-util/crash/crash-7.0.7.ebuild b/dev-util/crash/crash-7.0.7.ebuild
new file mode 100644
index 000000000000..8602841e7843
--- /dev/null
+++ b/dev-util/crash/crash-7.0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
+HOMEPAGE="http://people.redhat.com/anderson/"
+SRC_URI="http://people.redhat.com/anderson/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
+}
diff --git a/dev-util/crash/files/crash-5.1.1-install-fix.patch b/dev-util/crash/files/crash-5.1.1-install-fix.patch
new file mode 100644
index 000000000000..98b86759361d
--- /dev/null
+++ b/dev-util/crash/files/crash-5.1.1-install-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur crash-5.1.1/Makefile crash-5.1.1-fixes//Makefile
+--- crash-5.1.1/Makefile	2010-12-23 12:59:44.000000000 -0600
++++ crash-5.1.1-fixes//Makefile	2011-01-26 13:17:11.000000000 -0600
+@@ -322,7 +322,7 @@
+ 	cc -c ${CRASH_CFLAGS} build_data.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+ 
+ install:
+-	/usr/bin/install ${PROGRAM} ${INSTALLDIR}
++	/usr/bin/install -D ${PROGRAM} ${INSTALLDIR}/${PROGRAM}
+ #	/usr/bin/install ${PROGRAM}d ${INSTALLDIR}
+ 
+ unconfig: make_configure
diff --git a/dev-util/crash/metadata.xml b/dev-util/crash/metadata.xml
new file mode 100644
index 000000000000..1bbfd3cc345b
--- /dev/null
+++ b/dev-util/crash/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+	<longdescription lang="en">
+		The Red Hat crash analysis utility is loosely based on the SVR4 UNIX
+		crash command, but has been significantly enhanced by completely merging
+		it with the GNU gdb debugger. The marriage of the two effectively
+		combines the kernel-specific nature of the traditional UNIX crash
+		utility with the source code level debugging capabilities of gdb. 
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
new file mode 100644
index 000000000000..b19d7dadea8a
--- /dev/null
+++ b/dev-util/creduce/Manifest
@@ -0,0 +1,2 @@
+DIST creduce-2.0.1.tar.gz 509604 SHA256 ca06be313cddd85c7501654a767a4a1e7fa096eec5432fda6e478dc10bd39fd8 SHA512 764d61c5ff2c5e30b1c499bbf00c9bdf81ea1d5c7055cd8b0f8ba348c65856c874bcf7bb9ad9bef1ab5d28dd448fa81b7d7d22fbb147b1e424ec15a427eb4b65 WHIRLPOOL 2664a4b0321591f0ffe21d5bae269d1e9d19eb9fc346d08df004e6ac2b7f5ee148cd9ecf793446a579c54ec58fcf76a1519279754625f8ce0e25001e6b9bb2e4
+DIST creduce-2.1.0.tar.gz 614697 SHA256 aea1e9ed255ed072c937ec526a2732206ed67be79b70c121bc57141d466f06a3 SHA512 330100cb19977592e720116f0062dd9acb68ac14a389553c7bf40683a81dffc5d1be077fd7870dc13e8493c47cb8c4b43e03f3c0e7c3643d1a19dfcc340c0558 WHIRLPOOL ee34c3d84e4712b616ada2cd96fdf3a19669a1da3f5062a1b43847d535eb0b59395d18fe57bda627b23e3f2530897c0b68ec0bed637bb38cd642d0d014e25f14
diff --git a/dev-util/creduce/creduce-2.0.1.ebuild b/dev-util/creduce/creduce-2.0.1.ebuild
new file mode 100644
index 000000000000..775ab1e2a865
--- /dev/null
+++ b/dev-util/creduce/creduce-2.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="C-Reduce - a plugin-based C program reducer"
+HOMEPAGE="http://embed.cs.utah.edu/creduce/"
+SRC_URI="http://embed.cs.utah.edu/creduce/${P}.tar.gz"
+
+LICENSE="creduce"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/perl-5.10.0
+	<sys-devel/clang-3.2
+	<sys-devel/llvm-3.2"
+
+RDEPEND="${DEPEND}
+	app-text/delta
+	dev-perl/Exporter-Lite
+	dev-perl/File-Which
+	dev-perl/regexp-common
+	dev-util/astyle
+	dev-util/indent"
diff --git a/dev-util/creduce/creduce-2.1.0.ebuild b/dev-util/creduce/creduce-2.1.0.ebuild
new file mode 100644
index 000000000000..70e0ad4c9547
--- /dev/null
+++ b/dev-util/creduce/creduce-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="C-Reduce - a plugin-based C program reducer"
+HOMEPAGE="http://embed.cs.utah.edu/creduce/"
+SRC_URI="http://embed.cs.utah.edu/creduce/${P}.tar.gz"
+
+LICENSE="creduce"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/perl-5.10.0
+	app-text/delta
+	dev-perl/Benchmark-Timer
+	dev-perl/Exporter-Lite
+	dev-perl/File-Which
+	dev-perl/Getopt-Tabular
+	dev-perl/regexp-common
+	dev-perl/Sys-CPU
+	dev-util/astyle
+	dev-util/indent
+	sys-devel/clang:0/3.3
+	sys-devel/llvm:0/3.3[clang]"
+
+RDEPEND="${DEPEND}"
diff --git a/dev-util/creduce/metadata.xml b/dev-util/creduce/metadata.xml
new file mode 100644
index 000000000000..0cb5b5e2962f
--- /dev/null
+++ b/dev-util/creduce/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>rhill@gentoo.org</email>
+		<name>Ryan Hill</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/crow-designer/Manifest b/dev-util/crow-designer/Manifest
new file mode 100644
index 000000000000..d2fecff83162
--- /dev/null
+++ b/dev-util/crow-designer/Manifest
@@ -0,0 +1,2 @@
+DIST crow-2.21.0.tar.bz2 441555 SHA256 b3d84a80fd9a721199d2d3534fc2eea8f87434ba6896a34cd727bebeaa7ef194 SHA512 cfe7ba53185b9238f1df13265ca91deb7f1ff6ebc1808da423ef617d0bc750a62ba4827e32e52fdf34dd3d81aa86a551e67fd0074b6ac8da37821c0d9ff5cbd3 WHIRLPOOL a89fbb4966b14e1f7b80dff6b161c4dbe5a50bd4d04bcd3bbb5ed36557b40a2bc47a9a031a005b7481c5aae201e4f91fb846f0ab57f1503e06930516cba1b485
+DIST crow-2.99.0.tar.xz 391644 SHA256 19ed270b4cb446fa9855a2df9b8cc68f66d0b1a318f4df66e523923e5b28f1aa SHA512 3d90ae0f5bb8e474b55fead29ff062f8779f70db17a6548ef3d084fa7a593fd244c5ba2e704c45ee6cbe289df97c8c78dc6010fac657b91e05ab9ea0a65d9f55 WHIRLPOOL 740572d001fa7c860a4338895ba4a37139b3bf4c3de9d604090610a67df7d1243a9194c3bb2ecf505f60a7f95865172ceeb7a32c0fcb960ddb94d456964f0291
diff --git a/dev-util/crow-designer/crow-designer-2.21.0.ebuild b/dev-util/crow-designer/crow-designer-2.21.0.ebuild
new file mode 100644
index 000000000000..83628a6bb64a
--- /dev/null
+++ b/dev-util/crow-designer/crow-designer-2.21.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+DESCRIPTION="GTK+ GUI building tool"
+HOMEPAGE="http://www.crowdesigner.org"
+SRC_URI="http://nothing-personal.googlecode.com/files/crow-${PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+LANGS="ru"
+
+RDEPEND=">=dev-libs/guiloader-2.21
+	>=dev-libs/guiloader-c++-2.21
+	dev-cpp/gtkmm:2.4
+	>=dev-libs/dbus-glib-0.86"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.18 )"
+
+S=${WORKDIR}/crow-${PV}
+
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc doc/{authors.txt,news.{en,ru}.txt,readme.{en,ru}.txt,readme.ru.txt} || die
+}
diff --git a/dev-util/crow-designer/crow-designer-2.99.0.ebuild b/dev-util/crow-designer/crow-designer-2.99.0.ebuild
new file mode 100644
index 000000000000..22fa6654e723
--- /dev/null
+++ b/dev-util/crow-designer/crow-designer-2.99.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="GTK+ GUI building tool"
+HOMEPAGE="http://www.crowdesigner.org"
+SRC_URI="http://nothing-personal.googlecode.com/files/crow-${PV}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+LANGS="ru"
+
+RDEPEND=">=dev-libs/guiloader-2.99
+	>=dev-libs/guiloader-c++-2.99
+	dev-cpp/gtkmm:3.0
+	>=dev-libs/dbus-glib-0.92"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.18 )"
+
+S=${WORKDIR}/crow-${PV}
+
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/{authors.txt,news.{en,ru}.txt,readme.{en,ru}.txt,readme.ru.txt}
+}
diff --git a/dev-util/crow-designer/metadata.xml b/dev-util/crow-designer/metadata.xml
new file mode 100644
index 000000000000..7c9e19f15732
--- /dev/null
+++ b/dev-util/crow-designer/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">Gideon is a modern GUI builder for GTK+ toolkit. It is an advanced
+		IDE-embeddable RAD tool designed to fulfil l the needs of desktop
+		programmers who want to create multi-platform GTK+ based applications
+		with minimal GUI coding. Gideon is full-featured yet elegant: its
+		innovative Property Explorer solves many GUI constructing t asks in a
+		versatile manner without additional popup dialogs. The project is
+		targeted to develop a tool that i s coherent and highly productive for
+		experienced GTK+ users as well as simple and accessible for newcomers.</longdescription>
+	<upstream>
+		<remote-id type="google-code">nothing-personal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
new file mode 100644
index 000000000000..ab6ae8f7db2f
--- /dev/null
+++ b/dev-util/cscope/Manifest
@@ -0,0 +1 @@
+DIST cscope-15.8a.tar.gz 601232 SHA256 eb736ac40d5abebe8fa46820c7a8eccc8a17966a9a5f70375367b77177874d1e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318 WHIRLPOOL e71554c813dc7d33de2ed20350f454485c9ca5bd69de45ca05f19a9376d03dffb59503b0e6229927985a0f61312d968d64675ea3dd2a988f8582e0d404c46c02
diff --git a/dev-util/cscope/cscope-15.8a.ebuild b/dev-util/cscope/cscope-15.8a.ebuild
new file mode 100644
index 000000000000..8db9728cdede
--- /dev/null
+++ b/dev-util/cscope/cscope-15.8a.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools elisp-common eutils toolchain-funcs
+
+DESCRIPTION="Interactively examine a C program"
+HOMEPAGE="http://cscope.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="emacs"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
+	eautoreconf		  # prevent maintainer mode later on
+}
+
+src_compile() {
+	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+	if use emacs; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		dobin cscope-indexer
+	fi
+
+	cd "${S}"/contrib/webcscope || die
+	docinto webcscope
+	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
+	docinto webcscope/icons
+	dodoc icons/*.gif
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cscope/files/50cscope-gentoo.el b/dev-util/cscope/files/50cscope-gentoo.el
new file mode 100644
index 000000000000..08fd4b449352
--- /dev/null
+++ b/dev-util/cscope/files/50cscope-gentoo.el
@@ -0,0 +1,34 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'cscope-minor-mode "xcscope")
+(autoload 'cscope-display-buffer "xcscope"
+  "Display the *cscope* buffer." t)
+(autoload 'cscope-display-buffer-toggle "xcscope"
+  "Toggle cscope-display-cscope-buffer, which corresponds to
+\"Auto display *cscope* buffer\"." t)
+(autoload 'cscope-next-symbol "xcscope"
+  "Move to the next symbol in the *cscope* buffer." t)
+(autoload 'cscope-next-file "xcscope"
+  "Move to the next file in the *cscope* buffer." t)
+(autoload 'cscope-prev-symbol "xcscope"
+  "Move to the previous symbol in the *cscope* buffer." t)
+(autoload 'cscope-prev-file "xcscope"
+  "Move to the previous file in the *cscope* buffer." t)
+(autoload 'cscope-pop-mark "xcscope"
+  "Pop back to where cscope was last invoked." t)
+(autoload 'cscope-set-initial-directory "xcscope"
+  "Set the cscope-initial-directory variable." t)
+(autoload 'cscope-unset-initial-directory "xcscope"
+  "Unset the cscope-initial-directory variable." t)
+(autoload 'cscope-find-this-symbol "xcscope"
+  "Locate a symbol in source code." t)
+(autoload 'cscope-find-global-definition "xcscope"
+  "Find a symbol's global definition." t)
+(autoload 'cscope-find-global-definition-no-prompting "xcscope"
+  "Find a symbol's global definition without prompting." t)
+
+(defun cscope:hook ()
+  (cscope-minor-mode))
+(add-hook 'c-mode-hook 'cscope:hook)
+(add-hook 'c++-mode-hook 'cscope:hook)
+(add-hook 'dired-mode-hook 'cscope:hook)
diff --git a/dev-util/cscope/files/cscope-15.7a-ocs-sysdir.patch b/dev-util/cscope/files/cscope-15.7a-ocs-sysdir.patch
new file mode 100644
index 000000000000..6b4c17fe9145
--- /dev/null
+++ b/dev-util/cscope/files/cscope-15.7a-ocs-sysdir.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/269305
+
+--- cscope-15.7a-orig/contrib/ocs	2004-06-21 20:13:22.000000000 +0200
++++ cscope-15.7a/contrib/ocs	2009-05-11 22:33:51.000000000 +0200
+@@ -75,17 +75,10 @@
+ 
+ #set the default value for SYSDIR 
+ if [ -z "${SYSDIR}" ]; then
+-   SYSDIR=/usr/local/lib/cs
++   SYSDIR=/var/lib/cs
+    echo setting default sysdir
+ fi
+ 
+-#check that SYSDIR exists
+-if [ ! -d ${SYSDIR} ]; then
+-   echo -n $SYSDIR does not exist. 
+-   echo Please create the directory and set SYSDIR appropriately
+-   exit 
+-fi
+-
+ # Check that cscope is in PATH
+ type cscope 1>/dev/null 2>&1
+ 
diff --git a/dev-util/cscope/metadata.xml b/dev-util/cscope/metadata.xml
new file mode 100644
index 000000000000..434721ed1a1c
--- /dev/null
+++ b/dev-util/cscope/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>vim</herd>
+  <herd>emacs</herd>
+  <longdescription>
+Cscope is a developer's tool for browsing source code.  Cscope allows
+searching code for:
+
+  * cross referenced symbols
+  * global definitions
+  * callees and callers
+  * text strings and regular expression patterns
+  * files and files including a file
+
+Other features:
+
+  * curses based (text screen)
+  * fast searches
+  * fuzzy parser supports C and is flexible enough to be useful for
+    C++, Java and other documents
+  * command line mode for inclusion in scripts or as a backend to GUIs
+
+Cscope is distributed with xcscope which provides tight integration
+with GNU Emacs.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">cscope</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/csup/Manifest b/dev-util/csup/Manifest
new file mode 100644
index 000000000000..838edf46958a
--- /dev/null
+++ b/dev-util/csup/Manifest
@@ -0,0 +1 @@
+DIST csup-snap-20060318.tgz 78968 SHA256 81a9695be6cf989de6fb2e4fe53d6efadb003cd842cf6993844a52fc8190a7fc SHA512 60e40f6f903df81b1667af31397978ce99d33b6849dd2476232b325415a391e6840a29e70af85b928a3c7beea55cf3064d3b48d61b9c20c2280dc3f675adcd5a WHIRLPOOL 52236475e56ea2a2ebc84f1d67b2327f1ab2d78fcde82133a4e5725a88bb62c3802a2fa030f1f67b14f35c8d5db380ac4361af4e4d063a39ed2ebe6b994f51c6
diff --git a/dev-util/csup/csup-20060318.ebuild b/dev-util/csup/csup-20060318.ebuild
new file mode 100644
index 000000000000..5a44ca644f54
--- /dev/null
+++ b/dev-util/csup/csup-20060318.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A rewrite of CVSup"
+HOMEPAGE="http://www.mu.org/~mux/csup.html"
+SRC_URI="http://mu.org/~mux/csup-snap-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	!>=sys-freebsd/freebsd-ubin-6.2_beta1"
+
+DEPEND="${DEPEND}
+	>=sys-devel/bison-2.1"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-respectflags.patch"
+}
+
+src_compile() {
+	# unable to work with yacc, but bison is ok.
+	emake \
+		CC="$(tc-getCC)" \
+		PREFIX=/usr YACC=bison || die "emake failed"
+}
+
+src_install() {
+	# instead of using make install, just copy the stuff directly
+	dobin csup || die "failed to install executable"
+	doman csup.1 || die "failed to install man page"
+	dodoc README
+}
diff --git a/dev-util/csup/files/csup-20060318-respectflags.patch b/dev-util/csup/files/csup-20060318-respectflags.patch
new file mode 100644
index 000000000000..c95a974c75ed
--- /dev/null
+++ b/dev-util/csup/files/csup-20060318-respectflags.patch
@@ -0,0 +1,43 @@
+Index: csup/GNUmakefile
+===================================================================
+--- csup.orig/GNUmakefile
++++ csup/GNUmakefile
+@@ -21,7 +21,7 @@ WARNS=	-Wall -W -Wno-unused-parameter -W
+ 	-Wcast-align -Wunused-parameter -Wchar-subscripts -Winline \
+ 	-Wnested-externs -Wredundant-decls -Wno-format-y2k
+ 
+-CFLAGS+= -g -O -pipe -DNDEBUG -I$(PREFIX)/include
++CFLAGS+= -I$(PREFIX)/include
+ ifeq ($(UNAME), Linux)
+ 	CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ endif
+@@ -29,14 +29,14 @@ ifeq ($(UNAME), Darwin)
+ 	CFLAGS+= -DHAVE_FFLAGS
+ endif
+ CFLAGS+= $(WARNS)
+-LDFLAGS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
++LIBS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
+ 
+ .PHONY: all clean install
+ 
+ all: csup csup.1.gz
+ 
+ csup: $(OBJS)
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
+ 
+ config.c: parse.h
+ 
+Index: csup/Makefile
+===================================================================
+--- csup.orig/Makefile
++++ csup/Makefile
+@@ -11,7 +11,7 @@ SRCS=	attrstack.c config.c detailer.c di
+ 	globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
+ 	pathcomp.c proto.c status.c stream.c threads.c token.l updater.c
+ 
+-CFLAGS+=	-I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG
++CFLAGS+=	-I. -I${.CURDIR} -pthread -DHAVE_FFLAGS
+ WARNS?=		6
+ 
+ # A bit of tweaking is needed to get this Makefile working
diff --git a/dev-util/csup/metadata.xml b/dev-util/csup/metadata.xml
new file mode 100644
index 000000000000..6457f0d2d37c
--- /dev/null
+++ b/dev-util/csup/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>bsd</herd>
+</pkgmetadata>
+
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
new file mode 100644
index 000000000000..92c894834698
--- /dev/null
+++ b/dev-util/ctags/Manifest
@@ -0,0 +1,2 @@
+DIST ctags-5.8.tar.gz 479927 SHA256 0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7 SHA512 981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15 WHIRLPOOL 04506a4495025907ee5fe41b9c4ff104dd234fc9ef39bd594158b36c550bf511b6ab5980a98736f9857dc47b99f1718a7ae2928fd4a1d1c0b57dfd3d79fce2ea
+DIST ctags-ada-mode-4.3.11.tar.bz2 14060 SHA256 d25a3fd26b356adbd068f10a0b68691d36c154c04b96304b96386e169e4b6b57 SHA512 51c71e13ef658cd6682f04c94485315c4a702080ef2c7786fc9881b03c86f1c1d43aa1a69c452e4b0b2f7a78383804b66b159542cb4eae0cd309bc1ddbe2eb6e WHIRLPOOL 7e0ded8c97d3651e1afe48ec836697a4a19264baf3b203f6e98c134b88e3ab0eee7ac660789f5b955f0f827128996988694aa6c4bc78f18adf52724c5230da5d
diff --git a/dev-util/ctags/ctags-5.8-r1.ebuild b/dev-util/ctags/ctags-5.8-r1.ebuild
new file mode 100644
index 000000000000..c2fb30b158ba
--- /dev/null
+++ b/dev-util/ctags/ctags-5.8-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="http://ctags.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	ada? ( mirror://sourceforge/gnuada/ctags-ada-mode-4.3.11.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ada"
+
+RDEPEND="app-eselect/eselect-ctags"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-5.6-ebuilds.patch"
+	# Upstream fix for python variables starting with def
+	epatch "${FILESDIR}/${P}-python-vars-starting-with-def.patch"
+
+	# Bug #273697
+	epatch "${FILESDIR}/${P}-f95-pointers.patch"
+
+	# enabling Ada support
+	if use ada ; then
+		cp "${WORKDIR}/${PN}-ada-mode-4.3.11/ada.c" "${S}" || die
+		epatch "${FILESDIR}/${P}-ada.patch"
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-posix-regex \
+		--without-readlib \
+		--disable-etags \
+		--enable-tmpdir=/tmp
+}
+
+src_install() {
+	emake prefix="${D}"/usr mandir="${D}"/usr/share/man install
+
+	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${D}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${D}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+
+	dodoc FAQ NEWS README
+	dohtml EXTENDING.html ctags.html
+}
+
+pkg_postinst() {
+	eselect ctags update
+	elog "You can set the version to be started by /usr/bin/ctags through"
+	elog "the ctags eselect module. \"man ctags.eselect\" for details."
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/ctags-5.8.ebuild b/dev-util/ctags/ctags-5.8.ebuild
new file mode 100644
index 000000000000..de4c1087cc37
--- /dev/null
+++ b/dev-util/ctags/ctags-5.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="http://ctags.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	ada? ( mirror://sourceforge/gnuada/ctags-ada-mode-4.3.11.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ada"
+
+DEPEND="app-eselect/eselect-ctags"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-5.6-ebuilds.patch"
+	# Upstream fix for python variables starting with def
+	epatch "${FILESDIR}/${P}-python-vars-starting-with-def.patch"
+
+	# Bug #273697
+	epatch "${FILESDIR}/${P}-f95-pointers.patch"
+
+	# enabling Ada support
+	if use ada ; then
+		cp "${WORKDIR}/${PN}-ada-mode-4.3.11/ada.c" "${S}" || die
+		epatch "${FILESDIR}/${P}-ada.patch"
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-posix-regex \
+		--without-readlib \
+		--disable-etags \
+		--enable-tmpdir=/tmp
+}
+
+src_install() {
+	emake prefix="${D}"/usr mandir="${D}"/usr/share/man install
+
+	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${D}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${D}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+
+	dodoc FAQ NEWS README
+	dohtml EXTENDING.html ctags.html
+}
+
+pkg_postinst() {
+	eselect ctags update
+	elog "You can set the version to be started by /usr/bin/ctags through"
+	elog "the ctags eselect module. \"man ctags.eselect\" for details."
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/files/ctags-5.6-ebuilds.patch b/dev-util/ctags/files/ctags-5.6-ebuilds.patch
new file mode 100644
index 000000000000..5b0de663a15a
--- /dev/null
+++ b/dev-util/ctags/files/ctags-5.6-ebuilds.patch
@@ -0,0 +1,22 @@
+diff -ur ctags-5.6/sh.c ctags-5.6-ebuild/sh.c
+--- ctags-5.6/sh.c	2006-05-30 00:37:13.000000000 -0400
++++ ctags-5.6-ebuild/sh.c	2006-10-07 17:37:31.000000000 -0400
+@@ -7,7 +7,8 @@
+ *   GNU General Public License.
+ *
+ *   This module contains functions for generating tags for scripts for the
+-*   Bourne shell (and its derivatives, the Korn and Z shells).
++*   Bourne shell (and its derivatives, the Korn and Z shells), along with some
++*   specialised kinds of shell scripts (Gentoo ebuilds and eclasses).
+ */
+ 
+ /*
+@@ -102,7 +103,7 @@
+ extern parserDefinition* ShParser (void)
+ {
+ 	static const char *const extensions [] = {
+-		"sh", "SH", "bsh", "bash", "ksh", "zsh", NULL
++		"sh", "SH", "bsh", "bash", "ksh", "zsh", "ebuild", "eclass", NULL
+ 	};
+ 	parserDefinition* def = parserNew ("Sh");
+ 	def->kinds      = ShKinds;
diff --git a/dev-util/ctags/files/ctags-5.8-ada.patch b/dev-util/ctags/files/ctags-5.8-ada.patch
new file mode 100644
index 000000000000..48ed96f0d88e
--- /dev/null
+++ b/dev-util/ctags/files/ctags-5.8-ada.patch
@@ -0,0 +1,28 @@
+--- parsers-orig.h	2009-11-16 23:39:49.747328066 +0200
++++ parsers.h	2009-11-16 23:40:26.541581805 +0200
+@@ -16,6 +16,7 @@
+ 
+ /* Add the name of any new parser definition function here */
+ #define PARSER_LIST \
++	AdaParser, \
+ 	AntParser, \
+ 	AsmParser, \
+ 	AspParser, \
+--- source-orig.mak	2009-11-16 23:41:17.184586699 +0200
++++ source.mak	2009-11-16 23:41:48.358331136 +0200
+@@ -8,6 +8,7 @@
+ 	strlist.h vstring.h
+ 
+ SOURCES = \
++	ada.c \
+ 	args.c \
+ 	ant.c \
+ 	asm.c \
+@@ -70,6 +71,7 @@
+ REGEX_HEADERS = gnu_regex/regex.h
+ 
+ OBJECTS = \
++	ada.$(OBJEXT) \
+ 	args.$(OBJEXT) \
+ 	ant.$(OBJEXT) \
+ 	asm.$(OBJEXT) \
diff --git a/dev-util/ctags/files/ctags-5.8-f95-pointers.patch b/dev-util/ctags/files/ctags-5.8-f95-pointers.patch
new file mode 100644
index 000000000000..4ac9560f8785
--- /dev/null
+++ b/dev-util/ctags/files/ctags-5.8-f95-pointers.patch
@@ -0,0 +1,12 @@
+--- fortran-orig.c	2009-11-16 23:38:06.154328652 +0200
++++ fortran.c	2009-11-16 23:38:08.711335501 +0200
+@@ -1319,7 +1319,8 @@
+ 			readToken (token);
+ 			skipPast (token, TOKEN_OPERATOR);
+ 		}
+-		else if (strcmp (vStringValue (token->string), "=") == 0)
++		else if ((strcmp (vStringValue (token->string), "=") == 0) ||
++					(strcmp (vStringValue (token->string), "=>") == 0))
+ 		{
+ 			while (! isType (token, TOKEN_COMMA) &&
+ 					! isType (token, TOKEN_STATEMENT_END))
diff --git a/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch b/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch
new file mode 100644
index 000000000000..83d9f7e887eb
--- /dev/null
+++ b/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch
@@ -0,0 +1,13 @@
+--- python-orig.c	2009-11-16 23:33:44.930351712 +0200
++++ python.c	2009-11-16 23:35:08.433328150 +0200
+@@ -264,8 +264,8 @@
+ 	while (*cp)
+ 	{
+ 		cp = skipEverything (cp);
+-		if (!strncmp(cp, "def", 3) || !strncmp(cp, "class", 5) ||
+-			!strncmp(cp, "cdef", 4) || !strncmp(cp, "cpdef", 5))
++		if (!strncmp(cp, "def ", 4) || !strncmp(cp, "class ", 6) ||
++			!strncmp(cp, "cdef ", 5) || !strncmp(cp, "cpdef ", 6))
+ 		{
+ 			return cp;
+ 		}
diff --git a/dev-util/ctags/metadata.xml b/dev-util/ctags/metadata.xml
new file mode 100644
index 000000000000..3b8ef2c5908b
--- /dev/null
+++ b/dev-util/ctags/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>vim</herd>
+  <use>
+    <flag name="ada">Enable Ada support</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">gnuada</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
new file mode 100644
index 000000000000..dce8bae9d4bd
--- /dev/null
+++ b/dev-util/cucumber-core/Manifest
@@ -0,0 +1,2 @@
+DIST cucumber-core-1.1.3.gem 40448 SHA256 e6d1d41dd048e16161de92ddb415e2e599c6182923f9c6a2a2fcce63ce9dad94 SHA512 c108b12216ad6b1ca5f857d2fd144b5754077c2da2704343656229db0a1f86df8bd62a295eb24bb39b3b1ae8b020a85d99e4a0d3bc5cbe402c357e6110c0ba66 WHIRLPOOL 6873683d034612295527cc3857cbf5569c65f4a5129bc1f5b2956887ed45c83514e084c0c4b0beaffd03e96a7483fbd2aeab8449f227831f9cc2ee16d671d990
+DIST cucumber-core-1.2.0.gem 41984 SHA256 390e4d05a99d4b648f75343b553cb22c59aa9b4e461ab383323d4ca381b4b4bb SHA512 b24a108a0147afca99d292df7c64320190a1fa0b2fcc08038f3a98eb09d29f3f02e0581004a168e80e0c2091e7e981494f86e9086ff81504a014b52f5fe5ceeb WHIRLPOOL e49a4814d2810abfb1f8d4b79d858c87ce128c98d2e238147d0599eab7acdafa25fa438f1f1addd50dd195484f79fb0257f29dfb5fa5bbba07f173f313b6bedb
diff --git a/dev-util/cucumber-core/cucumber-core-1.1.3.ebuild b/dev-util/cucumber-core/cucumber-core-1.1.3.ebuild
new file mode 100644
index 000000000000..f191e2f0d702
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-1.1.3.ebuild
@@ -0,0 +1,31 @@
+# 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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+		>=dev-ruby/kramdown-1.4.2
+		dev-ruby/bundler
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/gherkin-2.12.0:0
+"
diff --git a/dev-util/cucumber-core/cucumber-core-1.2.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.2.0.ebuild
new file mode 100644
index 000000000000..b4abcbae10e8
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-1.2.0.ebuild
@@ -0,0 +1,31 @@
+# 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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https//github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+		>=dev-ruby/kramdown-1.4.2
+		dev-ruby/bundler
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/gherkin-2.12.0:0
+"
diff --git a/dev-util/cucumber-core/metadata.xml b/dev-util/cucumber-core/metadata.xml
new file mode 100644
index 000000000000..ae454929f0f5
--- /dev/null
+++ b/dev-util/cucumber-core/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aslakhellesoy/cucumber</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
new file mode 100644
index 000000000000..5d728c857e0b
--- /dev/null
+++ b/dev-util/cucumber-rails/Manifest
@@ -0,0 +1,2 @@
+DIST cucumber-rails-1.4.1.gem 404480 SHA256 6c4c97732c5539d4c9da3ea1dfb7d49fffecc27e089d30b62085f0752f895575 SHA512 6f0dd5a08a72a7d37e3ca0343c374a66071f893ba9389bacd51516ccbd129396e6f770bb18e10a80d00588b833bfa23b288f8e2b73dd3d7e618bae0ff40179fd WHIRLPOOL a73ff228acaec8ece7c7cd52dd8868d265fe800521a1c659fd020be0051719af74d08d8851b100400cc8625783c102f95b1f9999397472f059dfd1f2acaec903
+DIST cucumber-rails-1.4.2.gem 404480 SHA256 42cfe2f754a6676ec32825d2e3db59f49d68fcdf7606af18ba191f0180c555f3 SHA512 bacaf0f3ab153dc374a688ffe9b4a18bd015cbbef2d8715a7d0916748287ab674708c9af42116b31b4b8055a28d10aa7148c39b88bd6063154e0227bbe6c9b18 WHIRLPOOL c1a0399ced2f2f5ef804dfff300694cdc8b522462efe7a5b9a83e1182f8b43cc7c367b840ac8f34247ae6d7ef471f61725249b2516c99c2a77d0603363b7cb1e
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.4.1.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.4.1.ebuild
new file mode 100644
index 000000000000..108477a85a5f
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-1.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="1"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+#	test? (
+#		>=dev-ruby/ammeter-0.2.2
+#		>=dev-ruby/rspec-rails-2.7.0:2
+#	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-1.3.8
+	>=dev-ruby/nokogiri-1.5.0
+	>=dev-ruby/capybara-1.1.2 <dev-ruby/capybara-3
+	>=dev-ruby/rails-3.0.0
+	>=dev-ruby/mime-types-1.16:0"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.4.2.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.4.2.ebuild
new file mode 100644
index 000000000000..3dbe16ceb5a2
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-1.4.2.ebuild
@@ -0,0 +1,48 @@
+# 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=""
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="1"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+#	test? (
+#		>=dev-ruby/ammeter-0.2.2
+#		>=dev-ruby/rspec-rails-2.7.0:2
+#	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-1.3.8
+	>=dev-ruby/nokogiri-1.5.0
+	>=dev-ruby/capybara-1.1.2 <dev-ruby/capybara-3
+	>=dev-ruby/rails-3.0.0
+	>=dev-ruby/mime-types-1.16:0"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cucumber-rails/metadata.xml b/dev-util/cucumber-rails/metadata.xml
new file mode 100644
index 000000000000..3e14dfac3e8e
--- /dev/null
+++ b/dev-util/cucumber-rails/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cucumber/cucumber</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
new file mode 100644
index 000000000000..ae363225fba8
--- /dev/null
+++ b/dev-util/cucumber/Manifest
@@ -0,0 +1,4 @@
+DIST cucumber-1.3.17.gem 278528 SHA256 3d6029398314ebbbba899c0739e5777ca317cc02353c8a8bfe7510c772ef56be SHA512 85d36ea77df50b2e3ee0e53d92ac8134d45a620b0b8ddddd1625204a051986136039adf21d1d78e78be325441613aabaa4dfc0f951c69a04e36767e3ae9bc40f WHIRLPOOL 8a87e8b7562a9245c29082dc72da2aace9a51150e982750d7db8749fd3c8a168ee67a8f803b02ce84e5424a4a59a86e43e8f7814b177256cbe519735e65df312
+DIST cucumber-1.3.18.gem 278528 SHA256 bc21947eb2566020c1fb8630d48a03e8275e7516ae16ebf5a08bd9078ed5709c SHA512 8279f4394e5205f3e7fef850ab746206c13241343399f4d0960dcde6288c00a45942f112e87a3a86ab7a1d0d331bc8024c0304be39fb4b63a8b4b3ea509a0504 WHIRLPOOL 4623cc8d0648a995dbeb3d888cf41dda5871cde68891cb936cd1778eca65764a44b4d15b29a14dc142d1647d500be174eec65eaa7303dd6ec1da042b3d241797
+DIST cucumber-1.3.19.gem 275968 SHA256 d99ed3f6af563ef1c063122918af5ab5ac1b877a9f3fc94b4d31b04c99070a9c SHA512 491f4f35346d9b90620ba7e003c7b65a08ce6d4acc23e5614871b05d06200ce32fa3619784d4279f3c799120f3e8588651da06f9e875c6d947ccab6c76694c8b WHIRLPOOL 133a6a8f52431e5d0a715115cf06787b28afdf382e6f196375657bf060d057cc4177adbfaf9c0a7046660dc726216a589483afb24e2d2b35852e14696a5dd583
+DIST cucumber-1.3.20.gem 279040 SHA256 8720b60453866f3970d2743ccf62a503bc656a56c7077cb30a892011c248f080 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050 WHIRLPOOL 72488e56a8e8c34cf35fcf8f3dae3b4d80baaa2b57d4e10207bfcdf93e2d7bc45cd13517c97aaf615049f0ee1e6f583db45473f6270f2db18455aa265eeb8ef1
diff --git a/dev-util/cucumber/cucumber-1.3.17.ebuild b/dev-util/cucumber/cucumber-1.3.17.ebuild
new file mode 100644
index 000000000000..03d87c9a929f
--- /dev/null
+++ b/dev-util/cucumber/cucumber-1.3.17.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-2.13.0
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.5.2
+		>=dev-ruby/json-1.7
+		dev-ruby/bundler
+		>=dev-util/cucumber-1.3
+		dev-ruby/rubyzip:0
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2
+	>=dev-ruby/diff-lcs-1.1.3
+	>=dev-ruby/gherkin-2.12.0:0
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.1
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix too-strict test dependencies
+	sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
+		-e '/aruba/ s/= 0.5.2/~> 0.5/' \
+		-e '/rake/ s/10.2/10.5/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make sure spork is run in the right interpreter
+	sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die
+	rm features/drb_server_integration.feature || die
+
+	# Avoid json, they most likely fail due to multi_json weirdness.
+	rm features/json_formatter.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/git ls-files/d' cucumber.gemspec || die
+}
+
+each_ruby_test() {
+	ruby-ng_rspec
+	RUBYLIB=lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cucumber/cucumber-1.3.18.ebuild b/dev-util/cucumber/cucumber-1.3.18.ebuild
new file mode 100644
index 000000000000..15e488afe4cd
--- /dev/null
+++ b/dev-util/cucumber/cucumber-1.3.18.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-2.13.0
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.5.2
+		>=dev-ruby/json-1.7
+		dev-ruby/bundler
+		>=dev-util/cucumber-1.3
+		dev-ruby/rubyzip:0
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2
+	>=dev-ruby/diff-lcs-1.1.3
+	>=dev-ruby/gherkin-2.12.0:0
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.1
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix too-strict test dependencies
+	sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
+		-e '/aruba/ s/= 0.5.2/~> 0.5/' \
+		-e '/rake/ s/10.2/10.5/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make sure spork is run in the right interpreter
+	sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die
+	rm features/drb_server_integration.feature || die
+
+	# Avoid json, they most likely fail due to multi_json weirdness.
+	rm features/json_formatter.feature || die
+	# Avoid features that break with newer rspec versions.
+	sed -i -e '369,398d' features/background.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/git ls-files/d' cucumber.gemspec || die
+}
+
+each_ruby_test() {
+	ruby-ng_rspec
+	RUBYLIB=lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cucumber/cucumber-1.3.19.ebuild b/dev-util/cucumber/cucumber-1.3.19.ebuild
new file mode 100644
index 000000000000..29a9ad4e622b
--- /dev/null
+++ b/dev-util/cucumber/cucumber-1.3.19.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-2.13.0
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.5.2
+		>=dev-ruby/json-1.7
+		dev-ruby/bundler
+		>=dev-util/cucumber-1.3
+		dev-ruby/rubyzip:0
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2
+	>=dev-ruby/diff-lcs-1.1.3
+	>=dev-ruby/gherkin-2.12.0:0
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix too-strict test dependencies
+	sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
+		-e '/aruba/ s/= 0.5.2/~> 0.5/' \
+		-e '/rake/ s/10.2/10.5/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make sure spork is run in the right interpreter
+	sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die
+	rm features/drb_server_integration.feature || die
+
+	# Avoid json, they most likely fail due to multi_json weirdness.
+	rm features/json_formatter.feature || die
+	# Avoid features that break with newer rspec versions.
+	sed -i -e '369,398d' features/background.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/git ls-files/d' cucumber.gemspec || die
+}
+
+each_ruby_test() {
+	ruby-ng_rspec
+	RUBYLIB=lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cucumber/cucumber-1.3.20.ebuild b/dev-util/cucumber/cucumber-1.3.20.ebuild
new file mode 100644
index 000000000000..04b234b8b4ca
--- /dev/null
+++ b/dev-util/cucumber/cucumber-1.3.20.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-2.13.0
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.5.2
+		>=dev-ruby/json-1.7
+		dev-ruby/bundler
+		>=dev-util/cucumber-1.3
+		dev-ruby/rubyzip:0
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2:*
+	>=dev-ruby/diff-lcs-1.1.3
+	>=dev-ruby/gherkin-2.12.0:0
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix too-strict test dependencies
+	sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
+		-e '/aruba/ s/= 0.5.2/~> 0.5/' \
+		-e '/rake/ s/10.2/10.5/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make sure spork is run in the right interpreter
+	sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die
+	rm features/drb_server_integration.feature || die
+
+	# Avoid json, they most likely fail due to multi_json weirdness.
+	rm features/json_formatter.feature || die
+	# Avoid features that break with newer rspec versions.
+	sed -i -e '369,398d' features/background.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/git ls-files/d' cucumber.gemspec || die
+}
+
+each_ruby_test() {
+	ruby-ng_rspec
+	RUBYLIB=lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cucumber/files/cucumber-0.7.3-remove-rspec2.patch b/dev-util/cucumber/files/cucumber-0.7.3-remove-rspec2.patch
new file mode 100644
index 000000000000..5f1f8b26f15e
--- /dev/null
+++ b/dev-util/cucumber/files/cucumber-0.7.3-remove-rspec2.patch
@@ -0,0 +1,96 @@
+--- gem_tasks/rspec.rake.~1~	2010-09-12 12:55:56.549346307 +0200
++++ gem_tasks/rspec.rake	2010-09-12 12:56:40.796472416 +0200
+@@ -1,13 +1,3 @@
+-begin
+-  require 'rspec/core/rake_task'
+-
+-  desc "Run RSpec"
+-  Rspec::Core::RakeTask.new do |t|
+-    t.rcov = ENV['RCOV']
+-    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
+-    t.verbose = true
+-  end
+-rescue LoadError => e
+   require 'spec/rake/spectask'
+ 
+   desc "Run RSpec"
+@@ -17,4 +7,3 @@
+     t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
+     t.verbose = true
+   end
+-end
+--- lib/cucumber/rspec/diffing.rb.~1~	2010-09-12 12:55:56.276767180 +0200
++++ lib/cucumber/rspec/diffing.rb	2010-09-12 13:00:05.884598738 +0200
+@@ -2,16 +2,9 @@
+ 
+ options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
+ 
+-begin
+-  # RSpec >=2.0
+-  require 'rspec/expectations'
+-  require 'rspec/expectations/differs/default'
+-  Rspec::Expectations.differ = ::Rspec::Expectations::Differs::Default.new(options)
+-rescue LoadError => try_rspec_1_2_4_or_higher
+   begin
+     require 'spec/expectations'
+     require 'spec/runner/differs/default'
+     Spec::Expectations.differ = Spec::Expectations::Differs::Default.new(options)
+   rescue LoadError => give_up
+   end
+-end
+--- spec/spec_helper.rb.~1~	2010-09-12 12:55:56.280518419 +0200
++++ spec/spec_helper.rb	2010-09-12 13:02:14.329221958 +0200
+@@ -4,16 +4,6 @@
+ 
+ require 'rubygems'
+ 
+-begin
+-  require 'rspec'
+-  require 'rspec/autorun'
+-  Rspec.configure do |c|
+-    c.color_enabled = true
+-    c.before(:each) do
+-      ::Term::ANSIColor.coloring = true
+-    end
+-  end
+-rescue LoadError
+   require 'spec'
+   require 'spec/autorun'
+   Spec::Runner.configure do |c|
+@@ -21,7 +11,6 @@
+       ::Term::ANSIColor.coloring = true
+     end
+   end
+-end
+ 
+ require 'cucumber'
+ $KCODE='u' unless Cucumber::RUBY_1_9
+--- features/support/env.rb.~1~	2010-09-12 12:55:56.272596255 +0200
++++ features/support/env.rb	2010-09-12 13:03:37.824881422 +0200
+@@ -1,10 +1,6 @@
+ require 'rubygems'
+ require 'tempfile'
+-begin
+-  require 'rspec/expectations'
+-rescue LoadError
+   require 'spec/expectations'
+-end
+ require 'fileutils'
+ require 'forwardable'
+ require 'cucumber/formatter/unicode'
+--- cucumber.yml.~1~	2010-09-12 13:06:35.832722414 +0200
++++ cucumber.yml	2010-09-12 13:07:58.896848344 +0200
+@@ -2,13 +2,8 @@
+ rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+ rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format pretty #{rerun}"
+ std_opts = "--format progress features --strict --tags ~@wip"
+-begin
+-  require 'rspec/expectations'
+-  std_opts << ' --tags ~@rspec1'
+-rescue LoadError
+   # rspec 1
+   std_opts << ' --tags ~@rspec2'
+-end
+ %>
+ default: <%= std_opts %>
+ jruby: <%= std_opts %> --tags ~@spork --tags ~@wire
diff --git a/dev-util/cucumber/metadata.xml b/dev-util/cucumber/metadata.xml
new file mode 100644
index 000000000000..ae454929f0f5
--- /dev/null
+++ b/dev-util/cucumber/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aslakhellesoy/cucumber</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
new file mode 100644
index 000000000000..f1fbfa585dd1
--- /dev/null
+++ b/dev-util/cunit/Manifest
@@ -0,0 +1,2 @@
+DIST CUnit-2.1-0-src.tar.gz 628767 SHA256 b5fc0ab0f03e8d287a3f65935c7e36fabfdcd9f926ee6f50ac621ea6ab6fa8c6 SHA512 564c297293e3578384c11daef70bc45619188ff823107a2bbb6e56cfa702941b1c316cd9a4cb1116ecc5aefababd153febc39907296392b59e669d3251f85fbf WHIRLPOOL be977c03f15a571e35fb557239a70ef281f5dd9580faf4077b51ba4f80d96b824d650d4a3eb53ec34b9ffb3e08cc06ab4bc6a830f4f60ac8818f95a8556328b8
+DIST CUnit-2.1-2-src.tar.bz2 349037 SHA256 1f705f30b36fe1dadb5494989d1d663241603f456b468c81f606a1bdbc168bea SHA512 c0af37b9f3a00fd7bb971f33e94373699d0380c28fad12f6db860739990a9ffffe0bb0a71c0e3531529b9952128c11248b8f365875d0315c16637a0b7e91642d WHIRLPOOL a5617aa10baf617e7165c04c66e4fffb25d2d8d396d8aff8ed5f67183154d79514d2c426c88bc02d02440f4c53bbe2b6025bbd0165fa3a6008e2b19e0317498b
diff --git a/dev-util/cunit/cunit-2.1-r1.ebuild b/dev-util/cunit/cunit-2.1-r1.ebuild
new file mode 100644
index 000000000000..64321014533a
--- /dev/null
+++ b/dev-util/cunit/cunit-2.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit eutils autotools
+
+MY_PN='CUnit'
+MY_PV="${PV}-0"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="CUnit - C Unit Test Framework"
+SRC_URI="mirror://sourceforge/cunit/${MY_P}-src.tar.gz"
+HOMEPAGE="http://cunit.sourceforge.net"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e "/^docdir/d" -i doc/Makefile.am
+	sed -e '/^dochdrdir/{s:$(prefix)/doc/@PACKAGE@:$(docdir):}' \
+		-i doc/headers/Makefile.am
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS NEWS README ChangeLog
+}
diff --git a/dev-util/cunit/cunit-2.1_p2-r1.ebuild b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
new file mode 100644
index 000000000000..19aeace2416b
--- /dev/null
+++ b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
+
+MY_PN='CUnit'
+MY_PV="${PV/_p*}-2"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="CUnit - C Unit Test Framework"
+SRC_URI="mirror://sourceforge/cunit/${MY_P}-src.tar.bz2"
+HOMEPAGE="http://cunit.sourceforge.net"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ncurses static-libs"
+
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+src_prepare() {
+	sed -e "/^docdir/d" -i doc/Makefile.am || die
+	sed -e '/^dochdrdir/{s:$(prefix)/doc/@PACKAGE@:$(docdir):}' \
+		-i doc/headers/Makefile.am || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	eautoreconf
+
+	append-cppflags -D_BSD_SOURCE
+
+	# unable to find headers otherwise
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local LIBS=${LIBS}
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable static-libs static) \
+		--disable-debug \
+		$(use_enable ncurses curses)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-util/cunit/cunit-2.1_p2.ebuild b/dev-util/cunit/cunit-2.1_p2.ebuild
new file mode 100644
index 000000000000..854eccb3f7a8
--- /dev/null
+++ b/dev-util/cunit/cunit-2.1_p2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+MY_PN='CUnit'
+MY_PV="${PV/_p*}-2"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="CUnit - C Unit Test Framework"
+SRC_URI="mirror://sourceforge/cunit/${MY_P}-src.tar.bz2"
+HOMEPAGE="http://cunit.sourceforge.net"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ncurses static-libs"
+
+RDEPEND="ncurses? ( sys-libs/ncurses )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+src_prepare() {
+	sed -e "/^docdir/d" -i doc/Makefile.am || die
+	sed -e '/^dochdrdir/{s:$(prefix)/doc/@PACKAGE@:$(docdir):}' \
+		-i doc/headers/Makefile.am || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	eautoreconf
+	append-cppflags -D_BSD_SOURCE
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable static-libs static) \
+		--disable-debug \
+		$(use_enable ncurses curses)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-util/cunit/metadata.xml b/dev-util/cunit/metadata.xml
new file mode 100644
index 000000000000..875d63833a63
--- /dev/null
+++ b/dev-util/cunit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>lang-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">cunit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cutils/Manifest b/dev-util/cutils/Manifest
new file mode 100644
index 000000000000..c284c06428c5
--- /dev/null
+++ b/dev-util/cutils/Manifest
@@ -0,0 +1 @@
+DIST cutils-1.6.tar.gz 128722 SHA256 b26c22f2ca3905579273e132708094e95b4fe2a0576ce4bea8a7cbfc7a0084b8 SHA512 49a0f6ed210be01eec335903dee7ac6000bfa9d9c05a31b9a9fd6ae8534c8058d774f884d55b2b9fa029abc30beeca1866d8a74389b76158ebb216fb3dfad6eb WHIRLPOOL 37285efc69c8be9075fed1d11147d1dc2955f08e7a1449afca5355916566298fa71b9e7d48156860c52dfaa782b06d604c3481ed4c75b4205aae0897c4da9ac3
diff --git a/dev-util/cutils/cutils-1.6-r4.ebuild b/dev-util/cutils/cutils-1.6-r4.ebuild
new file mode 100644
index 000000000000..bcd27c82a79f
--- /dev/null
+++ b/dev-util/cutils/cutils-1.6-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="C language utilities"
+HOMEPAGE="http://www.sigala.it/sandro/software.php#cutils"
+SRC_URI="http://www.sigala.it/sandro/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-devel/flex"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-infopage.patch
+
+	epatch "${FILESDIR}"/${P}-case-insensitive.patch
+
+	mv "${S}"/src/cdecl/cdecl.1 			\
+		"${S}"/src/cdecl/cutils-cdecl.1 || die
+	# Force rebuild of cutils.info
+	rm -f "${S}"/doc/cutils.info || die
+
+	sed -e "s/cdecl/cutils-cdecl/g"	\
+		-i "${S}"/doc/cutils.texi || die
+	sed -e "/PROG/s/cdecl/cutils-cdecl/" \
+		-i "${S}"/src/cdecl/Makefile.in || die
+	sed -e "/Xr/s/cdecl/cutils-cdecl/" \
+		-i "${S}"/src/cundecl/cundecl.1 || die
+	sed -i "/Nm/s/cdecl/cutils-cdecl/" \
+		"${S}"/src/cdecl/cutils-cdecl.1 || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" -j1
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc CREDITS HISTORY NEWS README
+}
+
+pkg_postinst () {
+	elog "cdecl was installed as cutils-cdecl because of a naming conflict"
+	elog "with dev-util/cdecl."
+}
diff --git a/dev-util/cutils/files/cutils-1.6-case-insensitive.patch b/dev-util/cutils/files/cutils-1.6-case-insensitive.patch
new file mode 100644
index 000000000000..67318d0f55d8
--- /dev/null
+++ b/dev-util/cutils/files/cutils-1.6-case-insensitive.patch
@@ -0,0 +1,14 @@
+* On case insensitive filesystems, INSTALL is seen as the target install,
+  resulting in no installation at all.
+
+--- cutils-1.6/Makefile.in
++++ cutils-1.6/Makefile.in
+@@ -8,6 +8,8 @@
+ 		(cd $$f && $(MAKE) $@); \
+ 	done
+ 
++.PHONY : install
++
+ distclean:
+ 	@for f in $(subdirs); do \
+ 		(cd $$f && $(MAKE) $@); \
diff --git a/dev-util/cutils/files/cutils-infopage.patch b/dev-util/cutils/files/cutils-infopage.patch
new file mode 100644
index 000000000000..2b19aeee2d6e
--- /dev/null
+++ b/dev-util/cutils/files/cutils-infopage.patch
@@ -0,0 +1,16 @@
+# Add category, and entry to the texinfo document.
+
+--- cutils-1.6/doc/cutils.texi.orig	2008-11-24 23:18:41.732038120 +0000
++++ cutils-1.6/doc/cutils.texi	2008-11-24 23:18:27.907038555 +0000
+@@ -7,6 +7,11 @@
+ @c unwise to comment it out when running a master in case there are
+ @c overfulls which are deemed okay.
+ 
++@dircategory Programming
++@direntry
++* cutils: (cutils).            C language utilities.
++@end direntry
++
+ @iftex
+ @c @finalout
+ @end iftex
diff --git a/dev-util/cutils/metadata.xml b/dev-util/cutils/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/cutils/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
new file mode 100644
index 000000000000..004e7097a936
--- /dev/null
+++ b/dev-util/cwdiff/Manifest
@@ -0,0 +1,2 @@
+DIST cwdiff-0.2.8.tar.gz 4246 SHA256 cdfd1489420591b36a56370c647b361f87c0c4074fed220e9c09f3e7ea8f2c22 SHA512 bb1fb3790cc2d8f4e5f199e7abc9bf6a999ded0d25fc9e62ca1e003505f1d33b6c8575b0172a2e55128c4e5c853147304c928d0f1094c5b30e6a015b9fbcae09 WHIRLPOOL 7dec074fa079bb1468179efe6f559010b2d8267343ea5c77ad72810301baf49cb63977c7617bdc41321c944fdd067c6202d8a87b6bd5200f561176fac2fc115a
+DIST cwdiff-0.3.0.tar.gz 4666 SHA256 32c70aeae4e445a439aeed7f9b01395cc74645033533cc37b6974671cf2cfd9b SHA512 40401a0541209c83cd78ff55c62ce71dd362cf8674b07c1cdd56ad7a505741e818003f07c87fe0303cd2bfd911d99b8f560697612b32b6fee794a7671e7e86f0 WHIRLPOOL aad2e3c5c6d8dc94f70c8b272969598bf134f73bc0fc030d5f4087d341a2074736e5b409afc99c8039f250c2f0154b22d86b153e7ac3e4edc12f4c0642be2e76
diff --git a/dev-util/cwdiff/cwdiff-0.2.8.ebuild b/dev-util/cwdiff/cwdiff-0.2.8.ebuild
new file mode 100644
index 000000000000..860a9929d8e3
--- /dev/null
+++ b/dev-util/cwdiff/cwdiff-0.2.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
+HOMEPAGE="https://github.com/junghans/cwdiff"
+SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+IUSE="a2ps mercurial"
+
+DEPEND=""
+RDEPEND="
+	sys-apps/sed
+	app-shells/bash
+	app-text/wdiff
+	sys-apps/diffutils
+	a2ps? ( app-text/a2ps )
+	mercurial? ( dev-vcs/mercurial )
+	"
+
+src_install () {
+	dobin "${PN}"
+	if use mercurial ; then
+		insinto /etc/mercurial/hgrc.d
+		doins hgrc.d/"${PN}".rc
+	fi
+	dodoc README.md
+}
diff --git a/dev-util/cwdiff/cwdiff-0.3.0.ebuild b/dev-util/cwdiff/cwdiff-0.3.0.ebuild
new file mode 100644
index 000000000000..80e7cc94173b
--- /dev/null
+++ b/dev-util/cwdiff/cwdiff-0.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://github.com/junghans/${PN}.git http://github.com/junghans/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+fi
+
+DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
+HOMEPAGE="https://github.com/junghans/cwdiff"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="a2ps mercurial"
+
+DEPEND="sys-apps/help2man
+	sys-apps/coreutils"
+RDEPEND="
+	sys-apps/sed
+	app-shells/bash
+	app-text/wdiff
+	sys-apps/diffutils
+	a2ps? ( app-text/a2ps )
+	mercurial? ( dev-vcs/mercurial )
+	"
+
+src_install() {
+	emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
+	dodoc README.md
+}
diff --git a/dev-util/cwdiff/metadata.xml b/dev-util/cwdiff/metadata.xml
new file mode 100644
index 000000000000..ee07c168e0b4
--- /dev/null
+++ b/dev-util/cwdiff/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<use>
+		<flag name='a2ps'>install <pkg>app-text/a2ps</pkg> for postscript output</flag>
+		<flag name='mercurial'>install hg wdiff alias for <pkg>dev-vcs/mercurial</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">junghans/cwdiff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
new file mode 100644
index 000000000000..a9527600447d
--- /dev/null
+++ b/dev-util/d-feet/Manifest
@@ -0,0 +1,2 @@
+DIST d-feet-0.3.10.tar.xz 179500 SHA256 88f0df5fcb862387ff3d1793873c5eb368c3e4db0bbd82ea65f748cbf70a6359 SHA512 7a6832367b32eae204c456598ac4ad38ead585e916e2d2179203f63f4e87f2e9d9afbc8448324660552ebe4aaf2bd394f73e48f325513c3b0f5fa33f91fce40b WHIRLPOOL 559135be86d13bb7e2ff1c10d753d1c770e2fc0d0a849b643c626fb5db5e3779e5f7b7208086d6e2e92e3f1f81e06f5cb9e3cbc41510c0acab30b3b71fdf99ca
+DIST d-feet-0.3.9.tar.xz 176652 SHA256 6df917fc1c2ef43217fbeea94dc12ecfc2d136cac4c84dac2c89f03dfbca7953 SHA512 fa61f926dd0493ae5de3d81676aad78879062ade30f77e4054d1ca20e80b876c30fb61b4780a7e33a610c50f3d7df3b7cee10e91cfc69759a1228b38e9b2e1ab WHIRLPOOL 7bd1d5c7246138f4b80d1a0d1fb52de604b5b127bd6b7d8629966e42e257631efd2fc38b5d8de2d572a727a4830668dce981d4cfc42f8017897b81865039f42d
diff --git a/dev-util/d-feet/d-feet-0.3.10.ebuild b/dev-util/d-feet/d-feet-0.3.10.ebuild
new file mode 100644
index 000000000000..2411fd264582
--- /dev/null
+++ b/dev-util/d-feet/d-feet-0.3.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 virtualx
+
+DESCRIPTION="D-Feet is a powerful D-Bus debugger"
+HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/gobject-introspection-0.9.6
+	>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
+	>=sys-apps/dbus-1
+	>=x11-libs/gtk+-3.9.4:3[introspection]
+	x11-libs/libwnck:3[introspection]
+"
+DEPEND="
+	${PYTHON_DEPS}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40.0
+"
+
+src_prepare() {
+	python_fix_shebang .
+
+	# Do not run update-desktop-database (sandbox violation)
+	sed -e '/^UPDATE_DESKTOP/s:=.*:=true:' \
+		-i data/Makefile.am data/Makefile.in || die
+
+	# disable pep8 - checking python whitespace style is not useful for us
+	sed -e 's/pep8 /# pep8 /' \
+		-i src/tests/Makefile.am src/tests/Makefile.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# disable pep8 - checking python code style is not useful downstream
+	# (especially when that style check fails!)
+	gnome2_src_configure \
+		$(use_enable test tests) \
+		PEP8=$(type -P true)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/dev-util/d-feet/d-feet-0.3.9.ebuild b/dev-util/d-feet/d-feet-0.3.9.ebuild
new file mode 100644
index 000000000000..43e0c906bf47
--- /dev/null
+++ b/dev-util/d-feet/d-feet-0.3.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="D-Feet is a powerful D-Bus debugger"
+HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/gobject-introspection-0.9.6
+	>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
+	>=sys-apps/dbus-1
+	>=x11-libs/gtk+-3.9.4:3[introspection]
+	x11-libs/libwnck:3[introspection]
+"
+DEPEND="
+	${PYTHON_DEPS}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40.0
+	test? ( dev-python/pep8 )
+"
+
+src_prepare() {
+	python_fix_shebang .
+
+	# Do not run update-desktop-database (sandbox violation)
+	sed -e '/^UPDATE_DESKTOP/s:=.*:=true:' \
+		-i data/Makefile.am data/Makefile.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable test tests)
+}
diff --git a/dev-util/d-feet/metadata.xml b/dev-util/d-feet/metadata.xml
new file mode 100644
index 000000000000..9dac5c8a2bd2
--- /dev/null
+++ b/dev-util/d-feet/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<maintainer>
+  <email>cardoe@gentoo.org</email>
+  <name>Doug Goldstein</name>
+  <description>Feel free to bump or do any updates as needed</description>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
new file mode 100644
index 000000000000..969fb0e4a0c5
--- /dev/null
+++ b/dev-util/dbus-test-runner/Manifest
@@ -0,0 +1 @@
+DIST dbus-test-runner-12.10.1.tar.gz 382108 SHA256 71f2aa4a48a8f88f1629389f902bbfaf42df4b1fcbea9473acc78de75fab525f SHA512 6d40d607fdc417ebb9aaa6dc3cdd41a8ff1563cb3791689d17a99d105a0c16dad8ffcaf3da7ab6b8c3dcae17d2eba1bf8a6a5d92dc1d3de0975218220ed3c9c0 WHIRLPOOL 2c14b7022aede43c4ce2e4afb1e457a0aebc443ec956552eefd7e6a101aa0045d5bd2e91c9fa0d8ddd93315fc7b5a65d0dadc045acbae11eaa00380b4b45a951
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild
new file mode 100644
index 000000000000..6599066af4ed
--- /dev/null
+++ b/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_MAJOR_VERSION=12.10
+
+DESCRIPTION="Run executables under a new DBus session for testing"
+HOMEPAGE="https://launchpad.net/dbus-test-runner"
+SRC_URI="http://launchpad.net/${PN}/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.98
+	>=dev-libs/glib-2.34:2
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	test? ( dev-util/bustle )
+"
+
+src_prepare() {
+	# Drop -Werror usage
+	sed -e 's/-Werror//' \
+		-i libdbustest/Makefile.{am,in} \
+		-i src/Makefile.{am,in} \
+		-i tests/Makefile.{am,in} \
+		|| die
+}
diff --git a/dev-util/dbus-test-runner/metadata.xml b/dev-util/dbus-test-runner/metadata.xml
new file mode 100644
index 000000000000..19dcdd8183d2
--- /dev/null
+++ b/dev-util/dbus-test-runner/metadata.xml
@@ -0,0 +1,8 @@
+<?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="launchpad">dbus-test-runner</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
new file mode 100644
index 000000000000..2fc748351d28
--- /dev/null
+++ b/dev-util/ddd/Manifest
@@ -0,0 +1 @@
+DIST ddd-3.3.12.tar.gz 5687115 SHA256 3ad6cd67d7f4b1d6b2d38537261564a0d26aaed077bf25c51efc1474d0e8b65c SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3 WHIRLPOOL 5f4117036abc0b9f7cadd5547bbd7bd959427f783a5ea7d32be0682c23d31cf48fb45d4d2a2a9688190a6ff35159ebc48b15b295bcceb1f297eaf7133f252bf2
diff --git a/dev-util/ddd/ddd-3.3.12-r3.ebuild b/dev-util/ddd/ddd-3.3.12-r3.ebuild
new file mode 100644
index 000000000000..7abbaf42d872
--- /dev/null
+++ b/dev-util/ddd/ddd-3.3.12-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Graphical front-end for command-line debuggers"
+HOMEPAGE="http://www.gnu.org/software/ddd"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="+gnuplot readline"
+
+COMMON_DEPEND="
+	sys-devel/gdb
+	sys-libs/ncurses
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	>=x11-libs/motif-2.3:0
+	ppc? ( dev-libs/elfutils )
+	ppc64? ( dev-libs/elfutils )
+	readline? ( sys-libs/readline )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xfontsel
+	gnuplot? ( sci-visualization/gnuplot )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc44.patch"
+	"${FILESDIR}/${P}-gdb-disassembler-bug.patch"
+	"${FILESDIR}/${PN}-3.3.12-man.patch"
+)
+
+DOCS=(
+	AUTHORS CREDITS INSTALL NEWS PROBLEMS README TIPS TODO
+	doc/ddd{-paper.ps,.pdf,-themes.pdf}
+)
+
+AUTOTOOLS_AUTORECONF=1
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-termlib=ncurses
+		$(use_with readline)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	# Remove app defaults
+	rm -f "${S}"/ddd/Ddd
+
+	# Install ddd distribution
+	autotools-utils_src_install
+
+	# Install application icon
+	doicon "${S}"/icons/ddd.xpm
+}
+
+pkg_postinst() {
+	if ! use gnuplot; then
+		echo
+		elog "To enable data visualization in DDD, install sci-visualization/gnuplot,"
+		elog "or re-emerge DDD with gnuplot USE flag (recommended)."
+		elog "For flat file package.use layout:"
+		elog "   echo '${CATEGORY}/${PN} gnuplot' >> /etc/portage/package.use && emerge -va gnuplot"
+		elog "For directory package.use layout:"
+		elog "   echo '${CATEGORY}/${PN} gnuplot' > /etc/portage/package.use/ddd && emerge -va gnuplot"
+	fi
+	echo
+	elog "To be able to debug java, bash, perl or python scripts within DDD, install respectively:"
+	elog "    virtual/jdk"
+	elog "    app-shells/bashdb"
+	elog "    dev-lang/perl"
+	elog "    dev-python/pydb"
+	echo
+}
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
new file mode 100644
index 000000000000..8a9365757232
--- /dev/null
+++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Graphical front-end for command-line debuggers"
+HOMEPAGE="http://www.gnu.org/software/ddd"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="+gnuplot readline"
+
+COMMON_DEPEND="
+	sys-devel/gdb
+	sys-libs/ncurses
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	>=x11-libs/motif-2.3:0
+	ppc? ( dev-libs/elfutils )
+	ppc64? ( dev-libs/elfutils )
+	readline? ( sys-libs/readline )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xfontsel
+	gnuplot? ( sci-visualization/gnuplot )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc44.patch"
+	"${FILESDIR}/${P}-gdb-disassembler-bug.patch"
+	"${FILESDIR}/${PN}-3.3.12-man.patch"
+	"${FILESDIR}/${PN}-3.3.12-tinfo.patch"
+)
+
+DOCS=(
+	AUTHORS CREDITS INSTALL NEWS PROBLEMS README TIPS TODO
+	doc/ddd{-paper.ps,.pdf,-themes.pdf}
+)
+
+AUTOTOOLS_AUTORECONF=1
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_with readline)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	# Remove app defaults
+	rm -f "${S}"/ddd/Ddd
+
+	# Install ddd distribution
+	autotools-utils_src_install
+
+	# Install application icon
+	doicon "${S}"/icons/ddd.xpm
+}
+
+pkg_postinst() {
+	if ! use gnuplot; then
+		echo
+		elog "To enable data visualization in DDD, install sci-visualization/gnuplot,"
+		elog "or re-emerge DDD with gnuplot USE flag (recommended)."
+		elog "For flat file package.use layout:"
+		elog "   echo '${CATEGORY}/${PN} gnuplot' >> /etc/portage/package.use && emerge -va gnuplot"
+		elog "For directory package.use layout:"
+		elog "   echo '${CATEGORY}/${PN} gnuplot' > /etc/portage/package.use/ddd && emerge -va gnuplot"
+	fi
+	echo
+	elog "To be able to debug java, bash, perl or python scripts within DDD, install respectively:"
+	elog "    virtual/jdk"
+	elog "    app-shells/bashdb"
+	elog "    dev-lang/perl"
+	elog "    dev-python/pydb"
+	echo
+}
diff --git a/dev-util/ddd/files/ddd-3.3.12-gcc44.patch b/dev-util/ddd/files/ddd-3.3.12-gcc44.patch
new file mode 100644
index 000000000000..2464b2b4a9c4
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-gcc44.patch
@@ -0,0 +1,10 @@
+--- ddd-3.3.12-orig/ddd/strclass.C
++++ ddd-3.3.12/ddd/strclass.C
+@@ -39,6 +39,7 @@
+ #include <limits.h>
+ #include <new>
+ #include <stdlib.h>
++#include <stdio.h>
+ 
+ void string::error(const char* msg) const
+ {
diff --git a/dev-util/ddd/files/ddd-3.3.12-gdb-disassembler-bug.patch b/dev-util/ddd/files/ddd-3.3.12-gdb-disassembler-bug.patch
new file mode 100644
index 000000000000..738cda5946f9
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-gdb-disassembler-bug.patch
@@ -0,0 +1,11 @@
+--- a/ddd/GDBAgent.C	2004-09-01 20:07:38.000000000 +0200
++++ b/ddd/GDBAgent.C	2010-06-15 14:16:34.000000000 +0200
+@@ -3078,7 +3078,7 @@
+     {
+         string end_( end );
+ 	normalize_address(end_);
+-	cmd += ' ';
++	cmd += ',';
+ 	cmd += end_;
+     }
+     return cmd;
diff --git a/dev-util/ddd/files/ddd-3.3.12-man.patch b/dev-util/ddd/files/ddd-3.3.12-man.patch
new file mode 100644
index 000000000000..06f9deb806f0
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-man.patch
@@ -0,0 +1,16 @@
+diff -ruN ddd-3.3.12/ddd/Makefile.am ddd-my/ddd/Makefile.am
+--- ddd-3.3.12/ddd/Makefile.am	2009-02-11 18:25:07.000000000 +0100
++++ ddd-my/ddd/Makefile.am	2012-11-06 01:48:46.363493473 +0100
+@@ -1371,10 +1371,8 @@
+ man_MANS = ddd.1
+ 
+ # `ddd.man' has 8-bit format, `ddd.1' has 7-bit format
+-ddd.1:   ddd.man $(srcdir)/unumlaut.sed
+-	-$(SED) -f $(srcdir)/unumlaut.sed ddd.man | $(DELETE_CR) > $@~ \
+-	    && $(MV) $@~ $@
+-
++ddd.1:   ddd.man
++	iconv -f ISO8859-15 -t UTF-8 ddd.man > ddd.1
+ 
+ 
+ # -----------------------------------------------------------------------------
diff --git a/dev-util/ddd/files/ddd-3.3.12-tinfo.patch b/dev-util/ddd/files/ddd-3.3.12-tinfo.patch
new file mode 100644
index 000000000000..ab7df14ae9d9
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -360,7 +360,7 @@
+ dnl
+ _termlib="${ddd_termlib}"
+ if test "x${ddd_termlib}" = x; then
+-  _termlib="mytinfo ncurses curses termcap terminfo termlib"
++  _termlib="mytinfo ncurses tinfo curses termcap terminfo termlib"
+ fi
+ _termlib_path=
+ if test x"${ddd_termlib_libraries_path}" != x; then
diff --git a/dev-util/ddd/metadata.xml b/dev-util/ddd/metadata.xml
new file mode 100644
index 000000000000..8dbd141af8ea
--- /dev/null
+++ b/dev-util/ddd/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<longdescription lang="en">
+		GNU DDD is a graphical front-end for command-line debuggers such as
+		GDB, DBX, WDB, Ladebug, JDB, XDB, the Perl debugger, the bash debugger,
+		or the Python debugger. Besides ``usual'' front-end features such as
+		viewing source texts, DDD has become famous through its interactive
+		graphical data display, where data structures are displayed as graphs.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
new file mode 100644
index 000000000000..b82aa61ceac8
--- /dev/null
+++ b/dev-util/debhelper/Manifest
@@ -0,0 +1,4 @@
+DIST debhelper_9.20150101.tar.gz 545089 SHA256 fd8d81d71d1bb0ba4b58c517465551231dd60811b98c867e4344bc55ec6a45f2 SHA512 62c85f751627cf0bdac392c6e8c5298995030962b7753047414e740b3767d722c209329c9f0c3c07c94e82bbb7250c163ce49b681e268a0decdbd19b72ea132a WHIRLPOOL 31315544c3ee695a53ef2310ad69e59c68fb0b73399305b9fe57ceb7b01faab72995e01aed270300dd0fbaed2686a5b565a8a08cfc31c720c5baa2a6c475ac4e
+DIST debhelper_9.20150502.tar.xz 313460 SHA256 b4d55e83b7d3aa7f15ad5ddeab34fc043e803abcb051bd38ef81e80fc5423f13 SHA512 302d592dd70e95c6f14fe5d7aecb221399354dcea4d7a1d49007cc8c2c52014ce88b10f273739e2ff6673fff2139a343ec35f894145409c4235e66694ed39e47 WHIRLPOOL 58bb221ff062b5b471390abe3fbd463c83fbae359a11fc9e0dbf3662d463f3a454613f1ba42d8cdef9e774a1b89420e7a34b563fcacec51f85f31e32b3748e6b
+DIST debhelper_9.20150507.tar.xz 314408 SHA256 f3b51b3c1ad87cd936d4c443f1cebf8f194ece4b998dce6544e238ce5fd5dc39 SHA512 1a4ca17ccf9ebc874f5c5521320ec4421d3e128e83b1a07cbf53201c559d10473e3db92ab3119dfca778cdab0f2f8e66c77659410a9f3f8e50a03c654cc6b5f5 WHIRLPOOL d354f7adb9c1e059e53c4e6ebfa06f21bc9222152faa3461ab19e0efbf13cd6426e4f260ddff2880457093eafd83c4e40b5e301d3f8a304479d24aab41fc9d73
+DIST debhelper_9.20150628.tar.xz 317804 SHA256 8fb59c2a03fa9f6061db8091e7ecaf68c5680495eec05d6c145e3f782b09d68f SHA512 bde93266e475c3ac7dd8cbf5ee0d2c435593eadbc0f33d1389f2705f7debc36b4da165ae65cfd202a1c871fd708cda1d1c57763bdad04748a1bbdab516b2905a WHIRLPOOL 4a56790c1a1629e83b6fd164cb74d9edace02318334bc968acc74f421db98b343bbd32dce56fc15a5ca4a4c7b4364bfea9bf1213864c2f3a8238dbc43ee2a33f
diff --git a/dev-util/debhelper/debhelper-9.20150101.ebuild b/dev-util/debhelper/debhelper-9.20150101.ebuild
new file mode 100644
index 000000000000..cc2ce4d478db
--- /dev/null
+++ b/dev-util/debhelper/debhelper-9.20150101.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+IUSE="test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+
+NLS_DEPEND=$(
+	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10:=
+	>=app-arch/dpkg-1.17
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	test? ( dev-perl/Test-Pod )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lingua
+	for lingua in ${DH_LINGUAS[@]}; do
+		if use linguas_${lingua}; then
+			LANGS+=" ${lingua}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lingua
+	for manfile in *.1 *.7 ; do
+		for lingua in ${DH_LINGUAS[@]}; do
+			case ${manfile} in
+				*.${lingua}.?)
+					use linguas_${lingua} \
+						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/dev-util/debhelper/debhelper-9.20150502.ebuild b/dev-util/debhelper/debhelper-9.20150502.ebuild
new file mode 100644
index 000000000000..9d5f19551da6
--- /dev/null
+++ b/dev-util/debhelper/debhelper-9.20150502.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+
+NLS_DEPEND=$(
+	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10:=
+	>=app-arch/dpkg-1.17
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	test? ( dev-perl/Test-Pod )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lingua
+	for lingua in ${DH_LINGUAS[@]}; do
+		if use linguas_${lingua}; then
+			LANGS+=" ${lingua}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lingua
+	for manfile in *.1 *.7 ; do
+		for lingua in ${DH_LINGUAS[@]}; do
+			case ${manfile} in
+				*.${lingua}.?)
+					use linguas_${lingua} \
+						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/dev-util/debhelper/debhelper-9.20150507.ebuild b/dev-util/debhelper/debhelper-9.20150507.ebuild
new file mode 100644
index 000000000000..9d5f19551da6
--- /dev/null
+++ b/dev-util/debhelper/debhelper-9.20150507.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+
+NLS_DEPEND=$(
+	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10:=
+	>=app-arch/dpkg-1.17
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	test? ( dev-perl/Test-Pod )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lingua
+	for lingua in ${DH_LINGUAS[@]}; do
+		if use linguas_${lingua}; then
+			LANGS+=" ${lingua}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lingua
+	for manfile in *.1 *.7 ; do
+		for lingua in ${DH_LINGUAS[@]}; do
+			case ${manfile} in
+				*.${lingua}.?)
+					use linguas_${lingua} \
+						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/dev-util/debhelper/debhelper-9.20150628.ebuild b/dev-util/debhelper/debhelper-9.20150628.ebuild
new file mode 100644
index 000000000000..9d5f19551da6
--- /dev/null
+++ b/dev-util/debhelper/debhelper-9.20150628.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+
+NLS_DEPEND=$(
+	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10:=
+	>=app-arch/dpkg-1.17
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	test? ( dev-perl/Test-Pod )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lingua
+	for lingua in ${DH_LINGUAS[@]}; do
+		if use linguas_${lingua}; then
+			LANGS+=" ${lingua}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lingua
+	for manfile in *.1 *.7 ; do
+		for lingua in ${DH_LINGUAS[@]}; do
+			case ${manfile} in
+				*.${lingua}.?)
+					use linguas_${lingua} \
+						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/dev-util/debhelper/metadata.xml b/dev-util/debhelper/metadata.xml
new file mode 100644
index 000000000000..13183a3d7070
--- /dev/null
+++ b/dev-util/debhelper/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>deb-tools</herd>
+</pkgmetadata>
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
new file mode 100644
index 000000000000..7b5e77215a8e
--- /dev/null
+++ b/dev-util/debootstrap/Manifest
@@ -0,0 +1,6 @@
+DIST debootstrap_1.0.67.tar.gz 61863 SHA256 0a12e0a2bbff185d47711a716b1f2734856100e8784361203e834fed0cffa51b SHA512 751cfabdcefa6de099f12377f4e5ac611d97952197040c8d194abc0ac8f3abd59c21110828592bfa2c7a92299db57fe8c6ee0991e11894470f444a71cfd25151 WHIRLPOOL 64acdd3bda9f901b90621a1ce26671075f1a24da748b00ffc1ef9d554fb6ef04bed964988679a168df9e82780a30876c48b6d381dcbe41bd9a7c0f5a8119b261
+DIST debootstrap_1.0.69.tar.gz 61843 SHA256 146aac21c3121b0af09fdc841e4fd3a13ce9f5d990f3ca1b56a61e61d77dbe11 SHA512 697a725bc881a43bae0f65c6a1b23f0710ed2e724a27df7650cc261aa9dada7b812ca4a899496b16ff9cd41fdc281c3636b6181a5a11cd0caf05391ab6dc86f3 WHIRLPOOL 2901637279afe52e634731b63e5e11b5a6b68c61b9a98386b750dc236514581f27d96f27164430d198d8d17c494f1484a8eb45307be3bd932d9ac8ed2fd5258f
+DIST debootstrap_1.0.70.tar.gz 61438 SHA256 b23e6d5fc6cab7f3f381e064efd2a8178ac210d4b4335b29104e09048d7e200e SHA512 5fad057e6f942e937c7b0fedac0565cf426a07a1ca5a4438013756d789831b5e4612db575234a207264d162b3b4ac46582059f5b9161c865c6c03785e059bef3 WHIRLPOOL 93d276114ee50defbd3648924878961f49adbde4a8702491de6e43e2fb9f17b1918f2bdc58a2e0ec8b0926198a4c6e4c3c4e339a0110d91fb1ebb54487231c9f
+DIST debootstrap_1.0.71.tar.gz 61472 SHA256 356147383a1c1bf3ef2544b72d69c7ff7d41a1ed6ce3fd589fed21e73b659466 SHA512 0c6372a759676c6ea6a6e726251aa7d60acdb8759d41c84b41e80cbc3b2b77f26540c2ba2fb4b149f698e30c8acdbec1b8a3b55a686b43ccc02d0aa157d38e97 WHIRLPOOL ed42b07e7282f38114d03919e19c2d869571ebb9e2fecfbdee19409700c09505625264420488297e148550b8a2355426bdfedb5c56d60661b000968001128494
+DIST debootstrap_1.0.72.tar.gz 62089 SHA256 90f4cf1390326f020b9192b6a45ba1d323fffab9c22c6f62451780e6f5482f8d SHA512 b8f186b13f66789e96f775337d06821cfb464e35dd661a2bff1420bfb1254cf85ce9eb46be1a27dad7a462628e441cbfcdfffaf12ee5a394d15c248882295848 WHIRLPOOL 4106d631445661979321a89f43835bcd73460bc984baaf78da9b7cf12bbb8a97702d9fee4cb86a5f5dfe9a161085adc33ecb13f6d6aec3d121bb466861215285
+DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
diff --git a/dev-util/debootstrap/debootstrap-1.0.67.ebuild b/dev-util/debootstrap/debootstrap-1.0.67.ebuild
new file mode 100644
index 000000000000..7346ed712048
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.67.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring"
+		elog " (--keyring=K), please install app-crypt/gnupg."
+	fi
+}
diff --git a/dev-util/debootstrap/debootstrap-1.0.69.ebuild b/dev-util/debootstrap/debootstrap-1.0.69.ebuild
new file mode 100644
index 000000000000..b1d33cf3ffbf
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.69.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring"
+		elog " (--keyring=K), please install app-crypt/gnupg."
+	fi
+}
diff --git a/dev-util/debootstrap/debootstrap-1.0.70.ebuild b/dev-util/debootstrap/debootstrap-1.0.70.ebuild
new file mode 100644
index 000000000000..b1d33cf3ffbf
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.70.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring"
+		elog " (--keyring=K), please install app-crypt/gnupg."
+	fi
+}
diff --git a/dev-util/debootstrap/debootstrap-1.0.71.ebuild b/dev-util/debootstrap/debootstrap-1.0.71.ebuild
new file mode 100644
index 000000000000..b1d33cf3ffbf
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.71.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring"
+		elog " (--keyring=K), please install app-crypt/gnupg."
+	fi
+}
diff --git a/dev-util/debootstrap/debootstrap-1.0.72.ebuild b/dev-util/debootstrap/debootstrap-1.0.72.ebuild
new file mode 100644
index 000000000000..b1d33cf3ffbf
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.72.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring"
+		elog " (--keyring=K), please install app-crypt/gnupg."
+	fi
+}
diff --git a/dev-util/debootstrap/metadata.xml b/dev-util/debootstrap/metadata.xml
new file mode 100644
index 000000000000..d5fca454db1f
--- /dev/null
+++ b/dev-util/debootstrap/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>deb-tools</herd>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
new file mode 100644
index 000000000000..7c3062d15d85
--- /dev/null
+++ b/dev-util/debugedit/Manifest
@@ -0,0 +1,2 @@
+DIST debugedit-4.4.6.tar.bz2 12924 SHA256 33700d88de1dce201bcded9b43789bc352b9edce1c020ada0ac417bf88c3acb4 SHA512 ff1985e58ddc90f2fa9ea07573a72847dae89821a799ea9526c9056a11fd69c27879d9fc3c993ebb79e30c47968e0123083c6d031007ba58f186462fb2e49df9 WHIRLPOOL c1965db650ad3e871ae278af5848e06211249071660359800e5bcd32bb6dfa505a10fbfffd93b66907a934241d8be8bf9138da61f23c2f5feee69d8051141821
+DIST debugedit-5.3.5.tar.bz2 27799 SHA256 150461508dfd7791c9408c33248e5271e837167fdfa11d69d6fb51cc16d90663 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9 WHIRLPOOL f3ae87994c7b9f3233502b4212b9036eae169b0ed18632c4565cf7f299012c4ef02558f476ebc4d17f3bb82c64eba8b7ed180138b66062c215546747e64c2025
diff --git a/dev-util/debugedit/debugedit-4.4.6-r1.ebuild b/dev-util/debugedit/debugedit-4.4.6-r1.ebuild
new file mode 100644
index 000000000000..2c6d37eeefac
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.4.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Standalone debugedit taken from rpm"
+
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="http://dev.gentoo.org/~tester/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
+IUSE=""
+
+DEPEND="dev-libs/popt
+	dev-libs/elfutils"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-busted-paths-with-O0.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dobin debugedit
+}
diff --git a/dev-util/debugedit/debugedit-4.4.6-r2.ebuild b/dev-util/debugedit/debugedit-4.4.6-r2.ebuild
new file mode 100644
index 000000000000..39299141a1ed
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.4.6-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Standalone debugedit taken from rpm"
+
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="http://dev.gentoo.org/~tester/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/popt
+	dev-libs/elfutils"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-busted-paths-with-O0.patch"
+	epatch "${FILESDIR}/${P}-update.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dobin debugedit
+}
diff --git a/dev-util/debugedit/debugedit-5.3.5-r1.ebuild b/dev-util/debugedit/debugedit-5.3.5-r1.ebuild
new file mode 100644
index 000000000000..93374bf74ed8
--- /dev/null
+++ b/dev-util/debugedit/debugedit-5.3.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# To recreate this tarball, just grab latest rpm5 release:
+#	http://rpm5.org/files/rpm/
+# The files are in tools/
+# Or see $FILESDIR/update.sh
+
+EAPI="2"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="standalone debugedit taken from rpm"
+HOMEPAGE="http://www.rpm5.org/"
+SRC_URI="http://dev.gentoo.org/~swegener/distfiles/${P}.tar.bz2
+	http://dev.gentoo.org/~vapier/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-libs/popt
+	dev-libs/elfutils
+	dev-libs/beecrypt"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.3.5-DWARF-4.patch #400663
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin debugedit || die
+}
diff --git a/dev-util/debugedit/files/Makefile b/dev-util/debugedit/files/Makefile
new file mode 100644
index 000000000000..946a12865f64
--- /dev/null
+++ b/dev-util/debugedit/files/Makefile
@@ -0,0 +1,11 @@
+CPPFLAGS += -I.
+LDLIBS = -lelf -lpopt -lbeecrypt
+
+all: debugedit
+
+debugedit: debugedit.o hashtab.o
+
+clean:
+	rm -f *.o debugedit
+
+.PHONY: clean
diff --git a/dev-util/debugedit/files/debugedit-4.4.6-busted-paths-with-O0.patch b/dev-util/debugedit/files/debugedit-4.4.6-busted-paths-with-O0.patch
new file mode 100644
index 000000000000..fe2fec6e5553
--- /dev/null
+++ b/dev-util/debugedit/files/debugedit-4.4.6-busted-paths-with-O0.patch
@@ -0,0 +1,49 @@
+--- debugedit.c.orig	2007-11-07 05:54:25.093281634 +0000
++++ debugedit.c	2007-11-07 06:23:15.481373200 +0000
+@@ -723,8 +723,31 @@
+ 		}
+ 	    }
+ 
+-	    if (t->attr[i].attr == DW_AT_comp_dir) {
+-		if (form == DW_FORM_strp &&
++	  else if (t->attr[i].attr == DW_AT_comp_dir)
++	    {
++	      if (form == DW_FORM_string)
++	        {
++		  free (comp_dir);
++		  comp_dir = strdup (ptr);
++
++		  if (phase == 1 && dest_dir && has_prefix (ptr, base_dir))
++		    {
++		      base_len = strlen (base_dir);
++		      dest_len = strlen (dest_dir);
++
++		      memcpy (ptr, dest_dir, dest_len);
++		      if (dest_len < base_len)
++		        {
++			  memset (ptr + dest_len, '/',
++				  base_len - dest_len);
++
++		        }
++		      elf_flagdata (debug_sections[DEBUG_INFO].elf_data,
++				    ELF_C_SET, ELF_F_DIRTY);
++		    }
++	       }
++
++	     else if (form == DW_FORM_strp &&
+ 	      debug_sections[DEBUG_STR].data)
+ 	    {
+ 	      char *dir;
+@@ -749,11 +772,8 @@
+ 				ELF_C_SET, ELF_F_DIRTY);
+ 		}
+ 	    }
+-		else if (form == DW_FORM_string) {
+-			free(comp_dir);
+-			comp_dir = strdup (ptr);			
+-		}
+ 	    }
++
+ 	  else if ((t->tag == DW_TAG_compile_unit
+ 		    || t->tag == DW_TAG_partial_unit)
+ 		   && t->attr[i].attr == DW_AT_name
diff --git a/dev-util/debugedit/files/debugedit-4.4.6-update.patch b/dev-util/debugedit/files/debugedit-4.4.6-update.patch
new file mode 100644
index 000000000000..4b969c00d9fa
--- /dev/null
+++ b/dev-util/debugedit/files/debugedit-4.4.6-update.patch
@@ -0,0 +1,723 @@
+Patch-by: Peter Alfredsen <loki_val@gentoo.org>
+
+Mega patch, containing in no particular order:
+support for including empty directories in the output:
+https://bugzilla.redhat.com/show_bug.cgi?id=444310
+A bunch of warning fixes.
+DWARF3-support:
+https://bugzilla.redhat.com/show_bug.cgi?id=505774
+
+Most of this was pulled from rpm5.org
+
+We have factored out the support for the -i command line switch, since
+that would require pulling in another dependency (Beecrypt)
+
+--- debugedit.c.old	2009-10-20 16:48:31.000000000 +0200
++++ debugedit.c	2009-10-20 16:58:45.000000000 +0200
+@@ -1,6 +1,6 @@
+-/* Copyright (C) 2001, 2002, 2003, 2005 Red Hat, Inc.
++/* Copyright (C) 2001, 2002, 2003, 2005, 2007 Red Hat, Inc.
+    Written by Alexander Larsson <alexl@redhat.com>, 2002
+    Based on code by Jakub Jelinek <jakub@redhat.com>, 2001.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -83,10 +83,11 @@
+ static uint_16 (*do_read_16) (unsigned char *ptr);
+ static uint_32 (*do_read_32) (unsigned char *ptr);
+ static void (*write_32) (unsigned char *ptr, GElf_Addr val);
+ 
+ static int ptr_size;
++static int cu_version;
+ 
+ static inline uint_16
+ buf_read_ule16 (unsigned char *data)
+ {
+   return data[0] | (data[1] << 8);
+@@ -122,11 +123,11 @@
+       data = NULL;
+       while ((data = elf_rawdata (scn, data)) != NULL)
+ 	{
+ 	  if (data->d_buf
+ 	      && offset >= data->d_off
+-	      && offset < data->d_off + data->d_size)
++	      && offset < data->d_off + (off_t)data->d_size)
+ 	    return (const char *) data->d_buf + (offset - data->d_off);
+ 	}
+     }
+ 
+   return NULL;
+@@ -208,20 +209,22 @@
+ #define DEBUG_INFO	0
+ #define DEBUG_ABBREV	1
+ #define DEBUG_LINE	2
+ #define DEBUG_ARANGES	3
+ #define DEBUG_PUBNAMES	4
+-#define DEBUG_MACINFO	5
+-#define DEBUG_LOC	6
+-#define DEBUG_STR	7
+-#define DEBUG_FRAME	8
+-#define DEBUG_RANGES	9
++#define DEBUG_PUBTYPES	5
++#define DEBUG_MACINFO	6
++#define DEBUG_LOC	7
++#define DEBUG_STR	8
++#define DEBUG_FRAME	9
++#define DEBUG_RANGES	10
+     { ".debug_info", NULL, NULL, 0, 0, 0 },
+     { ".debug_abbrev", NULL, NULL, 0, 0, 0 },
+     { ".debug_line", NULL, NULL, 0, 0, 0 },
+     { ".debug_aranges", NULL, NULL, 0, 0, 0 },
+     { ".debug_pubnames", NULL, NULL, 0, 0, 0 },
++    { ".debug_pubtypes", NULL, NULL, 0, 0, 0 },
+     { ".debug_macinfo", NULL, NULL, 0, 0, 0 },
+     { ".debug_loc", NULL, NULL, 0, 0, 0 },
+     { ".debug_str", NULL, NULL, 0, 0, 0 },
+     { ".debug_frame", NULL, NULL, 0, 0, 0 },
+     { ".debug_ranges", NULL, NULL, 0, 0, 0 },
+@@ -297,11 +300,11 @@
+ 	  free (t);
+ 	  goto no_memory;
+         }
+       if (*slot != NULL)
+ 	{
+-	  error (0, 0, "%s: Duplicate DWARF-2 abbreviation %d", dso->filename,
++	  error (0, 0, "%s: Duplicate DWARF abbreviation %d", dso->filename,
+ 		 t->entry);
+ 	  free (t);
+ 	  htab_delete (h);
+ 	  return NULL;
+ 	}
+@@ -317,21 +320,21 @@
+ 		goto no_memory;
+ 	    }
+ 	  form = read_uleb128 (ptr);
+ 	  if (form == 2 || form > DW_FORM_indirect)
+ 	    {
+-	      error (0, 0, "%s: Unknown DWARF-2 DW_FORM_%d", dso->filename, form);
++	      error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form);
+ 	      htab_delete (h);
+ 	      return NULL;
+ 	    }
+ 
+ 	  t->attr[t->nattr].attr = attr;
+ 	  t->attr[t->nattr++].form = form;
+         }
+       if (read_uleb128 (ptr) != 0)
+         {
+-	  error (0, 0, "%s: DWARF-2 abbreviation does not end with 2 zeros",
++	  error (0, 0, "%s: DWARF abbreviation does not end with 2 zeros",
+ 		 dso->filename);
+ 	  htab_delete (h);
+ 	  return NULL;
+         }
+       *slot = t;
+@@ -369,46 +372,49 @@
+       /* At this point, we're always at the beginning of a path
+ 	 segment.  */
+ 
+       if (s[0] == '.' && (s[1] == 0 || IS_DIR_SEPARATOR (s[1])))
+ 	{
+-	  s ++;
++	  s++;
+ 	  if (*s)
+-	    s++;
+-	  else if (d > droot)
+-	    d--;
++	    while (IS_DIR_SEPARATOR (*s))
++	      ++s;
+ 	}
+ 
+       else if (s[0] == '.' && s[1] == '.'
+ 	       && (s[2] == 0 || IS_DIR_SEPARATOR (s[2])))
+ 	{
+-	  char *pre = d-1; /* includes slash */
++	  char *pre = d - 1; /* includes slash */
+ 	  while (droot < pre && IS_DIR_SEPARATOR (*pre))
+ 	    pre--;
+ 	  if (droot <= pre && ! IS_DIR_SEPARATOR (*pre))
+ 	    {
+-	      d = pre;
+-	      while (droot < d && ! IS_DIR_SEPARATOR (*d))
+-		d--;
+-	      /* d now points to the slash */
+-	      if (droot < d)
+-		d++;
+-	      s += 2;
+-	      if (*s)
+-		s++;
+-	      else if (d > droot)
+-		d--;
++	      while (droot < pre && ! IS_DIR_SEPARATOR (*pre))
++		pre--;
++	      /* pre now points to the slash */
++	      if (droot < pre)
++		pre++;
++	      if (pre + 3 == d && pre[0] == '.' && pre[1] == '.')
++		{
++		  *d++ = *s++;
++		  *d++ = *s++;
++		}
++	      else
++		{
++		  d = pre;
++		  s += 2;
++		  if (*s)
++		    while (IS_DIR_SEPARATOR (*s))
++		      s++;
++		}
+ 	    }
+ 	  else
+ 	    {
+ 	      *d++ = *s++;
+ 	      *d++ = *s++;
+-	      if (*s)
+-		*d++ = *s++;
+ 	    }
+ 	}
+-
+       else
+ 	{
+ 	  while (*s && ! IS_DIR_SEPARATOR (*s))
+ 	    *d++ = *s++;
+ 	}
+@@ -431,12 +437,12 @@
+ 
+ static int
+ has_prefix (const char  *str,
+ 	    const char  *prefix)
+ {
+-  int str_len;
+-  int prefix_len;
++  size_t str_len;
++  size_t prefix_len;
+   
+   str_len = strlen (str);
+   prefix_len = strlen (prefix);
+ 
+   if (str_len < prefix_len)
+@@ -476,11 +482,11 @@
+ 	     dso->filename);
+       return 1;
+     }
+ 
+   value = read_16 (ptr);
+-  if (value != 2)
++  if (value != 2 && value != 3)
+     {
+       error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
+ 	     value);
+       return 1;
+     }
+@@ -499,43 +505,43 @@
+   
+   /* dir table: */
+   value = 1;
+   while (*ptr != 0)
+     {
+-      ptr = strchr (ptr, 0) + 1;
++      ptr = (unsigned char *) strchr ((char *)ptr, 0) + 1;
+       ++value;
+     }
+ 
+   dirt = (unsigned char **) alloca (value * sizeof (unsigned char *));
+-  dirt[0] = ".";
++  dirt[0] = (unsigned char *) ".";
+   dirt_cnt = 1;
+   ptr = dir;
+   while (*ptr != 0)
+     {
+       dirt[dirt_cnt++] = ptr;
+-      ptr = strchr (ptr, 0) + 1;
++      ptr = (unsigned char *) strchr ((char *)ptr, 0) + 1;
+     }
+   ptr++;
+ 
+   /* file table: */
+   while (*ptr != 0)
+     {
+       char *s, *file;
+       size_t file_len, dir_len;
+ 
+-      file = ptr;
+-      ptr = strchr (ptr, 0) + 1;
++      file = (char *) ptr;
++      ptr = (unsigned char *) strchr ((char *)ptr, 0) + 1;
+       value = read_uleb128 (ptr);
+ 
+       if (value >= dirt_cnt)
+ 	{
+ 	  error (0, 0, "%s: Wrong directory table index %u",
+ 		 dso->filename, value);
+ 	  return 1;
+ 	}
+       file_len = strlen (file);
+-      dir_len = strlen (dirt[value]);
++      dir_len = strlen ((char *)dirt[value]);
+       s = malloc (comp_dir_len + 1 + file_len + 1 + dir_len + 1);
+       if (s == NULL)
+ 	{
+ 	  error (0, ENOMEM, "%s: Reading file table", dso->filename);
+ 	  return 1;
+@@ -552,34 +558,38 @@
+ 	  s[dir_len] = '/';
+ 	  memcpy (s + dir_len + 1, file, file_len + 1);
+ 	}
+       else
+ 	{
+-	  memcpy (s, comp_dir, comp_dir_len);
+-	  s[comp_dir_len] = '/';
+-	  memcpy (s + comp_dir_len + 1, dirt[value], dir_len);
+-	  s[comp_dir_len + 1 + dir_len] = '/';
+-	  memcpy (s + comp_dir_len + 1 + dir_len + 1, file, file_len + 1);
++	  char *p = s;
++	  if (comp_dir_len != 0)
++	    {
++	      memcpy (s, comp_dir, comp_dir_len);
++	      s[comp_dir_len] = '/';
++	      p += comp_dir_len + 1;
++	    }
++	  memcpy (p, dirt[value], dir_len);
++	  p[dir_len] = '/';
++	  memcpy (p + dir_len + 1, file, file_len + 1);
+ 	}
+       canonicalize_path (s, s);
+-      if (base_dir == NULL ||
+-	  has_prefix (s, base_dir))
++      if (list_file_fd != -1)
+ 	{
+-	  char *p;
+-	  size_t size;
+-	  ssize_t ret;
+-	  if (base_dir)
+-	    p = s + strlen (base_dir);
+-	  else
++	  char *p = NULL;
++	  if (base_dir == NULL)
+ 	    p = s;
+-	  
+-	  if (list_file_fd != -1)
++	  else if (has_prefix (s, base_dir))
++	    p = s + strlen (base_dir);
++	  else if (has_prefix (s, dest_dir))
++	    p = s + strlen (dest_dir);
++
++	  if (p)
+ 	    {
+-	      size = strlen (p) + 1;
++	      size_t size = strlen (p) + 1;
+ 	      while (size > 0)
+ 		{
+-		  ret = write (list_file_fd, p, size);
++		  ssize_t ret = write (list_file_fd, p, size);
+ 		  if (ret == -1)
+ 		    break;
+ 		  size -= ret;
+ 		  p += ret;
+ 		}
+@@ -610,26 +620,26 @@
+ 	}
+       else
+ 	ptr = srcptr = dir;
+       while (*srcptr != 0)
+ 	{
+-	  size_t len = strlen (srcptr) + 1;
++	  size_t len = strlen ((char *)srcptr) + 1;
+ 	  const unsigned char *readptr = srcptr;
+ 
+-	  if (*srcptr == '/' && has_prefix (srcptr, base_dir))
++	  if (*srcptr == '/' && has_prefix ((char *)srcptr, base_dir))
+ 	    {
+ 	      if (dest_len < base_len)
+ 		  ++abs_dir_cnt;
+ 	      memcpy (ptr, dest_dir, dest_len);
+ 	      ptr += dest_len;
+ 	      readptr += base_len;
+ 		}
+ 	  srcptr += len;
+ 
+ 	  shrank += srcptr - readptr;
+-	  canonicalize_path (readptr, ptr);
+-	  len = strlen (ptr) + 1;
++	  canonicalize_path ((char *)readptr, (char *)ptr);
++	  len = strlen ((char *)ptr) + 1;
+ 	  shrank -= len;
+ 	  ptr += len;
+ 
+ 	      elf_flagdata (debug_sections[DEBUG_STR].elf_data,
+ 			    ELF_C_SET, ELF_F_DIRTY);
+@@ -638,13 +648,16 @@
+       if (shrank > 0)
+ 	{
+ 	  if (--shrank == 0)
+ 	    error (EXIT_FAILURE, 0,
+ 		   "canonicalization unexpectedly shrank by one character");
+-	  memset (ptr, 'X', shrank);
+-	  ptr += shrank;
+-	  *ptr++ = '\0';
++	  else
++	    {	    
++	      memset (ptr, 'X', shrank);
++	      ptr += shrank;
++	      *ptr++ = '\0';
++	    }
+ 	}
+ 
+       if (abs_dir_cnt + abs_file_cnt != 0)
+ 	{
+ 	  size_t len = (abs_dir_cnt + abs_file_cnt) * (base_len - dest_len);
+@@ -658,13 +671,13 @@
+       *ptr++ = '\0';
+       ++srcptr;
+ 
+       while (*srcptr != 0)
+ 	{
+-	  size_t len = strlen (srcptr) + 1;
++	  size_t len = strlen ((char *)srcptr) + 1;
+ 
+-	  if (*srcptr == '/' && has_prefix (srcptr, base_dir))
++	  if (*srcptr == '/' && has_prefix ((char *)srcptr, base_dir))
+ 	    {
+ 	      memcpy (ptr, dest_dir, dest_len);
+ 	      if (dest_len < base_len)
+ 		{
+ 		  memmove (ptr + dest_len, srcptr + base_len,
+@@ -698,20 +711,20 @@
+ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase)
+ {
+   int i;
+   uint_32 list_offs;
+   int found_list_offs;
+-  unsigned char *comp_dir;
++  char *comp_dir;
+   
+   comp_dir = NULL;
+   list_offs = 0;
+   found_list_offs = 0;
+   for (i = 0; i < t->nattr; ++i)
+     {
+       uint_32 form = t->attr[i].form;
+-      uint_32 len = 0;
+-      int base_len, dest_len;
++      size_t len = 0;
++      size_t base_len, dest_len;
+       
+ 
+       while (1)
+ 	{
+ 	  if (t->attr[i].attr == DW_AT_stmt_list)
+@@ -721,70 +734,70 @@
+ 		  list_offs = do_read_32_relocated (ptr);
+ 		  found_list_offs = 1;
+ 		}
+ 	    }
+ 
+-	  else if (t->attr[i].attr == DW_AT_comp_dir)
+-	    {
+-	      if (form == DW_FORM_string)
+-	        {
++	  if (t->attr[i].attr == DW_AT_comp_dir)
++	  {
++	      if ( form == DW_FORM_string )
++	      {
+ 		  free (comp_dir);
+-		  comp_dir = strdup (ptr);
+-
+-		  if (phase == 1 && dest_dir && has_prefix (ptr, base_dir))
+-		    {
++		  comp_dir = strdup ((char *)ptr);
++		  
++		  if (phase == 1 && dest_dir && has_prefix ((char *)ptr, base_dir))
++		  {
+ 		      base_len = strlen (base_dir);
+ 		      dest_len = strlen (dest_dir);
+-
++		      
+ 		      memcpy (ptr, dest_dir, dest_len);
+ 		      if (dest_len < base_len)
+-		        {
+-			  memset (ptr + dest_len, '/',
+-				  base_len - dest_len);
+-
+-		        }
++		      {
++			  memset(ptr + dest_len, '/',
++				 base_len - dest_len);
++			  
++		      }
+ 		      elf_flagdata (debug_sections[DEBUG_INFO].elf_data,
+ 				    ELF_C_SET, ELF_F_DIRTY);
+-		    }
+-	       }
++		  }
++	      }
++	  
++	      else if (form == DW_FORM_strp &&
++		       debug_sections[DEBUG_STR].data)
++	      {
++		  char *dir;
+ 
+-	     else if (form == DW_FORM_strp &&
+-	      debug_sections[DEBUG_STR].data)
+-	    {
+-	      char *dir;
+-	      
+-	      dir = debug_sections[DEBUG_STR].data
+-		    + do_read_32_relocated (ptr);
+-	      free (comp_dir);
+-	      comp_dir = strdup (dir);
++		  dir = (char *) debug_sections[DEBUG_STR].data
++		      + do_read_32_relocated (ptr);
+ 
+-	      if (phase == 1 && dest_dir && has_prefix (dir, base_dir))
+-		{
+-		  base_len = strlen (base_dir);
+-		  dest_len = strlen (dest_dir);
+-		  
+-		  memcpy (dir, dest_dir, dest_len);
+-		  if (dest_len < base_len)
+-		    {
+-		      memmove (dir + dest_len, dir + base_len,
+-			       strlen (dir + base_len) + 1);
+-		    }
+-		  elf_flagdata (debug_sections[DEBUG_STR].elf_data,
+-				ELF_C_SET, ELF_F_DIRTY);
+-		}
+-	    }
+-	    }
++		  free (comp_dir);
++		  comp_dir = strdup (dir);
+ 
++		  if (phase == 1 && dest_dir && has_prefix (dir, base_dir))
++		  {
++		      base_len = strlen (base_dir);
++		      dest_len = strlen (dest_dir);
++		  
++		      memcpy (dir, dest_dir, dest_len);
++		      if (dest_len < base_len)
++		      {
++			  memmove (dir + dest_len, dir + base_len,
++				   strlen (dir + base_len) + 1);
++		      }
++		      elf_flagdata (debug_sections[DEBUG_STR].elf_data,
++				    ELF_C_SET, ELF_F_DIRTY);
++		  }
++	      }
++	  }
+ 	  else if ((t->tag == DW_TAG_compile_unit
+ 		    || t->tag == DW_TAG_partial_unit)
+ 		   && t->attr[i].attr == DW_AT_name
+ 		   && form == DW_FORM_strp
+ 		   && debug_sections[DEBUG_STR].data)
+ 	    {
+ 	      char *name;
+ 	      
+-	      name = debug_sections[DEBUG_STR].data
++	      name = (char *) debug_sections[DEBUG_STR].data
+ 		     + do_read_32_relocated (ptr);
+ 	      if (*name == '/' && comp_dir == NULL)
+ 		{
+ 		  char *enddir = strrchr (name, '/');
+ 
+@@ -814,10 +827,16 @@
+ 		}
+ 	    }
+ 
+ 	  switch (form)
+ 	    {
++	    case DW_FORM_ref_addr:
++	      if (cu_version == 2)
++		ptr += ptr_size;
++	      else
++		ptr += 4;
++	      break;
+ 	    case DW_FORM_addr:
+ 	      ptr += ptr_size;
+ 	      break;
+ 	    case DW_FORM_ref1:
+ 	    case DW_FORM_flag:
+@@ -839,16 +858,15 @@
+ 	    case DW_FORM_sdata:
+ 	    case DW_FORM_ref_udata:
+ 	    case DW_FORM_udata:
+ 	      read_uleb128 (ptr);
+ 	      break;
+-	    case DW_FORM_ref_addr:
+ 	    case DW_FORM_strp:
+ 	      ptr += 4;
+ 	      break;
+ 	    case DW_FORM_string:
+-	      ptr = strchr (ptr, '\0') + 1;
++	      ptr = (unsigned char *) strchr ((char *)ptr, '\0') + 1;
+ 	      break;
+ 	    case DW_FORM_indirect:
+ 	      form = read_uleb128 (ptr);
+ 	      continue;
+ 	    case DW_FORM_block1:
+@@ -866,21 +884,49 @@
+ 	      len = read_uleb128 (ptr);
+ 	      form = DW_FORM_block1;
+ 	      assert (len < UINT_MAX);
+ 	      break;
+ 	    default:
+-	      error (0, 0, "%s: Unknown DWARF-2 DW_FORM_%d", dso->filename,
++	      error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename,
+ 		     form);
+ 	      return NULL;
+ 	    }
+ 
+ 	  if (form == DW_FORM_block1)
+ 	    ptr += len;
+ 	  
+ 	  break;
+ 	}
+     }
++
++  /* Ensure the CU current directory will exist even if only empty.  Source
++     filenames possibly located in its parent directories refer relatively to
++     it and the debugger (GDB) cannot safely optimize out the missing
++     CU current dir subdirectories.  */
++  if (comp_dir && list_file_fd != -1)
++    {
++      char *p;
++      size_t size;
++
++      if (base_dir && has_prefix (comp_dir, base_dir))
++	p = comp_dir + strlen (base_dir);
++      else if (dest_dir && has_prefix (comp_dir, dest_dir))
++	p = comp_dir + strlen (dest_dir);
++      else
++	p = comp_dir;
++
++      size = strlen (p) + 1;
++      while (size > 0)
++	{
++	  ssize_t ret = write (list_file_fd, p, size);
++	  if (ret == -1)
++	    break;
++	  size -= ret;
++	  p += ret;
++	}
++    }
++
+   if (found_list_offs && comp_dir)
+     edit_dwarf2_line (dso, list_offs, comp_dir, phase);
+ 
+   free (comp_dir);
+ 
+@@ -1068,11 +1114,11 @@
+ 		  if (rtype != R_386_32)
+ 		    goto fail;
+ 		  break;
+ 		case EM_PPC:
+ 		case EM_PPC64:
+-		  if (rtype != R_PPC_ADDR32 || rtype != R_PPC_UADDR32)
++		  if (rtype != R_PPC_ADDR32 && rtype != R_PPC_UADDR32)
+ 		    goto fail;
+ 		  break;
+ 		case EM_S390:
+ 		  if (rtype != R_390_32)
+ 		    goto fail;
+@@ -1135,42 +1181,42 @@
+ 		{
+ 		  error (0, 0, "%s: .debug_info too small", dso->filename);
+ 		  return 1;
+ 		}
+ 	      
+-	      value = read_16 (ptr);
+-	      if (value != 2)
++	      cu_version = read_16 (ptr);
++	      if (cu_version != 2 && cu_version != 3)
+ 		{
+ 		  error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
+-			 value);
++			 cu_version);
+ 		  return 1;
+ 		}
+ 	      
+ 	      value = read_32_relocated (ptr);
+ 	      if (value >= debug_sections[DEBUG_ABBREV].size)
+ 		{
+ 		  if (debug_sections[DEBUG_ABBREV].data == NULL)
+ 		    error (0, 0, "%s: .debug_abbrev not present", dso->filename);
+ 		  else
+-		    error (0, 0, "%s: DWARF-2 CU abbrev offset too large",
++		    error (0, 0, "%s: DWARF CU abbrev offset too large",
+ 			   dso->filename);
+ 		  return 1;
+ 		}
+ 	      
+ 	      if (ptr_size == 0)
+ 		{
+ 		  ptr_size = read_1 (ptr);
+ 		  if (ptr_size != 4 && ptr_size != 8)
+ 		    {
+-		      error (0, 0, "%s: Invalid DWARF-2 pointer size %d",
++		      error (0, 0, "%s: Invalid DWARF pointer size %d",
+ 			     dso->filename, ptr_size);
+ 		      return 1;
+ 		    }
+ 		}
+ 	      else if (read_1 (ptr) != ptr_size)
+ 		{
+-		  error (0, 0, "%s: DWARF-2 pointer size differs between CUs",
++		  error (0, 0, "%s: DWARF pointer size differs between CUs",
+ 			 dso->filename);
+ 		  return 1;
+ 		}
+ 	      
+ 	      abbrev = read_abbrev (dso,
+@@ -1184,11 +1230,11 @@
+ 		  if (tag.entry == 0)
+ 		    continue;
+ 		  t = htab_find_with_hash (abbrev, &tag, tag.entry);
+ 		  if (t == NULL)
+ 		    {
+-		      error (0, 0, "%s: Could not find DWARF-2 abbreviation %d",
++		      error (0, 0, "%s: Could not find DWARF abbreviation %d",
+ 			     dso->filename, tag.entry);
+ 		      htab_delete (abbrev);
+ 		      return 1;
+ 		    }
+ 		  
+@@ -1289,11 +1335,10 @@
+   if (fd != -1)
+     close (fd);
+   return NULL;
+ }
+ 
+-
+ int
+ main (int argc, char *argv[])
+ {
+   DSO *dso;
+   int fd, i;
+@@ -1301,13 +1346,12 @@
+   poptContext optCon;   /* context for parsing command-line options */
+   int nextopt;
+   const char **args;
+   struct stat stat_buf;
+   char *p;
+-  
+-  optCon = poptGetContext("debugedit", argc, (const char **)argv,
+-			  optionsTable, 0);
++
++  optCon = poptGetContext("debugedit", argc, (const char **)argv, optionsTable, 0);
+   
+   while ((nextopt = poptGetNextOpt (optCon)) > 0 || nextopt == POPT_ERROR_BADOPT)
+     /* do nothing */ ;
+ 
+   if (nextopt != -1)
+@@ -1404,11 +1448,11 @@
+ 	  if (strcmp (name, ".stab") == 0)
+ 	    edit_stabs (dso, i);
+ #endif
+ 	  if (strcmp (name, ".debug_info") == 0)
+ 	    edit_dwarf2 (dso);
+-	  
++
+ 	  break;
+ 	default:
+ 	  break;
+ 	}
+     }
diff --git a/dev-util/debugedit/files/debugedit-5.1.9-DWARF-3.patch b/dev-util/debugedit/files/debugedit-5.1.9-DWARF-3.patch
new file mode 100644
index 000000000000..ab7bbb422c09
--- /dev/null
+++ b/dev-util/debugedit/files/debugedit-5.1.9-DWARF-3.patch
@@ -0,0 +1,152 @@
+Index: rpm/tools/debugedit.c
+RCS File: /v/rpm/cvs/rpm/tools/debugedit.c,v
+rcsdiff -q -kk '-r2.21' '-r2.22' -u '/v/rpm/cvs/rpm/tools/debugedit.c,v' 2>/dev/null
+--- debugedit.c	2008/12/25 17:21:43	2.21
++++ debugedit.c	2009/06/15 14:16:21	2.22
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2001, 2002, 2003, 2005, 2007 Red Hat, Inc.
++/* Copyright (C) 2001, 2002, 2003, 2005, 2007, 2009 Red Hat, Inc.
+    Written by Alexander Larsson <alexl@redhat.com>, 2002
+    Based on code by Jakub Jelinek <jakub@redhat.com>, 2001.
+ 
+@@ -114,6 +114,7 @@
+ static void (*write_32) (unsigned char *ptr, GElf_Addr val);
+ 
+ static int ptr_size;
++static int cu_version;
+ 
+ static inline rpmuint16_t
+ buf_read_ule16 (unsigned char *data)
+@@ -239,16 +240,18 @@
+ #define DEBUG_LINE	2
+ #define DEBUG_ARANGES	3
+ #define DEBUG_PUBNAMES	4
+-#define DEBUG_MACINFO	5
+-#define DEBUG_LOC	6
+-#define DEBUG_STR	7
+-#define DEBUG_FRAME	8
+-#define DEBUG_RANGES	9
++#define DEBUG_PUBTYPES	5
++#define DEBUG_MACINFO	6
++#define DEBUG_LOC	7
++#define DEBUG_STR	8
++#define DEBUG_FRAME	9
++#define DEBUG_RANGES	10
+     { ".debug_info", NULL, NULL, 0, 0, 0 },
+     { ".debug_abbrev", NULL, NULL, 0, 0, 0 },
+     { ".debug_line", NULL, NULL, 0, 0, 0 },
+     { ".debug_aranges", NULL, NULL, 0, 0, 0 },
+     { ".debug_pubnames", NULL, NULL, 0, 0, 0 },
++    { ".debug_pubtypes", NULL, NULL, 0, 0, 0 },
+     { ".debug_macinfo", NULL, NULL, 0, 0, 0 },
+     { ".debug_loc", NULL, NULL, 0, 0, 0 },
+     { ".debug_str", NULL, NULL, 0, 0, 0 },
+@@ -328,7 +331,7 @@
+         }
+       if (*slot != NULL)
+ 	{
+-	  error (0, 0, "%s: Duplicate DWARF-2 abbreviation %d", dso->filename,
++	  error (0, 0, "%s: Duplicate DWARF abbreviation %d", dso->filename,
+ 		 t->entry);
+ 	  free (t);
+ 	  htab_delete (h);
+@@ -348,7 +351,7 @@
+ 	  form = read_uleb128 (ptr);
+ 	  if (form == 2 || form > DW_FORM_indirect)
+ 	    {
+-	      error (0, 0, "%s: Unknown DWARF-2 DW_FORM_%d", dso->filename, form);
++	      error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form);
+ 	      htab_delete (h);
+ 	      return NULL;
+ 	    }
+@@ -358,7 +361,7 @@
+         }
+       if (read_uleb128 (ptr) != 0)
+         {
+-	  error (0, 0, "%s: DWARF-2 abbreviation does not end with 2 zeros",
++	  error (0, 0, "%s: DWARF abbreviation does not end with 2 zeros",
+ 		 dso->filename);
+ 	  htab_delete (h);
+ 	  return NULL;
+@@ -510,7 +513,7 @@
+     }
+ 
+   value = read_16 (ptr);
+-  if (value != 2)
++  if (value != 2 && value != 3)
+     {
+       error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
+ 	     value);
+@@ -855,7 +858,12 @@
+ 
+ 	  switch (form)
+ 	    {
+-	    case DW_FORM_ref_addr: /* ptr_size in DWARF 2, offset in DWARF 3 */
++	    case DW_FORM_ref_addr:
++	      if (cu_version == 2)
++		ptr += ptr_size;
++	      else
++		ptr += 4;
++	      break;
+ 	    case DW_FORM_addr:
+ 	      ptr += ptr_size;
+ 	      break;
+@@ -907,7 +915,7 @@
+ 	      assert (len < UINT_MAX);
+ 	      break;
+ 	    default:
+-	      error (0, 0, "%s: Unknown DWARF-2 DW_FORM_%d", dso->filename,
++	      error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename,
+ 		     form);
+ 	      return NULL;
+ 	    }
+@@ -1204,11 +1212,11 @@
+ 		  return 1;
+ 		}
+ 	      
+-	      value = read_16 (ptr);
+-	      if (value != 2)
++	      cu_version = read_16 (ptr);
++	      if (cu_version != 2 && cu_version != 3)
+ 		{
+ 		  error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
+-			 value);
++			 cu_version);
+ 		  return 1;
+ 		}
+ 	      
+@@ -1218,7 +1226,7 @@
+ 		  if (debug_sections[DEBUG_ABBREV].data == NULL)
+ 		    error (0, 0, "%s: .debug_abbrev not present", dso->filename);
+ 		  else
+-		    error (0, 0, "%s: DWARF-2 CU abbrev offset too large",
++		    error (0, 0, "%s: DWARF CU abbrev offset too large",
+ 			   dso->filename);
+ 		  return 1;
+ 		}
+@@ -1228,14 +1236,14 @@
+ 		  ptr_size = read_1 (ptr);
+ 		  if (ptr_size != 4 && ptr_size != 8)
+ 		    {
+-		      error (0, 0, "%s: Invalid DWARF-2 pointer size %d",
++		      error (0, 0, "%s: Invalid DWARF pointer size %d",
+ 			     dso->filename, ptr_size);
+ 		      return 1;
+ 		    }
+ 		}
+ 	      else if (read_1 (ptr) != ptr_size)
+ 		{
+-		  error (0, 0, "%s: DWARF-2 pointer size differs between CUs",
++		  error (0, 0, "%s: DWARF pointer size differs between CUs",
+ 			 dso->filename);
+ 		  return 1;
+ 		}
+@@ -1253,7 +1261,7 @@
+ 		  t = htab_find_with_hash (abbrev, &tag, tag.entry);
+ 		  if (t == NULL)
+ 		    {
+-		      error (0, 0, "%s: Could not find DWARF-2 abbreviation %d",
++		      error (0, 0, "%s: Could not find DWARF abbreviation %d",
+ 			     dso->filename, tag.entry);
+ 		      htab_delete (abbrev);
+ 		      return 1;
diff --git a/dev-util/debugedit/files/debugedit-5.1.9-cleanup.patch b/dev-util/debugedit/files/debugedit-5.1.9-cleanup.patch
new file mode 100644
index 000000000000..f83123f69ffc
--- /dev/null
+++ b/dev-util/debugedit/files/debugedit-5.1.9-cleanup.patch
@@ -0,0 +1,34 @@
+This patch is a hand-edited CVS patch covering only minor important cleanup changes.
+--- debugedit.c
++++ debugedit.c
+@@ -153,7 +153,7 @@
+ 	{
+ 	  if (data->d_buf
+ 	      && offset >= data->d_off
+-	      && offset < data->d_off + data->d_size)
++	      && offset < data->d_off + (off_t)data->d_size)
+ 	    return (const char *) data->d_buf + (offset - data->d_off);
+ 	}
+     }
+@@ -468,8 +465,8 @@
+ has_prefix (const char  *str,
+ 	    const char  *prefix)
+ {
+-  int str_len;
+-  int prefix_len;
++  size_t str_len;
++  size_t prefix_len;
+   
+   str_len = strlen (str);
+   prefix_len = strlen (prefix);
+@@ -747,8 +747,8 @@
+   for (i = 0; i < t->nattr; ++i)
+     {
+       uint_32 form = t->attr[i].form;
+-      uint_32 len = 0;
+-      int base_len, dest_len;
++      size_t len = 0;
++      size_t base_len, dest_len;
+       
+ 
+       while (1)
diff --git a/dev-util/debugedit/files/debugedit-5.3.5-DWARF-4.patch b/dev-util/debugedit/files/debugedit-5.3.5-DWARF-4.patch
new file mode 100644
index 000000000000..3e1406196e9b
--- /dev/null
+++ b/dev-util/debugedit/files/debugedit-5.3.5-DWARF-4.patch
@@ -0,0 +1,129 @@
+add DWARF 4 support
+
+https://bugs.gentoo.org/400663
+https://bugzilla.redhat.com/show_bug.cgi?id=707677
+
+--- debugedit-5.3.5/debugedit.c	2011-10-11 05:37:49.000000000 +0200
++++ debugedit-5.3.5/debugedit.c	2012-01-25 01:27:23.487999039 +0100
+@@ -70,6 +70,10 @@
+ #include <rpmtag.h>
+ 
+ #define DW_TAG_partial_unit 0x3c
++#define DW_FORM_sec_offset 0x17
++#define DW_FORM_exprloc 0x18
++#define DW_FORM_flag_present 0x19
++#define DW_FORM_ref_sig8 0x20
+ 
+ char *base_dir = NULL;
+ char *dest_dir = NULL;
+@@ -246,6 +250,7 @@
+ #define DEBUG_STR	8
+ #define DEBUG_FRAME	9
+ #define DEBUG_RANGES	10
++#define DEBUG_TYPES	11
+     { ".debug_info", NULL, NULL, 0, 0, 0 },
+     { ".debug_abbrev", NULL, NULL, 0, 0, 0 },
+     { ".debug_line", NULL, NULL, 0, 0, 0 },
+@@ -257,6 +262,7 @@
+     { ".debug_str", NULL, NULL, 0, 0, 0 },
+     { ".debug_frame", NULL, NULL, 0, 0, 0 },
+     { ".debug_ranges", NULL, NULL, 0, 0, 0 },
++    { ".debug_types", NULL, NULL, 0, 0, 0 },
+     { NULL, NULL, NULL, 0, 0, 0 }
+   };
+ 
+@@ -349,7 +355,8 @@
+ 		goto no_memory;
+ 	    }
+ 	  form = read_uleb128 (ptr);
+-	  if (form == 2 || form > DW_FORM_indirect)
++	  if (form == 2
++	      || (form > DW_FORM_flag_present && form != DW_FORM_ref_sig8))
+ 	    {
+ 	      error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form);
+ 	      htab_delete (h);
+@@ -378,7 +385,6 @@
+ canonicalize_path (const char *s, char *d)
+ {
+   char *rv = d;
+-  const char *sroot;
+   char *droot;
+ 
+   if (IS_DIR_SEPARATOR (*s))
+@@ -394,7 +400,6 @@
+ 	s++;
+     }
+   droot = d;
+-  sroot = s;
+ 
+   while (*s)
+     {
+@@ -513,7 +518,7 @@
+     }
+ 
+   value = read_16 (ptr);
+-  if (value != 2 && value != 3)
++  if (value != 2 && value != 3 && value != 4)
+     {
+       error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
+ 	     value);
+@@ -529,8 +534,8 @@
+       return 1;
+     }
+   
+-  opcode_base = ptr[4];
+-  ptr = dir = ptr + 4 + opcode_base;
++  opcode_base = ptr[4 + (value >= 4)];
++  ptr = dir = ptr + 4 + (value >= 4) + opcode_base;
+   
+   /* dir table: */
+   value = 1;
+@@ -758,7 +763,8 @@
+ 	{
+ 	  if (t->attr[i].attr == DW_AT_stmt_list)
+ 	    {
+-	      if (form == DW_FORM_data4)
++	      if (form == DW_FORM_data4
++		  || form == DW_FORM_sec_offset)
+ 		{
+ 		  list_offs = do_read_32_relocated (ptr);
+ 		  found_list_offs = 1;
+@@ -864,6 +870,8 @@
+ 	      else
+ 		ptr += 4;
+ 	      break;
++	    case DW_FORM_flag_present:
++	      break;
+ 	    case DW_FORM_addr:
+ 	      ptr += ptr_size;
+ 	      break;
+@@ -878,10 +886,12 @@
+ 	      break;
+ 	    case DW_FORM_ref4:
+ 	    case DW_FORM_data4:
++	    case DW_FORM_sec_offset:
+ 	      ptr += 4;
+ 	      break;
+ 	    case DW_FORM_ref8:
+ 	    case DW_FORM_data8:
++	    case DW_FORM_ref_sig8:
+ 	      ptr += 8;
+ 	      break;
+ 	    case DW_FORM_sdata:
+@@ -910,6 +920,7 @@
+ 	      form = DW_FORM_block1;
+ 	      break;
+ 	    case DW_FORM_block:
++	    case DW_FORM_exprloc:
+ 	      len = read_uleb128 (ptr);
+ 	      form = DW_FORM_block1;
+ 	      assert (len < UINT_MAX);
+@@ -1213,7 +1224,7 @@
+ 		}
+ 	      
+ 	      cu_version = read_16 (ptr);
+-	      if (cu_version != 2 && cu_version != 3)
++	      if (cu_version != 2 && cu_version != 3 && cu_version != 4)
+ 		{
+ 		  error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
+ 			 cu_version);
diff --git a/dev-util/debugedit/files/update.sh b/dev-util/debugedit/files/update.sh
new file mode 100755
index 000000000000..db5495d41eb2
--- /dev/null
+++ b/dev-util/debugedit/files/update.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+DISTDIR=/usr/portage/distfiles
+PN=debugedit
+
+. /etc/init.d/functions.sh
+
+set -e
+
+einfo "Getting updated index"
+rm -f index.html
+wget -q http://rpm5.org/
+
+PV=$(sed -n '/Production:/{n;s:.*RPM ::;s:<.*::;p;q}' index.html)
+einfo "Latest upstream version: ${PV}"
+rm -f index.html
+
+P="${PN}-${PV}"
+A=${P}.tar.bz2
+
+e=${P}.ebuild
+if [[ -e ../${e} ]] ; then
+	einfo "All up to date"
+	exit 0
+fi
+
+#tf=${DISTDIR}/${A}
+#if [[ ! -e ${tf} ]] ; then
+#	einfo "Cannot find ${tf}"
+#	exit 0
+#fi
+
+einfo "Fetching latest rpm tarball"
+r=rpm-${PV}
+wget -nv http://rpm5.org/files/rpm/rpm-${PV%.*}/${r}.tar.gz -P ${DISTDIR} -c
+
+einfo "Unpacking ${r}"
+rm -rf ${r}
+tar xf ${DISTDIR}/${r}.tar.gz
+
+einfo "Creating ${P}"
+rm -rf ${P}
+mkdir ${P}
+cp Makefile ${r}/tools/{hashtab.?,debugedit.c} ${P}/
+pushd ${P} >/dev/null
+more=true
+while ${more} ; do
+	more=false
+	for h in $(grep '#include' *.[ch] | awk '{print $NF}' | sed 's:[<>"]::g') ; do
+		[[ ${h} == */* ]] && continue
+		rh=$(find ../${r} -name ${h##*/})
+		if [[ -n ${rh} ]] && [[ ! -e ${rh##*/} ]] ; then
+			# don't copy glibc includes
+			if ! grep -qs 'This file is part of the GNU C Library' ${rh} ; then
+				cp ${rh} ./
+				more=true
+			fi
+		fi
+	done
+done
+popd >/dev/null
+tar jcf ${A} ${P}
+
+einfo "Testing build"
+pushd ${P} >/dev/null
+make -s
+popd >/dev/null
+
+einfo "Cleaning up"
+rm -rf ${P} ${r}
+du -b ${A}
diff --git a/dev-util/debugedit/metadata.xml b/dev-util/debugedit/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/dev-util/debugedit/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>base-system</herd>
+</pkgmetadata>
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
new file mode 100644
index 000000000000..6e9e55a95e0a
--- /dev/null
+++ b/dev-util/dejagnu/Manifest
@@ -0,0 +1,2 @@
+DIST dejagnu-1.4.4.tar.gz 1080346 SHA256 d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d SHA512 fae08d4801b6a815af8771896e6e5eb12b297b773faa89743eac28d08c7eac6ed7e530921acdba1b9a7903990060c520497d281651d29d98ab0def1dbfab392e WHIRLPOOL beddb08790591bd817b6096c8ee9f02e2b7e921420658eaebaadc2e1b806d5114632d3adea95d5e5814c4dedc542521582360a03d16f1cc5236052ccbbf149a4
+DIST dejagnu-1.5.tar.gz 576269 SHA256 c8b45808357a6f3e32cd56d8b56a4fdf8a1d5f3818818045c2022993e0e8a3db SHA512 a9486e28f7ce25c34b59d00c0e4862bbb4b7a01d8faae0d1f28669b9d3ded9ed233b892aa27c34e1d06911f071d894aba7c1469e2fd0bddaa5611c2383e4974f WHIRLPOOL 3bc4b393f8f6185f8cce4afcb255a18d11342f14d29eed0e0fc2fd4baf106db707c520802c4913d9c2df3c3dba254c79e1da89e565fd9d5b768e7b4a2abe9912
diff --git a/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild b/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
new file mode 100644
index 000000000000..65f1aba8927d
--- /dev/null
+++ b/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="framework for testing other programs"
+HOMEPAGE="http://www.gnu.org/software/dejagnu/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="doc"
+
+DEPEND="dev-lang/tcl
+	dev-tcltk/expect"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/dejagnu-ignore-libwarning.patch
+	epatch "${FILESDIR}"/${P}-rsh-username.patch
+	epatch "${FILESDIR}"/${P}-testglue-protos.patch
+}
+
+src_test() {
+	# if you dont have dejagnu emerged yet, you cant
+	# run the tests ... crazy aint it :)
+	type -p runtest || return 0
+	emake check || die "check failed :("
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	use doc && dohtml -r doc/html/
+}
diff --git a/dev-util/dejagnu/dejagnu-1.5.ebuild b/dev-util/dejagnu/dejagnu-1.5.ebuild
new file mode 100644
index 000000000000..7207e71a01fa
--- /dev/null
+++ b/dev-util/dejagnu/dejagnu-1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="framework for testing other programs"
+HOMEPAGE="http://www.gnu.org/software/dejagnu/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="doc"
+
+DEPEND="dev-lang/tcl
+	dev-tcltk/expect"
+
+src_test() {
+	# if you dont have dejagnu emerged yet, you cant
+	# run the tests ... crazy aint it :)
+	type -p runtest || return 0
+	emake check || die "check failed :("
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	use doc && dohtml -r doc/html/
+}
diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
new file mode 100644
index 000000000000..ff4e970a4fd4
--- /dev/null
+++ b/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
@@ -0,0 +1,45 @@
+fix from upstream:
+
+2004-03-05  Daniel Jacobowitz  <drow@mvista.com>
+                                                                                
+	* lib/remote.exp (standard_spawn): Fix rsh username support.
+
+diff --git a/lib/remote.exp b/lib/remote.exp
+index b57276e..cdec0d2 100644
+--- a/lib/remote.exp
++++ b/lib/remote.exp
+@@ -860,19 +860,18 @@ proc standard_spawn { dest commandline } {
+         set RSH [board_info $dest rsh_prog]
+     }
+ 
+-    if ![board_info $dest exists username] {
+-        set rsh_useropts ""
+-    } else {
+-        set rsh_useropts "-l $username"
+-    }
+-
+     if [board_info $dest exists hostname] {
+ 	set remote [board_info $dest hostname]
+     } else {
+ 	set remote $dest
+     }
+ 
+-    spawn $RSH $rsh_useropts $remote $commandline
++    if ![board_info $dest exists username] {
++        spawn $RSH $remote $commandline
++    } else {
++        spawn $RSH -l [board_info $dest username] $remote $commandline
++    }
++
+     set board_info($dest,fileid) $spawn_id
+     return $spawn_id
+ }
+@@ -1257,6 +1256,8 @@ proc remote_expect { board timeout args } {
+     }
+ 
+     if {$code == 1} {
++        if {[info exists string]} {send_user "ERROR OCCURED: $errorInfo $errorCode $string"}
++
+ 	if { $error_sect != "" } {
+ 	    set code [catch {uplevel $error_sect} string]
+ 	} else {
diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch
new file mode 100644
index 000000000000..4ddaffb1c66d
--- /dev/null
+++ b/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch
@@ -0,0 +1,21 @@
+fix from upstream:
+
+2004-08-20  Daniel Jacobowitz  <dan@debian.org>
+
+	* testglue.c: Prototype abort(3) and exit(3).
+
+diff --git a/testglue.c b/testglue.c
+index 55a7f92..4ede6eb 100644
+--- a/testglue.c
++++ b/testglue.c
+@@ -40,6 +40,10 @@
+ #define ORIG_ABORT __wrap_abort
+ #define ORIG_MAIN __wrap_main
+ #endif
++
++extern void abort (void);
++extern void exit (int);
++
+ #endif
+ 
+ #ifdef REAL_MAIN
diff --git a/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch b/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch
new file mode 100644
index 000000000000..f4af06e6ff89
--- /dev/null
+++ b/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch
@@ -0,0 +1,23 @@
+dejagnu/ChangeLog
+	* lib/target.exp (prune_warnings): Correct pic/PIC regexp.
+	Ignore incompatible library warning.
+
+Index: dejagnu/lib/target.exp
+===================================================================
+RCS file: /cvs/src/src/dejagnu/lib/target.exp,v
+retrieving revision 1.12
+diff -u -p -r1.12 target.exp
+--- dejagnu/lib/target.exp	21 Apr 2002 08:47:07 -0000	1.12
++++ dejagnu/lib/target.exp	9 Jun 2003 07:34:06 -0000
+@@ -279,7 +279,10 @@ proc prune_warnings { text } {
+     regsub -all "(^|\n)\[^\n\]*: warning:   as it has already been specified\[^\n\]*" $text "" text
+ 
+     # Cygwin cc1 warns about -fpic and -fPIC
+-    regsub -all ".*: warning: -f(pic|PIC) ignored for target .*" $text "" text
++    regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target \[^\n\]*" $text "" text
++
++    # Ignore linker warning when searching 64bit libraries in /lib.
++    regsub -all "(^|\n)\[^\n\]*: skipping incompatible \[^\n\]* when searching for \[^\n\]*" $text "" text
+ 
+     # It might be tempting to get carried away and delete blank lines, etc.
+     # Just delete *exactly* what we're ask to, and that's it.
diff --git a/dev-util/dejagnu/metadata.xml b/dev-util/dejagnu/metadata.xml
new file mode 100644
index 000000000000..fb4199eb7afe
--- /dev/null
+++ b/dev-util/dejagnu/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>toolchain</herd>
+</pkgmetadata>
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
new file mode 100644
index 000000000000..ccbf3c8f2944
--- /dev/null
+++ b/dev-util/desktop-file-utils/Manifest
@@ -0,0 +1,2 @@
+DIST desktop-file-utils-0.21.tar.xz 128972 SHA256 b6c9b860538ef1cffbcdfbc9cb578f85a080ad8c1207c8b3a39e9fd183f9782b SHA512 c7372d820e996eef72e85c7190c7f7cce61a3e08ebc348822013d1b28971db294242ce108d8f5e8e6c7539f9044619511d2bba0459a319bddbe5e5cf5d8665aa WHIRLPOOL 04e4957c52f5093db72a92735ac2438163303eac3edb3f0ec0361aa08c8cbca3a06cc648074f13dd5764afc86a1725fc6e9d85fac2e10bc2352b2ce56e970379
+DIST desktop-file-utils-0.22.tar.xz 131028 SHA256 843532672692f98e9b2d6ae6cc8658da562dfde1606c7f33d9d227a344de56c5 SHA512 26c1f0da44e4d3fc286640084ad1fad0595fc94edb5d2edd2a4d8cbed0aea4e409aa1a610cbba372f8e540188b62aed764fc7fdecddefbcfeeaedd1d19e3d20a WHIRLPOOL 70d57623cb16d5ecdb4a1cb24fd4545f6d4dfe7aba51446570684cf09eb1d498c0ce575ad8f3255289dd15987d632b76c51b99a335cb9f3a3099d2901bdaf2ea
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.21.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.21.ebuild
new file mode 100644
index 000000000000..2c34679c3e42
--- /dev/null
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.21.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit elisp-common eutils
+
+DESCRIPTION="Command line utilities to work with desktop menu entries"
+HOMEPAGE="http://freedesktop.org/wiki/Software/desktop-file-utils"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+SITEFILE=50${PN}-gentoo.el
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+src_prepare() {
+	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
+}
+
+src_configure() {
+	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile misc/desktop-entry-mode.el
+}
+
+src_install() {
+	default
+	if use emacs; then
+		elisp-install ${PN} misc/*.el misc/*.elc || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild
new file mode 100644
index 000000000000..024caf3a08cd
--- /dev/null
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit elisp-common eutils
+
+DESCRIPTION="Command line utilities to work with desktop menu entries"
+HOMEPAGE="http://freedesktop.org/wiki/Software/desktop-file-utils"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+SITEFILE=50${PN}-gentoo.el
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+src_prepare() {
+	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
+}
+
+src_configure() {
+	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile misc/desktop-entry-mode.el
+}
+
+src_install() {
+	default
+	if use emacs; then
+		elisp-install ${PN} misc/*.el misc/*.elc || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el b/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el
new file mode 100644
index 000000000000..546947a0b374
--- /dev/null
+++ b/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'desktop-entry-mode "desktop-entry-mode" "Desktop Entry mode" t)
+(add-to-list 'auto-mode-alist
+ '("\\.desktop\\(\\.in\\)?$" . desktop-entry-mode))
+(add-hook 'desktop-entry-mode-hook 'turn-on-font-lock)
diff --git a/dev-util/desktop-file-utils/metadata.xml b/dev-util/desktop-file-utils/metadata.xml
new file mode 100644
index 000000000000..8c868061b739
--- /dev/null
+++ b/dev-util/desktop-file-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>freedesktop</herd>
+<maintainer>
+<email>freedesktop-bugs@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/deskzilla/Manifest b/dev-util/deskzilla/Manifest
new file mode 100644
index 000000000000..21b30a5aca57
--- /dev/null
+++ b/dev-util/deskzilla/Manifest
@@ -0,0 +1,2 @@
+DIST deskzilla-1_7_1_without_jre.tar.gz 9248721 SHA256 8c643e2c828bfa14aa3b1ec668d92602aeb21edce67319c279f4bb5879425ebf SHA512 86997ebed6b01b39408e8c27ee0c560e506368cc9b12dfc82134addd47c1be746e74cdf908c9e9ee794d6337bb32971f2a07ce7c283b81e4f506027894edbac7 WHIRLPOOL 946f9a5b10a01dbe19d257712e788640823b360433dd0b6a2155699e77d8e59fd77aa0e2c4de93b3a40d9c732ec7f973051f8957e6521b7e7db8c20a3858f8eb
+DIST deskzilla_gentoo.license 1584 SHA256 a11b89eedf8211d50ca13177b7d8d1fc59645a5c9faa13761525c24a9ae84a74 SHA512 60437ba4ed872abc37d41974717a10fb290dcdf8bde31b3bc493fd71d8abbcdec63e236148720558f1867b773b804bc49d4cce6ea5f1b002c39eca5f074e5e9a WHIRLPOOL b9bc69f6fc53542b97a802c5ba426540ad68e49ff2020b0b8e5d86caf608b1dbf8826df52b8815af57add5ac3d59d4c47054650291c653ff04849ad7e08e4142
diff --git a/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild b/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..9f41c34a37ce
--- /dev/null
+++ b/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 versionator
+
+DESCRIPTION="A desktop client for Mozilla's Bugzilla bug tracking system"
+HOMEPAGE="http://almworks.com/deskzilla"
+
+MY_PV=$(replace_all_version_separators '_') #${PV/beta/b})
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://d1.almworks.com/.files/${MY_P}_without_jre.tar.gz
+		http://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/deskzilla_gentoo.license"
+LICENSE="ALMWorks-1.2"
+# license does not allow redistributing, and they seem to silently update
+# distfiles...
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.5
+	dev-java/picocontainer:1
+	dev-java/javolution:4
+	>=dev-java/commons-codec-1.3
+	>=dev-java/jgoodies-forms-1.0.7
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/xmlrpc-2.0.1
+	dev-java/xerces:2
+	dev-java/itext:0
+	dev-java/jazzy:0"
+
+src_unpack() {
+	unpack ${A}
+	# Remove external unaltered bundled jars
+	local lib="${S}/lib"
+	local liborig="${S}/lib.orig"
+	mv ${lib} ${liborig} || die
+	mkdir ${lib} || die
+	# They've patched commons-httpclient (was version 3.0)
+	mv ${liborig}/commons-httpclient.jar ${lib} || die
+	# They've patched nekohtml (was version 0.9.5)
+	mv ${liborig}/nekohtml.jar ${lib} || die
+	# Also jdom (was 1.0), soon they will patch everything and we will just unpack, yay
+	mv ${liborig}/pjdom.jar ${lib} || die
+	# Almworks proprietary lib
+	mv ${liborig}/almworks-tracker-api.jar ${lib} || die
+	# IntelliJ IDEA proprietary lib
+	mv ${liborig}/forms_rt.jar ${lib} || die
+	# God knows what's this. Anyway, proprietary.
+	mv ${liborig}/twocents.jar ${lib} || die
+	rm -rf ${liborig} || die
+}
+
+src_install () {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r components etc license lib log deskzilla.url
+	insinto "${dir}/license"
+	doins "${DISTDIR}"/deskzilla_gentoo.license
+
+	java-pkg_jarinto "${dir}"
+	java-pkg_dojar ${PN}.jar
+	local dep="xerces-2,picocontainer-1,commons-logging,commons-codec"
+	dep+=",jgoodies-forms,javolution-4,xmlrpc,itext,jazzy"
+	java-pkg_register-dependency ${dep}
+	java-pkg_dolauncher ${PN} --main "com.almworks.launcher.Launcher" --java_args "-Xmx256M"
+
+	newdoc README.txt README || die
+	newdoc RELEASE.txt RELEASE || die
+
+	doicon deskzilla.png
+	make_desktop_entry deskzilla "Deskzilla" deskzilla "Development"
+}
+
+pkg_postinst() {
+	elog "The default, evaluation license allows usage for one month."
+	elog "You may switch (per-user) to the license we obtained for Gentoo,"
+	elog "located in /opt/${PN}/license/${PN}_gentoo.license"
+	elog "It is locked to Gentoo, ALM Works and Mozilla bugzilla only."
+	elog "Note that you need to use 1.5 VM to run deskzilla when setting"
+	elog "license or it won't get set due to bug in 1.6+ VMs."
+	elog
+	elog "If you are going to use Deskzilla for an open source project,"
+	elog "you can similarly request your own free license:"
+	elog "http://almworks.com/opensource.html?product=deskzilla"
+}
diff --git a/dev-util/deskzilla/metadata.xml b/dev-util/deskzilla/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-util/deskzilla/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>java</herd>
+</pkgmetadata>
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
new file mode 100644
index 000000000000..3c36e8757e5e
--- /dev/null
+++ b/dev-util/devhelp/Manifest
@@ -0,0 +1,2 @@
+DIST devhelp-3.14.0.tar.xz 465860 SHA256 a78884cf81c1fb18fc8356c62271292591d5ca62c58b045dee30c6fc278e7083 SHA512 0f5c0de5f248fd57a34e77f0f102a8e7cc64e1414c5f0a08f45c293d18409562960fcc5523d14bdc681d1f39d7e36a0490128887ed0e458503eed20795b04296 WHIRLPOOL 68613cf9fa548f114187855682097de6af6a63e685cfac9edc8e377a6a8a3c5592f6e5a46ac469ea3f4ec2694a2ffee629fa2a7072ebf64db8fbdd1e5df400da
+DIST devhelp-3.16.1.tar.xz 469172 SHA256 673c34e6851c2848e6257da8de5edc222d41e1dbf110501bd29d7f6810f41345 SHA512 dc729125d8e5db8e333ea76b80bc435f1b1dcd3a0b67d0b079edb517374331e06a6366d2ca826847b928a4c273557153d3a037200b400dc836a5d168bdac8778 WHIRLPOOL c2ccaad276f322cd2bf977087e756f3232abe991ba5763c9ca9b55c627db6ef4690c8bece0b3e90ddf3eff3f088bf4fdeaeb0cd5e57acfd07a3a96132e5321aa
diff --git a/dev-util/devhelp/devhelp-3.14.0.ebuild b/dev-util/devhelp/devhelp-3.14.0.ebuild
new file mode 100644
index 000000000000..68d6828a6690
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.14.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+# gedit-3.8 is python3 only, this also per:
+# https://bugzilla.redhat.com/show_bug.cgi?id=979450
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-2+"
+SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="gedit"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+# FIXME: automagic python dependency
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2
+	>=x11-libs/gtk+-3.13.4:3
+	>=net-libs/webkit-gtk-2:4
+"
+RDEPEND="${COMMON_DEPEND}
+	gedit? (
+		${PYTHON_DEPS}
+		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+[introspection] )
+	gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+pkg_setup() {
+	use gedit && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use gedit ; then
+		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+	# ICC is crazy, silence warnings (bug #154010)
+	if [[ $(tc-getCC) == "icc" ]] ; then
+		myconf="--with-compile-warnings=no"
+	fi
+	gnome2_src_configure ${myconf}
+}
diff --git a/dev-util/devhelp/devhelp-3.16.1.ebuild b/dev-util/devhelp/devhelp-3.16.1.ebuild
new file mode 100644
index 000000000000..86d7b3addb9e
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.16.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+# gedit-3.8 is python3 only, this also per:
+# https://bugzilla.redhat.com/show_bug.cgi?id=979450
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-2+"
+SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="gedit"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+# FIXME: automagic python dependency
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2
+	>=x11-libs/gtk+-3.13.4:3
+	>=net-libs/webkit-gtk-2:4
+"
+RDEPEND="${COMMON_DEPEND}
+	gedit? (
+		${PYTHON_DEPS}
+		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+[introspection] )
+	gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+pkg_setup() {
+	use gedit && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use gedit ; then
+		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+	# ICC is crazy, silence warnings (bug #154010)
+	if [[ $(tc-getCC) == "icc" ]] ; then
+		myconf="--with-compile-warnings=no"
+	fi
+	gnome2_src_configure ${myconf}
+}
diff --git a/dev-util/devhelp/metadata.xml b/dev-util/devhelp/metadata.xml
new file mode 100644
index 000000000000..2bbccce04951
--- /dev/null
+++ b/dev-util/devhelp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+	<flag name="gedit">Install plugin for <pkg>app-editors/gedit</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
new file mode 100644
index 000000000000..7794b90539a4
--- /dev/null
+++ b/dev-util/dialog/Manifest
@@ -0,0 +1 @@
+DIST dialog-1.2-20150528.tgz 497650 SHA256 a8cd7a66bdb41e53a3145cbb0eb370c5ce7300fe0e9ad6d3e8d3b9e16ff16418 SHA512 fd044715ca83ea21d42daa979f7b7f91634ec28658da550b17e0b804eeb2393b4ff75aef967c994f276f1f341b428e13fba2258730ef1fbfb1d5e1675c68d80d WHIRLPOOL 543b716f5f749a03d78b40f762ed4f2ff23c07e0acab6f8e22be5518c1e05d9a65b9f372de083f43ee19cd7551043ecc8c19f3d4111369c4b500d357342c21fe
diff --git a/dev-util/dialog/dialog-1.2.20150528.ebuild b/dev-util/dialog/dialog-1.2.20150528.ebuild
new file mode 100644
index 000000000000..21ec10439328
--- /dev/null
+++ b/dev-util/dialog/dialog-1.2.20150528.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib versionator
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+S=${WORKDIR}/${PN}-${MY_PV}
+DESCRIPTION="tool to display dialog boxes from a shell"
+HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
+SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="examples minimal nls static-libs unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.2-r5[unicode?]
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	!minimal? ( sys-devel/libtool )
+	!<=sys-freebsd/freebsd-contrib-8.9999
+"
+
+src_prepare() {
+	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
+	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-rpath-hack \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-libtool-opts=$(usex static-libs '' '-shared') \
+		--with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+	use minimal && default || emake DESTDIR="${D}" install-full
+
+	use examples && dodoc -r samples
+
+	dodoc CHANGES README
+
+	prune_libtool_files
+}
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
new file mode 100644
index 000000000000..a56bb3ac4585
--- /dev/null
+++ b/dev-util/dialog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>livecd</herd>
+<use>
+<flag name="minimal">Disable library, install command-line program only</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
new file mode 100644
index 000000000000..5b29692979aa
--- /dev/null
+++ b/dev-util/diffball/Manifest
@@ -0,0 +1 @@
+DIST diffball-1.0.1.tar.bz2 387787 SHA256 f4d0c90ee42a415b5830ba52a9e57764a16535333b3093c0243575a4ffec461c SHA512 1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c WHIRLPOOL 8ddb7ef0f8bf2020ad5460df74e94669dc4833c41e55e9ad75c09c58aebaafa04ab33329091577b41b117b309f3c952ad48287260567b43cfc1c8181ba03cfd8
diff --git a/dev-util/diffball/diffball-1.0.1.ebuild b/dev-util/diffball/diffball-1.0.1.ebuild
new file mode 100644
index 000000000000..4d7935540b04
--- /dev/null
+++ b/dev-util/diffball/diffball-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Delta compression suite for using/generating binary patches"
+HOMEPAGE="http://diffball.googlecode.com/"
+SRC_URI="http://diffball.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=app-arch/bzip2-1.0.2
+	app-arch/xz-utils"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# Invalid RESTRICT for source package. Investigate.
+RESTRICT="strip"
+
+src_compile() {
+	econf $(use_enable debug asserts)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/dev-util/diffball/metadata.xml b/dev-util/diffball/metadata.xml
new file mode 100644
index 000000000000..95bdedc84cce
--- /dev/null
+++ b/dev-util/diffball/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">diffball</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/difffilter/Manifest b/dev-util/difffilter/Manifest
new file mode 100644
index 000000000000..1923a459352e
--- /dev/null
+++ b/dev-util/difffilter/Manifest
@@ -0,0 +1,2 @@
+DIST difffilter-0.3.1.tar.bz2 273674 SHA256 e9bcb74fb6aa3ec6c917a1a98c9e2e6023aa5c0bed5d4605787b3392f6340ded SHA512 eaadbdb3e215501461e46905066dc9c9adead54549f78727b5ffd3aff540aa81141d5853cb459932d695c25521f74f0c30c214df4693a3abaf141e0aad294a82 WHIRLPOOL 27f578d56e0a6222749f2d5ca8717233393183926afe14793f2358671ba1ea69a26fb4519f316df894d2ee37c2ad7f5ae0156eb1ebc643e71b7182c062c9f499
+DIST difffilter-0.3.3.tar.bz2 291226 SHA256 2f14af2a3535a52322ae77d805c2a4ae1e8301eee0905406845cea3c2ae0bcd3 SHA512 ac9aa95dd7e41b6c49c1416be9d1929a41b629587ecb90f3dcadd3982a46d8eb49d181f8f1b1645322113becd9a4b708d0df1e27f6fb9064ffb06b37e5f101f8 WHIRLPOOL 06f50da86ab174e974e9f88f522ed4b18a4c93e783b3691840be2fb419f20da8b823c41c2daff4ca8f78377463dc63de5741da5b1d8efe14fd6686fa8a34f299
diff --git a/dev-util/difffilter/difffilter-0.3.1.ebuild b/dev-util/difffilter/difffilter-0.3.1.ebuild
new file mode 100644
index 000000000000..de81ad35df7a
--- /dev/null
+++ b/dev-util/difffilter/difffilter-0.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit autotools-utils
+
+DESCRIPTION="Filter files out of unified diffs using POSIX extended regular expressions"
+HOMEPAGE="http://ohnopub.net/~ohnobinki/difffilter/"
+SRC_URI="ftp://ohnopub.net/mirror/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/liblist-2.3.1
+	dev-libs/libstrl
+	dev-libs/tre"
+DEPEND="doc? ( app-text/txt2man )
+	${RDEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/difffilter/difffilter-0.3.3.ebuild b/dev-util/difffilter/difffilter-0.3.3.ebuild
new file mode 100644
index 000000000000..e13939ddd58d
--- /dev/null
+++ b/dev-util/difffilter/difffilter-0.3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="Filter files out of unified diffs using POSIX extended regular expressions"
+HOMEPAGE="http://ohnopub.net/~ohnobinki/difffilter/"
+SRC_URI="ftp://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/liblist-2.3.1
+	dev-libs/libstrl
+	dev-libs/tre"
+DEPEND="doc? ( app-text/txt2man )
+	${RDEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/difffilter/metadata.xml b/dev-util/difffilter/metadata.xml
new file mode 100644
index 000000000000..43866671d490
--- /dev/null
+++ b/dev-util/difffilter/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>binki@gentoo.org</email>
+    <name>Nathan Phillip Brink</name>
+    <description>Upstream and maintainer. Assign bugs to him</description>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
new file mode 100644
index 000000000000..453abca7129d
--- /dev/null
+++ b/dev-util/diffstat/Manifest
@@ -0,0 +1,2 @@
+DIST diffstat-1.58.tgz 246826 SHA256 fad5135199c3b9aea132c5d45874248f4ce0ff35f61abb8d03c3b90258713793 SHA512 b2870a604e3e6fcde1929de763839c3b840575bc96f3816b215e102c670d65b73d40eececa41a01f385b9932b65d86005b4d478ecbf78623faa8cc34fec77cac WHIRLPOOL 2767e925235775604a784ddfa2d07eb6e665c036c51460c25d1195fa168ae00c5e5b6e3a3e821b19939d4aa20ac6bd74076beeee06572bd856f304155b4f7cc0
+DIST diffstat-1.59.tgz 247698 SHA256 267d1441b8889cbefbb7ca7dfd4a17f6c8bc73bc114904c74ecad945a3dbf270 SHA512 347694458f73379513c0076ea0b847fe20b3cfd2c839b9f226fb349bfa3f0f0f1ffe9872fbce36fce8d402de2bec40f65fe5236127a087f08bd901d87258c169 WHIRLPOOL fd27e100872c3c6b30153352c23ba219c637a504068a9099619b40a55bacd4a9c587c45fd6ea0aa49ab0807f4b93e9125f6c9a2a1ca64b7922038396818ff25e
diff --git a/dev-util/diffstat/diffstat-1.58.ebuild b/dev-util/diffstat/diffstat-1.58.ebuild
new file mode 100644
index 000000000000..4322bb712fd0
--- /dev/null
+++ b/dev-util/diffstat/diffstat-1.58.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Display a histogram of diff changes"
+HOMEPAGE="http://invisible-island.net/diffstat/diffstat.html"
+SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-util/diffstat/diffstat-1.59.ebuild b/dev-util/diffstat/diffstat-1.59.ebuild
new file mode 100644
index 000000000000..808fd0278746
--- /dev/null
+++ b/dev-util/diffstat/diffstat-1.59.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Display a histogram of diff changes"
+HOMEPAGE="http://invisible-island.net/diffstat/diffstat.html"
+SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-util/diffstat/metadata.xml b/dev-util/diffstat/metadata.xml
new file mode 100644
index 000000000000..2d5b39853545
--- /dev/null
+++ b/dev-util/diffstat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+  <upstream>
+    <changelog>http://invisible-island.net/diffstat/CHANGES</changelog>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
new file mode 100644
index 000000000000..28193c7b0482
--- /dev/null
+++ b/dev-util/diffuse/Manifest
@@ -0,0 +1,3 @@
+DIST diffuse-0.4.6.tar.bz2 170246 SHA256 748922902573de316a4829f1ccc2cb6fab218b4aaf69a1a4aadba7fd8f8fd916 SHA512 ddde5e6c06ecaeb9b164de47590f22074e52d32a9969764466aa09a2a24925b6fa6aa3a098816c83d4fdef34ff1d2d88eab963a3bb8de3f403e40d797d497ae6 WHIRLPOOL cc8cc5e43cf1c098a4b92f8e33c7aeb48e82bbe9ad2bf7de833ec0c29b150938e4b10c90de19d142d771bd3720d686d9d3bb4e8521311d5f4f771e273c27edce
+DIST diffuse-0.4.7.tar.bz2 189257 SHA256 b0f56acbd246f4b9a692ef51aab167134ae6650423a68d8e5f4ff4c8938f39ac SHA512 3db665ec2f05d8fd8b30f391a53e75ae0ef271d3f35f0c89f20226bda296ca46e88491a741cd3bcaa1159b9d5d2581931362ca600176b6d599351f4a34f56e2f WHIRLPOOL 3a0c382ffcb598f0d3aba8c9e45914a83d41a9f946f6cf10aab73320fdf8f6b8cc4f5f84ad6c86ca61e2ed33d00faa50d3846a560ebd4b7e9588402eefa055d2
+DIST diffuse-0.4.8.tar.bz2 557966 SHA256 c1d3b79bba9352fcb9aa4003537d3fece248fb824781c5e21f3fcccafd42df2b SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e WHIRLPOOL d1f044497103c6c429f9980fa759e3df019176359adf13bd71d07c030188aad7c297a2b202290ac7124beed3536172ba17aca18d1e7a4b535218e3dd2cb015d3
diff --git a/dev-util/diffuse/diffuse-0.4.6.ebuild b/dev-util/diffuse/diffuse-0.4.6.ebuild
new file mode 100644
index 000000000000..6c8868ac4652
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.4.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit fdo-mime python
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/pygtk"
+# file collision, bug #279018
+DEPEND="!sci-chemistry/tinker"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	python_convert_shebangs 2 src/usr/bin/diffuse
+}
+
+src_install() {
+	"$(PYTHON)" install.py \
+		--prefix=/usr \
+		--files-only \
+		--destdir="${D}" \
+		|| die "Installation failed"
+	dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-util/diffuse/diffuse-0.4.7-r1.ebuild b/dev-util/diffuse/diffuse-0.4.7-r1.ebuild
new file mode 100644
index 000000000000..f1ea525ddd8e
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.4.7-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime python-single-r1
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/pygtk[${PYTHON_USEDEP}]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	local i p
+
+	# linguas handling wrt #406433
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
+			if ! has ${i##*/} ${LINGUAS} ; then
+				rm "${S}"/${i}.po || die
+			fi
+		done
+	fi
+
+	python_fix_shebang src/usr/bin/diffuse
+}
+
+src_install() {
+	"${PYTHON}" install.py \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--files-only \
+		--destdir="${D}" \
+		|| die "Installation failed"
+	dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-util/diffuse/diffuse-0.4.8.ebuild b/dev-util/diffuse/diffuse-0.4.8.ebuild
new file mode 100644
index 000000000000..f1ea525ddd8e
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.4.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime python-single-r1
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/pygtk[${PYTHON_USEDEP}]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	local i p
+
+	# linguas handling wrt #406433
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
+			if ! has ${i##*/} ${LINGUAS} ; then
+				rm "${S}"/${i}.po || die
+			fi
+		done
+	fi
+
+	python_fix_shebang src/usr/bin/diffuse
+}
+
+src_install() {
+	"${PYTHON}" install.py \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--files-only \
+		--destdir="${D}" \
+		|| die "Installation failed"
+	dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-util/diffuse/metadata.xml b/dev-util/diffuse/metadata.xml
new file mode 100644
index 000000000000..744ec303222c
--- /dev/null
+++ b/dev-util/diffuse/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<longdescription>A graphical tool to compare and merge text files</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">diffuse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/dirdiff/Manifest b/dev-util/dirdiff/Manifest
new file mode 100644
index 000000000000..cb01607a6df7
--- /dev/null
+++ b/dev-util/dirdiff/Manifest
@@ -0,0 +1 @@
+DIST dirdiff-2.1.tar.gz 43105 SHA256 cb373654d5788027804355e355df0695862c3bfc1f6a3fc6014722b3156a9252 SHA512 826d5a7a633921bec7043c89ccdadff19b4a6328efd09913932b306a48242203fbf6b5bac69d72660acf2c76ce6c8c5e53be62c2e69bbf3e3717e21c544ca261 WHIRLPOOL db5342743f3c6719de6645e11f6eda883d27fc9fa83380022e4a11c5e897fd4a0066aa696316d9f262951a6500c8cfcd48afb3d59d2e9080823eda93f174cda5
diff --git a/dev-util/dirdiff/dirdiff-2.1-r2.ebuild b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
new file mode 100644
index 000000000000..00f9db57c924
--- /dev/null
+++ b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
@@ -0,0 +1,40 @@
+# 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 toolchain-funcs
+
+DESCRIPTION="A tool for differing and merging directories"
+SRC_URI="http://samba.org/ftp/paulus/${P}.tar.gz"
+HOMEPAGE="http://samba.org/ftp/paulus/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/tk:0=
+	dev-lang/tcl:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-include.patch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-vcs.patch \
+		"${FILESDIR}"/${P}-tcl8.6.patch \
+		"${FILESDIR}"/${P}-funky-chars.patch
+	tc-export CC
+	append-cppflags -I"${EPREFIX}"/usr/include/tcl
+}
+
+src_install() {
+	dobin dirdiff
+	dolib.so libfilecmp.so.0.0
+	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so.0
+	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so
+	dodoc README
+}
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-build.patch b/dev-util/dirdiff/files/dirdiff-2.1-build.patch
new file mode 100644
index 000000000000..bb5010265196
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-build.patch
@@ -0,0 +1,28 @@
+ Makefile | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b4a49f8..410e018 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,12 +7,17 @@ LIBDIR=$(DESTDIR)/usr/lib
+ INSTALL=install
+ 
+ # You may need to change the -I arguments depending on your system
+-CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
++#CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
++
++LIBS = -ltcl
+ 
+ all:	libfilecmp.so.0.0
+ 
+-libfilecmp.so.0.0: filecmp.c
+-	$(CC) $(CFLAGS) -shared -o $@ filecmp.c
++.c.o:
++	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
++
++libfilecmp.so.0.0: filecmp.o
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libfilecmp.so.0 -o $@ filecmp.o $(LIBS)
+ 
+ install: dirdiff libfilecmp.so.0.0
+ 	$(INSTALL) -c dirdiff $(BINDIR)
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch b/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch
new file mode 100644
index 000000000000..1d4f715ac167
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch
@@ -0,0 +1,201 @@
+--- cvs-local.orig/dirdiff
++++ cvs-local/dirdiff
+@@ -563,7 +563,7 @@
+ 	    if {$d1 == $d2} continue
+ 	    set any 1
+ 	    $base.p.$sub1 add command -label "$d2" \
+-		    -command "makepatch \"$d1\" \"$d2\""
++		    -command [list makepatch $d1 $d2]
+ 	}
+ 	if {$any} {
+ 	    $base.p add cascade -label "$d1 ->" -menu $base.p.$sub1
+@@ -579,7 +579,7 @@
+     set i 0
+     foreach d $dirs {
+ 	if {!$dirreadonly($i)} {
+-	    $base.t add command -label $d -command "touchfiles \"$d\""
++	    $base.t add command -label $d -command [list touchfiles $d]
+ 	}
+ 	incr i
+     }
+@@ -677,7 +677,7 @@
+     set i 0
+     foreach d $dirs {
+ 	.bar.options add checkbutton -label "Read-only $d" \
+-		-variable dirreadonly($i) -command "readonlychange $i"
++		-variable dirreadonly($i) -command [list readonlychange $i]
+ 	incr i
+     }
+ 
+@@ -1153,7 +1153,7 @@
+ 	if {$xi != ""} {
+ 	    set x [lindex $dirs $xi]
+ 	    $diffbut add command -label "Show $x" \
+-		    -command "showfile \"$x\" \"$selfile\""
++		    -command [list showfile $x $selfile]
+ 	}
+     } elseif {$numgroups > 1} {
+ 	if {$numgroups > 2} {
+@@ -1163,7 +1163,7 @@
+ 		lappend x [lindex $dirs $i]
+ 	    }
+ 	    $diffbut add command -label "$numgroups-way diff" \
+-		-command "diffn {$x} {$selfile}"
++		-command [list diffn $x $selfile]
+ 	}
+ 	for {set gn 1} {$gn < $numgroups} {incr gn} {
+ 	    set yi [lindex $groupelts($gn) 0]
+@@ -1184,7 +1184,7 @@
+ 		set xi [lindex $groupelts($go) 0]
+ 		if {$xi == ""} continue
+ 		set x [lindex $dirs $xi]
+-		set cmd "diff2 \"$x\" \"$y\" \"$selfile\""
++		set cmd [list diff2 $x $y $selfile]
+ 		if {$numgroups <= 3} {
+ 		    if {$compound_ok} {
+ 			$diffbut add command -label "$x vs. $y" \
+@@ -1283,7 +1283,7 @@
+                 set cl2 [lindex $bgcolors($ng) $age]
+                 if {$im2 == "ex"} {set im2 ""}
+ 		set y [lindex $dirs $dst]
+-		set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 0"
++		set cmd [list copyselfile $src $dst $selfile 0]
+ 		if {$any == 1} {
+ 		    if {$compound_ok} {
+ 			$copybut add command -label "$x -> $y" \
+@@ -1346,7 +1346,7 @@
+                 set im2 [lindex $agecolors($ng) $age]
+                 set cl2 [lindex $bgcolors($ng) $age]
+ 		set y [lindex $dirs $dst]
+-		set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 1"
++		set cmd [list copyselfile $src $dst $selfile 1]
+ 		if {$any == 1} {
+ 		    if {$compound_ok} {
+ 			$copybut add command -label "$x -> $y" \
+@@ -1392,10 +1392,10 @@
+                 if {$compound_ok} {
+ 		    $copybut add command -label "Remove from $x" \
+                         -image ex -compound left \
+-			-command "removeselfile \"$dst\" \"$selfile\""
++			-command [list removeselfile $dst $selfile]
+                 } else {
+ 		    $copybut add command -label "Remove from $x" \
+-			-command "removeselfile \"$dst\" \"$selfile\""
++			-command [list removeselfile $dst $selfile]
+                 }
+ 	    }
+ 	}
+@@ -1415,7 +1415,7 @@
+ 		if {$dirreadonly($d)} continue
+ 		set y [lindex $dirs $d]
+ 		$copybut add command -label "$x -> $y" \
+-			-command "copyselfile \"$s\" \"$d\" \"$selfile\" 0"
++			-command [list copyselfile $s $d $selfile 0]
+ 	    }
+ 	}
+ 	set needsep 1
+@@ -1429,10 +1429,10 @@
+             if {$compound_ok} {
+ 	        $copybut add command -label "Remove from $x" \
+                     -image ex -compound left \
+-		    -command "removeselfile \"$s\" \"$selfile\""
++		    -command [list removeselfile $s $selfile]
+             } else {
+ 	        $copybut add command -label "Remove from $x" \
+-		    -command "removeselfile \"$s\" \"$selfile\""
++		    -command [list removeselfile $s $selfile]
+             }
+ 	}
+     }
+@@ -1469,7 +1469,7 @@
+ 
+     # Show the file in an external viewer
+     if { [llength $showprogram] > 0} {
+-       eval "exec $showprogram \"$fn\" &"
++       exec $showprogram $fn &
+        return
+     }
+     # Or make our own viewer
+@@ -1569,7 +1569,7 @@
+     set diffopts "-U $ctxlines $diffiflag $diffwflag $diffbflag $diffBflag $diffdflag"
+ 
+     if { [llength $diffprogram] > 0} {
+-       eval "exec $diffprogram \"$path1\" \"$path2\" &"
++       exec $diffprogram $path1 $path2 &
+        return
+     }
+     # If we used an external diff program, its options are used.  If we didn't,
+@@ -1750,7 +1750,7 @@
+ 	    if {$gx == $g && !$dirreadonly($k)} {
+ 		set f [lindex $dirs $k]
+ 		$mergebut.m add command -label "update $f" \
+-		    -command "diffmerge $i \"$f\""
++		    -command [list diffmerge $i $f]
+ 		set path [joinname $f $difffile]
+ 		set diffmtime($path) [file mtime $path]
+ 	    }
+@@ -1770,7 +1770,7 @@
+ 	    if {$gx == $g && !$dirreadonly($k)} {
+ 		set f [lindex $dirs $k]
+ 		$mpatchbut.m add command -label "for $f" \
+-		    -command "diffmpatch $i \"$f\""
++		    -command [list diffmpatch $i $f]
+ 	    }
+ 	    incr k
+ 	}
+@@ -3424,7 +3424,7 @@
+     $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
+     $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
+     $w.bar.edit.m add command -label Find \
+-	    -command "difffind :merge:$di:$fi $w.t"
++	    -command [list difffind :merge:$di:$fi $w.t]
+     pack $w.bar.edit -side left
+     frame $w.f -relief sunk -border 2
+     entry $w.f.filename
+@@ -3533,7 +3533,7 @@
+     $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
+     $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
+     $w.bar.edit.m add command -label Find \
+-	    -command "difffind :mpatch:$fi $w.t"
++	    -command [list difffind :mpatch:$fi $w.t]
+     pack $w.bar.edit -side left
+     frame $w.f -relief sunk -border 2
+     entry $w.f.filename
+@@ -3993,7 +3993,7 @@
+        $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
+        $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
+        $w.bar.edit.m add command -label Find \
+-	    -command "difffind :patch:$patchnum $w.t"
++	    -command [list difffind :patch:$patchnum $w.t]
+        pack $w.bar.edit -side left
+        frame $w.f -relief sunk -border 2
+        label $w.f.l -text "Filename: "
+@@ -4032,23 +4032,23 @@
+ 	set p1 [joinname $d1 $f]
+ 	set p2 [joinname $d2 $f]
+ 	if {[file exists $p1] && [file exists $p2]} {
+-	    set fh [open "|diff $contextopt $p1 $p2" r]
++	    set fh [open [list |diff $contextopt $p1 $p2] r]
+ 	} elseif {[file exists $p1] && ! [file exists $p2]} {
+-	    set fh [open "|diff $contextopt $p1 $nullfile" r]
++	    set fh [open [list |diff $contextopt $p1 $nullfile] r]
+ 	} elseif {! [file exists $p1] && [file exists $p2]} {
+-	    set fh [open "|diff $contextopt $nullfile $p2" r]
++	    set fh [open [list |diff $contextopt $nullfile $p2] r]
+ 	} else {
+             continue
+ 	}
+ 	fconfigure $fh -blocking 0
+-	fileevent $fh readable "readpatch $fh $pnum $w $d1 $d2 $i \"$f\""
++	fileevent $fh readable [list readpatch $fh $pnum $w $d1 $d2 $i $f]
+ 	return
+     }
+     if {[string match ".*" $w]} {
+        $w.t delete "end - 1c" end
+     } else {
+         close $w
+-        eval "exec $showprogram \"$patch_outfile\" &"
++        exec $showprogram $patch_outfile &
+         # Should we remove the tempfile here?  We don't have it if we used 
+         # the internal viewer
+     }
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-include.patch b/dev-util/dirdiff/files/dirdiff-2.1-include.patch
new file mode 100644
index 000000000000..acaed3cf8026
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-include.patch
@@ -0,0 +1,10 @@
+--- a/filecmp.c	2005-04-19 12:22:01.000000000 +0200
++++ b/filecmp.c	2010-12-30 20:23:24.000000000 +0100
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include <tcl.h>
+ #include <sys/fcntl.h>
++#include <unistd.h> /* close() read() */
+ 
+ #define BSIZE		32768
+ #define MAXTAGLEN	512	/* max tag length for sanity, < BSIZE */
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch b/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch
new file mode 100644
index 000000000000..39d930a51724
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch
@@ -0,0 +1,16 @@
+ filecmp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/filecmp.c b/filecmp.c
+index 673c1a8..fd4c6e5 100644
+--- a/filecmp.c
++++ b/filecmp.c
+@@ -341,7 +341,7 @@ FileCmpCmd(clientData, interp, argc, argv)
+     if (n1 < 0 || n2 < 0)
+ 	return TCL_ERROR;
+ 
+-    sprintf(interp->result, "%d", same);
++    sprintf(Tcl_GetStringResult(interp), "%d", same);
+     return TCL_OK;
+ }
+ 
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch b/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch
new file mode 100644
index 000000000000..b8db24509eaa
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch
@@ -0,0 +1,16 @@
+ dirdiff | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dirdiff b/dirdiff
+index c5522b6..f470348 100755
+--- a/dirdiff
++++ b/dirdiff
+@@ -37,7 +37,7 @@ set nxdirmode 0
+ set docvsignore 0
+ 
+ set defaultcvsignore {
+-    RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS
++    RCS SCCS CVS CVS.adm RCSLOG cvslog.* .svn .git tags TAGS
+     .make.state .nse_depinfo *~ \#* .\#* ,* _$* *$
+     *.old *.bak *.BAK *.orig *.rej .del-* *.a *.olb
+     *.o *.obj *.so *.exe *.Z *.elc *.ln core
diff --git a/dev-util/dirdiff/metadata.xml b/dev-util/dirdiff/metadata.xml
new file mode 100644
index 000000000000..1470e032181b
--- /dev/null
+++ b/dev-util/dirdiff/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/dissembler/Manifest b/dev-util/dissembler/Manifest
new file mode 100644
index 000000000000..56efafd8b112
--- /dev/null
+++ b/dev-util/dissembler/Manifest
@@ -0,0 +1 @@
+DIST dissembler_0.9.tgz 4479 SHA256 fb2a38fe28ea6586bcead0acf918963f051c940af3ab35995ab9e27c6c2e198a SHA512 b6c7e4f42bb41be4320afd5d83abf6a0f1bbb58927931348e8a4ed9ee40ab756baa383ba4a405be5475ab669e5a38947422a4f6a0db16851eb8e6eb9f71f1332 WHIRLPOOL ba8c888450feb1894f3ebc23b08433be8b40d18fc71d7d82301b6d0d9d77c7ef3ba60727c6f3ad7e71152f65d062b6f17c3fb65e489587654168a7abffc72510
diff --git a/dev-util/dissembler/dissembler-0.9.ebuild b/dev-util/dissembler/dissembler-0.9.ebuild
new file mode 100644
index 000000000000..3ee7d80333f7
--- /dev/null
+++ b/dev-util/dissembler/dissembler-0.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}_${PV}
+DESCRIPTION="polymorphs bytecode to a printable ASCII string"
+HOMEPAGE="http://www.phiral.com/research/dissembler.html"
+SRC_URI="http://www.phiral.com/research/${MY_P}.tgz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" ${PN} || die
+}
+
+src_install() {
+	dobin ${PN} || die
+	dodoc ${PN}.txt
+}
diff --git a/dev-util/dissembler/files/dissembler-0.9-build.patch b/dev-util/dissembler/files/dissembler-0.9-build.patch
new file mode 100644
index 000000000000..019dfec20ad6
--- /dev/null
+++ b/dev-util/dissembler/files/dissembler-0.9-build.patch
@@ -0,0 +1,21 @@
+--- dissembler.c
++++ dissembler.c
+@@ -16,6 +16,9 @@
+ 
+          /*   FOR EDUCATIONAL PURPOSES ONLY  */
+
++#define _GNU_SOURCE 
++#include <string.h>
++#include <unistd.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+@@ -217,7 +217,7 @@ freedom:
+ 			fprintf(fh, "P");
+ 	}
+ 	fprintf(fh,"\n");
+-	if(fh != stdout) close(fh);
++	if(fh != stdout) fclose(fh);
+ 	free(mem-21);
+ }
+ 
diff --git a/dev-util/dissembler/metadata.xml b/dev-util/dissembler/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/dev-util/dissembler/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/dmake/Manifest b/dev-util/dmake/Manifest
new file mode 100644
index 000000000000..36400fda1273
--- /dev/null
+++ b/dev-util/dmake/Manifest
@@ -0,0 +1 @@
+DIST dmake-4.12.2.tar.bz2 461738 SHA256 2fcbf389a9baaec25a973bd0d9e338069ad427b17d2adc7dc023efb034e96057 SHA512 f09453205bd425882d933a7b2cf879d69d795765bb7586e1e35ca5c9e39444cb70cfe56ed9b350f12fae8d484670b4ae418bb5d2da7c0c2ff229d9165caff45b WHIRLPOOL d1d5f9f34302ba5d2b98e8016b27a46c0b0e67cc98e25867a6af4659c3b39ba1ae93d8d642d0cd5cc7a2a58cf7f1e9c01fc20079a41ba67ee65c929188a6b2e1
diff --git a/dev-util/dmake/dmake-4.12.2.ebuild b/dev-util/dmake/dmake-4.12.2.ebuild
new file mode 100644
index 000000000000..38e07de0672b
--- /dev/null
+++ b/dev-util/dmake/dmake-4.12.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Improved make"
+HOMEPAGE="http://code.google.com/a/apache-extras.org/p/dmake/"
+SRC_URI="http://${PN}.apache-extras.org.codespot.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+# test failure, reported upstream at
+# http://code.google.com/a/apache-extras.org/p/dmake/issues/detail?id=1
+RESTRICT="test"
+
+DEPEND="
+	app-arch/unzip
+	sys-apps/groff
+"
+RDEPEND=""
+
+src_prepare() {
+	# make tests executable, bug #404989
+	chmod +x tests/targets-{1..12} || die
+}
+
+src_install () {
+	default
+	newman man/dmake.tf dmake.1
+}
diff --git a/dev-util/dmake/files/4.12-fix-overlapping-stcpys.patch b/dev-util/dmake/files/4.12-fix-overlapping-stcpys.patch
new file mode 100644
index 000000000000..b79a53ba0eb8
--- /dev/null
+++ b/dev-util/dmake/files/4.12-fix-overlapping-stcpys.patch
@@ -0,0 +1,233 @@
+diff -ru dmake.orig/rulparse.c dmake/rulparse.c
+--- dmake.orig/rulparse.c	2009-07-29 13:31:47.000000000 +0100
++++ dmake/rulparse.c	2009-07-29 13:32:09.000000000 +0100
+@@ -897,7 +897,7 @@
+ 	 /* Handle %-targets. */
+ 	 CELLPTR cur;
+ 	 CELLPTR tpq = NIL(CELL);
+-	 CELLPTR nprq;
++	 CELLPTR nprq = NULL;
+ 
+ #ifdef DBUG
+ 	 DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]",
+@@ -915,7 +915,8 @@
+ 
+ 	    if( *name == '\'' && name[len-1]=='\'' ){
+ 	       name[len-1] = '\0';
+-	       strcpy(name,name+1);
++	       len = strlen(name+1)+1;
++	       memmove(name,name+1,len);
+ 	       /* add indirect prerequisite */
+ 	       _add_indirect_prereq( cur );
+ 	    }
+diff -ru dmake.orig/dag.c dmake/dag.c
+--- dmake.orig/dag.c	2009-08-07 20:18:31.000000000 +0100
++++ dmake/dag.c	2009-08-07 20:30:59.000000000 +0100
+@@ -369,14 +369,17 @@
+ 	 /* strip out any \<nl> combinations where \ is the current
+ 	  * CONTINUATION char */
+ 	 for(p=q; (p=strchr(p,CONTINUATION_CHAR))!=NIL(char); )
+-	    if( p[1] == '\n' )
+-	       strcpy( p, p+2 );
++	    if( p[1] == '\n' ) {
++	       size_t len = strlen(p+2)+1;
++	       memmove ( p, p+2, len );
++	    }
+ 	    else
+ 	       p++;
+ 
+ 	 p = DmStrSpn(q ," \t");	/* Strip white space before ... */
+ 	 if( p != q ) {
+-	    strcpy( q, p);
++	    size_t len = strlen(p)+1;
++	    memmove( q, p, len );
+ 	    p = q;
+ 	 }
+ 
+diff -ru dmake.orig/expand.c dmake/expand.c
+--- dmake.orig/expand.c	2009-08-07 20:18:34.000000000 +0100
++++ dmake/expand.c	2009-08-07 20:42:40.000000000 +0100
+@@ -230,6 +230,7 @@
+ char *tok;
+ {
+    if( strchr( "\"\\vantbrf01234567", tok[1] ) ) {
++      size_t len;
+       switch( tok[1] ) {
+ 	 case 'a' : *tok = 0x07; break;
+ 	 case 'b' : *tok = '\b'; break;
+@@ -246,13 +247,15 @@
+ 	    register int j = 0;
+ 	    for( ; i<2 && isdigit(tok[2]); i++ ) {
+ 	       j = (j << 3) + (tok[1] - '0');
+-	       strcpy( tok+1, tok+2 );
++	       len = strlen(tok+2)+1;
++	       memmove( tok+1, tok+2, len );
+ 	    }
+ 	    j = (j << 3) + (tok[1] - '0');
+ 	    *tok = j;
+ 	 }
+       }
+-      strcpy( tok+1, tok+2 );
++      len = strlen(tok+2)+1;
++      memmove( tok+1, tok+2, len );
+    }
+ }
+ 
+@@ -365,7 +368,8 @@
+       if( (e = Basename(s)) != s) {
+ 	 if( !(mod & DIRECTORY_FLAG) ) {
+ 	    /* Move the basename to the start. */
+-	    strcpy(s, e);
++	    size_t len = strlen(e)+1;
++	    memmove(s, e, len);
+ 	 }
+ 	 else
+ 	    s = e;
+@@ -382,7 +386,8 @@
+ 
+       if( !(mod & FILE_FLAG) ) {
+ 	 /* Move the suffix to the start. */
+-	 strcpy( s, e );
++	 size_t len = strlen(e)+1;
++         memmove(s, e, len);
+       }
+       else
+ 	 s = e;
+@@ -725,8 +730,10 @@
+ 	      done = !lev;
+ 	      break;
+             } else {
++              size_t len;
+ 	      s[1] = ' ';
+-	      strcpy( s, s+1 );
++              len = strlen(s+1)+1;
++	      memmove( s, s+1, len );
+ 	    }
+ 	    /*FALLTHRU*/
+ 	 case ' ':
+@@ -835,8 +842,10 @@
+        * converted them to a real space. Let's verify this. */
+       for( p=s; *p && *p != edelim && *p; p++ ) {
+ 	if( p[0] == '\\' && p[1] == '\n' ) {
++	  size_t len;
+ 	  p[1] = ' ';
+-	  strcpy( p, p+1 );
++	  len = strlen(p+1)+1;
++	  memmove( p, p+1, len );
+ 	}
+       }
+       if( !*p )
+@@ -1120,7 +1129,10 @@
+       *flag = 1;
+       res   = Expand( start );
+ 
+-      if( (t = DmStrSpn( res, " \t" )) != res ) strcpy( res, t );
++      if( (t = DmStrSpn( res, " \t" )) != res ) {
++          size_t len = strlen(t)+1;
++          memmove( res, t, len );
++      }
+    }
+ 
+    FREE( start );       /* this is ok! start is assigned a DmSubStr above */
+diff -ru dmake.orig/getinp.c dmake/getinp.c
+--- dmake.orig/getinp.c	2009-08-07 20:18:31.000000000 +0100
++++ dmake/getinp.c	2009-08-07 20:27:08.000000000 +0100
+@@ -169,7 +169,8 @@
+ 	  * text lines on input.  The maximum size of this is governened by
+ 	  * Buffer_size */
+ 	    if( q != p && q[-1] == CONTINUATION_CHAR ) {
+-	       strcpy( q, q+1 );
++	       size_t len = strlen(q+1)+1;
++	       memmove( q, q+1, len );
+ 	       q--;
+ 	       cont = FALSE;
+ 	    }
+@@ -290,7 +291,8 @@
+    while( (c = strchr(c, COMMENT_CHAR)) != NIL(char) ) {
+       if( Comment || State == NORMAL_SCAN )
+ 	 if( c != str && c[-1] == ESCAPE_CHAR ) {
+-	    strcpy( c-1, c );        /* copy it left, due to \# */
++	    size_t len = strlen(c)+1;
++	    memmove( c-1, c, len );  /* copy it left, due to \# */
+ 	    if( pend ) (*pend)--;    /* shift tail pointer left */
+ 	 }
+ 	 else {
+diff -ru dmake.orig/path.c dmake/path.c
+--- dmake.orig/path.c	2009-08-07 20:18:31.000000000 +0100
++++ dmake/path.c	2009-08-07 20:41:30.000000000 +0100
+@@ -172,6 +172,7 @@
+    char *tpath;
+    int hasdriveletter = 0;
+    int delentry;
++   size_t len;
+ 
+    DB_ENTER( "Clean_path" );
+ 
+@@ -231,14 +232,16 @@
+ 	    p++;
+ 	 }
+ 	 while( *p == *DirSepStr);
+-	 strcpy(t+1,p);
++	 len = strlen(p)+1;
++	 memmove(t+1,p,len);
+ 	 continue;
+       }
+ 
+       /* Remove './'. If OOODMAKEMODE is set do this only if it is not at
+        * the start of the path. */
+       if ( p-q == 1 && *q == '.' && (q != path || !STOBOOL(OOoDmMode)) ) {
+-	 strcpy(q,p+1);
++	 len = strlen(p+1)+1;
++	 memmove(q,p+1,len);
+ 	 q = tpath;
+ 	 continue;
+       }
+@@ -268,7 +271,8 @@
+ 	 }
+ 	 while( *t == *DirSepStr);
+ 	 /* q points to first letter of the current directory/file. */
+-	 strcpy(q,t);
++	 len = strlen(t)+1;
++	 memmove(q,t,len);
+ 	 q = tpath;
+       }
+       else
+--- dmake.orig/make.c	2009-08-08 09:56:10.000000000 +0100
++++ dmake/make.c	2009-08-08 10:00:04.000000000 +0100
+@@ -1352,8 +1352,10 @@
+        * Nothing in Expand() should be able to change dynamic macros. */
+       cmnd = Expand( rp->st_string );
+ 
+-      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
+-	 strcpy(cmnd,p);
++      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
++	 size_t len = strlen(p)+1;
++	 memmove(cmnd,p,len);
++      }
+ 
+       /* COMMAND macro is set to "$(CMNDNAME) $(CMNDARGS)" by default, it is
+        * possible for the user to reset it to, for example
+@@ -1381,8 +1383,10 @@
+ 	 shell  = ((l_attr & A_SHELL) != 0);
+ 
+ 	 /* clean up the attributes that we may have just added. */
+-	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd )
+-	    strcpy(cmnd,p);
++	 if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
++	    size_t len = strlen(p)+1;
++	    memmove(cmnd,p,len);
++	 }
+       }
+ 
+ #if defined(MSDOS)
+@@ -1477,8 +1481,9 @@
+    for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\0'; )
+       /* Remove the \<nl> sequences. */
+       if(*n == CONTINUATION_CHAR && n[1] == '\n') {
++	 size_t len = strlen(n+2)+1;
+ 	 DB_PRINT( "make", ("fixing [%s]", p) );
+-	 strcpy( n, n+2 );
++	 memmove( n, n+2, len );
+ 	 p = n;
+       }
+       /* Look for an escape sequence and replace it by it's corresponding
diff --git a/dev-util/dmake/files/dmake-4.1-r1.diff b/dev-util/dmake/files/dmake-4.1-r1.diff
new file mode 100644
index 000000000000..3655a6bb067e
--- /dev/null
+++ b/dev-util/dmake/files/dmake-4.1-r1.diff
@@ -0,0 +1,170 @@
+diff -ur dmake.orig/dbug/malloc/testmem.c dmake-4.1/dbug/malloc/testmem.c
+--- dmake.orig/dbug/malloc/testmem.c	1997-07-15 17:02:26.000000000 +0100
++++ dmake-4.1/dbug/malloc/testmem.c	2003-03-10 15:02:38.000000000 +0000
+@@ -64,7 +64,7 @@
+ int f;
+ extern char *sys_errlist[];
+ extern int sys_nerr;
+-extern int errno;
++#include <errno.h>
+ #endif
+ 
+ /* ARGSUSED */
+diff -ur dmake.orig/qssl/runargv.c dmake-4.1/qssl/runargv.c
+--- dmake.orig/qssl/runargv.c	1997-07-15 17:02:29.000000000 +0100
++++ dmake-4.1/qssl/runargv.c	2003-03-10 15:03:09.000000000 +0000
+@@ -24,6 +24,7 @@
+ */
+ 
+ #include <signal.h>
++#include <errno.h>
+ #include "extern.h"
+ #include "sysintf.h"
+ 
+@@ -67,7 +68,6 @@
+ int     shell;
+ char	*cmd;
+ {
+-   extern  int  errno;
+    int          pid;
+    char         **argv;
+ 
+diff -ur dmake.orig/qssl/stdlib.h dmake-4.1/qssl/stdlib.h
+--- dmake.orig/qssl/stdlib.h	1997-07-15 17:02:29.000000000 +0100
++++ dmake-4.1/qssl/stdlib.h	2003-03-10 15:03:35.000000000 +0000
+@@ -39,7 +39,7 @@
+ extern free();
+ #endif
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ #ifndef EIO
+ #	include <errno.h>
+diff -ur dmake.orig/unix/386ix/stdlib.h dmake-4.1/unix/386ix/stdlib.h
+--- dmake.orig/unix/386ix/stdlib.h	1997-07-15 17:02:34.000000000 +0100
++++ dmake-4.1/unix/386ix/stdlib.h	2003-03-10 15:04:33.000000000 +0000
+@@ -35,7 +35,7 @@
+ extern char *malloc();
+ extern char *realloc();
+ extern free();
+-extern int errno;
++#include <errno.h>
+ 
+ #ifndef EIO
+ #	include <errno.h>
+diff -ur dmake.orig/unix/bsd43/stdlib.h dmake-4.1/unix/bsd43/stdlib.h
+--- dmake.orig/unix/bsd43/stdlib.h	1997-07-15 17:02:35.000000000 +0100
++++ dmake-4.1/unix/bsd43/stdlib.h	2003-03-10 15:04:55.000000000 +0000
+@@ -35,7 +35,7 @@
+ extern char *malloc();
+ extern char *realloc();
+ extern free();
+-extern int errno;
++#include <errno.h>
+ 
+ #ifndef EIO
+ #	include <errno.h>
+diff -ur dmake.orig/unix/coherent/stdlib.h dmake-4.1/unix/coherent/stdlib.h
+--- dmake.orig/unix/coherent/stdlib.h	1997-07-15 17:02:35.000000000 +0100
++++ dmake-4.1/unix/coherent/stdlib.h	2003-03-10 15:05:33.000000000 +0000
+@@ -35,7 +35,7 @@
+ extern char *malloc();
+ extern char *realloc();
+ extern free();
+-extern int errno;
++#include <errno.h>
+ 
+ #ifndef EIO
+ #	include <errno.h>
+diff -ur dmake.orig/unix/runargv.c dmake-4.1/unix/runargv.c
+--- dmake.orig/unix/runargv.c	1997-07-15 17:02:34.000000000 +0100
++++ dmake-4.1/unix/runargv.c	2003-03-10 15:05:53.000000000 +0000
+@@ -24,6 +24,7 @@
+ */
+ 
+ #include <signal.h>
++#include <errno.h>
+ #include "extern.h"
+ #include "sysintf.h"
+ 
+@@ -67,8 +68,7 @@
+ int     shell;
+ char	*cmd;
+ {
+-   extern  int  errno;
+-   extern  char *sys_errlist[];
++   
+    int          pid;
+    char         **argv;
+ 
+diff -ur dmake.orig/unix/startup.h dmake-4.1/unix/startup.h
+--- dmake.orig/unix/startup.h	1997-07-15 17:02:34.000000000 +0100
++++ dmake-4.1/unix/startup.h	2003-03-10 15:00:46.000000000 +0000
+@@ -24,4 +24,4 @@
+ --      Use cvs log to obtain detailed change logs.
+ */
+ 
+-"MAKESTARTUP := $(ROOTDIR)/usr/local/lib/dmake/startup/startup.mk",
++"MAKESTARTUP := $(ROOTDIR)/usr/share/dmake/startup/startup.mk",
+diff -ur dmake.orig/unix/sysvr1/stdlib.h dmake-4.1/unix/sysvr1/stdlib.h
+--- dmake.orig/unix/sysvr1/stdlib.h	1997-07-15 17:02:36.000000000 +0100
++++ dmake-4.1/unix/sysvr1/stdlib.h	2003-03-10 15:06:16.000000000 +0000
+@@ -35,7 +35,7 @@
+ extern char *malloc();
+ extern char *realloc();
+ extern free();
+-extern int errno;
++#include <errno.h>
+ 
+ #ifndef EIO
+ #	include <errno.h>
+diff -ur dmake.orig/unix/sysvr3/stdlib.h dmake-4.1/unix/sysvr3/stdlib.h
+--- dmake.orig/unix/sysvr3/stdlib.h	1997-07-15 17:02:36.000000000 +0100
++++ dmake-4.1/unix/sysvr3/stdlib.h	2003-03-10 15:06:50.000000000 +0000
+@@ -46,10 +46,6 @@
+ #define NAME_MAX pathconf("/dev/null",_PC_NAME_MAX)
+ #endif
+ 
+-extern int errno;
+-
+-#ifndef EIO
+-#	include <errno.h>
+-#endif
++#include <errno.h>
+ 
+ #endif /* _STDLIB_INCLUDED_ */
+diff -ur dmake.orig/unix/xenix/stdlib.h dmake-4.1/unix/xenix/stdlib.h
+--- dmake.orig/unix/xenix/stdlib.h	1997-07-15 17:02:36.000000000 +0100
++++ dmake-4.1/unix/xenix/stdlib.h	2003-03-10 15:05:15.000000000 +0000
+@@ -41,7 +41,7 @@
+ extern free();
+ #endif
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ #ifndef EIO
+ #	include <errno.h>
+diff -ur dmake.orig/win95/microsft/vpp40/runargv.c dmake-4.1/win95/microsft/vpp40/runargv.c
+--- dmake.orig/win95/microsft/vpp40/runargv.c	1997-07-15 17:02:37.000000000 +0100
++++ dmake-4.1/win95/microsft/vpp40/runargv.c	2003-03-10 15:07:06.000000000 +0000
+@@ -73,7 +73,6 @@
+ int     shell;
+ char	*cmd;
+ {
+-   extern  int  errno;
+    extern  char *sys_errlist[];
+    int          pid;
+    char         **argv;
+diff -ur dmake.orig/winnt/microsft/vpp40/runargv.c dmake-4.1/winnt/microsft/vpp40/runargv.c
+--- dmake.orig/winnt/microsft/vpp40/runargv.c	1997-07-15 17:02:38.000000000 +0100
++++ dmake-4.1/winnt/microsft/vpp40/runargv.c	2003-03-10 15:07:21.000000000 +0000
+@@ -73,7 +73,6 @@
+ int     shell;
+ char	*cmd;
+ {
+-   extern  int  errno;
+    extern  char *sys_errlist[];
+    int          pid;
+    char         **argv;
diff --git a/dev-util/dmake/metadata.xml b/dev-util/dmake/metadata.xml
new file mode 100644
index 000000000000..8a9b49eec325
--- /dev/null
+++ b/dev-util/dmake/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>chithanh@gentoo.org</email>
+		<name>Chí-Thanh Christopher Nguyễn</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
new file mode 100644
index 000000000000..ca8fee9b8993
--- /dev/null
+++ b/dev-util/dogtail/Manifest
@@ -0,0 +1 @@
+DIST dogtail-0.9.0.tar.gz 119882 SHA256 564dae5fba4fa3a7f6d53503e0877dad56ae8bce10e181d3d2c0bdbf063f4e36 SHA512 cf2956fad923f0f325f5dc3cd8f5a575491f6c455e2fa597b034b09e1579054b84b6ae80b67cbbe161c012c0de48457f872cfe27a5e0274447d32e21e4a8360d WHIRLPOOL 771606a4bc3d59bd75df85ab9ef3dd8bd4e28161e13fc792bb4108f7b058db18f42c1174499b90d3c307c3302e254278aecf94e03ff894222bc7f12021611c1f
diff --git a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..9eaf0b20d149
--- /dev/null
+++ b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1 gnome2-utils fdo-mime
+
+DESCRIPTION="GUI test tool and automation framework using accessibility framework"
+HOMEPAGE="https://fedorahosted.org/dogtail/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/pyatspi[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-base/xorg-server[xvfb]
+	x11-apps/xinit
+"
+DEPEND="${DEPEND}"
+
+src_prepare() {
+	# Install docs in one place
+	sed "s:doc/${PN}:doc/${PF}:" -i setup.py || die
+
+	# Fix current user detection, upstream bug #46
+	# Also, respect TMPDIR
+	epatch "${FILESDIR}"/${PN}-0.9.0-get-user.patch
+
+	# Upstream loads resources relative to __file__, which doesn't work with
+	# gentoo's dev-lang/python-exec. So we need to add hard-coded paths.
+	epatch "${FILESDIR}"/${PN}-0.9.0-gentoo-paths.patch
+	sed -e "s:@EPREFIX_USR@:'${EPREFIX}/usr':" -i sniff/sniff || die "sed failed"
+
+	distutils-r1_src_prepare
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/dogtail/files/dogtail-0.9.0-gentoo-paths.patch b/dev-util/dogtail/files/dogtail-0.9.0-gentoo-paths.patch
new file mode 100644
index 000000000000..7c4acfb62884
--- /dev/null
+++ b/dev-util/dogtail/files/dogtail-0.9.0-gentoo-paths.patch
@@ -0,0 +1,43 @@
+diff --git a/sniff/sniff b/sniff/sniff
+index 86771f9..05f4c6a 100755
+--- a/sniff/sniff
++++ b/sniff/sniff
+@@ -45,23 +45,14 @@ class SniffApp(object):
+         if os.path.exists('sniff.ui'):
+             self.builder.add_from_file('sniff.ui')
+         else:
+-            import os
+-            path = os.path.abspath(
+-                os.path.join(__file__, os.path.pardir, os.path.pardir))
+-            if path is '/': # in case the path is /bin/sniff
+-                path = '/usr'
+-            self.builder.add_from_file(path +
++            self.builder.add_from_file(@EPREFIX_USR@ +
+                                        '/share/dogtail/glade/sniff.ui')
+         self.app = self.builder.get_object(self.appName)
+         try:
+             self.app.set_icon_from_file('../icons/dogtail-head.svg')
+         except Exception:
+             import os
+-            path = os.path.abspath(
+-                os.path.join(__file__, os.path.pardir, os.path.pardir))
+-            if path is '/':
+-                path = '/usr'
+-            self.app.set_icon_from_file(os.path.join(path,
++            self.app.set_icon_from_file(os.path.join(@EPREFIX_USR@,
+                                                      'share/icons/hicolor/scalable/apps/dogtail-head.svg'))
+         self.setUpWidgets()
+         self.connectSignals()
+@@ -666,11 +657,7 @@ def loadIcon(iconName):
+         pixbuf = GdkPixbuf.Pixbuf.new_from_file('icons/' + iconName)
+     except GObject.GError:
+         import os
+-        path = os.path.abspath(
+-            os.path.join(__file__, os.path.pardir, os.path.pardir))
+-        if path is '/':
+-                path = '/usr'
+-        iconName = os.path.join(path, 'share/dogtail/icons/', iconName)
++        iconName = os.path.join(@EPREFIX_USR@, 'share/dogtail/icons/', iconName)
+         pixbuf = GdkPixbuf.Pixbuf.new_from_file(iconName)
+     return pixbuf
+ 
diff --git a/dev-util/dogtail/files/dogtail-0.9.0-get-user.patch b/dev-util/dogtail/files/dogtail-0.9.0-get-user.patch
new file mode 100644
index 000000000000..07a6ad807467
--- /dev/null
+++ b/dev-util/dogtail/files/dogtail-0.9.0-get-user.patch
@@ -0,0 +1,28 @@
+Do not use USER as it can be unset.
+
+Use LOGNAME first as recommended by python documentation, then try alternatives.
+
+Also, use tempfile to respect environment variables changing tmpdir.
+
+Upstream: https://fedorahosted.org/dogtail/ticket/46
+Debian: http://bugs.debian.org/743500
+
+--- a/dogtail/config.py	2015-06-08 22:59:08.664107350 +0200
++++ b/dogtail/config.py	2015-06-08 22:57:54.433669729 +0200
+@@ -6,11 +6,15 @@ __author__ = "Zack Cerza <zcerza@redhat.com>, David Malcolm <dmalcolm@redhat.com
+ import os
+ import sys
+ import locale
++import tempfile
+ 
+ 
+ def _userTmpDir(baseName):
+     # i.e. /tmp/dogtail-foo
+-    return '-'.join(('/'.join(('/tmp', baseName)), os.environ['USER']))
++    return '-'.join((
++        '/'.join((tempfile.gettempdir(), baseName)),
++        os.getenv('LOGNAME', os.getenv('USER', os.getlogin()))
++    ))
+ 
+ 
+ class _Config(object):
diff --git a/dev-util/dogtail/metadata.xml b/dev-util/dogtail/metadata.xml
new file mode 100644
index 000000000000..dad9001338dc
--- /dev/null
+++ b/dev-util/dogtail/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>gnome</herd>
+</pkgmetadata>
diff --git a/dev-util/dropwatch/Manifest b/dev-util/dropwatch/Manifest
new file mode 100644
index 000000000000..e4cc3b5420e3
--- /dev/null
+++ b/dev-util/dropwatch/Manifest
@@ -0,0 +1 @@
+DIST dropwatch-1.4.tbz2 32199 SHA256 ede45fd3b4a847a9befa73e9e8f6336aee5418fc3e041648c684e5085113a3b4 SHA512 a5744ea156464c53d31d5b54bcaf9bd61f2035285059bc05a3eec20be71d1451a6191237f194dc5d8e6fb6fcbb81d9ef87adf5ac2d878cc1f159191c47118e29 WHIRLPOOL 3d8661ab85da0a7485e8f6312eeb99e1ed14f6af38d119093c835e94f518918908e596d3e5744be5f529d280b6644b459106eb503112df58b63865737f8eecc1
diff --git a/dev-util/dropwatch/dropwatch-1.4.ebuild b/dev-util/dropwatch/dropwatch-1.4.ebuild
new file mode 100644
index 000000000000..59e63c1f04df
--- /dev/null
+++ b/dev-util/dropwatch/dropwatch-1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="A utility to interface to the kernel to monitor for dropped network packets"
+HOMEPAGE="https://fedorahosted.org/dropwatch/"
+SRC_URI="https://fedorahosted.org/releases/d/r/dropwatch/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/libnl:3
+	sys-libs/readline
+	sys-devel/binutils"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~NET_DROP_MONITOR"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-binutils-2.23.patch"
+)
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" -C src
+}
+
+src_install() {
+	dobin "src/${PN}"
+	doman "doc/${PN}.1"
+	dodoc README
+}
+
+pkg_postinst() {
+	einfo "Ensure that 'drop_monitor' kernel module is loaded before running ${PN}"
+}
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
new file mode 100644
index 000000000000..43702c4ff385
--- /dev/null
+++ b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
@@ -0,0 +1,68 @@
+diff -aurd src.orig/lookup.c src/lookup.c
+--- src.orig/lookup.c	2011-10-03 22:51:38.000000000 +0400
++++ src/lookup.c	2013-02-18 09:13:56.683214438 +0400
+@@ -27,13 +27,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "lookup.h"
++#include <bfd.h>
+ 
+ extern struct lookup_methods bfd_methods;
+ extern struct lookup_methods kallsym_methods;
+diff -aurd src.orig/lookup.h src/lookup.h
+--- src.orig/lookup.h	2011-10-03 22:51:38.000000000 +0400
++++ src/lookup.h	2013-02-18 09:11:00.506895026 +0400
+@@ -28,6 +28,9 @@
+ #include <stdlib.h>
+ #include <asm/types.h>
+ 
++// satisfy PR 14072 in bfd.h
++#define PACKAGE 1
++#define PACKAGE_VERSION 1
+ 
+ /*
+  * Initalization routine
+diff -aurd src.orig/lookup_bfd.c src/lookup_bfd.c
+--- src.orig/lookup_bfd.c	2012-01-16 22:34:11.000000000 +0400
++++ src/lookup_bfd.c	2013-02-18 09:14:02.472984310 +0400
+@@ -25,13 +25,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "lookup.h"
++#include <bfd.h>
+ 
+ 
+ static int lookup_bfd_init(void)
+diff -aurd src.orig/lookup_kas.c src/lookup_kas.c
+--- src.orig/lookup_kas.c	2012-05-31 02:43:23.000000000 +0400
++++ src/lookup_kas.c	2013-02-18 09:14:07.906101713 +0400
+@@ -25,7 +25,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -33,6 +32,7 @@
+ #include <sys/queue.h>
+ 
+ #include "lookup.h"
++#include <bfd.h>
+ 
+ struct symbol_entry {
+ 	char *sym_name;
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
new file mode 100644
index 000000000000..14ffcc83513e
--- /dev/null
+++ b/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
@@ -0,0 +1,21 @@
+--- src/Makefile.orig	2012-10-24 13:27:12.000000000 +0400
++++ src/Makefile	2012-10-24 13:27:47.000000000 +0400
+@@ -1,14 +1,14 @@
+ all: dropwatch
+-CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0`
+-LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3
++CFLAGS+=-c -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0`
++LIBS=-lbfd -lreadline -lnl-3 -lnl-genl-3
+ OBJFILES := main.o lookup.o\
+ 	 lookup_bfd.o lookup_kas.o
+ 
+ dropwatch: $(OBJFILES) 
+-	gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) 
++	$(CC) -o dropwatch $(LDFLAGS) $(OBJFILES) $(LIBS)
+ 
+ %.o: %.c
+-	gcc $(CFLAGS) $<
++	$(CC) $(CFLAGS) $<
+ clean:
+ 	rm -f dropwatch *.o
+ 
diff --git a/dev-util/dropwatch/metadata.xml b/dev-util/dropwatch/metadata.xml
new file mode 100644
index 000000000000..ee2fca9fb255
--- /dev/null
+++ b/dev-util/dropwatch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/duma/Manifest b/dev-util/duma/Manifest
new file mode 100644
index 000000000000..e30d2704795e
--- /dev/null
+++ b/dev-util/duma/Manifest
@@ -0,0 +1,3 @@
+DIST duma-2.5.15-GNUmakefile.patch.bz2 4618 SHA256 71c79fedc436402301abc152ff0bca0db505c8641f57c2232a8d2d6e9f3a59b7 SHA512 6d83294897a60c6d0ebac388c8f791adc6a199b2c9838497bcfff39502262014c8437a331e08e3526568d3ef755a7dfdc2557771bdae89c58cd5f714eae70df2 WHIRLPOOL d295b278a35ce1cba7fd4f657c457dbad5a40b8f132632e5a3b1ff618e666a2de75b8347b053aacfaab77550918bcfedb92e8b3f0c6629069b242473c9e5b54f
+DIST duma_2_5_13.tar.gz 233157 SHA256 338757d68f580b38d0680f21151c55e705abf5c933d959410be90fe5c5248777 SHA512 da0f46a697f95cbb17d0dbb3135df779ac347fd9e63c1578d2d732300d5288958d02b5a271e84292a8279c1ebc3dc153f896cbeca916cf18aba8e54788671288 WHIRLPOOL 7262fecfb8a2176c352d0730f2fa2667d985740b2a75f42e7980d9a13f72d494eb9bd1dd4116cec37d03cc5441eb128d405de46e8a718b0a918179c7ae41368b
+DIST duma_2_5_15.tar.gz 240479 SHA256 baaf794854e3093ad1bddadbfb8ad4b220a7117d70359ee216bd59e353734e17 SHA512 0e2abdb08cfbaf9fd0a6be348c831a83ac4ee86d2297dcd1c4d625ddb4b2c1c73eef05e2b895e291d5b8076b1baea559c89d475f30e409210df4ab69b71b6345 WHIRLPOOL b7775cfefa49e942a8243520741920f506b09251e7c0966c2014863589f74a915de4ba8eee77716512ee3ad4071f748beb8ff4c03c95b7242f80aa397c4c51ad
diff --git a/dev-util/duma/duma-2.5.13.ebuild b/dev-util/duma/duma-2.5.13.ebuild
new file mode 100644
index 000000000000..0c3c41620aaa
--- /dev/null
+++ b/dev-util/duma/duma-2.5.13.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
+
+MY_P="${PN}_$(replace_all_version_separators '_')"
+
+DESCRIPTION="DUMA (Detect Unintended Memory Access) is a memory debugging library"
+HOMEPAGE="http://duma.sourceforge.net/"
+
+SRC_URI="mirror://sourceforge/duma/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-shells/bash"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	#DUMA_OPTIONS="-DDUMA_LIB_NO_LEAKDETECTION"
+	DUMA_OPTIONS="-DDUMA_USE_FRAMENO"
+	if [ -n "${DUMA_OPTIONS}" ]; then
+	    ewarn ""
+	    elog "Custom build options are ${DUMA_OPTIONS}."
+	else
+	    ewarn ""
+	    elog "Custom build options are not set!"
+	fi
+	elog "See the package Makefile for for more options (also installed"
+	elog "with package docs as Makefile.duma)."
+	ewarn ""
+}
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s:(prefix)/lib:(prefix)/$(get_libdir):g" Makefile
+	sed -i -e "s:share/doc/duma:share/doc/${P}:g" Makefile
+}
+
+src_compile(){
+	replace-flags O? O0
+	append-flags -Wall -Wextra -U_FORTIFY_SOURCE
+	tc-export AR CC CXX LD RANLIB
+
+	use amd64 && export DUMA_ALIGNMENT=16
+
+	make CPPFLAGS="${DUMA_OPTIONS}" reconfig || die "make reconfig failed"
+	emake CFLAGS="${CFLAGS}" CC=$(tc-getCC) || die "make failed"
+}
+
+src_test() {
+	ewarn "Control-C now if you want to disable tests..."
+	epause 5
+
+	cd "${S}"
+	use amd64 && export DUMA_ALIGNMENT=16
+	make CFLAGS="${DUMA_OPTIONS} ${CFLAGS}" \
+	    CC=$(tc-getCC) test || die "make test failed"
+
+	elog ""
+	ewarn "Check output above to verify all tests have passed.  Both"
+	ewarn "static and dynamic confidence tests should say PASSED."
+	elog ""
+}
+
+src_install(){
+	# make install fails nicely here on the first file...
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc CHANGELOG TODO
+	# All the good comments on duma build options are in the Makefile
+	newdoc Makefile Makefile.duma
+
+	if use examples; then
+	    insinto /usr/share/doc/${P}/examples
+	    doins example[1-6].cpp
+	    doins example_makes/ex6/Makefile
+	fi
+}
diff --git a/dev-util/duma/duma-2.5.15-r1.ebuild b/dev-util/duma/duma-2.5.15-r1.ebuild
new file mode 100644
index 000000000000..e295d5720991
--- /dev/null
+++ b/dev-util/duma/duma-2.5.15-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
+
+MY_P=${PN}_$(replace_all_version_separators '_')
+
+DESCRIPTION="DUMA (Detect Unintended Memory Access) is a memory debugging library"
+HOMEPAGE="http://duma.sourceforge.net"
+SRC_URI="mirror://sourceforge/duma/${MY_P}.tar.gz
+	mirror://gentoo/${P}-GNUmakefile.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+RDEPEND="app-shells/bash"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${DISTDIR}"/${P}-GNUmakefile.patch.bz2
+}
+
+src_compile() {
+	# strip-flags
+	replace-flags O? O0
+	append-flags -Wall -Wextra -U_FORTIFY_SOURCE
+	tc-export AR CC CXX LD RANLIB
+
+	case "${CHOST}" in
+		*-linux-gnu)
+			OS=linux;;
+		*-solaris*)
+			OS=solaris;;
+		*-darwin*)
+			OS=osx;;
+		*-freebsd*)
+			OS=freebsd;;
+		*-netbsd*)
+			OS=netbsd;;
+		*-cygwin*)
+			OS=cygwin;;
+		**-irix**)
+			OS=irix;;
+	esac
+	export OS="${OS}"
+	elog "Detected OS is: ${OS}"
+
+	if use amd64 && ! [ -n "${DUMA_ALIGNMENT}" ]; then
+		export DUMA_ALIGNMENT=16
+		elog "Exported DUMA_ALIGNMENT=${DUMA_ALIGNMENT} for x86_64,"
+	fi
+
+	make reconfig || die "make config failed"
+	# The above must be run first if distcc is enabled, otherwise
+	# the real build breaks on parallel makes.
+	emake || die "emake failed"
+}
+
+src_test() {
+	emake test || die "emake test failed"
+
+	elog "Please, see the output above to verify all tests have passed."
+	elog "Both static and dynamic confidence tests should say PASSED."
+}
+
+src_install(){
+	emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" \
+		docdir="${D}/usr/share/doc/${PF}" install || die "emake install failed"
+
+	dosed "s|LD_PRELOAD=./libduma|LD_PRELOAD=libduma|" /usr/bin/duma \
+		|| die "dosed failed"
+
+	dodoc CHANGELOG TODO GNUmakefile
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins example[1-6].cpp example_makes/ex6/Makefile || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "See the GNUmakefile which will be also installed at"
+	elog "/usr/share/doc/${PF} for more options. You can now export"
+	elog "varibles to the build system easily, e.g.:"
+	elog "# export CPPFLAGS=\"-DFLAG\" (or by using append-cppflags)"
+	elog "# export DUMA_ALIGNMENT=${DUMA_ALIGNMENT} (Default is 16 for x86_64)"
+	elog "See more information about DUMA_ALIGNMENT from Readme.txt"
+}
diff --git a/dev-util/duma/metadata.xml b/dev-util/duma/metadata.xml
new file mode 100644
index 000000000000..38964f6cb5a5
--- /dev/null
+++ b/dev-util/duma/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>dev-tools</herd>
+	<longdescription>
+DUMA is an open-source library (under GNU General Public License) to 
+detect buffer overruns and under-runs in C and C++ programs. This 
+library is a fork of Buce Perens Electric Fence library and adds 
+some new features to it.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">duma</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
new file mode 100644
index 000000000000..501891839bd0
--- /dev/null
+++ b/dev-util/dwarves/Manifest
@@ -0,0 +1 @@
+DIST dwarves-1.10_p20140618.tar.xz 105912 SHA256 1955f854206ad26a2949fd2ff20da2403db84393fe9db5769fafcbaacde001c6 SHA512 522a6d674da5cc2316c180bcb4e90419d5811ff34e6aeeef875950dbcc4c12ea5a133d159360629d687f93ae2db622bb87d9b94a747aade90a61b239b9137a2c WHIRLPOOL 63a4ff06e76e55a0bdd1feb3c5e3c450170f3fbfae80b3d61a36e69f0616ed90e2cdbe065f47cd08caaf8de57e2ed366ded8f581eb2b228bac917b23f66f8ab8
diff --git a/dev-util/dwarves/dwarves-1.10_p20140618.ebuild b/dev-util/dwarves/dwarves-1.10_p20140618.ebuild
new file mode 100644
index 000000000000..0d0e6e763789
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.10_p20140618.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib cmake-utils python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.131
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
+	S=${WORKDIR}
+else
+	SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.xz"
+fi
+
+DOCS=( README README.ctracer NEWS )
+PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake-utils_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${D}"/usr/bin/ostra-cg \
+		"${D}"/usr/share/dwarves/runtime/python/ostra.py
+}
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
new file mode 100644
index 000000000000..115786873e8f
--- /dev/null
+++ b/dev-util/dwarves/dwarves-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib cmake-utils git-2 python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND=">=dev-libs/elfutils-0.131
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOC=( README README.ctracer )
+
+DOCS=( README README.ctracer NEWS )
+PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake-utils_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${D}"/usr/bin/ostra-cg \
+		"${D}"/usr/share/dwarves/runtime/python/ostra.py
+}
diff --git a/dev-util/dwarves/files/dwarves-1.10-python-import.patch b/dev-util/dwarves/files/dwarves-1.10-python-import.patch
new file mode 100644
index 000000000000..e308ac6e2788
--- /dev/null
+++ b/dev-util/dwarves/files/dwarves-1.10-python-import.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=423817
+
+--- dwarves-1.10/ostra/ostra-cg
++++ dwarves-1.10/ostra/ostra-cg
+@@ -10,7 +10,9 @@
+ # under the terms of version 2 of the GNU General Public License as
+ # published by the Free Software Foundation.
+ 
+-import sys, datetime, os, ostra
++import sys
++sys.path.insert(0, "/usr/share/dwarves/runtime/python")
++import datetime, os, ostra
+ 
+ class_def = None
+ 
diff --git a/dev-util/dwarves/metadata.xml b/dev-util/dwarves/metadata.xml
new file mode 100644
index 000000000000..36b552b57152
--- /dev/null
+++ b/dev-util/dwarves/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    The more-than-seven dwarves is a collection of tools that allows
+    to inspect and query the DWARF2 information present in ELF files
+    built with full debug information. These tools include pahole
+    (Poke-a-hole) and codiff, and were originally designed to inspect
+    the Linux kernel and its modules, but can be used in for
+    user-space software too.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
new file mode 100644
index 000000000000..205c5ae3a835
--- /dev/null
+++ b/dev-util/dwdiff/Manifest
@@ -0,0 +1,3 @@
+DIST dwdiff-2.0.10.tar.bz2 76285 SHA256 67c4b9fbbbf8ea25335a07c7f4107028649dcd04136a3904778c7a767b843f6f SHA512 670ab12560e3aa98f44a9cd53e87ba8c553807f7864190f9da6db59cc3b152fdb486429b7316e9d0a58d61afc478353924330e984218da52d5017cb6932a6ee7 WHIRLPOOL cad6313439bb885987d593eb6058022937f6370e5ef3151bbdcd341179a033184a16e62f8ad9d606f812d02da90718c513017bba1688d8cb57cbb1bae6c989c3
+DIST dwdiff-2.0.9.tgz 86521 SHA256 c1c9217825ad3fac9936129cc26b73fa5479fb079e5c34522fc7066e74e31ef8 SHA512 73fe43dcc7ba6d3a4e773c7a8b117c359c0470b7b00d7f5bd53781dd046e06b5e02c5adfc7f877bc4ded289a767de3849bacea7cf03883f72046c2d0e7877f1b WHIRLPOOL 9054ef46bfa1f767a2fa64e195afaa7150d2895e99c7bb63cb9380463ce72d5d2e0e9bac336fb677d1a7dfd4c97f98f3e3541a267e1c4ea7096e6f61c4e09b0c
+DIST dwdiff-2.1.0.tar.bz2 79224 SHA256 45308f2f07c08c75c6ebd1eae3e3dcf7f836e5af1467cefc1b4829777c07743a SHA512 63e5ea3ae510c84fa2353da55bbc3cfac3a3753e1cebfb42c387218289a5e19d8e68af663181720a55eca05e49ef075db7d5dafda9dc4d57b9af503553ae9021 WHIRLPOOL 74ceba5cc7c20e0ab6ee09b62f7e8b07a1b8321bbe60ca7c3791c35176ba7137ddf17b1c471ff5ac0586ad0455e67968c71bf00f2de7cb137720b88a85c8f181
diff --git a/dev-util/dwdiff/dwdiff-2.0.10.ebuild b/dev-util/dwdiff/dwdiff-2.0.10.ebuild
new file mode 100644
index 000000000000..c217f2b6370e
--- /dev/null
+++ b/dev-util/dwdiff/dwdiff-2.0.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
+HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
+SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="dev-libs/icu:="
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e '/INSTALL/s:COPYING::' \
+		Makefile.in || die
+}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		$(use_with nls gettext) || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
+}
diff --git a/dev-util/dwdiff/dwdiff-2.0.9.ebuild b/dev-util/dwdiff/dwdiff-2.0.9.ebuild
new file mode 100644
index 000000000000..a212df95bcf7
--- /dev/null
+++ b/dev-util/dwdiff/dwdiff-2.0.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
+HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
+SRC_URI="http://os.ghalkes.nl/dist/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="dev-libs/icu:="
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e '/INSTALL/s:COPYING::' \
+		Makefile.in || die
+}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		$(use_with nls gettext) || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
+}
diff --git a/dev-util/dwdiff/dwdiff-2.1.0.ebuild b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
new file mode 100644
index 000000000000..c217f2b6370e
--- /dev/null
+++ b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
+HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
+SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="dev-libs/icu:="
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e '/INSTALL/s:COPYING::' \
+		Makefile.in || die
+}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		$(use_with nls gettext) || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
+}
diff --git a/dev-util/dwdiff/metadata.xml b/dev-util/dwdiff/metadata.xml
new file mode 100644
index 000000000000..8653502db3ff
--- /dev/null
+++ b/dev-util/dwdiff/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
new file mode 100644
index 000000000000..31e6d404b0d9
--- /dev/null
+++ b/dev-util/eclipse-sdk/Manifest
@@ -0,0 +1,2 @@
+DIST eclipse-R3_5_1-fetched-src.tar.bz2 79061683 SHA256 3c93115e3031686dd26c94833cd21ce26244340408a435a3b9dcd29404309c60 SHA512 2ad3669a5d39abeebed4121ccc67a42590b9ae80bde5ae69b4fc079e39640cabfcb3a7388c6cc6329fff74c0858f20b97c855fd4828a3b1a90bd6aa2c486dd63 WHIRLPOOL 36ccc7323ea0958b595e29bf12eb2b7a3891800119030353bdb4ed7f47f20f567435508415e909580958d2af1c0b40850dbb8f7d03ba1f649931b1d067fb59d9
+DIST eclipse-build-R0_4_0.tar.gz 164001 SHA256 87f159e0861b378b1ea13d3173d6066fbc141a350283b0f0278831a5097cbe1b SHA512 c8ff9fcf3dc6512e051d8d3d89391b49b6260583980851409263fdb03ea1af9f8bde55fc18db4e418c109cc78aa1bd33f90e0b5a8ffa65f4c826ecfc245ba6ca WHIRLPOOL 243be2d46de3454ca514e5955219742cddc2c9762ee9040087ccdac227699f054476f57e6b66daaf2a188e746c1196d6605b6e64b415c6f017600c256763d2d8
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..bdb50043c7fa
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps"
+
+# eclipse-build is too complicated for automatic fixing
+# if there are any fixes we should create patches
+# and push them upstream
+JAVA_PKG_BSFIX="off"
+
+inherit eutils java-pkg-2 java-ant-2 check-reqs
+
+BUILD_ID="R3_5_1"
+ECLIPSE_BUILD_VER="R0_4_0"
+S="${WORKDIR}/eclipse-build-${ECLIPSE_BUILD_VER}"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse/"
+SRC_URI="http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-${BUILD_ID}-fetched-src.tar.bz2
+	http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="3.5"
+KEYWORDS="amd64 x86"
+IUSE="doc gnome source"
+
+CDEPEND=">=dev-java/swt-${PV}:${SLOT}
+	>=dev-java/ant-1.7.1
+	>=dev-java/ant-core-1.7.1
+	>=dev-java/asm-3.1:3
+	>=dev-java/commons-codec-1.3
+	>=dev-java/commons-el-1.0
+	>=dev-java/commons-httpclient-3.1:3
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/hamcrest-core-1.1
+	>=dev-java/icu4j-4.0.1:4
+	>=dev-java/jsch-0.1.41
+	>=dev-java/junit-3.8.2:0
+	>=dev-java/junit-4.5:4
+	>=dev-java/lucene-1.9.1:1.9
+	>=dev-java/lucene-analyzers-1.9.1:1.9
+	>=dev-java/sat4j-core-2.1:2
+	>=dev-java/sat4j-pseudo-2.1:2
+	dev-java/tomcat-servlet-api:2.5
+	x86? ( gnome? ( gnome-base/gconf ) )
+	dev-java/ant-nodeps"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	>=virtual/jdk-1.6"
+
+ALL_OS='aix hpux linux macosx qnx solaris win32'
+ALL_WS='carbon cocoa gtk motif photon win32 wpf'
+ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64'
+
+buildDir="${S}/build/eclipse-${BUILD_ID}-fetched-src"
+
+pkg_setup() {
+	ws='gtk'
+	if use x86 ; then os='linux' ; arch='x86'
+	elif use amd64 ; then os='linux' ; arch='x86_64'
+	fi
+
+	java-pkg-2_pkg_setup
+
+	if use doc ; then
+		ewarn "Having the 'doc' USE flag enabled greatly increases the build time."
+		ewarn "You might want to disable it for ${PN} if you don't need it."
+	fi
+}
+
+src_unpack() {
+	CHECKREQS_MEMORY="1536"
+	if use doc || use source ; then
+		CHECKREQS_DISK_BUILD="3072"
+	else
+		CHECKREQS_DISK_BUILD="1536"
+	fi
+	check_reqs
+
+	unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz"
+	mv "${WORKDIR}/eclipse-build-0_4_RC6" "${S}" || die
+	ln -s "${DISTDIR}/eclipse-${BUILD_ID}-fetched-src.tar.bz2" "${S}"/ || die
+
+	cd "${S}"
+	# building with ecj fails for some reason (polluted classpath probably)
+	java-pkg_force-compiler javac
+	eant unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/3.5/jvmarg.patch" || die
+
+	# apply patches before we start cleaning junk out
+	eant applyPatches
+
+	# fix up hardcoded runtime class paths
+	sed -e 's|/usr/lib/jvm/java/jre/lib/rt\.jar:.*$|'"$(java-config --runtime)"'|' \
+			-i {,pde}build.properties || die
+
+	# fix up arch specifications if we're x86_64
+	if use amd64 ; then
+		sed -e 's/x86/\0_64/' -i "${buildDir}"/buildConfigs/eclipse-build-config/build.properties || die
+	fi
+
+	# disable building of libgnomeproxy on x86 if USE=-gnome
+	if ! use gnome ; then
+		sed_xml_element 'condition' -e '/property="build\.libgnomeproxy"/d' -i build.xml || die
+	fi
+
+	# skip compilation of SWT native libraries (we use the system-installed copies)
+	sed_xml_element 'ant' -e '/swt/d' -i build.xml || die
+
+	ebegin 'Removing plugins of irrelevant platforms'
+	local remove_os=" ${ALL_OS} " ; remove_os=${remove_os/ ${os} / }
+	remove_os=${remove_os# } ; remove_os=${remove_os% } ; remove_os=${remove_os// /'\|'}
+	local remove_ws=" ${ALL_WS} " ; remove_ws=${remove_ws/ ${ws} / }
+	remove_ws=${remove_ws# } ; remove_ws=${remove_ws% } ; remove_ws=${remove_ws// /'\|'}
+	local remove_arch=" ${ALL_ARCH} " ; remove_arch=${remove_arch/ ${arch} / }
+	remove_arch=${remove_arch# } ; remove_arch=${remove_arch% } ; remove_arch=${remove_arch// /'\|'}
+	sed_xml_element 'includes\|plugin' \
+			-e '/id="org\.eclipse\.\(core\.net\.linux\.x86\|update\.core\.linux\)"/b' \
+			-e '/os="'"${remove_os}"'"/d' -e '/ws="'"${remove_ws}"'"/d' -e '/arch="'"${remove_arch}"'"/d' \
+			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
+		|| die 'remove irrelevant platforms failed'
+	eend
+
+	if ! use doc ; then
+		ebegin 'Removing documentation plugins'
+		rm -rf "${buildDir}"/plugins/*.doc{,.*}
+		eclipse_delete-plugins '.*\.doc\(\..*\|\)'
+		eend
+	fi
+
+	if ! use source ; then
+		ebegin 'Removing source plugins'
+		rm -rf "${buildDir}"/plugins/*.source{,_*}
+		eclipse_delete-plugins '.*\.source'
+		eend
+	fi
+
+	unbundle "${buildDir}"/plugins
+	cd ${buildDir} || die
+	epatch "${FILESDIR}/${SLOT}/hamcrest-junit-lib.patch"
+	epatch "${FILESDIR}/${SLOT}/gtk_makefile.patch"
+}
+
+src_compile() {
+	ANT_OPTS='-Xmx512M' eant -DbuildArch=${arch}
+}
+
+src_install() {
+	local destDir="/usr/$(get_libdir)/eclipse-${SLOT}"
+
+	insinto "${destDir}"
+	shopt -s dotglob
+	doins -r "${buildDir}"/installation/* || die
+	shopt -u dotglob
+	chmod +x "${D}${destDir}"/eclipse
+	rm -f "${D}${destDir}"/libcairo-swt.so  # use the system-installed SWT libraries
+
+	ebegin 'Unbundling dependencies'
+	unbundle "${D}${destDir}"
+	eend
+
+	# Install Gentoo wrapper and config
+	dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}" || die
+	insinto /etc
+	doins "${FILESDIR}/${SLOT}/eclipserc-${SLOT}" || die
+
+	# Create desktop entry
+	make_desktop_entry "eclipse-${SLOT}" "Eclipse ${PV}" "${destDir}/icon.xpm" || die
+}
+
+unbundle() {
+	pushd "${1}" > /dev/null || die
+	eclipse_unbundle-dir plugins/org.apache.ant_* ant-core,ant-nodeps lib
+	eclipse_unbundle-dir plugins/org.junit_* junit
+	eclipse_unbundle-dir plugins/org.junit4_* junit-4
+	eclipse_unbundle-jar plugins/com.ibm.icu_*.jar icu4j-4
+	eclipse_unbundle-jar plugins/com.jcraft.jsch_*.jar jsch
+	eclipse_unbundle-jar plugins/javax.servlet_*.jar tomcat-servlet-api-2.5 servlet-api
+	eclipse_unbundle-jar plugins/javax.servlet.jsp_*.jar tomcat-servlet-api-2.5 jsp-api
+	eclipse_unbundle-jar plugins/org.apache.commons.codec_*.jar commons-codec
+	eclipse_unbundle-jar plugins/org.apache.commons.el_*.jar commons-el
+	eclipse_unbundle-jar plugins/org.apache.commons.httpclient_*.jar commons-httpclient-3
+	eclipse_unbundle-jar plugins/org.apache.commons.logging_*.jar commons-logging
+	#eclipse_unbundle-jar plugins/org.apache.jasper_*.jar tomcat-jasper
+	eclipse_unbundle-jar plugins/org.apache.lucene_*.jar lucene-1.9
+	eclipse_unbundle-jar plugins/org.apache.lucene.analysis_*.jar lucene-analyzers-1.9
+	eclipse_unbundle-jar plugins/org.eclipse.swt."${ws}.${os}.${arch}"_*.jar swt-${SLOT}
+	eclipse_unbundle-jar plugins/org.hamcrest.core_*.jar hamcrest-core
+	#eclipse_unbundle-jar plugins/org.mortbay.jetty_*.jar jetty
+	eclipse_unbundle-jar plugins/org.objectweb.asm_*.jar asm-3
+	eclipse_unbundle-jar plugins/org.sat4j.core_*.jar sat4j-core-2
+	eclipse_unbundle-jar plugins/org.sat4j.pb_*.jar sat4j-pseudo-2
+	popd > /dev/null
+}
+
+# Replaces the bundled jars in plugin dir ${1} with links to the jars from
+# java-config package ${2}. If ${3} is given, the jars are linked in ${1}/${3}.
+eclipse_unbundle-dir() {
+	local bundle=${1} package=${2} into=${3}
+	local basename=$(basename "${bundle}")
+	local barename=${basename%_*}
+
+	if [[ -d "${bundle}" ]] ; then
+		einfo "  ${barename} => ${package}"
+
+		pushd "${bundle}" > /dev/null || die
+		local classpath=$(manifest_get META-INF/MANIFEST.MF 'Bundle-ClassPath')
+		manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
+		rm -f ${classpath//,/ } META-INF/ECLIPSEF.{RSA,SF}
+		java-pkg_jar-from ${into:+--into "${into}"} "${package}"
+		popd > /dev/null
+	fi
+}
+
+# Converts plugin jar ${1} into a plugin dir, creates symbolic links to the
+# jars of java-config package ${2} in that dir, and updates artifacts.xml and
+# bundles.info to reflect the fact that the plugin is now a dir.
+eclipse_unbundle-jar() {
+	local bundle=${1} package=${2} jar=${3}
+	local basename=$(basename "${bundle}" .jar)
+	local barename=${basename%_*}
+
+	if [[ -f "${bundle}" ]] ; then
+		einfo "  ${barename} => ${package}"
+
+		mkdir "${bundle%.jar}"
+		pushd "${bundle%.jar}" > /dev/null || die
+		"$(java-config --jar)" -xf "../${basename}.jar" plugin.properties META-INF/MANIFEST.MF || die
+		java-pkg_jar-from "${package}" ${jar:+"${jar}.jar"}
+		local classpath=$(find . -type l -name '*.jar' -print0 | tr '\0' ',')
+		classpath=${classpath%,} ; classpath=${classpath//.\/}
+		manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
+		manifest_replace META-INF/MANIFEST.MF 'Bundle-ClassPath' "${classpath}"
+		popd > /dev/null || die
+		rm "${bundle}"
+
+		sed_xml_element 'artifact' \
+				-e '/id='\'"${barename//./\.}"\''/s|</artifact>|  <repositoryProperties size='\'1\''>\n        <property name='\'artifact.folder\'' value='\'true\''/>\n      </repositoryProperties>\n    \0|' \
+				-i artifacts.xml || die
+		sed -e 's|'"${bundle//./\.}"'|'"${bundle%.jar}"'/|' \
+			-i configuration/org.eclipse.equinox.simpleconfigurator/bundles.info || die
+	fi
+}
+
+# Removes feature.xml references to plugins matching ${1}.
+eclipse_delete-plugins() {
+	sed_xml_element 'includes\|plugin' -e '/id="'"${1}"'"/d' \
+			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
+		|| die 'eclipse_delete-plugins failed'
+}
+
+# Prints the first value from manifest file ${1} whose key matches regex ${2},
+# unfolding as necessary.
+manifest_get() {
+	sed -n -e '/^\('"${2}"'\): /{h;:A;$bB;n;/^ /!bB;H;bA};d;:B;g;s/^[^:]*: //;s/\n //g;p;q' "${1}" \
+		|| die 'manifest_get failed'
+}
+
+# Deletes values from manifest file ${1} whose keys match regex ${2}, taking
+# into account folding.
+manifest_delete() {
+	sed -n -e ':A;/^\('"${2}"'\): /{:B;n;/^ /!{bA};bB};p' -i "${1}" \
+		|| die 'manifest_delete failed'
+}
+
+# Replaces the value for key ${2} in the first section of manifest file ${1}
+# with ${3}, or adds the key-value pair to that section if the key was absent.
+manifest_replace() {
+	LC_ALL='C' awk -v key="${2}" -v val="${3}" '
+function fold(s,  o, l, r) {
+	o = 2 ; l = length(s) - 1 ; r = substr(s, 1, 1)
+	while (l > 69) { r = r substr(s, o, 69) "\n " ; o += 69 ; l -= 69 }
+	return r substr(s, o)
+}
+BEGIN { FS = ": " }
+f { print ; next }
+i { if ($0 !~ "^ ") { f = 1 ; print } ; next }
+$1 == key { print fold(key FS val) ; i = 1 ; next }
+/^\r?$/ { print fold(key FS val) ; print ; f = 1 ; next }
+{ print }
+END { if (!f) { print fold(key FS val) } }
+' "${1}" > "${1}-" && mv "${1}"{-,} || die 'manifest_replace failed'
+}
+
+# Executes sed over each XML element with a name matching ${1}, rather than
+# over each line. The entire element (and its children) may be removed with the
+# 'd' command, or they may be edited using all the usual sed foo. Basically,
+# the script argument will be executed only for elements matching ${1}, and the
+# sed pattern space will consist of the entire element, including any nested
+# elements. Note that this is not perfect and requires no more than one XML
+# element per line to be reliable.
+sed_xml_element() {
+	local elem="${1}" ; shift
+	sed -e '/<\('"${elem}"'\)\([> \t]\|$\)/{:_1;/>/!{N;b_1};/\/>/b_3' \
+			-e ':_2;/<\/\('"${elem}"'\)>/!{N;b_2};b_3};b;:_3' "${@}"
+}
diff --git a/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 b/dev-util/eclipse-sdk/files/3.5/eclipse-3.5
new file mode 100644
index 000000000000..f50a51ad629d
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.5/eclipse-3.5
@@ -0,0 +1,50 @@
+#! /bin/sh
+#
+# Tiny startup wrapper for Eclipse
+#
+# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
+# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org>
+# Copyright (c) 2004-2008, Gentoo Foundation
+#
+# Licensed under the GNU General Public License, version 2
+#
+
+SLOT="3.5"
+
+[ -f "/etc/eclipserc-${SLOT}" ] && . "/etc/eclipserc-${SLOT}"
+[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc"
+
+ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-${SLOT}"}
+ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
+
+if [ ! -x "${ECLIPSE_BIN}" ] ; then
+	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
+	exit 1
+fi
+
+if [ $(id -u) -eq 0 ] ; then
+	echo "Do not run eclipse as root user! Exiting ..." > /dev/stderr
+	exit 1
+fi
+
+case "$(java-config -f)" in
+	*gcj*)
+		export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb"
+		;;
+esac
+
+eval $(gjl --package "swt-${SLOT}" --get-args)
+
+[ -n "${ECLIPSE_XMS}" ] && VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}"
+[ -n "${ECLIPSE_XMX}" ] && VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}"
+[ -n "${ECLIPSE_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}"
+[ -n "${ECLIPSE_MAX_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}"
+
+# Fix for JRE 1.5.
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib
+
+# Fix for >=x11-libs/gtk+-2.18.1 (not needed for Eclipse 3.6+)
+# see https://bugs.eclipse.org/bugs/show_bug.cgi?id=291257
+export GDK_NATIVE_WINDOWS=true
+
+exec "${ECLIPSE_BIN}" -vm $(java-config --java) "$@" "${ECLIPSE_USER_ARGS}" -vmargs ${VM_ARGS} 
diff --git a/dev-util/eclipse-sdk/files/3.5/eclipserc-3.5 b/dev-util/eclipse-sdk/files/3.5/eclipserc-3.5
new file mode 100644
index 000000000000..703b6491c463
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.5/eclipserc-3.5
@@ -0,0 +1,20 @@
+# This file specifies some initial Eclipse settings, like memory allowed
+# These settings only affect Eclipse startup and overall configuration
+# Main Eclipse configuration should be done within Eclipse (with the GUI)
+
+# Following variables controls the minimal and maximum amounts of memory
+# allocated to Eclipse (respectively).
+# Increase those numbers if you get OutOfMemory errors.
+
+ECLIPSE_XMS=128m
+ECLIPSE_XMX=256m
+
+# Following variables controls the minimal and maximum amounts of memory
+# allocated to the permanent generation space.
+# This space contains data related to all classes.
+# Thus, if you use a lot of Eclipse plugins, it is recommended to uncomment
+# these variables and even increase it, if you have enough RAM.
+# Else you will get crashes related to OutOfMemory in PermGen exceptions. 
+
+#ECLIPSE_PERMSIZE=64m
+#ECLIPSE_MAX_PERMSIZE=128m
\ No newline at end of file
diff --git a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
new file mode 100644
index 000000000000..a9ab46e50588
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
@@ -0,0 +1,43 @@
+--- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak.bak	2010-03-06 06:32:49.000000000 +1300
++++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak	2010-03-06 06:33:31.000000000 +1300
+@@ -27,14 +27,14 @@
+   PROGRAM_OUTPUT=eclipse
+ endif
+ 
+-PROGRAM_LIBRARY=$(PROGRAM_OUTPUT)_$(LIB_VERSION).so
++PROGRAM_SONAME=$(PROGRAM_OUTPUT)_$(LIB_VERSION)
++PROGRAM_LIBRARY=$(PROGRAM_SONAME).so
+ 
+ ifeq ($(DEFAULT_JAVA),)
+   DEFAULT_JAVA=DEFAULT_JAVA_JNI
+ endif
+ 
+ # Define the object modules to be compiled and flags.
+-CC=gcc
+ MAIN_OBJS = eclipseMain.o
+ COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseGtkCommon.o eclipseGtkInit.o
+ DLL_OBJS	= eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o eclipseShm.o eclipseNix.o
+@@ -44,8 +44,8 @@
+ #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl
+ LIBS = -lpthread -ldl
+ GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\""
+-LFLAGS = -shared -fpic -Wl,--export-dynamic 
+-CFLAGS = -g -s -Wall\
++LFLAGS = -shared -Wl,-soname=$(PROGRAM_SONAME) -fpic -Wl,--export-dynamic 
++CFLAGS += -Wall\
+ 	-fpic \
+ 	-DLINUX \
+ 	-DMOZILLA_FIX \
+@@ -95,10 +95,10 @@
+ 	$(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
+ 
+ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+-	$(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+ 	
+ $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+-	$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+ 
+ install: all
+ 	cp $(EXEC) $(OUTPUT_DIR)
diff --git a/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch b/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch
new file mode 100644
index 000000000000..f76f540b9b5e
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch
@@ -0,0 +1,11 @@
+--- ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java.old	2010-03-04 07:29:04.000000000 +1300
++++ ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java	2010-03-04 07:29:28.000000000 +1300
+@@ -139,7 +139,7 @@
+ 			"org.junit4", new VersionRange("[4.5.0,5.0.0)"), "junit.jar", "org.junit4.source", "junitsrc.zip", JUnitPreferencesConstants.JUNIT4_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ 	
+ 	private static final JUnitPluginDescription HAMCREST_CORE_PLUGIN= new JUnitPluginDescription(
+-			"org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), null, "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
++			"org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), "hamcrest-core.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ 
+ 	/**
+ 	 * @return the JUnit3 classpath container
diff --git a/dev-util/eclipse-sdk/files/3.5/jvmarg.patch b/dev-util/eclipse-sdk/files/3.5/jvmarg.patch
new file mode 100644
index 000000000000..95ac7049038a
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.5/jvmarg.patch
@@ -0,0 +1,10 @@
+--- a/build/eclipse-build-0_4_RC6/build.xml	2009-11-05 11:15:17.000000000 +0000
++++ b/build/eclipse-build-0_4_RC6/build.xml	2010-01-07 22:29:17.000000000 +0000
+@@ -283,6 +283,7 @@
+ 			<arg line="-Dbuilder=${buildConfig} " />
+ 			<arg line="-DbuildDirectory=${buildDirectory} " />
+ 			<arg line="-consolelog " />
++			<jvmarg value="-Xmx512m"/>
+ 		</java>
+ 		<!--
+ 		<ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
diff --git a/dev-util/eclipse-sdk/metadata.xml b/dev-util/eclipse-sdk/metadata.xml
new file mode 100644
index 000000000000..24d1f1cf72fd
--- /dev/null
+++ b/dev-util/eclipse-sdk/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription>
+The Eclipse Project is an open source project of eclipse.org, overseen by
+a Project Management Committee (PMC) and project leaders. The work is done
+in subprojects working against a CVS repository. The Eclipse Project
+Charter describes the organization of the project, roles and
+responsibilities of the participants, and top level development process
+for the project. The JDT and PDE are plug-in tools for the Eclipse
+Platform. Together, these three pieces form the Eclipse SDK download, a
+complete development environment for Eclipse-based tools, and for
+developing Eclipse itself.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/eggy/Manifest b/dev-util/eggy/Manifest
new file mode 100644
index 000000000000..36fbe73fe2cf
--- /dev/null
+++ b/dev-util/eggy/Manifest
@@ -0,0 +1 @@
+DIST eggy-0.3.3.tar.bz2 1225934 SHA256 f341df847c2f7de6f569e881e10b1ccdc7a28d84b66409b3532804d8328b1a74 SHA512 f8b35d06bbfd4d87b7b7bf803b921c5cddae6b4be539fe3a83af1a18ce59cd48490b8773c64b0ad6bd110c044daa431ff18b386c4be3930333f4c55b6e1c50e0 WHIRLPOOL da965d2ec3cdc7a5431fb9ac3d18b465d6061a022880ecb139cfbe0dda5471f4b1d3c0af76c42ec90750d8ed5a33fed7fb0baa171855055691f9b836786638fa
diff --git a/dev-util/eggy/eggy-0.3.3-r1.ebuild b/dev-util/eggy/eggy-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..c59e804b26ab
--- /dev/null
+++ b/dev-util/eggy/eggy-0.3.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An IDE/editor for several programming languages, including Python, Java, C, Perl and others"
+HOMEPAGE="http://eggy.yolky.org/eggy/default/about"
+SRC_URI="http://eggy.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	dev-python/qscintilla-python[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# remove the bundled chardet library
+	sed -i "s:'eggy\\.chardet', ::" setup.py || die
+	rm -rf ${P}/${PN}/chardet || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-util/eggy/metadata.xml b/dev-util/eggy/metadata.xml
new file mode 100644
index 000000000000..32ab455d1400
--- /dev/null
+++ b/dev-util/eggy/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">eggy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/egypt/Manifest b/dev-util/egypt/Manifest
new file mode 100644
index 000000000000..c006fe4ce46b
--- /dev/null
+++ b/dev-util/egypt/Manifest
@@ -0,0 +1 @@
+DIST egypt-1.10.tar.gz 4670 SHA256 b5586ad65a491c9cb35252fd45ebbd22b926fd3cc1947513a4dfa58fb6911c64 SHA512 81e98b3d379301f1c0919aeb46d45264772b7d9d77277cb842c8ed7b944d61918e530f4e9e2c56451445dc2c6a312fd76086a81e193540baa3d56f3bb56b438d WHIRLPOOL 4be11ef2bdca52fca70d3b3ef89d4d9215c86681361e90d11c2d18f60a571d792645d909d64897a83274796543af3180fecb62b94c9044cfff2ff9abe44c4903
diff --git a/dev-util/egypt/egypt-1.10.ebuild b/dev-util/egypt/egypt-1.10.ebuild
new file mode 100644
index 000000000000..877ae1e21072
--- /dev/null
+++ b/dev-util/egypt/egypt-1.10.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="devilishly simple tool for creating call graphs of C programs"
+HOMEPAGE="http://www.gson.org/egypt/"
+SRC_URI="http://www.gson.org/egypt/download/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-util/egypt/metadata.xml b/dev-util/egypt/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/dev-util/egypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
new file mode 100644
index 000000000000..8e8bff7117aa
--- /dev/null
+++ b/dev-util/elfkickers/Manifest
@@ -0,0 +1,2 @@
+DIST ELFkickers-3.0.tar.gz 99527 SHA256 8597dc38ecb1a352f86c5075608547f2c4dcd50f4ba89de70c5494cf6611c6aa SHA512 dab3076baa0bc62cdcadd885fa101df77e602ba32b67ad1635be1f981e817078944f682f3bffaba1c8b0dc181036f7266ddbd82fe15a2e34ca5dadf1aa9974ed WHIRLPOOL d5d4a98169ad397df695a7f7861a95b44ca7c48d454968788965098077e04a58c953d984dfa6dbb7963c1cd52cec2965f4faf6a7ca08e1adde1e9d8915dabd62
+DIST ELFkickers-3.0a.tar.gz 100112 SHA256 c3429957142169c21ff550e0c06bbb0d48bb76437c4ccbc67164bf56b6e9774f SHA512 c90a763e5b60069f9cb67fd5c114da753184ff466c3db1dd9a44e86de9408a4384a3ac00a8c67191ca9a6556fd0db11058542361e987710f9b5bedabaec2717c WHIRLPOOL 9ed47c5c64c79dca6bce891beb430502b33481b3bc14f19f46e26157b6772ca5d1e6bc00907337dd3dc07d163b6a0cc246fef7e4afd36a85547e210b7b4bd2ea
diff --git a/dev-util/elfkickers/elfkickers-3.0-r1.ebuild b/dev-util/elfkickers/elfkickers-3.0-r1.ebuild
new file mode 100644
index 000000000000..964a2f1359dc
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PN=${PN/elf/ELF}-${PV}
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
+HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~sparc x86"
+IUSE="doc"
+
+DEPEND="app-misc/pax-utils"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-CFLAGS-LDFLAGS.patch
+	epatch "${FILESDIR}"/create-destdir-path.patch
+	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) all
+}
diff --git a/dev-util/elfkickers/elfkickers-3.0-r2.ebuild b/dev-util/elfkickers/elfkickers-3.0-r2.ebuild
new file mode 100644
index 000000000000..c00344f5ce9f
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PN=${PN/elf/ELF}-${PV}
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
+HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="app-misc/pax-utils"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-CFLAGS-LDFLAGS.patch
+	epatch "${FILESDIR}"/create-destdir-path.patch
+	epatch "${FILESDIR}"/add-freebsd-elf-defs.patch
+	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) all
+}
diff --git a/dev-util/elfkickers/elfkickers-3.0a.ebuild b/dev-util/elfkickers/elfkickers-3.0a.ebuild
new file mode 100644
index 000000000000..2e6562628b36
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.0a.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PN=${PN/elf/ELF}-${PV}
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
+HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~mips sparc x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="app-misc/pax-utils"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-CFLAGS-LDFLAGS.patch
+	epatch "${FILESDIR}"/create-destdir-path.patch
+	epatch "${FILESDIR}"/add-freebsd-elf-defs.patch
+	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) all
+}
diff --git a/dev-util/elfkickers/files/add-freebsd-elf-defs.patch b/dev-util/elfkickers/files/add-freebsd-elf-defs.patch
new file mode 100644
index 000000000000..792a91d6dfb2
--- /dev/null
+++ b/dev-util/elfkickers/files/add-freebsd-elf-defs.patch
@@ -0,0 +1,68 @@
+--- ./elfrw/elfrw.h.orig	2011-05-31 01:47:08.000000000 +0200
++++ ./elfrw/elfrw.h	2011-06-08 12:16:37.000000000 +0200
+@@ -10,6 +10,24 @@
+ #include <stdio.h>
+ #include <elf.h>
+ 
++#ifdef __FreeBSD__
++typedef uint16_t Elf64_Section;
++
++#define PT_GNU_STACK	0x6474e551
++#define PT_GNU_RELRO	0x6474e552
++
++#if  __FreeBSD_version < 700022
++#define SHT_GNU_HASH	0x6ffffff6
++#define EM_CRIS		76
++#define EM_M32R		88
++#define EM_MN10300	89
++#endif
++
++#define ELFCLASSNUM 3
++#define ELFDATANUM  3
++#define EV_NUM      2
++#endif
++
+ /*
+  * The initialization functions. Call one of these to set the flavor
+  * of ELF structures to translate to and from. The library can be
+--- ./elftoc/readelf.h.orig	2011-05-22 20:46:29.000000000 +0200
++++ ./elftoc/readelf.h	2011-06-08 12:16:37.000000000 +0200
+@@ -7,6 +7,12 @@
+ #ifndef	_readelf_h_
+ #define	_readelf_h_
+ 
++#ifdef __FreeBSD__
++#define ELFCLASSNUM 3
++#define ELFDATANUM  3
++#define EV_NUM      2
++#endif
++
+ /* Read all of the basic headers from the file image (namely the ELF
+  * header, the program segment header table, and the section header
+  * table). False is returned if the file could not be parsed as an ELF
+--- ./elftoc/pieces.c.orig	2011-05-26 03:25:14.000000000 +0200
++++ ./elftoc/pieces.c	2011-06-08 12:16:37.000000000 +0200
+@@ -16,6 +16,10 @@
+ #include "out.h"
+ #include "pieces.h"
+ 
++#ifdef __FreeBSD__
++typedef uint64_t Elf32_Xword;
++#endif
++
+ /* Flags used to insert warnings in the generated source code.
+  */
+ #define	PW_MISALIGNED	0x0001	/* piece misaligned for original type */
+--- ./elftoc/outbase.h.orig	2011-05-22 20:46:29.000000000 +0200
++++ ./elftoc/outbase.h	2011-06-08 12:16:37.000000000 +0200
+@@ -7,6 +7,10 @@
+ #ifndef _outbase_h_
+ #define _outbase_h_
+ 
++#ifdef __FreeBSD__
++#define NT_AUXV     6
++#endif
++
+ /* Set the current output file. Call this before calling any output
+  * functions. (The FILE* argument is given as a void* so as to not
+  * include stdio.h here.)
diff --git a/dev-util/elfkickers/files/create-destdir-path.patch b/dev-util/elfkickers/files/create-destdir-path.patch
new file mode 100644
index 000000000000..d279db0ad606
--- /dev/null
+++ b/dev-util/elfkickers/files/create-destdir-path.patch
@@ -0,0 +1,14 @@
+--- Makefile.orig	2011-05-30 16:37:41.000000000 -0400
++++ Makefile	2011-05-30 16:38:30.000000000 -0400
+@@ -22,8 +22,9 @@
+ infect: bin/infect doc/infect.1
+ 
+ install: $(PROGRAMS:%=bin/%)
+-	cp bin/* $(prefix)/bin/.
+-	cp doc/* $(prefix)/share/man/man1/.
++	install -d $(prefix)/usr/bin $(prefix)/usr/share/man/man1
++	install bin/* $(prefix)/usr/bin
++	install -m 644 doc/* $(prefix)/usr/share/man/man1
+ 
+ clean:
+ 	for dir in elfrw $(PROGRAMS) ; do $(MAKE) -C$$dir clean ; done
diff --git a/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
new file mode 100644
index 000000000000..6663ef8e79af
--- /dev/null
+++ b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,102 @@
+diff -Naur ELFkickers-3.0.orig//ebfc/Makefile ELFkickers-3.0/ebfc/Makefile
+--- ELFkickers-3.0.orig//ebfc/Makefile	2011-05-24 00:51:07.000000000 -0400
++++ ELFkickers-3.0/ebfc/Makefile	2011-06-02 23:05:30.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for ebfc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -Wno-missing-field-initializers
++CC ?= gcc
++CFLAGS += -Wno-missing-field-initializers
+ 
+ ebfc: ebfc.o brainfuck.o libelfparts.a
+ 
+diff -Naur ELFkickers-3.0.orig//elfls/Makefile ELFkickers-3.0/elfls/Makefile
+--- ELFkickers-3.0.orig//elfls/Makefile	2011-05-31 02:53:05.000000000 -0400
++++ ELFkickers-3.0/elfls/Makefile	2011-06-02 23:04:15.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for elfls
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ elfls: elfls.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.0.orig//elfrw/Makefile ELFkickers-3.0/elfrw/Makefile
+--- ELFkickers-3.0.orig//elfrw/Makefile	2011-05-22 14:02:12.000000000 -0400
++++ ELFkickers-3.0/elfrw/Makefile	2011-06-02 23:04:37.000000000 -0400
+@@ -1,7 +1,6 @@
+ #  Makefile for libelfrw.a
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -O3
++CC ?= gcc
+ 
+ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+diff -Naur ELFkickers-3.0.orig//elftoc/Makefile ELFkickers-3.0/elftoc/Makefile
+--- ELFkickers-3.0.orig//elftoc/Makefile	2011-05-23 23:30:22.000000000 -0400
++++ ELFkickers-3.0/elftoc/Makefile	2011-06-02 23:04:27.000000000 -0400
+@@ -1,8 +1,6 @@
+ #  Makefile for elftoc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ OBJS = gen.o names.o address.o readelf.o shdrtab.o phdrtab.o dynamic.o \
+        pieces.o outbase.o outitems.o outelf64.o outelf32.o out.o elftoc.o
+diff -Naur ELFkickers-3.0.orig//infect/Makefile ELFkickers-3.0/infect/Makefile
+--- ELFkickers-3.0.orig//infect/Makefile	2011-05-31 02:52:27.000000000 -0400
++++ ELFkickers-3.0/infect/Makefile	2011-06-02 23:04:01.000000000 -0400
+@@ -1,7 +1,6 @@
+ #  Makefile for infect
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ infect: infect.c
+ 
+diff -Naur ELFkickers-3.0.orig//objres/Makefile ELFkickers-3.0/objres/Makefile
+--- ELFkickers-3.0.orig//objres/Makefile	2011-05-23 23:29:39.000000000 -0400
++++ ELFkickers-3.0/objres/Makefile	2011-06-02 23:05:08.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for objres
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ objres: objres.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.0.orig//rebind/Makefile ELFkickers-3.0/rebind/Makefile
+--- ELFkickers-3.0.orig//rebind/Makefile	2011-05-23 23:29:16.000000000 -0400
++++ ELFkickers-3.0/rebind/Makefile	2011-06-02 23:04:57.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for rebind
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ rebind: rebind.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.0.orig//sstrip/Makefile ELFkickers-3.0/sstrip/Makefile
+--- ELFkickers-3.0.orig//sstrip/Makefile	2011-05-23 23:29:58.000000000 -0400
++++ ELFkickers-3.0/sstrip/Makefile	2011-06-02 23:05:41.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for sstrip
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ sstrip: sstrip.c ../elfrw/libelfrw.a
+ 
diff --git a/dev-util/elfkickers/metadata.xml b/dev-util/elfkickers/metadata.xml
new file mode 100644
index 000000000000..d3cf0833c4dd
--- /dev/null
+++ b/dev-util/elfkickers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>hardened</herd>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<longdescription>ELF kickers is a collection of programs that manipulate ELF files. The main purpose of these programs is to be illustrative and educational -- to help fellow programmers understand the ELF file format and something of how it works under the Linux platform.</longdescription>
+</pkgmetadata>
diff --git a/dev-util/elfsh/Manifest b/dev-util/elfsh/Manifest
new file mode 100644
index 000000000000..e9e9a5fcb325
--- /dev/null
+++ b/dev-util/elfsh/Manifest
@@ -0,0 +1,2 @@
+DIST elfsh-0.51b3-portable.tgz 136679 SHA256 ecffe100d0da12235cfe464726313491409739493030f3fbdb3a28696b23447f SHA512 3af4a7f031e830c24ecd05701c4ade052845cdd3808f6d5b60f19f8fff3ffa66f2edd1490fc62b9bbd8ac51d7c8aadb045fc2d369c885eb47a33210690f1c9df WHIRLPOOL 3d19b1bca64ebf98de3637978531bd1823c1f4b5fa9d2144873be9cf91c3c7771abb33b42107a156cfe7ca52ee0af33a5837581250ead29fa3a937883f946592
+DIST elfsh-0.65_rc1.zip 444993 SHA256 740e0bda6c368cbf7ceb6082e038d84c155220666c4edbb8dc8724b83d4feb93 SHA512 4268b29467cecfa661b4162214f1dc9dd9e465558aa62aa5ee412c6533a0405e3783c536d8e5bee420f87b636aafa4d1902d9f5b1b6fe0a3ad771894cd05ac76 WHIRLPOOL 89cef773854537865ef0f7a88dbcc44046ddfa8096c01a71f90719bdcc231d659b5d56767649c7d955e3e1d10dfe5673817d642b6ad8a2414b2295dfe3aedea4
diff --git a/dev-util/elfsh/elfsh-0.51_beta3.ebuild b/dev-util/elfsh/elfsh-0.51_beta3.ebuild
new file mode 100644
index 000000000000..b7ebaac34357
--- /dev/null
+++ b/dev-util/elfsh/elfsh-0.51_beta3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib toolchain-funcs
+
+MY_PV=${PV/_beta/b}
+S=${WORKDIR}/${PN}-${MY_PV}
+DESCRIPTION="scripting language to modify ELF binaries"
+HOMEPAGE="http://www.eresi-project.org/"
+SRC_URI="mirror://gentoo/elfsh-${MY_PV}-portable.tgz"
+#http://elfsh.segfault.net/files/elfsh-${MY_PV}-portable.tgz
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/expat-1.95"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-glibc210.patch
+	sed -i \
+		-e "s:-g3 -O2:${CFLAGS}:" \
+		-e "s:\$(CC):& \$(CFLAGS) \$(ELDFLGS): "\
+		`find -name Makefile` \
+		|| die
+	sed -i -e "s:LIBPATH = \$(PREFIX)/lib:LIBPATH = \$(PREFIX)/$(get_libdir):" Makefile
+
+}
+
+src_compile() {
+	# emacs does not have to be a requirement.
+	emake CC=$(tc-getCC) ETAGS=echo ELDFLGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "einstall failed"
+}
diff --git a/dev-util/elfsh/elfsh-0.65_rc1.ebuild b/dev-util/elfsh/elfsh-0.65_rc1.ebuild
new file mode 100644
index 000000000000..4b481d8599f0
--- /dev/null
+++ b/dev-util/elfsh/elfsh-0.65_rc1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="scripting language to modify ELF binaries"
+HOMEPAGE="http://www.eresi-project.org/"
+SRC_URI="mirror://gentoo/${P}.zip"
+#http://www.eresi-project.org/browser/tags/elfsh_0_65rc1
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="readline"
+
+DEPEND=">=dev-libs/expat-1.95
+	readline? ( sys-libs/readline )
+	app-arch/unzip
+	dev-libs/libhash"
+RDEPEND=""
+
+S="${WORKDIR}/tags/elfsh_0_65rc1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e 's: -O2 : :g' \
+		-e "s: -g3 : ${CFLAGS} :" \
+		-e "/^LDFLAGS/s:=:=${LDFLAGS} :" \
+		$(find -name Makefile) \
+		|| die
+	chmod +x configure
+}
+
+src_compile() {
+	local bits
+	touch foo.c && $(tc-getCC) -c foo.c -o foo.o || die
+	case $(file foo.o) in
+		*64-bit*)  bits=64;;
+		*32-bit*)  bits=32;;
+		*)         die "unknown bits: $(file foo.o)";;
+	esac
+	# not an autoconf script
+	./configure \
+		$([[ ${bits} == "64" ]] && echo "--enable-m64") \
+		--enable-${bits} \
+		$(use_enable readline) \
+		|| die
+	# emacs does not have to be a requirement.
+	emake ETAGS=echo || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "install failed"
+	dodoc README.FIRST doc/AUTHOR doc/CREDITS doc/Changelog doc/*.txt
+	doman doc/*.1
+}
diff --git a/dev-util/elfsh/files/0.51_beta3-gentoo.patch b/dev-util/elfsh/files/0.51_beta3-gentoo.patch
new file mode 100644
index 000000000000..26c4f7b91308
--- /dev/null
+++ b/dev-util/elfsh/files/0.51_beta3-gentoo.patch
@@ -0,0 +1,63 @@
+diff -ur elfsh-0.51b3.orig/Makefile elfsh-0.51b3/Makefile
+--- elfsh-0.51b3.orig/Makefile	2004-09-20 22:20:22.152723392 -0400
++++ elfsh-0.51b3/Makefile	2004-09-20 22:21:37.270303784 -0400
+@@ -5,12 +5,14 @@
+ ## Last update Sun May 25 18:12:43 2003 mayhem
+ ##
+ 
++DESTDIR = /
++PREFIX  = $(DESTDIR)/usr
+ RM	= rm -f
+ ETAGS   = etags
+-MODPATH = /usr/share/elfsh/
+-BINPATH = /usr/bin
+-LIBPATH = /usr/lib/
+-INCPATH = /usr/include/
++BINPATH = $(PREFIX)/bin
++LIBPATH = $(PREFIX)/lib
++INCPATH = $(PREFIX)/include
++MODPATH = $(LIBPATH)/elfsh
+ 
+ all	:
+ 	@echo 'Builting libelfsh...'
+@@ -32,14 +34,15 @@
+ 	#$(MAKE) -s tags
+ 
+ install	: mod_install
++	@mkdir -p $(BINPATH) $(LIBPATH) $(INCPATH)
+ 	@cp vm/elfsh $(BINPATH)/
+ 	@cp libelfsh/libelfsh.a libelfsh/libelfsh.so $(LIBPATH)
+ 	@cp libelfsh/include/libelfsh*.h $(INCPATH)
+-	@chmod 755 $(BINPATH)/elfsh $(LIBPATH)libelfsh.so $(LIBPATH)libelfsh.a $(INCPATH)libelfsh*.h
++	@chmod 755 $(BINPATH)/elfsh $(LIBPATH)/libelfsh.so
+ 	@echo 'ELFsh and Libelfsh installed successfully .'
+ 
+ mod_install:
+-	@mkdir $(MODPATH) 2>/dev/null || true
++	@mkdir -p $(MODPATH)
+ 	@cp modules/*.so $(MODPATH)
+ 	@chmod -R 755 $(MODPATH)
+ 
+diff -ur elfsh-0.51b3.orig/vm/Makefile elfsh-0.51b3/vm/Makefile
+--- elfsh-0.51b3.orig/vm/Makefile	2004-09-20 22:20:22.117728712 -0400
++++ elfsh-0.51b3/vm/Makefile	2004-09-20 22:22:17.807141248 -0400
+@@ -13,6 +13,7 @@
+ #DLOPT_linux-gnu	= -ldl
+ #DLOPT_solaris		= -ldl
+ #EXTRAOPT		= -lefence
++EXTRAOPT = -ldl
+ 
+ # Uncomment that to use libasm
+ #ASMOPT			= -DUSE_LIBASM
+diff -ur elfsh-0.51b3.orig/vm/include/elfsh.h elfsh-0.51b3/vm/include/elfsh.h
+--- elfsh-0.51b3.orig/vm/include/elfsh.h	2004-09-20 22:20:22.116728864 -0400
++++ elfsh-0.51b3/vm/include/elfsh.h	2004-09-20 22:20:22.358692080 -0400
+@@ -94,7 +94,7 @@
+ #define	ELFSH_SHELL		"/bin/bash"
+ #define	ELFSH_INIT		"elfsh_init"
+ #define	ELFSH_FINI		"elfsh_fini"
+-#define	ELFSH_MODPATH		"/usr/share/elfsh/"
++#define	ELFSH_MODPATH		"/usr/lib/elfsh/"
+ 
+ /* For elfsh/elfsh/disasm.c:display_object() */
+ #define	ELFSH_HEXA_VIEW		0
diff --git a/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch b/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch
new file mode 100644
index 000000000000..2e83c93d19af
--- /dev/null
+++ b/dev-util/elfsh/files/elfsh-0.51_beta3-glibc210.patch
@@ -0,0 +1,70 @@
+diff -NrU5 elfsh-0.51b3.original/modules/modgraph.c elfsh-0.51b3/modules/modgraph.c
+--- elfsh-0.51b3.original/modules/modgraph.c	2009-07-22 23:17:51.000000000 -0600
++++ elfsh-0.51b3/modules/modgraph.c	2009-07-22 23:33:28.000000000 -0600
+@@ -181,11 +181,11 @@
+       }
+     }
+   else
+     {
+       name = elfsh_reverse_metasym(world.current, blk->vaddr, &off);
+-      dprintf(fd, "%s_%08x", name, off);
++      d_printf(fd, "%s_%08x", name, off);
+ 
+       }
+   free(buffer);
+   world.state.vm_quiet = vm_quiet;
+ }
+diff -NrU5 elfsh-0.51b3.original/vm/disasm.c elfsh-0.51b3/vm/disasm.c
+--- elfsh-0.51b3.original/vm/disasm.c	2009-07-22 23:17:51.000000000 -0600
++++ elfsh-0.51b3/vm/disasm.c	2009-07-22 23:33:53.000000000 -0600
+@@ -80,30 +80,30 @@
+   
+   /* Are we in quiet mode ? */
+   if (world.state.vm_quiet)
+     {
+       snprintf(buf, sizeof(buf), " %08X %s + %u", vaddr + index, name, nindex);
+-      dprintf(fd, "%-40s %-30s ", buf, s);
++      d_printf(fd, "%-40s %-30s ", buf, s);
+     }
+   else
+     {
+       snprintf(buf, sizeof(buf), " %08X [foff: %u] %s + %u", 
+ 	      vaddr + index, foffset + index, name, nindex);
+-      dprintf(fd, "%-60s %-50s ", buf, s);
++      d_printf(fd, "%-60s %-50s ", buf, s);
+     }
+   
+   /* Print bytes in hexa for this instruction */
+   ret = asm_instr_len(&ptr);
+   if (!ret)
+     ret++;
+   
+   if (!world.state.vm_quiet)
+     for (idx_bytes = 0; idx_bytes < ret; idx_bytes++)
+-      dprintf(fd, "%c%c ", 
++      d_printf(fd, "%c%c ", 
+ 	     base[(buff[index + idx_bytes] >> 4) & 0x0F], 
+ 	     base[buff[index + idx_bytes] & 0x0F]);
+-  dprintf(fd, "\n");
++  d_printf(fd, "\n");
+   return (ret);
+ }
+ #endif	/* USE_LIBASM */
+ 
+ 
+diff -NrU5 elfsh-0.51b3.original/vm/include/elfsh.h elfsh-0.51b3/vm/include/elfsh.h
+--- elfsh-0.51b3.original/vm/include/elfsh.h	2009-07-22 23:17:51.000000000 -0600
++++ elfsh-0.51b3/vm/include/elfsh.h	2009-07-22 23:22:30.000000000 -0600
+@@ -469,11 +469,11 @@
+ int		vm_getsort(u_int index, u_int argc, char **argv);
+ int		vm_getdisasm(u_int index, u_int argc, char **argv);
+ int		vm_gethexa(u_int index, u_int argc, char **argv);
+ int		vm_getvarparams(u_int index, u_int argc, char **argv);
+ 
+-int		dprintf(int fd, char *format, ...);
++int		d_printf(int fd, char *format, ...);
+ 
+ /* Libasm resolve handler */
+ void		do_resolve(void *data, u_int vaddr, char *, u_int);
+ u_int		display_instr(int, u_int, u_int, u_int, u_int,
+ 			      char *, u_int, char *);
diff --git a/dev-util/elfsh/metadata.xml b/dev-util/elfsh/metadata.xml
new file mode 100644
index 000000000000..d48e561d339f
--- /dev/null
+++ b/dev-util/elfsh/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>blueness@gentoo.org</email>
+</maintainer>
+<longdescription>
+ELFsh is an interactive and scriptable ELF machine to play with executable files, shared libraries and relocatable ELF32 objects. It is useful for daily binary manipulations such as on-the-fly patching, embedded code injection, and binary analysis in research fields such as reverse engineering, security auditing and intrusion detection.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/emilpro/Manifest b/dev-util/emilpro/Manifest
new file mode 100644
index 000000000000..4f2ccc1add09
--- /dev/null
+++ b/dev-util/emilpro/Manifest
@@ -0,0 +1,2 @@
+DIST binutils-2.23.2.tar.bz2 21440347 SHA256 fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097 SHA512 dec753bbba008f1526b89cf1bd85feba78f362f5333ffdf93953fd131eb755976dec82a0a4ba38c43d2434da007137780cfe674de5414be5cf7ce7fbc6af6d16 WHIRLPOOL 1be65f03569d599899c5b57ac7aedbf90b311f9a47c1883dc62c0717b0757ebfb33e17ab3def8d0b805daabba67cf554463f88675c9f552a6fd8dbe7ca77b442
+DIST emilpro-3.tar.gz 120276 SHA256 6c4cf5d7debcc19a87bc61682d3adee4e2d1cdec2a06570f203130d6cf917748 SHA512 18a90dd672a4fb878f0da1eefacb01f159e25b28c94ea6707578deab74dbf07ee0f9d276e376f4eaff7b00c4dd7edcf5b7cbb3e5b316f4d720fe0343e1c36727 WHIRLPOOL d484f6860118db921736001982461ad5410cdf63aca21c9896e9bbe17fdb693f7debd53282fca61d085f405c1d701af99bfcd12b2cc554ddc11607b98977262a
diff --git a/dev-util/emilpro/emilpro-3-r1.ebuild b/dev-util/emilpro/emilpro-3-r1.ebuild
new file mode 100644
index 000000000000..4a2cab3b7345
--- /dev/null
+++ b/dev-util/emilpro/emilpro-3-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+DESCRIPTION="a graphical disassembler for a large number of instruction sets"
+HOMEPAGE="http://www.emilpro.com/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/SimonKagstrom/emilpro"
+	inherit git-r3
+	KEYWORDS=""
+	SRC_URI="mirror://gnu/binutils/binutils-2.23.2.tar.bz2"
+else
+	SRC_URI="http://www.emilpro.com/${P}.tar.gz
+		!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+system-binutils"
+
+DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0
+	dev-cpp/libxmlpp:2.6
+	system-binutils? ( sys-devel/binutils[multitarget] )
+	net-misc/curl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-cflags.patch
+	if use system-binutils; then
+		epatch "${FILESDIR}"/use-gentoo-binutils.patch
+	else
+		sed -i "s#wget -O binutils.tar.bz2 http://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
+	fi
+	cmake-utils_src_prepare
+}
+
+src_compile() {
+	if use system-binutils; then
+		cmake-utils_src_compile
+	else
+		#bundled binutils is broken, always builds with one thread
+		#but somehow it still fails if I don't do this
+		cd "${BUILD_DIR}"
+		emake -j1
+	fi
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/emilpro
+}
diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
new file mode 100644
index 000000000000..c0d05005014a
--- /dev/null
+++ b/dev-util/emilpro/emilpro-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+DESCRIPTION="a graphical disassembler for a large number of instruction sets"
+HOMEPAGE="http://www.emilpro.com/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/SimonKagstrom/emilpro"
+	inherit git-r3
+	KEYWORDS=""
+	SRC_URI="mirror://gnu/binutils/binutils-2.23.2.tar.bz2"
+else
+	SRC_URI="http://www.emilpro.com/${P}.tar.gz
+		!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+system-binutils"
+
+DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0
+	dev-cpp/libxmlpp:2.6
+	system-binutils? ( sys-devel/binutils[multitarget] )
+	net-misc/curl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if use system-binutils; then
+		epatch "${FILESDIR}"/use-gentoo-binutils.patch
+	else
+		sed -i "s#wget -O binutils.tar.bz2 http://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
+	fi
+	cmake-utils_src_prepare
+}
+
+src_compile() {
+	if use system-binutils; then
+		cmake-utils_src_compile
+	else
+		#bundled binutils is broken, always builds with one thread
+		#but somehow it still fails if I don't do this
+		cd "${BUILD_DIR}"
+		emake -j1
+	fi
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/emilpro
+}
diff --git a/dev-util/emilpro/files/respect-cflags.patch b/dev-util/emilpro/files/respect-cflags.patch
new file mode 100644
index 000000000000..12d5bd52db5d
--- /dev/null
+++ b/dev-util/emilpro/files/respect-cflags.patch
@@ -0,0 +1,12 @@
+diff -Naur emilpro-3/CMakeLists.txt emilpro-3-cflags/CMakeLists.txt
+--- emilpro-3/CMakeLists.txt	2013-12-28 04:22:34.000000000 -0500
++++ emilpro-3-cflags/CMakeLists.txt	2014-03-18 17:59:47.534542384 -0400
+@@ -29,7 +29,7 @@
+ pkg_check_modules(LIBXMLPP libxml++-2.6)
+ pkg_check_modules(LIBCURL libcurl)
+ 
+-set (CMAKE_CXX_FLAGS "-std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
+ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64)
+ 
+ if (HAVE_BFD_MULTIARCH)
diff --git a/dev-util/emilpro/files/use-gentoo-binutils.patch b/dev-util/emilpro/files/use-gentoo-binutils.patch
new file mode 100644
index 000000000000..576055810710
--- /dev/null
+++ b/dev-util/emilpro/files/use-gentoo-binutils.patch
@@ -0,0 +1,36 @@
+diff -Naur emilpro-3/CMakeLists.txt emilpro-3-nobinutils/CMakeLists.txt
+--- emilpro-3/CMakeLists.txt	2013-12-28 04:22:34.000000000 -0500
++++ emilpro-3-nobinutils/CMakeLists.txt	2014-03-18 14:59:17.983479920 -0400
+@@ -11,7 +11,6 @@
+ set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ # Dependencies
+-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
+ 
+ find_package (LibElf REQUIRED)
+ find_package (PkgConfig REQUIRED)
+@@ -30,7 +29,6 @@
+ pkg_check_modules(LIBCURL libcurl)
+ 
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
+-LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64)
+ 
+ if (HAVE_BFD_MULTIARCH)
+ 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
+@@ -110,7 +108,6 @@
+ 	src/include/
+ 	${CMAKE_BINARY_DIR}
+ 	${LIBELF_INCLUDE_DIRS}
+-	${CMAKE_BINARY_DIR}/install-binutils/include/
+ 	${GTKMM_INCLUDE_DIRS}
+ 	${GTKSOURCEVIEWMM_INCLUDE_DIRS}
+ 	${LIBXMLPP_INCLUDE_DIRS}
+@@ -128,8 +125,6 @@
+ 	tools/squash-instruction-models.cc
+ 	)
+ 
+-set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils)
+-set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils)
+ 
+ set (BASE_LIBS
+ 	${LIBELF_LIBRARIES}
diff --git a/dev-util/emilpro/metadata.xml b/dev-util/emilpro/metadata.xml
new file mode 100644
index 000000000000..6151b9b64083
--- /dev/null
+++ b/dev-util/emilpro/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>zerochaos@gentoo.org</email>
+<name>Rick Farina</name>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+<use>
+<flag name="system-binutils">Use the gentoo binutils instead of building against an unpatched vanilla version</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
new file mode 100644
index 000000000000..788ffe5fc2aa
--- /dev/null
+++ b/dev-util/eric/Manifest
@@ -0,0 +1,21 @@
+DIST eric4-4.5.25.tar.gz 7989002 SHA256 d609d576476d63a71e4217605c05cbcdf303f03fc8a0067f2ea624295c301757 SHA512 2c1ce9387544654fdbe0515766f49a4ecd771d9a63c1782578b5224fcf4afc031af1ec53743a154026edb0cc3ff102ac7a4872204b1de54b7dafb432afe5d95f WHIRLPOOL 9acd05c04debddb09ccc76ddd35a03aa6ef7e5cb7bc4956992d25080fddc3ec70366e1559d187f3335268d2d434ed9acba3974f18c69e9d98edc43b229fde37e
+DIST eric4-i18n-cs-4.5.25.tar.gz 451987 SHA256 34784f5ec942cb10077aa80c18c3b5f3e8a9a89bf6d147c58e48cfc81ce20885 SHA512 0c9dbf0744b577e75889a65abe303ec437ae69db15e7c3689b5d0f319dc1b125e8a6189e5ca769df815b46b5519aae1290bd84831c4ebb99b184983094f71b30 WHIRLPOOL b6c803e879489267dc5d1765101226536bdf448c11c7ec5d63d3695f9e008516f81e30f61232f4a49461aca53e43b005f8836b754151a542e2e4c420f4d3a2b5
+DIST eric4-i18n-de-4.5.25.tar.gz 468496 SHA256 acfbda7dac0bb3e9b77fdacfe685580cba69da30a119dabf634eb884e9afc8ac SHA512 f73a69e5a1f8dde01287c3eb80e33eb7842355d72cc77ed8c064dc52b7adfdeeeb3fc48bbc76b9fa779b04810dd7f1f96c027c240ca97a44561bf60473c44eaa WHIRLPOOL 4e8abc67b74f8597a6cc447cf49d9cf6254a0989b6a5279013dfb48670a1ef8265469ea2e95ee093ddcf0d88be5ff93ac5c517f77dba3ae48b33d96b12ea7c11
+DIST eric4-i18n-en-4.5.25.tar.gz 126955 SHA256 7a2578ce53867ed5f44a05d8e42643a9164dc20c6f114ec89ac8cb925aa869c8 SHA512 6d720e904a8580954668d532476d269201936869d9ab46cdbeec50f7ef6bdb456c6974b605ca68268afe3e338f298aeed74b80fb8d25934279f9840a5df1d3e1 WHIRLPOOL 4cfb655a957a065311b41c452180142972d2af241521e6a52e70d16f47a7573229b213fe7fa3d65d4a713f17260287390dbe453cdfd995a72cbdc198e52bb041
+DIST eric4-i18n-es-4.5.25.tar.gz 473331 SHA256 a95d6df0e4396ac97df2224c9755247c134163e57f6d579f6614585c3884b70b SHA512 3b2e2c24f13b0ec51a7951de6b5c64524c0da58da7f82e8856ba3be2f18210a4ed18b80cf3401c20c049826dca3e1354d4b539bee86b9430412254190f61a8f9 WHIRLPOOL c1e9567ccd74b08fb38f6ba571cd5abb6a00553d1262c20e08a05f6935b0c894e31f6d2a412716fcf03a5ec66f414984d1dabe5405923e76953af20319c41733
+DIST eric4-i18n-fr-4.5.25.tar.gz 468434 SHA256 de21c8db456110cfcfacfff29f97168df7359a97c7c3dea9ca5a41ce11f45934 SHA512 434fe4bd080eea7511988b8d3a6d90002651d4b74956e05410f71e797eb790f555077873abb5dd3d957a010f61e4644fad71494add42e4690d28521201a42cdf WHIRLPOOL 8e910e0d924d683fcdf70f53b05ff2b4e46fb72676dbe70c356385a3ae498d7ee29bc068dee08a9e49428a94c2581f853510e1e07b48dc256d832f4dc6f31699
+DIST eric4-i18n-it-4.5.25.tar.gz 461971 SHA256 490f9bf8757959de315076ddb911493574671a6f6bfa18b3884676a65ef84ac3 SHA512 012b2d193e121de1e79a3d1ece8054c9941157ea242f679e16d5058aa3a5d1456b433e81a12ea232974492baecaa7eded51dda3432565889f51184329dd4f3e7 WHIRLPOOL 3776a6a10c12806edffb0cda67bc517855862980f0137be8358ad8eb58cf6003da3b66b3811c5e3b34560b1249185b4c2cf69118320cc08b1a552a2ccf7e5e7f
+DIST eric4-i18n-ru-4.5.25.tar.gz 474745 SHA256 f7b4caf81f38637ea0350b3281c30ee60fc32b833a2c22d899ab5eb578fc89e7 SHA512 cb8c42d921b181228f8d3476b2da02226927744772bcf5738f31c1504617928be30925d6a181313d241af76d068b2d951f781acda12cc616c2f7d52baf3aa8d1 WHIRLPOOL ff5237e010d39f8a33a8091a3a92ad2d566388d9d3a535552f7cf51f2855bf25f37b361b43641fe7743d7365e479f470df9f571cf48b6a315b63dc8235b81e72
+DIST eric4-i18n-tr-4.5.25.tar.gz 352461 SHA256 476f568ae4b2e764e014d704e5b062650ada6d7f957cc483d2fc733b5f3863ac SHA512 e3cdcd66e950123cbf668b3cf8c723f197a1aaa940b4234d2a63579bdc5a3678463215e1df26081ca8390c78156a408852bd7b2a674eb796cf97d32649323c9c WHIRLPOOL 294ff20bbf172e3b74f77ae8dd4148812bc7d046d1958391af43633a01073f849f234c2663bd556cab54555528a1a5b2a04c1714b3e255a10e1890f08a959ee1
+DIST eric4-i18n-zh_CN.GB2312-4.5.25.tar.gz 381281 SHA256 4c4c614fea86c42e067dbaa44e4804f5dfb203fb58188cee84b76a93cd6a9fa2 SHA512 691f9a652aae1be4f0f582d920c084ee51cea9d242647de6e3266d203c7ad12f41a300a4d2a121a2c94ffd6551eac247fce206ee8887bae552dca330c3ab70ff WHIRLPOOL 0501b6d7084193f3dc7ccda8f1fd909872bdf8c088eeb470fadcb83d2bdbb7ebe04bcafe578092ee80fd43c2ed826350b630d482bd1ed0231f667e6f105c4688
+DIST eric5-5.5.2.tar.gz 10649618 SHA256 501550e01617a3c8cd66ebcb5e071cd928029fb3aba64aec88617821bf5c3871 SHA512 ba48ffbda67de66f24819ac3389bb373a9945e8842a802ade185e5fcbfac34f8062999fe96cc5be9321dacca58f70c47bbe530ddef0349f3f103800b1fa689f9 WHIRLPOOL 7b450b6569b789c87d1a3b44d24fe91072f2a3d417249a46da8c6793b06a940807c724aad729dd7c969e816464bfe9c81fda82f3a8dbe3fccb4557cd33510bcc
+DIST eric5-i18n-cs-5.5.2.tar.gz 556017 SHA256 ead32f57107701f1664543fd0e8dbd07764f07e8c2e4f684977f8cabc3e26685 SHA512 b4bff691d4067d2d91923aeb823678a02775d4a275a4cc2ee7e0dd207d33c696c8eebad4bc2b9c4add1b2f928e868cd183d477c5939e81cc8ab96a42db0f818b WHIRLPOOL 475209f28eb62e58db9d4629c6c1de77a38407f6abd3a101b9d313314e708c9597f6cb802b1112935728628551b4555762e952c4f1cb0992a59632d57f28b886
+DIST eric5-i18n-de-5.5.2.tar.gz 759671 SHA256 b08d6ddb10c332c8c020d8f8a3dd1dae315427d7067b67643848c79733ecce38 SHA512 6fd4fc26995fde57caf182989da1db5cf5fb92eb185645f0130d1c19eeffca3a8d4c495e5c3673fc6ae89a33cbb8f5593b2fa34c1aa530e2393ecf5e7180000d WHIRLPOOL 2bab53467a11f79934399348d00f70502e5fdc2ffb5cf217426a2a5e9fe88b79edc546c3615642385be18e2c92f0cabdfdaf686a9a261062a3c3f81771389be3
+DIST eric5-i18n-en-5.5.2.tar.gz 205563 SHA256 934bd715cde409e9dc79245dbdd845f14aa4b6bb36cbad064e16c85106110b85 SHA512 51aa8c4e6b938f13ee95bfa1759dc2e83d4e3cdcbfcb4db4b86d494669e09ea51d173e16fad0bf31ba67cb06e910fa109e931a89f431ac8ca902def15067489c WHIRLPOOL c8235fe9b5e6754bebd60c98086086bb479ae1f8456787985a68ea02d68fd93ec04bc9947b2770f0cb1b604e68d5ba365e04bbb7b185147ee91c246deddaa368
+DIST eric5-i18n-es-5.5.2.tar.gz 761577 SHA256 b0ffdc03c02a0fde6fa030871677de72e44675f0c4d557c3abeeea44798a1907 SHA512 39332f66acd2014f60360647d2096792a8d9d7dbf356b983d00362e08b5fe90aa844399c980e7d8a45e67e361614c3f11b321998dc322a3ea53cdb9700a2ae42 WHIRLPOOL a6580465c3473b414a8a3de86fe9e9504e78a2f730bd02f7a9c9099cda26bd269c04da6d092f00a853162881f09c2159dab718a79758c21d149781ec2a98cde5
+DIST eric5-i18n-fr-5.5.2.tar.gz 504012 SHA256 294e92b114b881ed764489e9dba137bb113e02fda8a5089fe3480d417f7e120d SHA512 9fc8e1205f00f27407bf0e9c8ce401ec640abcadc8eb12afe4d5846f6ab48bb6294ef96c0265ed8f2dfb52229370d3f243b0863da3814ebf4851a440318e42ff WHIRLPOOL 0b24e5b975162e5d735d7c713750ec9f7feb605264392b710d35c243585a341d618ce8f4f5aa80aa8d2ce74705bb30ed203473d6225c85fd1df08650f19ec288
+DIST eric5-i18n-it-5.5.2.tar.gz 630960 SHA256 94300cfb84d9b811d76e0be98bbd60924845ae1dca788dd74f8d0c5fd55fa46c SHA512 5cc02d2c3238eb44a2dbda9323ff073c1b51d3029623337c243e0bfc57736b2ba859d9b6b00aa5dd4d875824d504c3d9d763c76d92b3a9525f637f9d6efeaf18 WHIRLPOOL f1da01ff437090f15bb9c612ca61c4d15e34f484f0c05eeb1c5147a131d441d9ee023b0376acf0ab3a8774707f06c419e8dd37502afd449fc150fd0f3abfc2da
+DIST eric5-i18n-pt-5.5.2.tar.gz 443308 SHA256 2baaa96bab273f8ad695101675fdac7a527ad7b62d14a25491dd846ca6933342 SHA512 6564fdab325251cd9898253c0c9ed9dc4406038600ccd6c7db5ec6da76517258919c8619846816ec43c6b799672c14306b291a4d274f980e35e634b98bc9e6f6 WHIRLPOOL 5ed5c90af0858cac6d275740c612c95a9f2af38c406cd090835cc07f5c63bdf23c319d4959654735d02066d4a8bf703375bf42d9d469034d7e65ed842731f8d0
+DIST eric5-i18n-ru-5.5.2.tar.gz 786342 SHA256 63c8fb9ab53010bddbb5049e227ca5cb49e50cc985745c7fd529fe4449d832ca SHA512 bbca86c04883d636d0a4afad721507a79796ee7a805e263845f1da79cbd0e2d098e93f919bc253a8a51d2ed003a24ae14fc9cda6d5e90568a928739582b0b486 WHIRLPOOL 714bdbf694326050e813b322576bc0009f12e3109a6a11f7acc0112fe15c332f83547308f6ab6ece117b8151f8bdae9551265344fd336d53014998a6f85436ac
+DIST eric5-i18n-tr-5.5.2.tar.gz 481796 SHA256 b5935c2384608d87a8ff3e7f4b90613c686e9af176a724da44fb67486175532a SHA512 8831fb2039745b40f9f74f3ec8801a0dab5ee96ceb6686e418bfb58ddeeb44c2400bc0e36aa0035475923aaf20724cfbb656adf8a0ae27b78247d372ed747fc8 WHIRLPOOL 12075a1d44d2ff01662d3323cf5c985890da44d62eb7aad782e50e4067cc4e930d0dcd47eec63dc77b6fd6e42bf6098d67f30de7034e44b9b1dc8c38ea7f56fb
+DIST eric5-i18n-zh_CN.GB2312-5.5.2.tar.gz 446780 SHA256 ebd592a1f28a28af2a00d79ebaa61e94b5ea8bc8b3883a098d79460c68940a97 SHA512 96a1263bca33c4a7709c8d86d5c5412779044f37d98fa62d18e37e7dd891607bf282808d25544bf7fef7206a669c57c49bf97bd5ae7db54fa49bc15c47dc5689 WHIRLPOOL 4d84c9b38f31a6fad71400367d20f6a707bc9dc4c2a30509bdde72fa83613e088e5c5ea36b173d69a9c7474929b81282a8cbbce3ea64a70877b9b5155f4346b4
diff --git a/dev-util/eric/eric-4.5.25-r1.ebuild b/dev-util/eric/eric-4.5.25-r1.ebuild
new file mode 100644
index 000000000000..d0b6c47e84ce
--- /dev/null
+++ b/dev-util/eric/eric-4.5.25-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.7"
+SUPPORT_PYTHON_ABIS="1"
+# 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
+PYTHON_USE_WITH="sqlite xml"
+
+PLOCALES="cs de en es fr it ru tr zh_CN"
+
+inherit eutils l10n python
+
+DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
+HOMEPAGE="http://eric-ide.python-projects.org/"
+
+SLOT="4"
+MY_PV=${PV/_rc/-RC}
+MY_P=${PN}${SLOT}-${MY_PV}
+
+BASE_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${MY_PV}"
+SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
+for L in ${PLOCALES}; do
+	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${PN}${SLOT}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
+done
+unset L
+
+LICENSE="GPL-3"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="kde"
+
+DEPEND="
+	>=dev-python/sip-4.12.4
+	>=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit]
+	>=dev-python/qscintilla-python-2.3
+	kde? ( kde-base/pykde4 )
+"
+RDEPEND="${DEPEND}
+	>=dev-python/chardet-2.0.1
+	>=dev-python/coverage-3.0.1
+	>=dev-python/pygments-1.5
+"
+
+S=${WORKDIR}/${MY_P}
+
+PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
+
+src_prepare() {
+	epatch "${FILESDIR}/eric-4.5-no-interactive.patch"
+	use kde || epatch "${FILESDIR}/eric-4.4-no-pykde.patch"
+
+	# Delete internal copies of dev-python/chardet,
+	# dev-python/pygments and dev-python/simplejson
+	rm -fr eric/ThirdParty
+
+	# Delete internal copy of dev-python/coverage
+	rm -fr eric/DebugClients/Python{,3}/coverage
+	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
+		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
+}
+
+src_install() {
+	installation() {
+		"$(PYTHON)" install.py \
+			-z \
+			-b "${EPREFIX}/usr/bin" \
+			-i "${T}/images/${PYTHON_ABI}" \
+			-d "${EPREFIX}$(python_get_sitedir)" \
+			-c
+	}
+	python_execute_function installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	doicon eric/icons/default/eric.png
+	make_desktop_entry "eric4 --nosplash" eric4 eric "Development;IDE;Qt"
+}
+
+pkg_postinst() {
+	python_mod_optimize eric4{,config.py,plugins}
+
+	elog "The following packages will give Eric extended functionality:"
+	elog "  dev-python/cx_Freeze"
+	elog "  dev-python/pyenchant"
+	elog "  dev-python/pylint"
+	elog "  dev-python/pysvn"
+	elog "  dev-vcs/mercurial"
+	elog
+	elog "This version has a plugin interface with plugin-autofetch from"
+	elog "the application itself. You may want to check that as well."
+}
+
+pkg_postrm() {
+	python_mod_cleanup eric4{,config.py,plugins}
+}
diff --git a/dev-util/eric/eric-5.5.2.ebuild b/dev-util/eric/eric-5.5.2.ebuild
new file mode 100644
index 000000000000..3769513ecbed
--- /dev/null
+++ b/dev-util/eric/eric-5.5.2.ebuild
@@ -0,0 +1,93 @@
+# 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} )
+PYTHON_REQ_USE="sqlite,xml"
+PLOCALES="cs de en es fr it pt ru tr zh_CN"
+
+inherit eutils l10n python-single-r1
+
+DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
+HOMEPAGE="http://eric-ide.python-projects.org/"
+
+SLOT="5"
+MY_PV=${PV/_rc/-RC}
+MY_P=${PN}${SLOT}-${MY_PV}
+
+BASE_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${MY_PV}"
+SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
+for L in ${PLOCALES}; do
+	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${PN}${SLOT}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
+done
+unset L
+
+LICENSE="GPL-3"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt4-4.10[${PYTHON_USEDEP},X,help,sql,svg,webkit]
+	>=dev-python/qscintilla-python-2.7.1[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Avoid file collisions between different slots of Eric
+	sed -i -e 's/^Icon=eric$/&5/' eric/eric5.desktop || die
+	sed -i -e 's/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/' \
+		$(grep -lr 'eric\.png' .) || die
+	mv eric/icons/default/eric{,5}.png || die
+	mv eric/pixmaps/eric{,5}.png || die
+	rm -f eric/APIs/Python/zope-*.api
+	rm -f eric/APIs/Ruby/Ruby-*.api
+
+	# Delete internal copies of dev-python/chardet and dev-python/pygments
+	rm -fr eric/ThirdParty/{CharDet,Pygments}
+
+	# Delete internal copy of dev-python/coverage
+	rm -fr eric/DebugClients/Python{,3}/coverage
+	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
+		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
+
+	# Fix desktop files (bug 458092)
+	sed -i -e '/^Categories=/s:Python:X-&:' eric/eric5{,_webbrowser}.desktop || die
+}
+
+src_install() {
+	"${PYTHON}" install.py \
+		-b "${EPREFIX}/usr/bin" \
+		-d "$(python_get_sitedir)" \
+		-i "${D}" \
+		-c \
+		-z \
+		|| die
+
+	python_optimize
+
+	doicon eric/icons/default/eric5.png
+	dodoc changelog THANKS
+}
+
+pkg_postinst() {
+	elog "The following packages will give Eric extended functionality:"
+	elog "  dev-python/cx_Freeze"
+	elog "  dev-python/pyenchant"
+	elog "  dev-python/pylint"
+	elog "  dev-python/pysvn"
+	elog "  dev-vcs/mercurial"
+	elog
+	elog "This version has a plugin interface with plugin-autofetch from"
+	elog "the application itself. You may want to check that as well."
+}
diff --git a/dev-util/eric/files/eric-4.4-no-pykde.patch b/dev-util/eric/files/eric-4.4-no-pykde.patch
new file mode 100644
index 000000000000..26bbf8925d5c
--- /dev/null
+++ b/dev-util/eric/files/eric-4.4-no-pykde.patch
@@ -0,0 +1,146 @@
+Index: eric4-4.4-snapshot-20091129/eric/KdeQt/__init__.py
+===================================================================
+--- eric4-4.4-snapshot-20091129.orig/eric/KdeQt/__init__.py
++++ eric4-4.4-snapshot-20091129/eric/KdeQt/__init__.py
+@@ -20,19 +20,6 @@ import sys
+ import Preferences
+ 
+ if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde:
+-    try:
+-        import PyKDE4
+-        from PyQt4.QtCore import QString
+-        
+-        def __kdeIsKDE():
+-            """
+-            Public function to signal the availability of KDE4.
+-            
+-            @return availability flag (always True)
+-            """
+-            return True
+-        
+-    except (ImportError, RuntimeError):
+         sys.e4nokde = True
+ 
+ def __kdeKdeVersionString():
+@@ -56,96 +43,29 @@ def __kdeKdeVersionString():
+         return QString("unknown")
+     
+ def __kdePyKdeVersionString():
+-    """
+-    Public function to return the PyKDE4 version as a string.
+-    
+-    @return PyKDE4 version as a string (QString)
+-    """
+-    try:
+-        try:
+-            from PyKDE4.kdecore import pykde_versionMajor, pykde_versionMinor, \
+-                                       pykde_versionRelease
+-            return QString("%d.%d.%d" % \
+-                (pykde_versionMajor(), pykde_versionMinor(), 
+-                 pykde_versionRelease()))
+-        except (ImportError, AttributeError):
+-            from PyKDE4 import pykdeconfig
+-            try:
+-                return QString(pykdeconfig.Configuration().pykde_version_str)
+-            except AttributeError:
+-                return QString("unknown")
+-    except ImportError:
+-        return QString("unknown")
++        return QString("PyKDE support is disabled")
+     
+ from PyQt4.QtCore import QString
+ 
+ def __qtIsKDE():
+-    """
+-    Private function to signal the availability of KDE.
+-    
+-    @return availability flag (always False)
+-    """
+     return False
+     
+ def __qtKdeVersionString():
+-    """
+-    Private function to return the KDE version as a string.
+-    
+-    @return KDE version as a string (QString) (always empty)
+-    """
+     return QString("")
+     
+ def __qtPyKdeVersionString():
+-    """
+-    Private function to return the PyKDE version as a string.
+-    
+-    @return PyKDE version as a string (QString) (always empty)
+-    """
+     return QString("")
+ 
+ ################################################################################
+ 
+ def isKDEAvailable():
+-    """
+-    Public function to signal the availability of KDE.
+-    
+-    @return availability flag (always False)
+-    """
+-    try:
+-        import PyKDE4
+-        return True
+-    except ImportError:
+-        return False
++	return False
+ 
+ def isKDE():
+-    """
+-    Public function to signal, if KDE usage is enabled.
+-    
+-    @return KDE support flag (always False)
+-    """
+-    if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde:
+-        return __kdeIsKDE()
+-    else:
+-        return __qtIsKDE()
++	return __qtIsKDE()
+     
+ def kdeVersionString():
+-    """
+-    Public function to return the KDE version as a string.
+-    
+-    @return KDE version as a string (QString) (always empty)
+-    """
+-    if isKDEAvailable():
+-        return __kdeKdeVersionString()
+-    else:
+-        return __qtKdeVersionString()
++	return __qtKdeVersionString()
+     
+ def pyKdeVersionString():
+-    """
+-    Public function to return the PyKDE version as a string.
+-    
+-    @return PyKDE version as a string (QString) (always empty)
+-    """
+-    if isKDEAvailable():
+-        return __kdePyKdeVersionString()
+-    else:
+-        return __qtPyKdeVersionString()
++	return __qtPyKdeVersionString()
+Index: eric4-4.4-snapshot-20091129/eric/eric4.py
+===================================================================
+--- eric4-4.4-snapshot-20091129.orig/eric/eric4.py
++++ eric4-4.4-snapshot-20091129/eric/eric4.py
+@@ -32,13 +32,12 @@ restartArgsList = ["--nokde", "--nosplas
+ restartArgs = [arg for arg in sys.argv[1:] if arg.split("=", 1)[0] in restartArgsList]
+ 
+ # disable the usage of KDE widgets, if requested
+-sys.e4nokde = False
++sys.e4nokde = True
+ if "--nokde" in sys.argv:
+     del sys.argv[sys.argv.index("--nokde")]
+     sys.e4nokde = True
+ else:
+-    sys.e4nokde = os.getenv("e4nokde") is not None and os.getenv("e4nokde") == "1"
+-
++	print "PyKDE support has been disabled. Enable 'kde' useflag to bring it back"
+ if "--debug" in sys.argv:
+     del sys.argv[sys.argv.index("--debug")]
+     logging.basicConfig(level = logging.DEBUG)
diff --git a/dev-util/eric/files/eric-4.5-no-interactive.patch b/dev-util/eric/files/eric-4.5-no-interactive.patch
new file mode 100644
index 000000000000..37e57748e487
--- /dev/null
+++ b/dev-util/eric/files/eric-4.5-no-interactive.patch
@@ -0,0 +1,15 @@
+--- eric4-4.5.10/install.py
++++ eric4-4.5.10/install.py
+@@ -1053,12 +1053,6 @@
+                     (v[0], v[1], v[2])
+                 print "    with foreign characters. Please see 'README-PyXML.txt' for"
+                 print "    details."
+-                try:
+-                    res = raw_input("    Shall pyXML be patched now (y/n)? ")
+-                    if res in ["Y", "y"]:
+-                        patchPyXML()
+-                except EOFError:
+-                    pass
+     except ImportError:
+         pass
+     
diff --git a/dev-util/eric/metadata.xml b/dev-util/eric/metadata.xml
new file mode 100644
index 000000000000..0b863c387a3e
--- /dev/null
+++ b/dev-util/eric/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qt</herd>
+  <upstream>
+    <remote-id type="sourceforge">eric-ide</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/exmap/Manifest b/dev-util/exmap/Manifest
new file mode 100644
index 000000000000..a34a5b5dbe01
--- /dev/null
+++ b/dev-util/exmap/Manifest
@@ -0,0 +1 @@
+DIST exmap-0.10.tgz 124620 SHA256 f6d5feffa53afa3e1321df91b127cdf403f7239076539eeef9aab665286c007c SHA512 ce9cd231ab8d726ea29f9ad1cccd505b00661290acfa6dadfe0bee756d706011cc7003ade011b106778eaa11d00b8b7b2eb094fb3666062faa063761f4622503 WHIRLPOOL 3cc45d74be4eee8d61993799d1f89ad7529b33c0dd979520b0f1160da75cd8477519fd3f4c904f6295f08d5d908a5ae61b6638f38a7624ab7e26496837fba34d
diff --git a/dev-util/exmap/exmap-0.10-r1.ebuild b/dev-util/exmap/exmap-0.10-r1.ebuild
new file mode 100644
index 000000000000..4c25abe48413
--- /dev/null
+++ b/dev-util/exmap/exmap-0.10-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils linux-mod
+
+DESCRIPTION="A memory analysis kernel module with userland tool"
+HOMEPAGE="http://www.berthels.co.uk/exmap/"
+SRC_URI="http://www.berthels.co.uk/${PN}/download/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="dev-libs/libpcre
+	gtk? ( dev-cpp/gtkmm:2.4
+		x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+MODULE_NAMES="exmap(misc:${S}/kernel)"
+BUILD_TARGETS="clean kernel_modules"
+
+src_prepare() {
+	# patch find_task_by_pid to pid_task and &proc_root to NULL
+	epatch "${FILESDIR}/${P}-kernel.patch"
+
+	# use $(MAKE), remove -g on CXXFLAGS, clean up CXX/LD invocations
+	# remove -Werror, bug 468246
+	epatch "${FILESDIR}/${PF}-makefiles.patch"
+
+	# somthing strange between linux-mod supplied ARCH and old kernels
+	# which leads to arch/x86/Makefile: file/dir x86 not found
+	if kernel_is lt 2 6 25 ; then
+		sed -i -e 's:\$(MAKE):unset ARCH ; \$(MAKE):' kernel/Makefile || die
+	fi
+
+	# new gcc include behavior
+	epatch "${FILESDIR}/${P}-gcc.patch"
+
+	# gcc4.5 fails on return false as std::string
+	epatch "${FILESDIR}/${P}-gcc45.patch"
+
+	# fix for 64bit from http://www.kdedevelopers.org/node/4166
+	epatch "${FILESDIR}/${P}-fix64bit.patch"
+
+	# fix underlinking with -Wl,--as-needed
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	# no longer call make clean in kernel source dir
+	epatch "${FILESDIR}/${P}-kernel-3.5.patch"
+
+	rm -v src/{*.so,munged-ls-threeloads,prelinked-amule} || die
+}
+
+src_compile() {
+	export KERNEL_DIR
+	linux-mod_src_compile
+
+	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C jutil || die
+	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C src $(use gtk || echo exmtool) || die
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dobin src/exmtool || die
+	use gtk && { dobin src/gexmap || die ; }
+	dodoc TODO README || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	elog "Please load the exmap kernel module before running exmtool or gexmap."
+}
diff --git a/dev-util/exmap/exmap-0.10.ebuild b/dev-util/exmap/exmap-0.10.ebuild
new file mode 100644
index 000000000000..1ee0349cf09e
--- /dev/null
+++ b/dev-util/exmap/exmap-0.10.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils linux-mod
+
+DESCRIPTION="A memory analysis kernel module with userland tool"
+HOMEPAGE="http://www.berthels.co.uk/exmap/"
+SRC_URI="http://www.berthels.co.uk/${PN}/download/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="dev-libs/libpcre
+	gtk? ( dev-cpp/gtkmm:2.4
+		x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+MODULE_NAMES="exmap(misc:${S}/kernel)"
+BUILD_TARGETS="clean kernel_modules"
+
+src_prepare() {
+	# patch find_task_by_pid to pid_task and &proc_root to NULL
+	epatch "${FILESDIR}/${P}-kernel.patch"
+
+	# use $(MAKE), remove -g on CXXFLAGS, clean up CXX/LD invocations
+	epatch "${FILESDIR}/${P}-makefiles.patch"
+
+	# somthing strange between linux-mod supplied ARCH and old kernels
+	# which leads to arch/x86/Makefile: file/dir x86 not found
+	if kernel_is lt 2 6 25 ; then
+		sed -i -e 's:\$(MAKE):unset ARCH ; \$(MAKE):' kernel/Makefile || die
+	fi
+
+	# new gcc include behavior
+	epatch "${FILESDIR}/${P}-gcc.patch"
+
+	# gcc4.5 fails on return false as std::string
+	epatch "${FILESDIR}/${P}-gcc45.patch"
+
+	# fix for 64bit from http://www.kdedevelopers.org/node/4166
+	epatch "${FILESDIR}/${P}-fix64bit.patch"
+
+	# fix underlinking with -Wl,--as-needed
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	# no longer call make clean in kernel source dir
+	epatch "${FILESDIR}/${P}-kernel-3.5.patch"
+
+	rm -v src/{*.so,munged-ls-threeloads,prelinked-amule} || die
+}
+
+src_compile() {
+	export KERNEL_DIR
+	linux-mod_src_compile
+
+	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C jutil || die
+	emake CXX="$(tc-getCXX)" LD="$(tc-getLD)" -C src $(use gtk || echo exmtool) || die
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dobin src/exmtool || die
+	use gtk && { dobin src/gexmap || die ; }
+	dodoc TODO README || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	elog "Please load the exmap kernel module before running exmtool or gexmap."
+}
diff --git a/dev-util/exmap/files/exmap-0.10-as-needed.patch b/dev-util/exmap/files/exmap-0.10-as-needed.patch
new file mode 100644
index 000000000000..72671b31fc70
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-as-needed.patch
@@ -0,0 +1,21 @@
+--- src/Makefile	2010-08-09 01:17:29.000000000 +0200
++++ src/Makefile	2010-08-09 01:21:13.000000000 +0200
+@@ -42,15 +42,15 @@
+ OBJS += $(TR_OBJ)
+ TESTS +=  t_range
+ 
+-TE_OBJ = t_elf.o Elf.o Range.o
++TE_OBJ = t_elf.o Elf.o Range.o ../jutil/Pcre.o
+ OBJS += $(TE_OBJ)
+ TESTS +=  t_elf
+ 
+-TP_OBJ = t_pcre.o
++TP_OBJ = t_pcre.o ../jutil/Pcre.o
+ OBJS += $(TP_OBJ)
+ TESTS +=  t_pcre
+ 
+-TX_OBJ = t_exmap.o $(EXMAP_OBJ)
++TX_OBJ = t_exmap.o ../jutil/Pcre.o $(EXMAP_OBJ)
+ OBJS += $(TX_OBJ)
+ TESTS +=  t_exmap
+ 
diff --git a/dev-util/exmap/files/exmap-0.10-fix64bit.patch b/dev-util/exmap/files/exmap-0.10-fix64bit.patch
new file mode 100644
index 000000000000..8f886f1fe9a7
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-fix64bit.patch
@@ -0,0 +1,24 @@
+I quite frankly don't entirely understand this code, but exmap's debug
+output on i586 and x86_64 pointed out these differences and this makes
+it work.
+
+--- exmap-0.10/src/Exmap.cpp.sav	2006-09-28 18:52:25.000000000 +0200
++++ exmap-0.10/src/Exmap.cpp	2010-01-02 17:45:49.787955568 +0100
+@@ -450,7 +450,7 @@ void Vma::add_pages(const list<Page> &pa
+ 
+ bool Vma::is_vdso()
+ {
+-    return fname() == "[vdso]";
++    return fname() == "[vdso]" || fname() == "[vsyscall]";
+ }
+ 
+ bool Vma::is_file_backed()
+@@ -1495,7 +1495,7 @@ bool MapCalculator::calc_map_for_seg(con
+ 
+     filevmas.pop_front();
+     dbg << pref.str() << "consuming vma\n";
+-    if (!filevmas.empty() && !filevmas.front()->is_file_backed()) {
++    while (!filevmas.empty() && !filevmas.front()->is_file_backed()) {
+ 	filevmas.pop_front();
+ 	dbg << pref.str() << "consuming anon vma\n";
+     }
diff --git a/dev-util/exmap/files/exmap-0.10-gcc.patch b/dev-util/exmap/files/exmap-0.10-gcc.patch
new file mode 100644
index 000000000000..fd73371529bc
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-gcc.patch
@@ -0,0 +1,68 @@
+diff -ru exmap-0.10/work/exmap-0.10/jutil/jutil.cpp exm/work/exmap-0.10/jutil/jutil.cpp
+--- jutil/jutil.cpp	2006-09-28 18:52:25.000000000 +0200
++++ jutil/jutil.cpp	2010-02-15 15:35:43.000000000 +0100
+@@ -3,6 +3,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <cstring>
+ #include <limits.h>
+ #include <dirent.h>
+ 
+diff -ru exmap-0.10/work/exmap-0.10/jutil/jutil.hpp exm/work/exmap-0.10/jutil/jutil.hpp
+--- jutil/jutil.hpp	2006-09-28 18:52:25.000000000 +0200
++++ jutil/jutil.hpp	2010-02-15 15:40:02.000000000 +0100
+@@ -3,6 +3,7 @@
+ 
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ #include <list>
+ #include <map>
+ 
+diff -ru exmap-0.10/work/exmap-0.10/src/exmtool.cpp exm/work/exmap-0.10/src/exmtool.cpp
+--- src/exmtool.cpp	2006-09-28 18:52:25.000000000 +0200
++++ src/exmtool.cpp	2010-02-15 15:34:04.000000000 +0100
+@@ -5,6 +5,7 @@
+ 
+ #include <sstream>
+ #include <iostream>
++#include <cstring>
+ #include <vector>
+ 
+ using namespace std;
+@@ -19,9 +18,9 @@
+ 
+ struct command
+ {
+-    char *command;
++    const char *command;
+     Handler handler;
+-    char *usage;
++    const char *usage;
+ } cmd_handles[] = {
+     { "procs",
+       do_procs,
+
+diff -ru exmap-0.10/work/exmap-0.10/src/Elf.cpp norg/work/exmap-0.10/src/Elf.cpp
+--- src/Elf.cpp	2006-09-28 18:52:25.000000000 +0200
++++ src/Elf.cpp	2010-02-15 16:55:37.000000000 +0100
+@@ -4,6 +4,7 @@
+ #include "Elf.hpp"
+ 
+ #include <sstream>
++#include <cstring>
+ #include <unistd.h> // getpagesize()
+ 
+ using namespace std;
+
+diff -ru exmap-0.10/jutil/TestRunner.cpp.orig exmap-0.10/jutil/TestRunner.cpp
+--- jutil/TestRunner.cpp.orig	2010-02-15 22:00:03.000000000 +0100
++++ jutil/TestRunner.cpp	2010-02-15 22:00:19.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include "TestRunner.hpp"
+ #include "Pcre.hpp"
++#include <cstdio>
+ 
+ using namespace std;
+ 
diff --git a/dev-util/exmap/files/exmap-0.10-gcc45.patch b/dev-util/exmap/files/exmap-0.10-gcc45.patch
new file mode 100644
index 000000000000..a9ed3419e774
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-gcc45.patch
@@ -0,0 +1,11 @@
+--- src/Elf.cpp	2010-05-14 01:40:27.000000000 +0200
++++ src/Elf.cpp	2010-05-14 01:46:06.000000000 +0200
+@@ -579,7 +579,7 @@
+ std::string Section::find_string(istream &is, int index)
+ {
+     if (!is_string_table() || index < 0) {
+-	return false;
++	return NULL;
+     }
+ 
+     int offset = _sectstruct->offset() + index;
diff --git a/dev-util/exmap/files/exmap-0.10-kernel-3.5.patch b/dev-util/exmap/files/exmap-0.10-kernel-3.5.patch
new file mode 100644
index 000000000000..314f0fc3301f
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-kernel-3.5.patch
@@ -0,0 +1,8 @@
+--- exmap-0.10/kernel/Makefile
++++ exmap-0.10/kernel/Makefile
+@@ -10,4 +10,4 @@
+ 	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules
+ 
+ clean:
+-	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean
++	#$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean
diff --git a/dev-util/exmap/files/exmap-0.10-kernel.patch b/dev-util/exmap/files/exmap-0.10-kernel.patch
new file mode 100644
index 000000000000..8bc58737b6d5
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-kernel.patch
@@ -0,0 +1,50 @@
+Tested with linux-2.6.16-gentoo-r13, linux-2.6.25-gentoo-r9, linux-2.6.26-gentoo-r4, linux-2.6.27-gentoo-r10, 
+linux-2.6.28-gentoo-r6, linux-2.6.29-gentoo-r6, linux-2.6.30-gentoo-r9, linux-2.6.32-gentoo-r4, linux-2.6.32-gentoo-r5
+
+diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/exmap.c exmap-0.10/work/exmap-0.10/kernel/exmap.c
+--- kernel/exmap.c	2006-09-28 18:52:25.000000000 +0200
++++ kernel/exmap.c	2010-02-17 16:15:04.000000000 +0100
+@@ -392,7 +392,11 @@
+ 	struct task_struct *tsk;
+ 	int errcode = -EINVAL;
+ 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++	tsk = pid_task(find_pid_ns(pid, &init_pid_ns), PIDTYPE_PID);
++	#else
+ 	tsk = find_task_by_pid(pid);
++	#endif
+ 	if (tsk == NULL) {
+ 		printk (KERN_ALERT
+ 			"/proc/%s: can't find task for pid %d\n",
+@@ -507,7 +511,11 @@
+ 							NULL);
+ 
+ 	if (exmap_proc_file == NULL) {
++		#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++		remove_proc_entry (PROCFS_NAME, NULL);
++		#else
+ 		remove_proc_entry (PROCFS_NAME, &proc_root);
++		#endif
+ 		printk (KERN_ALERT "/proc/%s: could not initialize\n",
+ 			PROCFS_NAME);
+ 		return -ENOMEM;
+@@ -523,7 +523,9 @@
+ 	
+ 	exmap_proc_file->read_proc = procfile_read;
+ 	exmap_proc_file->write_proc = procfile_write;
++	#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,29)
+ 	exmap_proc_file->owner = THIS_MODULE;
++	#endif
+ 	
+ 	/*     exmap_proc_file->mode         = S_IFREG | S_IRUGO; */
+ 	/* TODO - this is quite probably a security problem */
+@@ -532,5 +540,9 @@
+ void cleanup_module ()
+ {
+ 	printk (KERN_INFO "/proc/%s: remove\n", PROCFS_NAME);
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++	remove_proc_entry (PROCFS_NAME, NULL);
++	#else
+ 	remove_proc_entry (PROCFS_NAME, &proc_root);
++	#endif
+ }
diff --git a/dev-util/exmap/files/exmap-0.10-makefiles.patch b/dev-util/exmap/files/exmap-0.10-makefiles.patch
new file mode 100644
index 000000000000..e3841c60566d
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-makefiles.patch
@@ -0,0 +1,115 @@
+diff -ru exmap-0.10.orig/work/exmap-0.10/jutil/Makefile exmap-0.10/work/exmap-0.10/jutil/Makefile
+--- jutil/Makefile	2006-09-28 18:52:25.000000000 +0200
++++ jutil/Makefile	2010-02-17 17:31:56.000000000 +0100
+@@ -12,21 +12,20 @@
+ OBJ += $(ETOBJ)
+ EXES += egtest
+ 
+-CXX=g++
+-CXXFLAGS=-Wall -Werror -g -I.
+-LD=g++
+-LDFLAGS=-lpcre
++CXX = g++
++CXXFLAGS += -Wall -Werror -I.
++LD = ld
+ 
+ build: $(LIBS) $(EXES)
+ 
+ trun: $(TROBJ) $(JLIB)
+-	$(LD) $(TROBJ) -o trun $(LDFLAGS) -ljutil -L.
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(TROBJ) -o trun -ljutil -lpcre -L.
+ 
+ $(JLIB): $(JOBJ)
+ 	ar rs $(JLIB) $(JOBJ)
+ 
+ egtest: $(ETOBJ)
+-	$(LD) $(ETOBJ) -o egtest $(LDFLAGS)
++	$(CXX) $(CXXFLAGS) $(ETOBJ) -o egtest $(LDFLAGS)
+ 
+ clean:
+ 	rm -f $(OBJ) $(EXES) $(JLIB) *~
+diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/Makefile exmap-0.10/work/exmap-0.10/kernel/Makefile
+--- kernel/Makefile	2006-09-28 18:52:25.000000000 +0200
++++ kernel/Makefile	2010-02-17 17:30:06.000000000 +0100
+@@ -7,7 +7,7 @@
+ build: kernel_modules
+ 
+ kernel_modules:
+-	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) modules
++	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules
+ 
+ clean:
+-	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) clean
++	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean
+Only in exmap-0.10/work/exmap-0.10/kernel/.tmp_versions: exmap.mod
+diff -ru exmap-0.10.orig/work/exmap-0.10/src/Makefile exmap-0.10/work/exmap-0.10/src/Makefile
+--- src/Makefile	2006-09-28 18:52:25.000000000 +0200
++++ src/Makefile	2010-02-17 17:33:38.000000000 +0100
+@@ -1,5 +1,5 @@
+ CXX=g++
+-LD=g++
++LD=ld
+ JUTILDIR=../jutil
+ 
+ #CXXFLAGS += -pg
+@@ -11,11 +11,12 @@
+ 
+ EXMAP_OBJ=Exmap.o Range.o Elf.o
+ 
+-CXXFLAGS += -g -Wall -Werror -I$(JUTILDIR)
+-LDFLAGS += -lpcre -ljutil -L$(JUTILDIR)
++CXXFLAGS += -Wall -Werror -I$(JUTILDIR)
++LDFLAGS += -L$(JUTILDIR)
++LIBS += -lpcre -ljutil
+ 
+ GTKCXXFLAGS = `pkg-config --cflags gtkmm-2.4`
+-GTKLDFLAGS = `pkg-config --libs gtkmm-2.4`
++GTKLIBS = `pkg-config --libs gtkmm-2.4`
+ 
+ # ------------------------------------------------------------
+ 
+@@ -76,34 +77,34 @@
+ 	$(JUTILDIR)/trun $(TESTS)
+ 
+ gexmap: $(GEM_OBJ)
+-	$(LD) -o gexmap $(GEM_OBJ) $(LDFLAGS) $(GTKLDFLAGS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o gexmap $(GEM_OBJ) $(LIBS) $(GTKLIBS)
+ 
+ gexmap.o: gexmap.cpp
+-	$(CC) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
+ 
+ exmtool: $(CL_OBJ)
+-	$(LD) -o exmtool $(CL_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o exmtool $(CL_OBJ) $(LIBS)
+ 
+ elftool: $(ET_OBJ)
+-	$(LD) -o elftool $(ET_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o elftool $(ET_OBJ) $(LIBS)
+ 
+ showproc: $(SP_OBJ)
+-	$(LD) -o showproc $(SP_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o showproc $(SP_OBJ) $(LIBS)
+ 
+ t_range: $(TR_OBJ)
+-	$(LD) -o t_range $(TR_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_range $(TR_OBJ) $(LIBS)
+ 
+ t_elf: $(TE_OBJ)
+-	$(LD) -o t_elf $(TE_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_elf $(TE_OBJ) $(LIBS)
+ 
+ t_pcre: $(TP_OBJ)
+-	$(LD) -o t_pcre $(TP_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_pcre $(TP_OBJ) $(LIBS)
+ 
+ t_exmap: $(TX_OBJ)
+-	$(LD) -o t_exmap $(TX_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_exmap $(TX_OBJ) $(LIBS)
+ 
+ t_artsd: $(TA_OBJ)
+-	$(LD) -o t_artsd $(TA_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_artsd $(TA_OBJ) $(LIBS) 
+ 
+ clean: cleantags cleandoc
+ 	rm -f $(OBJS) $(EXES) $(SHLIBS) $(EXTRA_DEL_FILES)
diff --git a/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch b/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch
new file mode 100644
index 000000000000..4c971454bc74
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-r1-makefiles.patch
@@ -0,0 +1,115 @@
+diff -ru exmap-0.10.orig/work/exmap-0.10/jutil/Makefile exmap-0.10/work/exmap-0.10/jutil/Makefile
+--- jutil/Makefile	2006-09-28 18:52:25.000000000 +0200
++++ jutil/Makefile	2010-02-17 17:31:56.000000000 +0100
+@@ -12,21 +12,20 @@
+ OBJ += $(ETOBJ)
+ EXES += egtest
+ 
+-CXX=g++
+-CXXFLAGS=-Wall -Werror -g -I.
+-LD=g++
+-LDFLAGS=-lpcre
++CXX = g++
++CXXFLAGS += -Wall -I.
++LD = ld
+ 
+ build: $(LIBS) $(EXES)
+ 
+ trun: $(TROBJ) $(JLIB)
+-	$(LD) $(TROBJ) -o trun $(LDFLAGS) -ljutil -L.
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(TROBJ) -o trun -ljutil -lpcre -L.
+ 
+ $(JLIB): $(JOBJ)
+ 	ar rs $(JLIB) $(JOBJ)
+ 
+ egtest: $(ETOBJ)
+-	$(LD) $(ETOBJ) -o egtest $(LDFLAGS)
++	$(CXX) $(CXXFLAGS) $(ETOBJ) -o egtest $(LDFLAGS)
+ 
+ clean:
+ 	rm -f $(OBJ) $(EXES) $(JLIB) *~
+diff -ru exmap-0.10.orig/work/exmap-0.10/kernel/Makefile exmap-0.10/work/exmap-0.10/kernel/Makefile
+--- kernel/Makefile	2006-09-28 18:52:25.000000000 +0200
++++ kernel/Makefile	2010-02-17 17:30:06.000000000 +0100
+@@ -7,7 +7,7 @@
+ build: kernel_modules
+ 
+ kernel_modules:
+-	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) modules
++	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) modules
+ 
+ clean:
+-	make -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) clean
++	$(MAKE) -C ${KERNEL_DIR} M=$(CURDIR) clean
+Only in exmap-0.10/work/exmap-0.10/kernel/.tmp_versions: exmap.mod
+diff -ru exmap-0.10.orig/work/exmap-0.10/src/Makefile exmap-0.10/work/exmap-0.10/src/Makefile
+--- src/Makefile	2006-09-28 18:52:25.000000000 +0200
++++ src/Makefile	2010-02-17 17:33:38.000000000 +0100
+@@ -1,5 +1,5 @@
+ CXX=g++
+-LD=g++
++LD=ld
+ JUTILDIR=../jutil
+ 
+ #CXXFLAGS += -pg
+@@ -11,11 +11,12 @@
+ 
+ EXMAP_OBJ=Exmap.o Range.o Elf.o
+ 
+-CXXFLAGS += -g -Wall -Werror -I$(JUTILDIR)
+-LDFLAGS += -lpcre -ljutil -L$(JUTILDIR)
++CXXFLAGS += -Wall -I$(JUTILDIR)
++LDFLAGS += -L$(JUTILDIR)
++LIBS += -lpcre -ljutil
+ 
+ GTKCXXFLAGS = `pkg-config --cflags gtkmm-2.4`
+-GTKLDFLAGS = `pkg-config --libs gtkmm-2.4`
++GTKLIBS = `pkg-config --libs gtkmm-2.4`
+ 
+ # ------------------------------------------------------------
+ 
+@@ -76,34 +77,34 @@
+ 	$(JUTILDIR)/trun $(TESTS)
+ 
+ gexmap: $(GEM_OBJ)
+-	$(LD) -o gexmap $(GEM_OBJ) $(LDFLAGS) $(GTKLDFLAGS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o gexmap $(GEM_OBJ) $(LIBS) $(GTKLIBS)
+ 
+ gexmap.o: gexmap.cpp
+-	$(CC) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) $(GTKCXXFLAGS) -c $<
+ 
+ exmtool: $(CL_OBJ)
+-	$(LD) -o exmtool $(CL_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o exmtool $(CL_OBJ) $(LIBS)
+ 
+ elftool: $(ET_OBJ)
+-	$(LD) -o elftool $(ET_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o elftool $(ET_OBJ) $(LIBS)
+ 
+ showproc: $(SP_OBJ)
+-	$(LD) -o showproc $(SP_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o showproc $(SP_OBJ) $(LIBS)
+ 
+ t_range: $(TR_OBJ)
+-	$(LD) -o t_range $(TR_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_range $(TR_OBJ) $(LIBS)
+ 
+ t_elf: $(TE_OBJ)
+-	$(LD) -o t_elf $(TE_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_elf $(TE_OBJ) $(LIBS)
+ 
+ t_pcre: $(TP_OBJ)
+-	$(LD) -o t_pcre $(TP_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_pcre $(TP_OBJ) $(LIBS)
+ 
+ t_exmap: $(TX_OBJ)
+-	$(LD) -o t_exmap $(TX_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_exmap $(TX_OBJ) $(LIBS)
+ 
+ t_artsd: $(TA_OBJ)
+-	$(LD) -o t_artsd $(TA_OBJ) $(LDFLAGS) 
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o t_artsd $(TA_OBJ) $(LIBS) 
+ 
+ clean: cleantags cleandoc
+ 	rm -f $(OBJS) $(EXES) $(SHLIBS) $(EXTRA_DEL_FILES)
diff --git a/dev-util/exmap/metadata.xml b/dev-util/exmap/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/dev-util/exmap/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/fatrace/Manifest b/dev-util/fatrace/Manifest
new file mode 100644
index 000000000000..9a8124bef66a
--- /dev/null
+++ b/dev-util/fatrace/Manifest
@@ -0,0 +1,3 @@
+DIST fatrace-0.4.tar.bz2 18155 SHA256 8abd5d382610e3284f4057dc202f565ff653a5432f3bbc65463be61647e2ef94 SHA512 bd2e31a16f79127294a9599094c41043a612609241653f33fdb8adef17da99a781b5029f6b1af1731b7c939e7ae3c1d2c19f985dde72c9f409e6945d4dc1f7ce WHIRLPOOL c28337e5ca3d14b045704bb23ce386034c5a71559f8ed1a5bb471b4f4202af87088120d7e8e3de76ceae1d860b47179aceead09f277297895753c75ebfc2186e
+DIST fatrace-0.5.tar.bz2 18310 SHA256 de7e04df5650d84da9b1cecd60b0f1dade50adf7cff57835a8617bc94f2becf0 SHA512 e0357e6e74683f4d6ffaa958a704bca996823406a77b92c36537ff2bb4a47b39dd909186b0f0a5cb46672bf48d0ba64c07288d9a1f7fc83bc3928bce5bf91b2d WHIRLPOOL 0bf8ddf1370e9ab95945ed4a5df5f37c3c81e3cff7f22b05f23a86ec48507dc16541e30f58871f426624877df8afafaec3f925ed010745ef0313647bb7134efc
+DIST fatrace-0.9.tar.bz2 18828 SHA256 c028d822ffde68805e5d1f62c4e2d0f4b3d4ae565802cc9468c82b25b92e68cd SHA512 a1dbc17e1e408ddfc145e8f70580b0f5ce500fb53736d6a22547c370c4b221b362973c19a40df3c2dd911c899d74e9dc944a881eea99f9d143f6de7e213146c3 WHIRLPOOL d9b8e05cd32a9fe3904b2f1ba41ddff3e70e44610ae0f05940bb70aa54f40ed5cf6890fd6abd7b5eb4b8015a209c77e49dee6919e7afe3875a32f17f25f4ae53
diff --git a/dev-util/fatrace/fatrace-0.4.ebuild b/dev-util/fatrace/fatrace-0.4.ebuild
new file mode 100644
index 000000000000..2f6f7dc82485
--- /dev/null
+++ b/dev-util/fatrace/fatrace-0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="powertop? *"
+
+inherit linux-info python toolchain-funcs
+
+DESCRIPTION="report file access events from all running processes"
+HOMEPAGE="https://launchpad.net/fatrace"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="powertop"
+
+RDEPEND="powertop? ( =sys-power/powertop-1.13 )"
+DEPEND=""
+
+CONFIG_CHECK="~FANOTIFY"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python_pkg_setup
+}
+
+src_prepare() {
+	if use powertop ; then
+		sed -e "s/powertop-1.13/powertop/g" \
+			-i power-usage-report || die
+	fi
+
+	tc-export CC
+}
+
+src_install() {
+	dosbin fatrace
+	use powertop && dosbin power-usage-report
+
+	doman fatrace.1
+	dodoc NEWS
+}
diff --git a/dev-util/fatrace/fatrace-0.5.ebuild b/dev-util/fatrace/fatrace-0.5.ebuild
new file mode 100644
index 000000000000..7308375c20d8
--- /dev/null
+++ b/dev-util/fatrace/fatrace-0.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="report file access events from all running processes"
+HOMEPAGE="https://launchpad.net/fatrace"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="powertop"
+
+RDEPEND="powertop? ( ${PYTHON_DEPS} )"
+DEPEND=""
+
+CONFIG_CHECK="~FANOTIFY"
+
+src_prepare() {
+	tc-export CC
+}
+
+src_install() {
+	dosbin fatrace
+	use powertop && dosbin power-usage-report
+
+	doman fatrace.1
+	dodoc NEWS
+}
diff --git a/dev-util/fatrace/fatrace-0.9.ebuild b/dev-util/fatrace/fatrace-0.9.ebuild
new file mode 100644
index 000000000000..afe7c165c9ef
--- /dev/null
+++ b/dev-util/fatrace/fatrace-0.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit linux-info python-r1 toolchain-funcs
+
+DESCRIPTION="report file access events from all running processes"
+HOMEPAGE="https://launchpad.net/fatrace"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="powertop"
+
+RDEPEND="powertop? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="powertop? ( ${PYTHON_REQUIRED_USE} )"
+
+CONFIG_CHECK="~FANOTIFY"
+
+src_prepare() {
+	tc-export CC
+}
+
+src_install() {
+	dosbin fatrace
+	use powertop && dosbin power-usage-report
+
+	doman fatrace.1
+	dodoc NEWS
+}
diff --git a/dev-util/fatrace/metadata.xml b/dev-util/fatrace/metadata.xml
new file mode 100644
index 000000000000..c4dc617de58c
--- /dev/null
+++ b/dev-util/fatrace/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="powertop">Add powetop integration</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">fatrace</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/febootstrap/Manifest b/dev-util/febootstrap/Manifest
new file mode 100644
index 000000000000..b86ee2441f0c
--- /dev/null
+++ b/dev-util/febootstrap/Manifest
@@ -0,0 +1 @@
+DIST febootstrap-2.11.tar.gz 585966 SHA256 e99d0411702eb619127cc6e2f79a5f4d2fec3d0524e46069738c5ed5b5dc69f4 SHA512 243171e779449f7f25c422842aaef3d5eff5931397530a9b6b1a168ef0fd723ebc4f38846b7699ce7271a715f266033ad2a033ef0aca1b4811d9c7e68929e4ee WHIRLPOOL dbb93f3d502f68b197175cd23d7c2e4faf05a8041efdfb93fbbb9635bdb07e0dd4a39a55fc8b7c1c99827f34505582e08586b10a8e625e0e6b63028625812b01
diff --git a/dev-util/febootstrap/febootstrap-2.11.ebuild b/dev-util/febootstrap/febootstrap-2.11.ebuild
new file mode 100644
index 000000000000..dc1da839142f
--- /dev/null
+++ b/dev-util/febootstrap/febootstrap-2.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="Fedora bootstrap scripts"
+HOMEPAGE="http://people.redhat.com/~rjones/febootstrap/"
+SRC_URI="http://people.redhat.com/~rjones/febootstrap/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/fakeroot-1.11
+	>=sys-apps/fakechroot-2.9
+	dev-lang/perl
+	>=sys-apps/yum-3.2.21
+	sys-fs/e2fsprogs
+	sys-libs/e2fsprogs-libs"
+RDEPEND="${DEPEND}"
+QA_EXECSTACK="usr/bin/febootstrap-supermin-helper"
+
+src_prepare() {
+	# https://lists.gnu.org/archive/html/grub-devel/2012-07/msg00051.html
+	sed -i -e '/gets is a security/d' lib/stdio.in.h
+	epatch "${FILESDIR}"/remove_all-static.patch
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc TODO README examples/*.sh || die
+}
diff --git a/dev-util/febootstrap/files/remove_all-static.patch b/dev-util/febootstrap/files/remove_all-static.patch
new file mode 100644
index 000000000000..4f0f16e79b92
--- /dev/null
+++ b/dev-util/febootstrap/files/remove_all-static.patch
@@ -0,0 +1,12 @@
+diff --git a/helper/Makefile.am b/helper/Makefile.am
+--- a/helper/Makefile.am
++++ b/helper/Makefile.am
+@@ -40,7 +40,7 @@
+ noinst_PROGRAMS = init
+ init_SOURCES = init.c
+ init_CFLAGS = -static
+-init_LDFLAGS = -all-static
++init_LDFLAGS = -static
+ 
+ # http://www.doof.me.uk/2010/05/07/cute-objcopy-hack/
+ ELF_DEFAULT_ARCH = $(shell $(srcdir)/elf-default-arch | gawk '{ print $$1 }')
diff --git a/dev-util/febootstrap/metadata.xml b/dev-util/febootstrap/metadata.xml
new file mode 100644
index 000000000000..d62d48a3f6df
--- /dev/null
+++ b/dev-util/febootstrap/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ 	<email>andreis.vinogradovs@gmail.com</email>
+</maintainer>
+<maintainer>
+	<email>maksbotan@gentoo.org</email>
+	<name>Maxim Koltsov</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/fhist/Manifest b/dev-util/fhist/Manifest
new file mode 100644
index 000000000000..efecc0b1baeb
--- /dev/null
+++ b/dev-util/fhist/Manifest
@@ -0,0 +1,2 @@
+DIST fhist-1.16.tar.gz 383180 SHA256 3f71c86939694755e456a9c82156f779063e74240d21da2251f33ae3c25ea336 SHA512 919fc4d424e1f878404ec2d305dbcd66a4697c88c38af54033bdb178704cf08997c816d75db93ddbfc5248f29b997c4b8aaa3fd98ee790c32582124fc332bc1d WHIRLPOOL 6469fc9a4a5ed9f82af0dca8f1f167b9c56385283328d0c24bcd88b7e38fbf9912eeb71a37a64687f9bf1c58e0996ec7ae71649ae6fa4b0622b83f65bfc8526a
+DIST fhist-1.19.tar.gz 409083 SHA256 e18d97f6ff5c44593f82775eb82540d870409ed80712eead8fd41684f194f62c SHA512 d93f0ce1b29e527af5de3f49d44ebc11567f53bb0b428322daa42b0a4a14ae75333ffcb9a65ba14b2a6240d57be7bdf7632e6b4eccd071d4e9b6e90c14c317a9 WHIRLPOOL 072a3231c3994310396f00dfab0b7214e23c5e59bfa511ba0987ff89b686e3d4a33bf6f10e77fad3f1e80857f337a47a77204d3dd14aa62f42932b48d088afeb
diff --git a/dev-util/fhist/fhist-1.16.ebuild b/dev-util/fhist/fhist-1.16.ebuild
new file mode 100644
index 000000000000..7a565ba2c3f0
--- /dev/null
+++ b/dev-util/fhist/fhist-1.16.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="File history and comparison tools"
+HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
+SRC_URI="http://fhist.sourceforge.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc x86"
+IUSE="test"
+
+RDEPEND="sys-devel/gettext
+		sys-apps/groff"
+DEPEND="${RDEPEND}
+		test? ( app-arch/sharutils )
+		sys-devel/bison"
+
+MAKEOPTS+=" -j1"
+
+src_compile() {
+	econf
+	emake || die "emake failed"
+}
+
+src_test() {
+	emake sure || die "src_test failed"
+}
+
+src_install () {
+	emake \
+		RPM_BUILD_ROOT="${D}" \
+		NLSDIR="${D}/usr/share/locale" \
+		install || die "make install failed"
+
+	dodoc lib/en/*.txt || die
+	dodoc lib/en/*.ps || die
+
+	# remove duplicate docs etc.
+	rm -r "${D}"/usr/share/fhist
+
+	dodoc MANIFEST README || die
+}
diff --git a/dev-util/fhist/fhist-1.19.ebuild b/dev-util/fhist/fhist-1.19.ebuild
new file mode 100644
index 000000000000..7e50006d988b
--- /dev/null
+++ b/dev-util/fhist/fhist-1.19.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="File history and comparison tools"
+HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
+SRC_URI="http://fhist.sourceforge.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/libexplain
+	sys-devel/gettext
+	sys-apps/groff"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	test? ( app-arch/sharutils )"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-ldflags.patch
+}
diff --git a/dev-util/fhist/files/1.19-ldflags.patch b/dev-util/fhist/files/1.19-ldflags.patch
new file mode 100644
index 000000000000..c0fa0e825a9e
--- /dev/null
+++ b/dev-util/fhist/files/1.19-ldflags.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile.in b/Makefile.in
+index 8aa8408..2c39b28 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -500,8 +500,9 @@ common/sub/expr.$(OBJEXT): common/sub/expr.c common/ac/stdarg.h \
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -I. -c common/sub/expr.c
+ 	mv expr.$(OBJEXT) common/sub/expr.$(OBJEXT)
+ 
+-common/sub/expr_gram.yacc.c common/sub/expr_gram.yacc.h: \
+-		common/sub/expr_gram.y
++common/sub/expr_gram.yacc.c: common/sub/expr_gram.yacc.h
++
++common/sub/expr_gram.yacc.h:  common/sub/expr_gram.y
+ 	$(YACC) -d common/sub/expr_gram.y
+ 	sed -e 's/[yY][yY]/sub_expr_gram_/g' y.tab.c > \
+ 		common/sub/expr_gram.yacc.c
+@@ -961,7 +962,7 @@ common/libcommon.a: $(lib_obj)
+ fcomp_obj = fcomp/main.$(OBJEXT)
+ 
+ bin/fcomp$(EXEEXT): $(fcomp_obj) common/libcommon.a .bin
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fcomp_obj) \
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fcomp_obj) \
+ 		common/libcommon.a $(LIBS)
+ 
+ $(bindir)/fcomp$(EXEEXT): bin/fcomp$(EXEEXT) .bindir
+@@ -974,7 +975,7 @@ fhist_obj = fhist/breaks.$(OBJEXT) fhist/diff.$(OBJEXT) \
+ 		fhist/subroutine.$(OBJEXT) fhist/update.$(OBJEXT)
+ 
+ bin/fhist$(EXEEXT): $(fhist_obj) common/libcommon.a .bin
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fhist_obj) \
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fhist_obj) \
+ 		common/libcommon.a $(LIBS)
+ 
+ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
+@@ -983,7 +984,7 @@ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
+ fmerge_obj = fmerge/main.$(OBJEXT) fmerge/work.$(OBJEXT)
+ 
+ bin/fmerge$(EXEEXT): $(fmerge_obj) common/libcommon.a .bin
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fmerge_obj) \
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fmerge_obj) \
+ 		common/libcommon.a $(LIBS)
+ 
+ $(bindir)/fmerge$(EXEEXT): bin/fmerge$(EXEEXT) .bindir
diff --git a/dev-util/fhist/metadata.xml b/dev-util/fhist/metadata.xml
new file mode 100644
index 000000000000..40149c995561
--- /dev/null
+++ b/dev-util/fhist/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>shell-tools</herd>
+</pkgmetadata>
diff --git a/dev-util/filepp/Manifest b/dev-util/filepp/Manifest
new file mode 100644
index 000000000000..03b5342a517a
--- /dev/null
+++ b/dev-util/filepp/Manifest
@@ -0,0 +1,2 @@
+DIST filepp-1.6.0.tar.gz 117650 SHA256 2a272c2004e1f0a8453b9e5b00c6c0fe53cbbf8e6805fa1916aee950bf02a68c SHA512 197b3a36468c35a983683186929edb9f4ece83f36b2b7dd48edd1944d75e4b66664a8e22b3185c2c11aba70538125ba244e83f31e1072759d60a352ec907a6cb WHIRLPOOL 30d8fdda94123e07cc89738f802d3042ac65a7030103f99c07d73113e3f9f8b1c6ed6d51ff0940a27c070a44aa47c2d75a713d7897706da9130ae0c67080d01c
+DIST filepp-1.8.0.tar.gz 142875 SHA256 12bd2297184ac3a9a38df9e8d0c76083eef2d5d561661b4fd93c426e76dab956 SHA512 9d5c37391afbe4cd5e3f07db4806aaa49844eeef228321c5909e3b393e204a7f6cbc795f6b9495ff81a1416a913fc7da80ad58b3ba467860dae8daf5ddd2395a WHIRLPOOL 200780cbe548b9d9e4a5a7162d0ae229b7bbb6c623a5b14e67bb73ee0079b47a2e5cf4d0c49fa3b07eac81be673145846b38d2b2422e82ada1fac585cd94dd57
diff --git a/dev-util/filepp/filepp-1.6.0.ebuild b/dev-util/filepp/filepp-1.6.0.ebuild
new file mode 100644
index 000000000000..f1c639110e7b
--- /dev/null
+++ b/dev-util/filepp/filepp-1.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Generic file-preprocessor with a CPP-like syntax"
+HOMEPAGE="http://www.cabaret.demon.co.uk/filepp/"
+SRC_URI="http://www.cabaret.demon.co.uk/filepp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~mips ppc s390 sparc x86"
+IUSE=""
+
+moduledir="/usr/share/${P}/modules"
+
+src_compile() {
+	econf --with-moduledir=${moduledir} || die "econf failed"
+}
+
+src_install() {
+	einstall moduledir="${D}/${moduledir}"
+	dodoc ChangeLog README
+	dohtml filepp.html
+}
diff --git a/dev-util/filepp/filepp-1.8.0.ebuild b/dev-util/filepp/filepp-1.8.0.ebuild
new file mode 100644
index 000000000000..b42605d77e20
--- /dev/null
+++ b/dev-util/filepp/filepp-1.8.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+DESCRIPTION="a generic file preprocessor with a CPP-like syntax"
+HOMEPAGE="http://www.cabaret.demon.co.uk/filepp"
+SRC_URI="http://www.cabaret.demon.co.uk/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+moduledir="${EPREFIX}/usr/share/${P}/modules"
+
+src_configure() {
+	econf --with-moduledir=${moduledir}
+}
+
+src_install() {
+	einstall moduledir="${D}"/${moduledir} || die "einstall failed."
+	dodoc ChangeLog README
+	dohtml *.html
+}
diff --git a/dev-util/filepp/metadata.xml b/dev-util/filepp/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/filepp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/findbugs/Manifest b/dev-util/findbugs/Manifest
new file mode 100644
index 000000000000..314794ab58a0
--- /dev/null
+++ b/dev-util/findbugs/Manifest
@@ -0,0 +1 @@
+DIST findbugs-3.0.1-source.zip 9625065 SHA256 bd8ec66550d419ed40283bd78a6268f9af57dcad20b732a9309fd1835abd33ff SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f WHIRLPOOL 9e407cb5733560d6a548da37becdf1b1b120459a2453d85d4a345a7ff30a3ba1d92179a2586ebfac3c23c6d20f591aed6429b501d6ec791f4b1a390ab77ce387
diff --git a/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch b/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
new file mode 100644
index 000000000000..c92e18741ae1
--- /dev/null
+++ b/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
@@ -0,0 +1,48 @@
+From d4ef7a75e6d0e50f6417825d851ad9e5ed757985 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Tue, 10 Mar 2015 23:47:00 +0000
+Subject: [PATCH 1/2] Support bcel 6.0 RC3 instead of a random snapshot
+
+---
+ .../src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java | 2 +-
+ findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java   | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java b/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
+index 52468c9..d7cbd0e 100644
+--- a/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
++++ b/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
+@@ -50,7 +50,7 @@ import edu.umd.cs.findbugs.bcel.generic.NULL2Z;
+  * @see Frame
+  * @see DataflowAnalysis
+  */
+-public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> implements VisitorSupportsInvokeDynamic {
++public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> extends EmptyVisitor {
+     private FrameType frame;
+ 
+     private Location location;
+diff --git a/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java b/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
+index 5d62092..a36abac 100644
+--- a/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
++++ b/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
+@@ -56,7 +56,7 @@ import org.apache.bcel.classfile.StackMap;
+ import org.apache.bcel.classfile.StackMapEntry;
+ import org.apache.bcel.classfile.Synthetic;
+ import org.apache.bcel.classfile.Unknown;
+-import org.apache.bcel.classfile.Visitor;
++import org.apache.bcel.classfile.EmptyVisitor;
+ 
+ /**
+  * Fixedup of from org.apache.bcel.classfile.Visitor
+@@ -64,7 +64,7 @@ import org.apache.bcel.classfile.Visitor;
+  * @author <A HREF="http://www.cs.umd.edu/~pugh">William Pugh</A>
+  * @version 980818
+  */
+-public abstract class BetterVisitor implements Visitor {
++public abstract class BetterVisitor extends EmptyVisitor {
+ 
+     /**
+      * clone() is overridden to change access control from protected to public.
+-- 
+2.0.4
+
diff --git a/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch b/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch
new file mode 100644
index 000000000000..67938e4e371c
--- /dev/null
+++ b/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch
@@ -0,0 +1,25 @@
+From c956ffd82e5b88be74dca187dc80afcf6559a78f Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 11 Mar 2015 21:41:36 +0000
+Subject: [PATCH 2/2] Don't bundle anything in the annotations jar
+
+---
+ findbugs/build.xml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/findbugs/build.xml b/findbugs/build.xml
+index 698b91f..3eac5d6 100644
+--- a/findbugs/build.xml
++++ b/findbugs/build.xml
+@@ -298,8 +298,6 @@
+             <fileset dir="${src.dir}">
+                 <include name="**/annotations/*.java"/>
+             </fileset>
+-            <zipfileset src="${jar.dir}/jcip-annotations.jar" excludes="META-INF/**,**/*.html"/>
+-            <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
+         </jar>
+     </target>
+ 
+-- 
+2.0.4
+
diff --git a/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch b/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch
new file mode 100644
index 000000000000..ce4e186f0aca
--- /dev/null
+++ b/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch
@@ -0,0 +1,30 @@
+From af7e19734c9bbd21d2f1bf8a66b5ca1c131eeacd Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 13 Mar 2015 00:20:20 +0000
+Subject: [PATCH 3/3] JDK 1.8 works fine for me
+
+---
+ findbugs/build.xml | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/findbugs/build.xml b/findbugs/build.xml
+index 3eac5d6..48c8f2b 100644
+--- a/findbugs/build.xml
++++ b/findbugs/build.xml
+@@ -122,13 +122,6 @@
+                 </javac>
+     </target>
+     <target name="classes" depends="init">
+-        <echo>Requires JDK 7.x (not 8!), using: ${ant.java.version}</echo>
+-        <fail message="Requires JDK 7.x (not 8!), using: ${ant.java.version}">
+-             <condition>
+-                 <equals arg1="1.8" arg2="${ant.java.version}"/>
+-             </condition>
+-         </fail>
+-
+         <!-- Compile Java source files. -->
+         <echo level="info" message="compiling findbugs"/>
+         <javac
+-- 
+2.0.4
+
diff --git a/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch b/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch
new file mode 100644
index 000000000000..670f497e507b
--- /dev/null
+++ b/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch
@@ -0,0 +1,25 @@
+From c73984b12bb3c80a67d993a30c894ee05613d422 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 13 Mar 2015 13:59:22 +0000
+Subject: [PATCH 4/4] Don't clean before generating docs
+
+---
+ findbugs/build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/findbugs/build.xml b/findbugs/build.xml
+index 48c8f2b..d0cbc04 100644
+--- a/findbugs/build.xml
++++ b/findbugs/build.xml
+@@ -652,7 +652,7 @@
+     </target>
+ 
+ 
+-    <target name="checkdocs" depends="clean">
++    <target name="checkdocs">
+         <!-- FIXME: check whether docs are up to date -->
+     </target>
+ 
+-- 
+2.0.4
+
diff --git a/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch b/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch
new file mode 100644
index 000000000000..acdff2ce96d2
--- /dev/null
+++ b/dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch
@@ -0,0 +1,25 @@
+From cbf9d81dba1ef0a42f79391c87845d7875a13993 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 18 May 2015 20:41:58 +0100
+Subject: [PATCH 5/5] Don't require git to build
+
+---
+ findbugs/build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/findbugs/build.xml b/findbugs/build.xml
+index d0cbc04..42c6d09 100644
+--- a/findbugs/build.xml
++++ b/findbugs/build.xml
+@@ -636,7 +636,7 @@
+     </target>
+ 
+ 
+-    <target name="version" depends="classes,-get-git-revision" >
++    <target name="version" depends="classes" >
+         <echo>${gitrnum}</echo>
+         <java classpathref="tools.classpath"
+               output="${version.props.file}"
+-- 
+2.3.3
+
diff --git a/dev-util/findbugs/files/launchers/fb b/dev-util/findbugs/files/launchers/fb
new file mode 100644
index 000000000000..79d44a41681d
--- /dev/null
+++ b/dev-util/findbugs/files/launchers/fb
@@ -0,0 +1,75 @@
+escape_arg() {
+	echo "$1" | sed -e "s,\\([\\\"'         ]\\),\\\\\\1,g"
+}
+
+# Set defaults
+fb_mainclass="edu.umd.cs.findbugs.workflow.FB"
+user_jvmargs=''
+ea_arg=''
+debug_arg=''
+conservespace_arg=''
+user_props=''
+
+# Handle command line arguments.
+while [ $# -gt 0 ]; do
+	case $1 in
+	-textui)
+		fb_mainclass="edu.umd.cs.findbugs.FindBugs2"
+		;;
+
+	-jvmArgs)
+		shift
+		user_jvmargs="$1"
+		;;
+		
+	-ea)
+		ea_arg='-ea'
+		;;
+
+	-maxHeap)
+		shift
+		fb_maxheap="-Xmx$1m"
+		;;
+
+	-debug)
+		debug_arg="-Dfindbugs.debug=true"
+		;;
+
+	-conserveSpace)
+		conservespace_arg="-Dfindbugs.conserveSpace=true"
+		;;
+
+	-property)
+		shift
+		user_props="-D$1 $user_props"
+		;;
+	
+	-D*=*)
+		user_props="$1 $user_props"
+		;;
+
+	-version)
+		fb_mainclass=edu.umd.cs.findbugs.Version
+		fb_appargs="-release"
+		while [ $# -gt 0 ]; do
+			shift
+		done
+		;;
+
+	-help)
+		fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
+		;;
+
+	# All unrecognized arguments will be accumulated and
+	# passed to the application.
+	*)
+		fb_appargs="$fb_appargs `escape_arg "$1"`"
+		;;
+	esac
+
+	shift
+done
+
+fb_maxheap=${fb_maxheap:-"-Xmx768m"}
+fb_jvmargs="$fb_maxheap $user_jvmargs $debug_arg $conservespace_arg $user_props $ea_arg"
+gjl_pkg_args="$fb_appargs"
diff --git a/dev-util/findbugs/files/launchers/fbwrap b/dev-util/findbugs/files/launchers/fbwrap
new file mode 100644
index 000000000000..7d208611c13c
--- /dev/null
+++ b/dev-util/findbugs/files/launchers/fbwrap
@@ -0,0 +1,3 @@
+fb_mainclass="$1"
+unset fb_jvmargs
+shift
diff --git a/dev-util/findbugs/files/launchers/findbugs b/dev-util/findbugs/files/launchers/findbugs
new file mode 100644
index 000000000000..e557ce516212
--- /dev/null
+++ b/dev-util/findbugs/files/launchers/findbugs
@@ -0,0 +1,83 @@
+escape_arg() {
+	echo "$1" | sed -e "s,\\([\\\"'         ]\\),\\\\\\1,g"
+}
+
+# Set defaults
+fb_mainclass="edu.umd.cs.findbugs.LaunchAppropriateUI"
+user_jvmargs=''
+ea_arg=''
+debug_arg=''
+conservespace_arg=''
+user_props=''
+
+# Handle command line arguments.
+while [ $# -gt 0 ]; do
+	case $1 in
+	-gui)
+		# this is the default
+		;;
+
+	-gui1)
+		user_props="-Dfindbugs.launchUI=1 $user_props"
+		;;
+
+	-textui)
+		fb_mainclass="edu.umd.cs.findbugs.FindBugs2"
+		;;
+
+	-jvmArgs)
+		shift
+		user_jvmargs="$1"
+		;;
+		
+	-ea)
+		ea_arg='-ea'
+		;;
+
+	-maxHeap)
+		shift
+		fb_maxheap="-Xmx$1m"
+		;;
+
+	-debug)
+		debug_arg="-Dfindbugs.debug=true"
+		;;
+
+	-conserveSpace)
+		conservespace_arg="-Dfindbugs.conserveSpace=true"
+		;;
+
+	-property)
+		shift
+		user_props="-D$1 $user_props"
+		;;
+	
+	-D*=*)
+		user_props="$1 $user_props"
+		;;
+
+	-version)
+		fb_mainclass=edu.umd.cs.findbugs.Version
+		fb_appargs="-release"
+		while [ $# -gt 0 ]; do
+			shift
+		done
+		;;
+
+	-help)
+		fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
+		;;
+
+	# All unrecognized arguments will be accumulated and
+	# passed to the application.
+	*)
+		fb_appargs="$fb_appargs `escape_arg "$1"`"
+		;;
+	esac
+
+	shift
+done
+
+fb_maxheap=${fb_maxheap:-"-Xmx768m"}
+fb_jvmargs="$fb_maxheap $user_jvmargs $debug_arg $conservespace_arg $user_props $ea_arg"
+gjl_pkg_args="$fb_appargs"
diff --git a/dev-util/findbugs/files/launchers/findbugs2 b/dev-util/findbugs/files/launchers/findbugs2
new file mode 100644
index 000000000000..d87ea82c0907
--- /dev/null
+++ b/dev-util/findbugs/files/launchers/findbugs2
@@ -0,0 +1,89 @@
+# Default UI is GUI2
+fb_launchui="2"
+
+#
+# Stuff we're going to pass to the JVM as JVM arguments.
+#
+jvm_debug=""
+jvm_maxheap="-Xmx768m"
+jvm_ea=""
+jvm_conservespace=""
+jvm_user_props=""
+
+#
+# Process command line args until we hit one we don't recognize.
+#
+finishedArgs=false
+while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; do
+
+	arg=$1
+
+	case $arg in
+		-textui)
+			shift
+			fb_launchui="0"
+			;;
+
+		-gui)
+			shift
+			fb_launchui="2"
+			;;
+
+		-gui1)
+			shift
+			fb_launchui="1"
+			;;
+
+		-maxHeap)
+			shift
+			jvm_maxheap="-Xmx$1m"
+			shift
+			;;
+
+		-ea)
+			shift
+			jvm_ea="-ea"
+			;;
+
+		-debug)
+			shift
+			jvm_debug="-Dfindbugs.debug=true"
+			;;
+
+		-conserveSpace)
+			shift
+			jvm_conservespace="-Dfindbugs.conserveSpace=true"
+			;;
+
+		-property)
+			shift
+			jvm_user_props="-D$1 $jvm_user_props"
+			shift
+			;;
+	
+		-D*=*)
+			jvm_user_props="$1 $user_props"
+			shift
+			;;
+
+		-version)
+			shift
+			fb_launchui="version"
+			;;
+
+		-help)
+			shift
+			fb_launchui="help"
+			;;
+
+		# All arguments starting from the first unrecognized arguments
+		# are passed on to the Java app.
+		*)
+			finishedArgs=true
+			;;
+	esac
+
+done
+
+fb_mainclass="edu.umd.cs.findbugs.LaunchAppropriateUI"
+fb_jvmargs="$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props -Dfindbugs.launchUI=$fb_launchui"
diff --git a/dev-util/findbugs/findbugs-3.0.1.ebuild b/dev-util/findbugs/findbugs-3.0.1.ebuild
new file mode 100644
index 000000000000..6b8031832df6
--- /dev/null
+++ b/dev-util/findbugs/findbugs-3.0.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Find Bugs in Java Programs"
+HOMEPAGE="http://findbugs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/apple-java-extensions-bin:0
+	>=dev-java/asm-5:4
+	>=dev-java/bcel-6:0
+	dev-java/commons-lang:2.1
+	dev-java/dom4j:1
+	dev-java/hamcrest-core:1.3
+	dev-java/jaxen:1.1
+	dev-java/jcip-annotations:0
+	dev-java/jdepend:0
+	>=dev-java/jformatstring-2.0.3:0
+	dev-java/jsr305:0
+	dev-java/junit:4"
+
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-java/saxon:6.5
+	)
+	test? ( dev-java/ant-junit:0 )
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="build"
+EANT_DOC_TARGET="apiJavadoc docs"
+EANT_TEST_TARGET="runjunit"
+EANT_GENTOO_CLASSPATH="ant-core,apple-java-extensions-bin,asm-4,bcel,commons-lang-2.1,dom4j-1,hamcrest-core-1.3,jaxen-1.1,jcip-annotations,jdepend,jformatstring,jsr305,junit-4"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)"
+	EANT_EXTRA_ARGS="-Dgitrnum=gentoo -Dxsl.stylesheet.home=${EROOT}usr/share/sgml/docbook/xsl-stylesheets"
+}
+
+java_prepare() {
+	epatch \
+		"${FILESDIR}/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch" \
+		"${FILESDIR}/0002-Don-t-bundle-anything-in-the-annotations-jar.patch" \
+		"${FILESDIR}/0003-JDK-1.8-works-fine-for-me.patch" \
+		"${FILESDIR}/0004-Don-t-clean-before-generating-docs.patch" \
+		"${FILESDIR}/0005-Don-t-require-git-to-build.patch"
+
+	# Remove bundled jars.
+	find -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar lib/{${PN},${PN}-ant,annotations}.jar
+
+	insinto "/usr/share/${PN}/plugin"
+	doins plugin/README
+
+	use source && java-pkg_dosrc src/*/edu
+
+	if use doc; then
+		insinto "/usr/share/doc/${PF}/html/web"
+		doins -r build/doc/*
+		java-pkg_dojavadoc apiJavaDoc
+	fi
+
+	local SCRIPT CLASS
+	local ARGS="-Dfindbugs.home=${EROOT}usr/share/findbugs"
+
+	ls src/scripts/standard | grep -E -v '^(findbugs2?|fb|fbwrap)$' | while read SCRIPT; do
+		CLASS=$(grep '^fb_mainclass=' "src/scripts/standard/${SCRIPT}" | sed 's/^.*=//')
+		java-pkg_dolauncher "findbugs-${SCRIPT#findbugs-}" \
+			--java_args "${ARGS}" --main "${CLASS}"
+	done
+
+	for SCRIPT in findbugs{,2} fb{,wrap}; do
+		java-pkg_dolauncher "${SCRIPT}" \
+			--java_args "\$fb_jvmargs ${ARGS}" --main '$fb_mainclass' \
+			-pre "${FILESDIR}/launchers/${SCRIPT}"
+	done
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "findbugs ships with many launcher scripts. Most of these have been"
+	elog "installed with a findbugs- prefix to avoid conflicts and confusion"
+	elog "with other executables in the PATH."
+}
diff --git a/dev-util/findbugs/metadata.xml b/dev-util/findbugs/metadata.xml
new file mode 100644
index 000000000000..66ae673b690e
--- /dev/null
+++ b/dev-util/findbugs/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>FindBugs uses static analysis to inspect Java bytecode for occurrences of bug patterns. Static analysis means that FindBugs can find bugs by simply inspecting a program's code: executing the program is not necessary. This makes FindBugs very easy to use: in general, you should be able to use it to look for bugs in your code within a few minutes of downloading it. FindBugs works by analyzing Java bytecode (compiled class files), so you don't even need the program's source code to use it. Because its analysis is sometimes imprecise, FindBugs can report false warnings, which are warnings that do not indicate real errors. In practice, the rate of false warnings reported by FindBugs is less than 50%.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">findbugs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/fix-la-relink-command/Manifest b/dev-util/fix-la-relink-command/Manifest
new file mode 100644
index 000000000000..07e67575ae95
--- /dev/null
+++ b/dev-util/fix-la-relink-command/Manifest
@@ -0,0 +1 @@
+DIST fix-la-relink-command-0.1.1.tar.xz 5072 SHA256 fd7103a3a256375114135ad91b9ccd4b8de6c6cff814bd66540f28947e2ac740 SHA512 3b3f7f467f932d7737ec1d2cc7d2a71c65d34da4fde3451d6ac8d3545adf564cb2b5c352d89bc580f5f9c19352bfa8eccbecf2eb7bf8b968579d4e4e3bd901bd WHIRLPOOL f527275dcbfeb87e3a93921b58c88c33b52a0e678b0d2940fad47b482189f64419416c3523c3e3f8f213bf5726a089929537a727ce3fd3680f7180b08b8a6992
diff --git a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
new file mode 100644
index 000000000000..0dfdd5b97956
--- /dev/null
+++ b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Helps prevent .la files from relinking to libraries outside a build tree"
+HOMEPAGE="http://dev.gentoo.org/~tetromino/distfiles/${PN}"
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc NEWS
+}
diff --git a/dev-util/fix-la-relink-command/metadata.xml b/dev-util/fix-la-relink-command/metadata.xml
new file mode 100644
index 000000000000..7aa4c63325e2
--- /dev/null
+++ b/dev-util/fix-la-relink-command/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>tetromino@gentoo.org</email>
+<name>Alexandre Rostovtsev</name>
+</maintainer>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
new file mode 100644
index 000000000000..5b66bcc6cf20
--- /dev/null
+++ b/dev-util/flawfinder/Manifest
@@ -0,0 +1,2 @@
+DIST flawfinder-1.27.tar.gz 123086 SHA256 8825a9742db29da329ec57861d702a744452f84fbc02f617c037becafaf6f546 SHA512 97f32f20761e361ee5ccda908c2dab489d352ae52438d3f226b784487e732c8a92fcc3b14d3cfe6328e567b6d23501911908612c40fa568010b8d42a302c374d WHIRLPOOL 9f0aaa6cfb4daf5a442754ad422367581e39ec8d73ea87964236554c3b37d075d036146f6af2ce1983e3d0c556e15c29c948d53de3cdf9c8837d3386878795a1
+DIST flawfinder-1.31.tar.gz 174148 SHA256 bca7256fdf71d778eb59c9d61fc22b95792b997cc632b222baf79cfc04887c30 SHA512 880919a05dbf0e29055f052b88c8bbfd403105504749bc65fb17675e6ebe0d84f9cd367e7a6efc68dc0d9209e0938185da4718b70f484007c507fe96b83e0355 WHIRLPOOL 4afd25adf50a1457fb678e84104182bcefbd88bbe3ec5cdc4f44136d5e3dce13da5911acae2edde15cf4fa6193af81a31ab4c2f9daf3463fac0f67a5a5c1c525
diff --git a/dev-util/flawfinder/files/flawfinder-1.27-whitespace-traceback.patch b/dev-util/flawfinder/files/flawfinder-1.27-whitespace-traceback.patch
new file mode 100644
index 000000000000..fcd60f916acd
--- /dev/null
+++ b/dev-util/flawfinder/files/flawfinder-1.27-whitespace-traceback.patch
@@ -0,0 +1,17 @@
+From: Robert Buchholz <rbu@gentoo.org>
+Subject: Fix IndexError that occurs when there is whitespace at the end of the file
+
+Origin: vendor, http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/flawfinder/files/flawfinder-1.27-whitespace-traceback.patch
+Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1834743&group_id=186989&atid=919499
+
+--- flawfinder.orig	2009-09-29 13:55:15.433911571 +0200
++++ flawfinder	2009-09-29 13:56:03.114786154 +0200
+@@ -1299,6 +1299,8 @@
+     m = p_whitespace.match(text,i)
+     if m:
+       i = m.end(0)
++      if i >= len(text):
++        break
+ 
+     c = text[i]
+     if linebegin:  # If at beginning of line, see if #include is there.
diff --git a/dev-util/flawfinder/flawfinder-1.27-r2.ebuild b/dev-util/flawfinder/flawfinder-1.27-r2.ebuild
new file mode 100644
index 000000000000..ea5100233851
--- /dev/null
+++ b/dev-util/flawfinder/flawfinder-1.27-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+PYTHON_DEPEND="2"
+inherit eutils python
+
+DESCRIPTION="Examines C/C++ source code for security flaws"
+HOMEPAGE="http://www.dwheeler.com/flawfinder/"
+SRC_URI="http://www.dwheeler.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/flawfinder-1.27-whitespace-traceback.patch
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog INSTALL.txt README announcement
+	dodoc flawfinder.pdf
+	python_convert_shebangs 2 "${ED}"usr/bin/flawfinder
+}
diff --git a/dev-util/flawfinder/flawfinder-1.31.ebuild b/dev-util/flawfinder/flawfinder-1.31.ebuild
new file mode 100644
index 000000000000..38027e1b2d56
--- /dev/null
+++ b/dev-util/flawfinder/flawfinder-1.31.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="Examines C/C++ source code for security flaws"
+HOMEPAGE="http://www.dwheeler.com/flawfinder/"
+SRC_URI="http://www.dwheeler.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc announcement ChangeLog README announcement
+	dodoc flawfinder.pdf
+	python_fix_shebang "${ED}"usr/bin/flawfinder
+}
diff --git a/dev-util/flawfinder/metadata.xml b/dev-util/flawfinder/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/dev-util/flawfinder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
new file mode 100644
index 000000000000..fb6d92e9504c
--- /dev/null
+++ b/dev-util/ftjam/Manifest
@@ -0,0 +1 @@
+DIST ftjam-2.5.3rc2.tar.bz2 215963 SHA256 a9f8a274049893a4d1f1ad82f7b04f3ebc2554635dd606185e20ba97cb4d64ec SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd WHIRLPOOL 4a688ea0c6a883f12e9b22bd6166ec972a43fe29473a8db46c2d278e333507215b20977e01da40782fb2f266b250541c11617ad066128ac4bc7c965e56ba9d59
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch
new file mode 100644
index 000000000000..ba6613430308
--- /dev/null
+++ b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch
@@ -0,0 +1,14 @@
+Make jam print the commandline it's executing.
+Only useful for ebuild debugging - I just always forget how to enable it.
+
+--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in
++++ ftjam-2.5.3rc2/builds/unix/Makefile.in
+@@ -16,7 +16,7 @@
+ 
+ all: jam0
+ 	chmod a+w jambase.c
+-	./jam0
++	./jam0 -dx -q
+ 
+ include common.mk
+ 
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch b/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch
new file mode 100644
index 000000000000..1b33a0f770d3
--- /dev/null
+++ b/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch
@@ -0,0 +1,59 @@
+Respect CC, *FLAGS.  Add datarootdir for autoconf-2.60 warnings.
+
+--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in
++++ ftjam-2.5.3rc2/builds/unix/Makefile.in
+@@ -37,6 +37,7 @@ exec_prefix  := @exec_prefix@
+ libdir       := @libdir@
+ bindir       := @bindir@
+ includedir   := @includedir@
++datarootdir  := @datarootdir@
+ datadir      := @datadir@
+ 
+ version_info := @version_info@
+--- ftjam-2.5.3rc2-orig/jambase.c
++++ ftjam-2.5.3rc2/jambase.c
+@@ -652,21 +652,21 @@ const char *jambase[] = {
+ "\n",
+ "AR      ?= ar ru ;\n",
+ "AS      ?= as ;\n",
+-"ASFLAGS     ?= ;\n",
++"ASFLAGS     += $(ASFLAGS) ;\n",
+ "AWK     ?= awk ;\n",
+ "BINDIR      ?= /usr/local/bin ;\n",
+-"C++     ?= cc ;\n",
+-"C++FLAGS    ?= ;\n",
+-"CC      ?= cc ;\n",
+-"CCFLAGS     ?= ;\n",
++"C++     ?= $(CXX) ;\n",
++"C++FLAGS    += $(CXXFLAGS) ;\n",
++"CC      ?= $(CC) ;\n",
++"CCFLAGS     += $(CFLAGS) ;\n",
+ "CP      ?= cp -f ;\n",
+ "CRELIB      ?= ;\n",
+ "DOT     ?= . ;\n",
+ "DOTDOT      ?= .. ;\n",
+ "EXEMODE     ?= 711 ;\n",
+ "FILEMODE    ?= 644 ;\n",
+-"FORTRAN     ?= f77 ;\n",
+-"FORTRANFLAGS    ?= ;\n",
++"FORTRAN     ?= $(F77) ;\n",
++"FORTRANFLAGS    += $(FFLAGS) ;\n",
+ "HDRS        ?= ;\n",
+ "INSTALLGRIST    ?= installed ;\n",
+ "JAMFILE     ?= Jamfile ;\n",
+@@ -674,13 +674,13 @@ const char *jambase[] = {
+ "LEX     ?= ;\n",
+ "LIBDIR      ?= /usr/local/lib ;\n",
+ "LINK        ?= $(CC) ;\n",
+-"LINKFLAGS   ?= ;\n",
++"LINKFLAGS   += $(LDFLAGS) ;\n",
+ "LINKLIBS    ?= ;\n",
+ "LN      ?= ln ;\n",
+ "MANDIR      ?= /usr/local/man ;\n",
+ "MKDIR       ?= mkdir ;\n",
+ "MV      ?= mv -f ;\n",
+-"OPTIM       ?= ;\n",
++"OPTIM       = ;\n",
+ "RCP     ?= rcp ;\n",
+ "RM      ?= rm -f ;\n",
+ "RMDIR       ?= $(RM) ;\n",
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch b/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch
new file mode 100644
index 000000000000..44322d64c2cf
--- /dev/null
+++ b/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch
@@ -0,0 +1,54 @@
+diff -Naurp ftjam-2.5.3rc2-orig/Jambase ftjam-2.5.3rc2/Jambase
+--- ftjam-2.5.3rc2-orig/Jambase	2007-06-05 08:20:19.000000000 -0600
++++ ftjam-2.5.3rc2/Jambase	2008-07-21 19:26:02.000000000 -0600
+@@ -813,7 +813,7 @@ else if $(UNIX)

+     LINKLIBS    ?= ;

+     OPTIM       ?= -O ;

+     RANLIB      ?= ranlib ;

+-    YACC        ?= yacc ;

++    YACC        ?= bison -y ;

+     YACCGEN     ?= .c ;

+     YACCFILES   ?= y.tab ;

+     YACCFLAGS   ?= -d ;

+@@ -882,10 +882,10 @@ DC ?= dmd ;

+     SUFLIB      ?= .a ;

+     SUFOBJ      ?= .o ;

+     UNDEFFLAG   ?= "-u _" ;

+-    YACC        ?= ;

+-    YACCGEN     ?= ;

+-    YACCFILES   ?= ;

+-    YACCFLAGS   ?= ;

++    YACC        ?= bison -y ;

++    YACCGEN     ?= .c ;

++    YACCFILES   ?= y.tab ;

++    YACCFLAGS   ?= -d ;

+ 

+     HDRPATTERN =

+             "^[ 	]*#[ 	]*include[ 	]*[<\"]([^\">]*)[\">].*$" ;

+diff -Naurp ftjam-2.5.3rc2-orig/jambase.c ftjam-2.5.3rc2/jambase.c
+--- ftjam-2.5.3rc2-orig/jambase.c	2007-06-05 08:31:08.000000000 -0600
++++ ftjam-2.5.3rc2/jambase.c	2008-07-21 19:27:55.000000000 -0600
+@@ -632,7 +632,7 @@ const char *jambase[] = {
+ "LINKLIBS    ?= ;\n",
+ "OPTIM       ?= -O ;\n",
+ "RANLIB      ?= ranlib ;\n",
+-"YACC        ?= yacc ;\n",
++"YACC        ?= bison -y ;\n",
+ "YACCGEN     ?= .c ;\n",
+ "YACCFILES   ?= y.tab ;\n",
+ "YACCFLAGS   ?= -d ;\n",
+@@ -695,10 +695,10 @@ const char *jambase[] = {
+ "SUFLIB      ?= .a ;\n",
+ "SUFOBJ      ?= .o ;\n",
+ "UNDEFFLAG   ?= \"-u _\" ;\n",
+-"YACC        ?= ;\n",
+-"YACCGEN     ?= ;\n",
+-"YACCFILES   ?= ;\n",
+-"YACCFLAGS   ?= ;\n",
++"YACC        ?= bison -y ;\n",
++"YACCGEN     ?= .c ;\n",
++"YACCFILES   ?= y.tab ;\n",
++"YACCFLAGS   ?= -d ;\n",
+ "\n",
+ "HDRPATTERN =\n",
+ "\"^[ 	]*#[ 	]*include[ 	]*[<\\\"]([^\\\">]*)[\\\">].*$\" ;\n",
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch b/dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch
new file mode 100644
index 000000000000..1b7e69fc2c8f
--- /dev/null
+++ b/dev-util/ftjam/files/ftjam-2.5.3-nostrip.patch
@@ -0,0 +1,40 @@
+diff -Naur ftjam-2.5.3rc2-orig/Jamfile ftjam-2.5.3rc2/Jamfile
+--- ftjam-2.5.3rc2-orig/Jamfile	2007-06-05 08:30:52.000000000 -0600
++++ ftjam-2.5.3rc2/Jamfile	2007-06-10 12:55:03.000000000 -0600
+@@ -138,16 +138,6 @@
+ LinkLibraries 	jam : libjam.a ;
+ GenFile 	jambase.c : mkjambase Jambase ;
+ 
+-if $(UNIX) && ! $(DEBUG)
+-{
+-  actions Strip
+-  {
+-    strip $(1)
+-  }
+-
+-  Strip jam ;
+-}
+-
+ Library         libjam.a :
+ 		    builtins.c command.c compile.c $(code) expand.c
+ 		    glob.c hash.c headers.c lists.c make.c make1.c
+@@ -156,19 +146,6 @@
+ 		    hdrmacro.c rope.c
+ 		    ;
+ 
+-# Strip the Jam executable on Mingw
+-#
+-if $(JAM_TOOLSET) = MINGW
+-{
+-  actions  Strip
+-  {
+-    strip $(1)
+-  }
+-
+-  Strip  jam$(SUFEXE) ;
+-}
+-
+-
+ if $(BINDIR) 	{ InstallBin $(BINDIR) : jam ; }
+ 
+ #
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
new file mode 100644
index 000000000000..15495163947b
--- /dev/null
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator _)
+
+DESCRIPTION="Jam is a powerful alternative to make.  FTJam is a 100% compatible enhanced Jam implementation"
+HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
+SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
+
+LICENSE="perforce GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="!dev-util/jam
+	sys-devel/bison"
+RDEPEND="!dev-util/jam"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.5.3-nostrip.patch
+	epatch "${FILESDIR}"/${PN}-2.5.3-i-hate-yacc.patch
+	epatch "${FILESDIR}"/${PN}-2.5.3-false-flags.patch
+#	epatch "${FILESDIR}"/${PN}-2.5.3-debug-commandline.patch  # development only
+}
+
+src_compile() {
+	tc-export CC
+	econf
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README README.ORG CHANGES INSTALL RELNOTES
+	dohtml Jam.html Jambase.html Jamfile.html
+}
diff --git a/dev-util/ftjam/metadata.xml b/dev-util/ftjam/metadata.xml
new file mode 100644
index 000000000000..0cb5b5e2962f
--- /dev/null
+++ b/dev-util/ftjam/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>rhill@gentoo.org</email>
+		<name>Ryan Hill</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/ftnchek/Manifest b/dev-util/ftnchek/Manifest
new file mode 100644
index 000000000000..9689477d1384
--- /dev/null
+++ b/dev-util/ftnchek/Manifest
@@ -0,0 +1 @@
+DIST ftnchek-3.3.1.tar.gz 1048638 SHA256 d92212dc0316e4ae711f7480d59e16095c75e19aff6e0095db2209e7d31702d4 SHA512 14c698a6d936ffcd1966822f3b307fc2a70ffd5d58dcff27e10a9491562cff12ef75d98c0e67a7053e106df4f6b4d920e8164950778c5e13e7c15543fa2ecc41 WHIRLPOOL bab1d6e4b0214bb99d55aa4e4964d7fbf03b070e51aeb306204d62ab97220edb36792aa7333fff3779dd459ccd7db68dcd1d36982c7aa962d4dea0f636f76bda
diff --git a/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild b/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..8347727de84d
--- /dev/null
+++ b/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit autotools
+
+DESCRIPTION="Static analyzer a la 'lint' for Fortran 77"
+HOMEPAGE="http://www.dsm.fordham.edu/~ftnchek/"
+SRC_URI="http://www.dsm.fordham.edu/~${PN}/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+src_prepare() {
+	#1 Do not strip
+	#2 CFLAGS is used internally, so append to it
+	sed -i Makefile.in \
+		-e '/-$(STRIP)/d' \
+		-e 's|CFLAGS\([[:space:]]*\)=|CFLAGS\1+=|' \
+		|| die "sed Makefile.in"
+
+	#1 Respect CFLAGS
+	#2 Respect LDFLAGS
+	sed -i configure.in \
+		-e 's|OPT=".*"|OPT=""|g' \
+		-e '/^LDFLAGS=/d' \
+		|| die "sed configure.in"
+
+	eautoreconf
+}
+
+src_install() {
+	einstall || die
+	dodoc FAQ PATCHES README ToDo
+	dohtml html/*
+	dodir /usr/share/${PN}
+	cp -r test "${D}"/usr/share/${PN}
+}
diff --git a/dev-util/ftnchek/metadata.xml b/dev-util/ftnchek/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/dev-util/ftnchek/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/fuzz/Manifest b/dev-util/fuzz/Manifest
new file mode 100644
index 000000000000..aa5271a05185
--- /dev/null
+++ b/dev-util/fuzz/Manifest
@@ -0,0 +1,2 @@
+DIST fuzz-0.6.tar.gz 54431 SHA256 70fcd0d5b83f211f0a6fd9a95e1772c3e3aaaf83d533ae224a57812c00c0ce1b SHA512 87a9b103bb37c91937e2bd4667a33f3792c464f8464fe1f35b022d9c01a13255c7228ab80ce0bfac4ccfdab9a25238a5e1add00e9380cbeb24f95b686d18151b WHIRLPOOL f24f3162bee0e81751f7b64d71880a3e38d76a503b7f4f1d488ad96d89b745758f659cfd0f76c3a6f0c75a41f3500e7badd06557aafe8ce736e7a3a9bd27fd6f
+DIST fuzz_0.6-7.3.diff.gz 3004 SHA256 6f657d720c306bf29669a9cd9bf1523deb1710fde6284c9d865863b533c2bb11 SHA512 aef080a908269d44536071bb6d4a91560d7f357fb2145fc0d0369ea5997fa6a5c1b13b3fc673c370a61add5c76f40df3501f5103f2ac35ddce9662c9345e20af WHIRLPOOL 46ab73f38c4389cd4a82aaa7201a9a2252eee2777fd170ba6f48cbebf738b5178f4bc68df52e7b81b46fc5900969ccef8635946c7aafe3aeb6df7120719498b4
diff --git a/dev-util/fuzz/fuzz-0.6.ebuild b/dev-util/fuzz/fuzz-0.6.ebuild
new file mode 100644
index 000000000000..715a471bc43a
--- /dev/null
+++ b/dev-util/fuzz/fuzz-0.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Stress-tests programs by giving them random input"
+HOMEPAGE="http://fuzz.sourceforge.net/"
+DEB_P="${PN}_${PV}"
+DEB_PR="7.3"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+		mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=sys-libs/readline-4.3"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	epatch "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc NEWS README ChangeLog AUTHORS
+}
diff --git a/dev-util/fuzz/metadata.xml b/dev-util/fuzz/metadata.xml
new file mode 100644
index 000000000000..ecbc43d4a42a
--- /dev/null
+++ b/dev-util/fuzz/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">fuzz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
new file mode 100644
index 000000000000..6db0f815edfc
--- /dev/null
+++ b/dev-util/gdbus-codegen/Manifest
@@ -0,0 +1,4 @@
+DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
+DIST glib-2.42.1.tar.xz 6985120 SHA256 8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a SHA512 0d273e3e24f164f16f6663f88866ae412714eab7d15c1901fdef61f13649a08f9962e49f9d52e8a1683100f9c2dcc468b9a5bf8a9b3d6ca7b0d9488bc58f3f1e WHIRLPOOL 5cf0dbce9890a61210f0c1c0b43a6147bfff107ee8d37de959fc533b56fa9e253d74996ed3ad05b2d756aecf65c1bd8cb1faaaa50096304df2b2f09d05b28804
+DIST glib-2.42.2.tar.xz 7002480 SHA256 a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db SHA512 6b46e4ac67d79ca2cc5c32ceb7cc8112140645032cb3c8c9ba2f59a0d3c2aee06707b7573bbd72f6c21ea7798a7351bd205aa57857a58b0be008c75f897ef782 WHIRLPOOL 5c25c5f6d20217cce4f8c34d9d05cd39197b4b36c5a85447943fcab47cd343253879516b722eb0c4895eebae5f3d4e76c820730b9e7f6c890aca9c87dc963564
+DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
new file mode 100644
index 000000000000..ffeb17ba2375
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.40.0-sitedir.patch
@@ -0,0 +1,31 @@
+From 626f79dcfb1f26997f2807829c6fa19f6c3303f5 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Sun, 20 Jan 2013 20:25:13 +0330
+Subject: [PATCH] glib-2.35.4-external-gdbus-codegen
+
+---
+ gio/gdbus-2.0/codegen/gdbus-codegen.in | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 253d151..2295481 100644
+--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+@@ -29,13 +29,7 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
+ 
+ if srcdir is not None:
+     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.name == 'nt':
+-    # Makes gdbus-codegen 'relocatable' at runtime on Windows.
+-    path = os.path.join(os.path.dirname(__file__), '..', 'share', 'glib-2.0')
+ else:
+-    path = os.path.join('@datadir@', 'glib-2.0')
+-
+-sys.path.insert(0, os.path.abspath(path))
+-from codegen import codegen_main
++    from gdbus_codegen import codegen_main
+ 
+ sys.exit(codegen_main.codegen_main())
+-- 
+1.8.1
+
diff --git a/dev-util/gdbus-codegen/files/setup.py-2.32.4 b/dev-util/gdbus-codegen/files/setup.py-2.32.4
new file mode 100644
index 000000000000..c5318e30588b
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/setup.py-2.32.4
@@ -0,0 +1,6 @@
+from distutils.core import setup
+setup(name="gdbus_codegen",
+      version="@PV@",
+      packages=["gdbus_codegen"],
+      package_dir={"gdbus_codegen" : ""},
+      scripts=["gdbus-codegen"])
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.40.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.40.2.ebuild
new file mode 100644
index 000000000000..a9216f9c6881
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.40.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
+		-i config.py || die "sed config.py failed"
+
+	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.42.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.42.1.ebuild
new file mode 100644
index 000000000000..d9d31179c11a
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.42.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
+		-i config.py || die "sed config.py failed"
+
+	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.42.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.42.2.ebuild
new file mode 100644
index 000000000000..54cf3fe5ceca
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.42.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
new file mode 100644
index 000000000000..eb59bd06f1d2
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/gdbus-codegen/metadata.xml b/dev-util/gdbus-codegen/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/dev-util/gdbus-codegen/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>gnome</herd>
+</pkgmetadata>
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
new file mode 100644
index 000000000000..e6b8972f4c43
--- /dev/null
+++ b/dev-util/geany-plugins/Manifest
@@ -0,0 +1,2 @@
+DIST geany-plugins-1.23.tar.gz 3642803 SHA256 b0e79c1cd679a5b5f02632922920478a1047c3a5985982a1cc2348fa7e4454c4 SHA512 68ba0c96712cd6ea944ff68810378a96a411717a0950bfc72f5aade36bf6e5b065d229beec3b5724921c2eaf4ddb73a19f4ae77137a96208fef52f739d65c6ef WHIRLPOOL 56e54586611f8e804059b489d54d2e3970f9cf7c958e99169eeee96472c2d7848aa446bc74a150bd32ec18aa6daaba030939facaada376327fea5e90e2a15e9c
+DIST geany-plugins-1.24.tar.gz 4037065 SHA256 2e5fa09afe7710cdc2eebae3656d56561429d5df8898c6b5dc91915f15aec0fc SHA512 947bdf8bd602ae5576d3298029d7249ac40881c13cb3676123c92f4b183be200126d0e19e5c0697c237e5a8d3d9f2d7d715b0cd562f98a059af9fa5d4f3e611e WHIRLPOOL 4386cedfef05c5f4b0bb218122b20a84167bc0b2e43b06bf080ac21dd111b57d9fbf770af78d16394d0ee01592849fae8466e8467bc05176fafd331ba0f7d2a7
diff --git a/dev-util/geany-plugins/geany-plugins-1.23.ebuild b/dev-util/geany-plugins/geany-plugins-1.23.ebuild
new file mode 100644
index 000000000000..00f5e337c2ba
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.23.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils vala versionator
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="http://plugins.geany.org/geany-plugins"
+SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+IUSE="+commander debugger devhelp enchant gpg gtkspell lua markdown multiterm nls scope soup webkit"
+
+LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
+
+COMMON_DEPEND=">=dev-util/geany-$(get_version_component_range 1-2)
+	commander? ( x11-libs/gtk+:2 )
+	dev-libs/libxml2:2
+	dev-libs/glib:2
+	debugger? ( x11-libs/vte:0 )
+	devhelp? (
+		dev-util/devhelp
+		gnome-base/gconf:2
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		x11-libs/libwnck:1
+		)
+	enchant? ( app-text/enchant )
+	gpg? ( app-crypt/gpgme )
+	gtkspell? ( app-text/gtkspell:2 )
+	lua? ( dev-lang/lua )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		)
+	multiterm? (
+		$(vala_depend)
+		x11-libs/gtk+:2
+		>=x11-libs/vte-0.28:0
+		)
+	scope? ( x11-libs/vte:0 )
+	soup? ( net-libs/libsoup )
+	webkit? (
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		x11-libs/gdk-pixbuf:2
+		)"
+RDEPEND="${COMMON_DEPEND}
+	scope? ( sys-devel/gdb )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	# bundled lib buster
+	rm markdown/peg-markdown/markdown_lib.c || die
+
+	autotools-utils_src_prepare
+	use multiterm && vala_src_prepare
+}
+
+src_configure() {
+	# GeanyGenDoc requires ctpl which isn’t yet in portage
+	local myeconfargs=(
+		--docdir=/usr/share/doc/${PF}
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		--disable-geanygendoc
+		# peg-markdown is bundled, use app-text/discount instead
+		--disable-peg-markdown
+		--enable-geanymacro
+		--enable-geanynumberedbookmarks
+		--enable-gproject
+		--enable-pretty-printer
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-xmlsnippets
+		$(use_enable commander)
+		$(use_enable debugger)
+		$(use_enable devhelp)
+		$(use_enable enchant spellcheck)
+		$(use_enable gpg geanypg)
+		$(use_enable gtkspell)
+		$(use_enable markdown)
+		$(use_enable multiterm)
+		$(use_enable lua geanylua)
+		$(use_enable nls)
+		$(use_enable scope)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		$(use_enable soup geniuspaste)
+		$(use_enable webkit webhelper)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/geany-plugins/geany-plugins-1.24-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.24-r1.ebuild
new file mode 100644
index 000000000000..5b32351161bc
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.24-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils python-single-r1 vala versionator
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="http://plugins.geany.org/geany-plugins"
+SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 sparc x86"
+IUSE="+autoclose +commander debugger +defineformat devhelp enchant gpg gtkspell lua markdown multiterm nls python scope soup webkit"
+
+LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
+
+COMMON_DEPEND=">=dev-util/geany-$(get_version_component_range 1-2)
+	autoclose? ( x11-libs/gtk+:2 )
+	commander? ( x11-libs/gtk+:2 )
+	defineformat? ( x11-libs/gtk+:2 )
+	dev-libs/libxml2:2
+	dev-libs/glib:2
+	debugger? ( x11-libs/vte:0 )
+	devhelp? (
+		dev-util/devhelp
+		gnome-base/gconf:2
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		x11-libs/libwnck:1
+		)
+	enchant? ( app-text/enchant )
+	gpg? ( app-crypt/gpgme )
+	gtkspell? ( app-text/gtkspell:2 )
+	lua? ( dev-lang/lua )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		)
+	multiterm? (
+		$(vala_depend)
+		x11-libs/gtk+:2
+		>=x11-libs/vte-0.28:0
+		)
+	python? (
+		dev-python/pygtk[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		)
+	scope? ( x11-libs/vte:0 )
+	soup? ( net-libs/libsoup )
+	webkit? (
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		x11-libs/gdk-pixbuf:2
+		)"
+RDEPEND="${COMMON_DEPEND}
+	scope? ( sys-devel/gdb )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# bundled lib buster
+	rm markdown/peg-markdown/markdown_lib.c || die
+
+	autotools-utils_src_prepare
+	use multiterm && vala_src_prepare
+}
+
+src_configure() {
+	# GeanyGenDoc requires ctpl which isn’t yet in portage
+	local myeconfargs=(
+		--docdir=/usr/share/doc/${PF}
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		--disable-geanygendoc
+		# peg-markdown is bundled, use app-text/discount instead
+		--disable-peg-markdown
+		--enable-geanymacro
+		--enable-geanynumberedbookmarks
+		--enable-gproject
+		--enable-pretty-printer
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-xmlsnippets
+		$(use_enable autoclose)
+		$(use_enable commander)
+		$(use_enable debugger)
+		$(use_enable defineformat)
+		$(use_enable devhelp)
+		$(use_enable enchant spellcheck)
+		$(use_enable gpg geanypg)
+		$(use_enable gtkspell)
+		$(use_enable markdown)
+		$(use_enable multiterm)
+		$(use_enable lua geanylua)
+		$(use_enable nls)
+		$(use_enable python geanypy)
+		$(use_enable scope)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		$(use_enable soup geniuspaste)
+		$(use_enable webkit webhelper)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
new file mode 100644
index 000000000000..0f39490cad47
--- /dev/null
+++ b/dev-util/geany-plugins/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>binki@gentoo.org</email>
+    <name>Nathan Phillip Brink</name>
+  </maintainer>
+  <use>
+    <flag name='autoclose'>Enable the autoclose plugin.</flag>
+    <flag name='commander'>Enable the commander plugin which provides a command panel for rapid access to any action.</flag>
+    <flag name='debugger'>Enable the debugger plugin which interfaces with <pkg>sys-devel/gdb</pkg></flag>
+    <flag name='defineformat'>Enable the defineformat plugin.</flag>
+    <flag name='devhelp'>Enable the devhelp plugin which integrates <pkg>dev-util/devhelp</pkg></flag>
+    <flag name='enchant'>Enable spell checking using enchant</flag>
+    <flag name='gpg'>Enable geanypg plugin which integrates GPG using <pkg>app-crypt/gpgme</pkg></flag>
+    <flag name='gtkspell'>Use gtkspell for dictionary support</flag>
+    <flag name='markdown'>Enable the markdown plugin which uses <pkg>app-text/discount</pkg> and <pkg>net-libs/webkit-gtk</pkg> to display a realtime preview markdown.</flag>
+    <flag name='multiterm'>Enable the multiterm plugin</flag>
+    <flag name='scope'>Enable the scope plugin which is a graphical GDB front-end</flag>
+    <flag name='soup'>Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag>
+    <flag name='webkit'>Enable webhelper plugin which requires <pkg>net-libs/webkit-gtk</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
new file mode 100644
index 000000000000..ce4d56889987
--- /dev/null
+++ b/dev-util/geany/Manifest
@@ -0,0 +1,3 @@
+DIST geany-1.23.1.tar.bz2 3622524 SHA256 8815b16e59d8679ec359a1a5754fee05e77f7bca53083c939654bfc77d978fad SHA512 e986c35b5fbbc23745d3acda4cddc5de6f273807ffb4da7ff7ea20f108c1f04d763b1207268f06bc45e675d0f0883b309a90dc8e27b8af2f1ec626b557faf015 WHIRLPOOL d777c915738338de7d67578527c63b9da201eefd3322c2118513082b1f109187f6a4900c6ed335e4bd6b2d6472d34ecaff6d1267f43b38827b73026c813e2108
+DIST geany-1.24.1.tar.bz2 3990492 SHA256 7fb505d9b01fe6874890525f837644a6a38c23a372bb068c65ef3673108a8c33 SHA512 89bf627a861dd4c1087f283c71da9ba9c978f00f3106d97a8ee118c5b1134a8dabc0794a06fb85e58e17689e4d38da4814251b62f4109eb99984fa866483d716 WHIRLPOOL c9c7bfac0130a9e88c22136c5caf19c2965a1707f667a29e20d1aedb626f843ff93fc147b6afdcd1108842bc93e9facf19257a3290aa96c09429af93a5bf4aa7
+DIST geany-1.25.tar.bz2 4149876 SHA256 8ee41da28cead8c94d433e616d7ababa81727c63e9196ca6758ade3af14a49ef SHA512 18c98190e387870fd85e8dba7c8033be90594bad038701cc285bfa6a7c3e8bf2817b91330be8d832c18afa3aba17bb3c9c67d86921c5c55be21483b0eb727942 WHIRLPOOL 3f94b5a87b22bc4c45f5f5eccf8d2cb6a1419fe7598e6e2414eb6ea1c08ea7e35bf28b8e1115da3249e58a2136fae7c82ff2f56dbf416a97df3a55b66133ced6
diff --git a/dev-util/geany/geany-1.23.1.ebuild b/dev-util/geany/geany-1.23.1.ebuild
new file mode 100644
index 000000000000..5d8a02fcb634
--- /dev/null
+++ b/dev-util/geany/geany-1.23.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime gnome2-utils
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="http://www.geany.org"
+SRC_URI="http://download.geany.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+vte"
+
+RDEPEND=">=x11-libs/gtk+-2.16:2
+	>=dev-libs/glib-2.20:2
+	vte? ( x11-libs/vte:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable vte)
+}
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
+	prune_libtool_files --all
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/geany/geany-1.24.1.ebuild b/dev-util/geany/geany-1.24.1.ebuild
new file mode 100644
index 000000000000..24aff566d0fc
--- /dev/null
+++ b/dev-util/geany/geany-1.24.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime gnome2-utils
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="http://www.geany.org"
+SRC_URI="http://download.geany.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+vte"
+
+RDEPEND=">=x11-libs/gtk+-2.16:2
+	>=dev-libs/glib-2.20:2
+	vte? ( x11-libs/vte:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--docdir="/usr/share/doc/${PF}" \
+		--disable-gtk3 \
+		$(use_enable vte)
+}
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
+	prune_libtool_files --all
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/geany/geany-1.25.ebuild b/dev-util/geany/geany-1.25.ebuild
new file mode 100644
index 000000000000..9fad636508de
--- /dev/null
+++ b/dev-util/geany/geany-1.25.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime gnome2-utils
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="http://www.geany.org"
+SRC_URI="http://download.geany.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gtk3 +vte"
+
+RDEPEND=">=dev-libs/glib-2.28:2
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	vte? ( x11-libs/vte:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable gtk3) \
+		$(use_enable vte)
+}
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
+	prune_libtool_files --all
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml
new file mode 100644
index 000000000000..5989ba525e9a
--- /dev/null
+++ b/dev-util/geany/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <longdescription lang="en">
+		Geany is a small and lightweight integrated development environment.
+		It was developed to provide a small and fast IDE, which has only a
+		few dependencies from other packages. Another goal was to be as
+		independent as possible from a special Desktop Environment like KDE
+		or GNOME. So it is using only the GTK2 toolkit and therefore you need
+		only the GTK2 runtime libraries to run Geany.
+
+		The basic features of Geany are: syntax highlighting; code completion;
+		auto completion of often used constructs like if, for and while;
+		auto completion of XML and HTML tags; call tips; many supported
+		filetypes like C, Java, PHP, HTML, Python, Perl, Pascal; symbol lists.
+	</longdescription>
+  <longdescription lang="fr">
+		Geany est un environnement de développement integré (EDI) petit et
+		léger. Il a été développé pour fournir un EDI petit et rapide, qui ne
+		possède que peu de dépendences avec d'autres paquets. Un autre but
+		était qu'il soit aussi indépendant que possible d'environnements de
+		bureaux comme KDE ou Gnome. Ainsi, il n'utilise que la boîte à outils
+		GTK2.
+
+		Les principales fonctionnalités sont: la coloration syntaxique; la
+		complétion de code source; la complétion automatique de certaines
+		constructions couramment utilisées, comme les blocs "if", "for" et
+		"while"; complétion automatique des balises XML et HTML; info-bulles
+		décrivant la syntaxe d'appel des fonctions; de nombreux langages
+		supportés, comme C, Java, PHP, HTML, Python, Perl, Pascal; liste des
+		symboles.
+	</longdescription>
+  <use>
+    <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
+    <flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/gengetopt/Manifest b/dev-util/gengetopt/Manifest
new file mode 100644
index 000000000000..8479b3ee7b46
--- /dev/null
+++ b/dev-util/gengetopt/Manifest
@@ -0,0 +1 @@
+DIST gengetopt-2.22.6.tar.gz 1056293 SHA256 30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7 SHA512 dad5baf1b6c4c76ae7f532dd63c6aecdc30f31d68a259b6a26a10197f1fe42dc9147a52ac12a0c3fc4b7cd61d288a343a9223f967a5a9a15a0614330b41f68dc WHIRLPOOL 031b5ddac8f78d3fb37dfbe448acdb563e751858eab9392f5ae8b55e926a5967b9c851295f1d95dff09b4e5fc36a99f380f2ce0be79174b26c4dd4a8afade34f
diff --git a/dev-util/gengetopt/files/gengetopt-2.22.6-docdirs.patch b/dev-util/gengetopt/files/gengetopt-2.22.6-docdirs.patch
new file mode 100644
index 000000000000..2991a1be6adc
--- /dev/null
+++ b/dev-util/gengetopt/files/gengetopt-2.22.6-docdirs.patch
@@ -0,0 +1,16 @@
+--- gengetopt-2.22.6/configure.ac
++++ gengetopt-2.22.6/configure.ac
+@@ -27,11 +27,11 @@
+ 
+ dnl directory for docs (html)
+ AC_SUBST(gengetoptdocdir)
+-gengetoptdocdir=$docdir
++gengetoptdocdir=$docdir/html
+ 
+ dnl directory for examples
+ AC_SUBST(gengetoptexamplesdir)
+-gengetoptexamplesdir=$gengetoptdocdir/examples
++gengetoptexamplesdir=$docdir/examples
+ 
+ dnl Checks for C compiler.
+ AC_PROG_CC
diff --git a/dev-util/gengetopt/files/gengetopt-2.22.6-makefile.patch b/dev-util/gengetopt/files/gengetopt-2.22.6-makefile.patch
new file mode 100644
index 000000000000..f4317caa89d1
--- /dev/null
+++ b/dev-util/gengetopt/files/gengetopt-2.22.6-makefile.patch
@@ -0,0 +1,11 @@
+--- gengetopt-2.22.6/src/Makefile.am
++++ gengetopt-2.22.6/src/Makefile.am
+@@ -51,7 +51,7 @@
+ 	@LTLIBOBJS@ \
+ 	skels/libgen.la
+ 
+-LDADD = $(top_builddir)/src/libgengetopt.la
++LDADD = libgengetopt.la
+ 
+ EXTRA_DIST = parser.h argsdef.h gengetopt.h ggos.h gm.h gnugetopt.h \
+ cmdline.c cmdline.h \
diff --git a/dev-util/gengetopt/files/gengetopt-2.22.6-no-docs.patch b/dev-util/gengetopt/files/gengetopt-2.22.6-no-docs.patch
new file mode 100644
index 000000000000..321bacf15e10
--- /dev/null
+++ b/dev-util/gengetopt/files/gengetopt-2.22.6-no-docs.patch
@@ -0,0 +1,9 @@
+--- gengetopt-2.22.6/Makefile.am
++++ gengetopt-2.22.6/Makefile.am
+@@ -19,5 +19,3 @@
+ 
+ EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
+ SUBDIRS = gl src doc tests
+-
+-gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE
+\ No newline at end of file
diff --git a/dev-util/gengetopt/gengetopt-2.22.6.ebuild b/dev-util/gengetopt/gengetopt-2.22.6.ebuild
new file mode 100644
index 000000000000..5a29f7f8a3c9
--- /dev/null
+++ b/dev-util/gengetopt/gengetopt-2.22.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="A tool to write command line option parsing code for C programs"
+HOMEPAGE="http://www.gnu.org/software/gengetopt/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-no-docs.patch
+	epatch "${FILESDIR}"/${P}-docdirs.patch
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/dev-util/gengetopt/metadata.xml b/dev-util/gengetopt/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/gengetopt/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/ghh/ghh-9999.ebuild b/dev-util/ghh/ghh-9999.ebuild
new file mode 100644
index 000000000000..ca34689eb469
--- /dev/null
+++ b/dev-util/ghh/ghh-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+PYTHON_DEPEND="2:2.6"
+inherit autotools git-2 python
+
+DESCRIPTION="a tool to track the history and make backups of your home directory"
+HOMEPAGE="http://jean-francois.richard.name/ghh/"
+EGIT_REPO_URI="git://github.com/jfrichard/git-home-history.git
+	https://github.com/jfrichard/git-home-history.git"
+EGIT_BOOTSTRAP="autogen.sh"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+DOCS=( AUTHORS ChangeLog MAINTAINERS NEWS README TODO )
+
+# probably needs more/less crap listed here ...
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2
+	gnome-base/libgnome
+	app-text/gnome-doc-utils
+	>=app-text/asciidoc-8
+	dev-python/pygtk:2
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	NOCONFIGURE=yes git_src_prepare
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ${DOCS[@]}
+	python_convert_shebangs -r 2 "${ED}"
+}
diff --git a/dev-util/ghh/metadata.xml b/dev-util/ghh/metadata.xml
new file mode 100644
index 000000000000..a40624fba8f0
--- /dev/null
+++ b/dev-util/ghh/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
new file mode 100644
index 000000000000..9f18ac1f85b7
--- /dev/null
+++ b/dev-util/glade/Manifest
@@ -0,0 +1,2 @@
+DIST glade-3.18.3.tar.xz 3266400 SHA256 ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452 SHA512 6e98d6ba98118fde4066f983024818528ac8c82d176896e2c5c62a19094377df4bf4c6b4edd028cd72bf8744c807c28a930e467f2a23670537b02af327b683f8 WHIRLPOOL 4e1e86b86216739007b3524464a5fcaf07c66ba5adc36a3c497c0c411401fffc6345db2722a1b0f85d1e1e13c920553014e4eac3bdbbd2dcc7ddbd8ac7cb41a3
+DIST glade3-3.8.5.tar.xz 2322076 SHA256 58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735 SHA512 722a33f1a1ec3baa785bf3c6f7f5ec2cbe7cf6fe44c9c26d33728de16f2856cbb1ace0cd38c5b5356081e326666cc82fd00f2b6af53bd06bb832079610042985 WHIRLPOOL 672c38822dd04e43e2a3c6642fa34e9e485172d943a0abd5e16f7f378f73bc9126768955d9aad431960f5966be8edaa26a755ca28e2644a790c111e0b6c0142d
diff --git a/dev-util/glade/files/glade-3.14.1-doc-version.patch b/dev-util/glade/files/glade-3.14.1-doc-version.patch
new file mode 100644
index 000000000000..39c9641719a4
--- /dev/null
+++ b/dev-util/glade/files/glade-3.14.1-doc-version.patch
@@ -0,0 +1,29 @@
+From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 6 May 2012 22:40:47 -0400
+Subject: [PATCH] Version glade documentation
+
+Rename gnome help files to prevent collision with other versions.
+
+Avoid loading glade-3.8's devhelp files.
+---
+ help/Makefile.am   |    5 ++++-
+ src/glade-window.c |    2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/glade-window.c b/src/glade-window.c
+index 89a4549..4eb8be5 100644
+--- a/src/glade-window.c
++++ b/src/glade-window.c
+@@ -2041,7 +2041,7 @@ show_developer_manual_cb (GtkAction * action, GladeWindow * window)
+ {
+   if (glade_util_have_devhelp ())
+     {
+-      glade_util_search_devhelp ("gladeui", NULL, NULL);
++      glade_util_search_devhelp ("gladeui-2", NULL, NULL);
+       return;
+     }
+ 
+-- 
+1.7.8.6
+
diff --git a/dev-util/glade/files/glade-3.18.1-underlinking.patch b/dev-util/glade/files/glade-3.18.1-underlinking.patch
new file mode 100644
index 000000000000..f34c03a2da58
--- /dev/null
+++ b/dev-util/glade/files/glade-3.18.1-underlinking.patch
@@ -0,0 +1,46 @@
+From 80c9532e39fac397960fc59eb407e596d9e8d2e4 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 2 Jun 2014 22:41:14 -0400
+Subject: [PATCH] build: Explicitly link libgladeui with libm
+
+Fixes underlinking failure with ld.gold.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=724104
+---
+ configure.ac        | 6 ++++++
+ gladeui/Makefile.am | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c86e947..7bf65e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,6 +133,12 @@ AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);],
+         ])
+ 
+ dnl ================================================================
++dnl libm
++dnl ================================================================
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
++dnl ================================================================
+ dnl Check for gtk-doc
+ dnl ================================================================
+ GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
+diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
+index c63b6a3..77af09c 100644
+--- a/gladeui/Makefile.am
++++ b/gladeui/Makefile.am
+@@ -145,7 +145,7 @@ libgladeui_2_la_CFLAGS =    \
+ 	$(AM_CFLAGS)
+ 
+ libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
+-libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS)
++libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) $(LIBM)
+ 
+ libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui
+ libgladeuiinclude_HEADERS = \
+-- 
+2.0.0
+
diff --git a/dev-util/glade/glade-3.18.3.ebuild b/dev-util/glade/glade-3.18.3.ebuild
new file mode 100644
index 000000000000..7c8b395af4ae
--- /dev/null
+++ b/dev-util/glade/glade-3.18.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1 versionator virtualx
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="http://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+introspection python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/atk[introspection?]
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2.4.0:2
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.12:3[introspection?]
+	x11-libs/pango[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf requires:
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# To avoid file collison with other slots, rename help module.
+	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
+	epatch "${FILESDIR}"/${PN}-3.14.1-doc-version.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=724104
+	epatch "${FILESDIR}"/${PN}-3.18.1-underlinking.patch
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gladeui \
+		--enable-libtool-lock \
+		$(use_enable introspection) \
+		$(use_enable python) \
+		ITSTOOL=$(type -P true)
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	# modify Name in .desktop file to avoid confusion with other slots
+	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
+		-i data/glade.desktop || die "sed of data/glade.desktop failed"
+	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
+	sed -e 's:name="gladeui":name="gladeui-2":' \
+		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version dev-util/devhelp ; then
+		elog "You may want to install dev-util/devhelp for integration API"
+		elog "documentation support."
+	fi
+}
diff --git a/dev-util/glade/glade-3.8.5.ebuild b/dev-util/glade/glade-3.8.5.ebuild
new file mode 100644
index 000000000000..7bbc82cba077
--- /dev/null
+++ b/dev-util/glade/glade-3.8.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="glade3"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="http://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3/11" # subslot = suffix of libgladeui-1.so
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="gnome python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.8:2
+	>=x11-libs/gtk+-2.24:2
+	>=dev-libs/libxml2-2.4:2
+	gnome?	(
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/libbonoboui-2 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=app-text/gnome-doc-utils-0.9
+	app-text/docbook-xml-dtd:4.1.2
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-libtool-lock \
+		$(use_enable gnome) \
+		$(use_enable python)
+}
diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/dev-util/glade/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>gnome</herd>
+</pkgmetadata>
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
new file mode 100644
index 000000000000..9505a07851c9
--- /dev/null
+++ b/dev-util/global/Manifest
@@ -0,0 +1 @@
+DIST global-6.3.1.tar.gz 1369634 SHA256 fb10668ef1a2f63d0730564a36ecae7716aed89c09cc5896cd8c579be4ebae6c SHA512 83becd6cda06f8da17ea0c701bb135523ff48cec73b233d24566387d11a35c0b42f410b62753838e2b364a5a485cac033b4aef1159cc6f4cdeca4a7b6c5bb4d6 WHIRLPOOL 1321e131b267f842b68561f04155c06dc11b0adfe177e83113b1884eb629d8e27844de6421c1613efd2ad7472d51140deb5360a6ad78fd25f50844426314de5c
diff --git a/dev-util/global/files/50gtags-gentoo.el b/dev-util/global/files/50gtags-gentoo.el
new file mode 100644
index 000000000000..cd9c5546de91
--- /dev/null
+++ b/dev-util/global/files/50gtags-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; global site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'gtags-mode "gtags"
+  "Toggle Gtags mode, a minor mode for browsing source code using GLOBAL." t)
diff --git a/dev-util/global/files/global-6.2.9-tinfo.patch b/dev-util/global/files/global-6.2.9-tinfo.patch
new file mode 100644
index 000000000000..ef247d4abbcb
--- /dev/null
+++ b/dev-util/global/files/global-6.2.9-tinfo.patch
@@ -0,0 +1,28 @@
+diff --git a/m4/check_curses.m4 b/m4/check_curses.m4
+index 14aaec5..dca7c0e 100644
+--- a/m4/check_curses.m4
++++ b/m4/check_curses.m4
+@@ -229,16 +229,17 @@ AC_DEFUN([AC_NCURSES], [
+ ])
+ 
+ AC_DEFUN([AC_SEARCH_NCURSES], [
++    PKG_CHECK_MODULES(NCURSES,ncurses)
+     AS_MESSAGE(checking "location of ncurses.h file"...)
+ 
+-    AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
+-    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
+-    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local")
+-    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
++    AC_NCURSES(/usr/include, ncurses.h, $NCURSES_LIBS,, "ncurses on /usr/include")
++    AC_NCURSES(/usr/include/ncurses, ncurses.h, $NCURSES_LIBS, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
++    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib $NCURSES_LIBS, -I/usr/local/include, "ncurses on /usr/local")
++    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses $NCURSES_LIBS, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
+ 
+-    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
++    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib $NCURSES_LIBS, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
+ 
+-    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
++    AC_NCURSES(/usr/include/ncurses, curses.h, $NCURSES_LIBS, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
+ 
+     dnl
+     dnl We couldn't find ncurses, try SysV curses
diff --git a/dev-util/global/global-6.3.1.ebuild b/dev-util/global/global-6.3.1.ebuild
new file mode 100644
index 000000000000..a7b694e9b2e3
--- /dev/null
+++ b/dev-util/global/global-6.3.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="GNU Global is a tag system to find the locations of a specified object in various sources"
+HOMEPAGE="http://www.gnu.org/software/global/global.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="doc emacs vim"
+
+RDEPEND="|| ( dev-libs/libltdl:0 sys-devel/libtool:2 )
+	sys-libs/ncurses
+	emacs? ( virtual/emacs )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${DEPEND}
+	doc? ( app-text/texi2html sys-apps/texinfo )"
+
+SITEFILE="50gtags-gentoo.el"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-6.2.9-tinfo.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf "$(use_with emacs lispdir "${SITELISP}/${PN}")"
+}
+
+src_compile() {
+	if use doc; then
+		texi2pdf -q -o doc/global.pdf doc/global.texi
+		texi2html -o doc/global.html doc/global.texi
+	fi
+
+	if use emacs; then
+		elisp-compile *.el
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use doc; then
+		dohtml doc/global.html
+		# doc/global.pdf is generated if tex executable (e.g. /usr/bin/tex) is available.
+		[[ -f doc/global.pdf ]] && dodoc doc/global.pdf
+	fi
+
+	dodoc AUTHORS FAQ NEWS README THANKS
+
+	insinto /etc
+	doins gtags.conf
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins gtags.vim
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} *.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/global/metadata.xml b/dev-util/global/metadata.xml
new file mode 100644
index 000000000000..429c6105e4c5
--- /dev/null
+++ b/dev-util/global/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>naota@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>arfrever.fta@gmail.com</email> 
+		<description>Proxy maintainer</description>   
+	</maintainer>    
+	<use>
+		<flag name="vim">Integrate the GNU GLOBAL source code tag system with Vim</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
new file mode 100644
index 000000000000..09de700f91e4
--- /dev/null
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -0,0 +1,4 @@
+DIST gnome-devel-docs-3.12.3.tar.xz 10199720 SHA256 c8e13e3d94aa28de5d09645abf9ec72f19a37af87fbf5765871dc8a52407c656 SHA512 a677f43ebcf5c5a72360477a451770d5ab5d34384e7e3b023d7d19a0f77b8c9af4afcc54fafb702fde58d8a845595b5a8bf6829dbe95bf316955673418675d66 WHIRLPOOL 18f7c6009cce7edd4ad8453a13bf1feb48949df2e183697d6c831adc7bf02d4d512e7feb0eabbeb0cca7b70807344b0fb15c8b6a660649bfb51da72273ca498f
+DIST gnome-devel-docs-3.14.3.tar.xz 8523916 SHA256 3d36bd8c07ff7bc8092223aa8f366cc42dfd9a091ea0ce720caaa77254284a70 SHA512 5f61fcb5520a215e0621f7477e7a9672e13ac5c978bf93ae720dd69d600e22d6217c92bb751a264ec011624ca3557e9e0ba27e2ba60083ee3bb854da7157a336 WHIRLPOOL ae455435b83292fad227fc40d4844277c82253acef0e25b9fc0a90cc4a507d5ae4392faec7efe1a9547c3b7d6f829e1f1eab0face580d7b454284e54ec91f74a
+DIST gnome-devel-docs-3.14.4.tar.xz 8527376 SHA256 515a940239223f9f1bbbbe81258c4e1f37a6a225197c1075411c0afac76e229b SHA512 16e941ff150c8c25b36c69cfe45dab41e45e51fbdf7dcc8bd6285ba3474efd3914066ec9d86b2d1e12677392b8724f2591c3157b796ee453d0c1ac1aae919910 WHIRLPOOL 2cf02eed1c9fbc95d2abbf04c281c488ec7ff921973df5dd8513e9ff4457b2036c20913cf0e1e04e79968511109014eb74c81abef8ab6ce769537a5cf935efa8
+DIST gnome-devel-docs-3.16.2.tar.xz 8716332 SHA256 9a5ad076fe931785fff6f79cc13ed111977ece86611d714fd11ad7a23c2070ca SHA512 54835c0327d699f505beb42f53f9498b46e9644b1b34fad06464fec777701f6a6d2caeba3cc08034a7989c3226f446c227d93db7466d8885cc95618d9ebadf39 WHIRLPOOL c42a8263d3d333e2f0687795df2c5fd836eef66aee6f607977b916ac7e80eac4848ef9cf6c626e5bafbc37b72af522c11cc17f871e21768d118c98e514eaa71e
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.12.3.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.12.3.ebuild
new file mode 100644
index 000000000000..22bd537ea34c
--- /dev/null
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.12.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Documentation for developing for the GNOME desktop environment"
+HOMEPAGE="http://developer.gnome.org/"
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=735882
+LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	gnome2_src_configure ITSTOOL=$(type -P true)
+}
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.3.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.3.ebuild
new file mode 100644
index 000000000000..9334a89c2e9e
--- /dev/null
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Documentation for developing for the GNOME desktop environment"
+HOMEPAGE="http://developer.gnome.org/"
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=735882
+LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	gnome2_src_configure ITSTOOL=$(type -P true)
+}
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild
new file mode 100644
index 000000000000..cdf198aec25a
--- /dev/null
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Documentation for developing for the GNOME desktop environment"
+HOMEPAGE="http://developer.gnome.org/"
+
+LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	gnome2_src_configure ITSTOOL=$(type -P true)
+}
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.16.2.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.16.2.ebuild
new file mode 100644
index 000000000000..33a9d6ad19a4
--- /dev/null
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.16.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Documentation for developing for the GNOME desktop environment"
+HOMEPAGE="http://developer.gnome.org/"
+
+LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	# Wants to build demo samples
+	gnome2_src_configure ITSTOOL=$(type -P true) ac_cv_path_CC=""
+}
diff --git a/dev-util/gnome-devel-docs/metadata.xml b/dev-util/gnome-devel-docs/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/dev-util/gnome-devel-docs/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>gnome</herd>
+</pkgmetadata>
diff --git a/dev-util/gob/Manifest b/dev-util/gob/Manifest
new file mode 100644
index 000000000000..251355d7926c
--- /dev/null
+++ b/dev-util/gob/Manifest
@@ -0,0 +1 @@
+DIST gob2-2.0.20.tar.xz 202540 SHA256 5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428 SHA512 9d09692ef208f8d6422fd573aa1955ca5dcfc3feaf9e0fb64c27e52f4638fe19a5e08a7282f682ed5241a8fafce3852e4168ba4f3865890df972dad4ee342b7a WHIRLPOOL bc2c081bab2f9745c56cc36a8a40fa71820ea1251f28860a7374507ae6f53d43613de2472b9c41cc486778709525fa3610ccb2afe9f7234872bef84357f6261f
diff --git a/dev-util/gob/gob-2.0.20.ebuild b/dev-util/gob/gob-2.0.20.ebuild
new file mode 100644
index 000000000000..5aabc207283c
--- /dev/null
+++ b/dev-util/gob/gob-2.0.20.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="gob2"
+
+inherit gnome2
+
+DESCRIPTION="Preprocessor for making GTK+ objects with inline C code"
+HOMEPAGE="http://www.jirka.org/gob.html"
+
+LICENSE="GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.4:2"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
diff --git a/dev-util/gob/metadata.xml b/dev-util/gob/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/dev-util/gob/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>gnome</herd>
+</pkgmetadata>
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
new file mode 100644
index 000000000000..a23f5df01a65
--- /dev/null
+++ b/dev-util/google-perftools/Manifest
@@ -0,0 +1,2 @@
+DIST google-perftools-1.8.3.tar.gz 1265062 SHA256 6ad744b34abb24312631740d9912f4667993b02e5f59b91246c31a2a911a9d59 SHA512 c6938391d182982ba6a87cd3d023e5fdf3501c42aecb951504e2fc97ce9e5bb2a6e6a577504ddbe89220b45ae47e58ce3e68f84aa45ff238d949dee4fc765b51 WHIRLPOOL 70ef15f25451a0f3eddb92e948e6d7d2e46a7ee8684636ddff312d5f0dda1429a7fe3f1f6756f0a979e4957b09c47513ddad9504415795e9e82ba51188672fdc
+DIST gperftools-2.0.tar.gz 1261243 SHA256 7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080 SHA512 61bf7a26974058912a4165cbc363351bc735599d36ab569dc7e84a75a690adbc17a4178512a57469fc7c17befaad2a271ef4ea5c29a36b664153938939269926 WHIRLPOOL 4f49a7da976040cacdecb8e18294b09fbfe276422ba35058476a14a3c1df072f8748d70f738adafa03a3a445701ed32b6232f13962d8ec8c5a968652414797a6
diff --git a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
new file mode 100644
index 000000000000..b17e0d57f5fb
--- /dev/null
+++ b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
@@ -0,0 +1,13 @@
+Index: gperftools-2.0/src/base/linuxthreads.cc
+===================================================================
+--- gperftools-2.0.orig/src/base/linuxthreads.cc
++++ gperftools-2.0/src/base/linuxthreads.cc
+@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
+ /* Signal handler to help us recover from dying while we are attached to
+  * other threads.
+  */
+-static void SignalHandler(int signum, siginfo_t *si, void *data) {
++static void SignalHandler(int signum, struct siginfo *si, void *data) {
+   if (sig_pids != NULL) {
+     if (signum == SIGABRT) {
+       while (sig_num_threads-- > 0) {
diff --git a/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch b/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
new file mode 100644
index 000000000000..df89a92ed010
--- /dev/null
+++ b/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
@@ -0,0 +1,17 @@
+Atomic64 not available on all architectures.
+Use AtomicWord instead.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar gperftools-2.0.orig/src/base/spinlock_internal.cc gperftools-2.0/src/base/spinlock_internal.cc
+--- gperftools-2.0.orig/src/base/spinlock_internal.cc	2012-02-02 21:36:23.000000000 +0000
++++ gperftools-2.0/src/base/spinlock_internal.cc	2013-01-20 23:44:01.629077919 +0000
+@@ -80,7 +80,7 @@
+ static int SuggestedDelayNS(int loop) {
+   // Weak pseudo-random number generator to get some spread between threads
+   // when many are spinning.
+-  static base::subtle::Atomic64 rand;
++  static AtomicWord rand;
+   uint64 r = base::subtle::NoBarrier_Load(&rand);
+   r = 0x5deece66dLL * r + 0xb;   // numbers from nrand48()
+   base::subtle::NoBarrier_Store(&rand, r);
diff --git a/dev-util/google-perftools/google-perftools-1.8.3.ebuild b/dev-util/google-perftools/google-perftools-1.8.3.ebuild
new file mode 100644
index 000000000000..5e68342450ae
--- /dev/null
+++ b/dev-util/google-perftools/google-perftools-1.8.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
+HOMEPAGE="http://code.google.com/p/google-perftools/"
+SRC_URI="http://google-perftools.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+# contains ASM code, with support for
+# freebsd x86/amd64
+# linux x86/amd64/ppc/ppc64/arm
+# OSX ppc/amd64
+# AIX ppc/ppc64
+KEYWORDS="-* amd64 x86 ~x86-fbsd"
+IUSE="largepages +debug minimal" # test"
+
+DEPEND="sys-libs/libunwind"
+RDEPEND="${DEPEND}"
+
+# tests end up in an infinite loop, even without sandbox
+RESTRICT=test
+
+pkg_setup() {
+	# set up the make options in here so that we can actually make use
+	# of them on both compile and install.
+
+	# Avoid building the unit testing if we're not going to execute
+	# tests; this trick here allows us to ignore the tests without
+	# touching the build system (and thus without rebuilding
+	# autotools). Keep commented as long as it's restricted.
+
+	# use test && \
+		makeopts="${makeopts} noinst_PROGRAMS= "
+
+	# don't install _anything_ from the documentation, since it would
+	# install it in non-standard locations, and would just waste time.
+	makeopts="${makeopts} dist_doc_DATA= "
+}
+
+src_configure() {
+	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		--enable-fast-install \
+		$(use_enable debug debugalloc) \
+		$(use_enable minimal)
+}
+
+src_compile() {
+	emake ${makeopts} || die "emake failed"
+}
+
+src_test() {
+	case "${LD_PRELOAD}" in
+		*libsandbox*)
+			ewarn "Unable to run tests when sanbox is enabled."
+			ewarn "See http://bugs.gentoo.org/290249"
+			return 0
+			;;
+	esac
+
+	emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install ${makeopts} || die "emake install failed"
+
+	# Remove libtool files since we dropped the static libraries
+	find "${D}" -name '*.la' -delete
+
+	dodoc README AUTHORS ChangeLog TODO NEWS || die
+	pushd doc
+	dohtml -r * || die
+	popd
+}
diff --git a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
new file mode 100644
index 000000000000..75888f266925
--- /dev/null
+++ b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="gperftools-${PV}"
+
+inherit toolchain-funcs eutils flag-o-matic autotools-utils
+
+DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
+HOMEPAGE="http://code.google.com/p/gperftools/"
+SRC_URI="http://gperftools.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/4"
+# contains ASM code, with support for
+# freebsd x86/amd64
+# linux x86/amd64/ppc/ppc64/arm
+# OSX ppc/amd64
+# AIX ppc/ppc64
+KEYWORDS="-* amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="largepages +debug minimal test static-libs"
+
+DEPEND="sys-libs/libunwind"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+HTML_DOCS="doc"
+
+pkg_setup() {
+	# set up the make options in here so that we can actually make use
+	# of them on both compile and install.
+
+	# Avoid building the unit testing if we're not going to execute
+	# tests; this trick here allows us to ignore the tests without
+	# touching the build system (and thus without rebuilding
+	# autotools). Keep commented as long as it's restricted.
+	use test || \
+		MAKEOPTS+=" noinst_PROGRAMS= "
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${MY_P}+glibc-2.16.patch"
+	epatch "${FILESDIR}/${MY_P}-32bit-barrier.patch"
+}
+
+src_configure() {
+	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
+
+	local myeconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(use_enable debug debugalloc)
+		$(use_enable minimal)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_test() {
+	case "${LD_PRELOAD}" in
+		*libsandbox*)
+			ewarn "Unable to run tests when sanbox is enabled."
+			ewarn "See http://bugs.gentoo.org/290249"
+			return 0
+			;;
+	esac
+
+	autotools-utils_src_test
+}
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
new file mode 100644
index 000000000000..450a4d64b8ac
--- /dev/null
+++ b/dev-util/google-perftools/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
+
+  <use>
+    <flag name="largepages">
+      Use (experimental) larger pages for tcmalloc, this increases
+      memory usage, but should speed up the allocation/free
+      operations.
+    </flag>
+
+    <flag name="debug">
+      Build a set of libraries with debug support (so-called
+      debugalloc). These are available by default but are not needed
+      unless you're actually developing using tcmalloc.
+    </flag>
+
+    <flag name="minimal">
+      Only build the tcmalloc_minimal library, ignoring the heap
+      checker and the profilers.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
new file mode 100644
index 000000000000..23de2233dfcd
--- /dev/null
+++ b/dev-util/gource/Manifest
@@ -0,0 +1,3 @@
+DIST gource-0.39.tar.gz 856723 SHA256 0f97a3bad240ebc04e37ebbe8e0affaf8ad9bed997d90a4b59d05770c788ffeb SHA512 ff3e3ffb78e541c4aab542e2b0268e0008c9380743214b2726a95d88c7be07727535940c6225cdb7908c0dbf7b85565ee51fcc1d6f4244eef58b1efe68d2f7da WHIRLPOOL 5d8398be7bb543e0ced8cb8970c4e8e37aef23e2e999151f9371c2d4ece150c29d225c2e4d7adeefecffe98bf698e8353b77ae9b955317788fe2dcb0732251ec
+DIST gource-0.40.tar.gz 861731 SHA256 9c890a926bb3bab8ea3e546c1357488e5a5034d1ea9402afc654cb7e00ccd112 SHA512 f027a791674162a366ef30743508d841bc94b7b81c76041a8041d247420b76a9a82581793cb61e571da4805b2989a11e02dfd1246fe656115fef5568f283802a WHIRLPOOL f668854dc43fcc6776ffddc7582491b08744997a5c7a70ab59a5ca5019cc582ac3cbce7d041baa3fec41f78fed6f832cc803e0aea53b9a70cfb4f01f3ddb0bce
+DIST gource-0.43.tar.gz 874141 SHA256 85a40ac8e4f5c277764216465c248d6b76589ceac012541c4cc03883a24abde4 SHA512 4983c8afc534280ea61f9d1e0db2479f351acd349b62c2afd0c059faba0a73e1cebfb7d5e97ee6183461c7079df5a8126813f851cceb9cfa60ef23784e9152bd WHIRLPOOL b98c73f9b9bd73f49c459a28b1a75f00af696f26a3e202a7ee5fec09ea59132a77e07d9673ca1d04acc138e8bed53833bf93b5eaa4a1d250bf120c9de5480125
diff --git a/dev-util/gource/gource-0.39.ebuild b/dev-util/gource/gource-0.39.ebuild
new file mode 100644
index 000000000000..3b9f0c49df3b
--- /dev/null
+++ b/dev-util/gource/gource-0.39.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic versionator
+
+MY_P=${P/_p/-}
+MY_P=${MY_P/_/-}
+MY_DATE=${PV/*_p}
+
+DESCRIPTION="A software version control visualization tool"
+HOMEPAGE="http://code.google.com/p/gource/"
+SRC_URI="http://gource.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.46:=[threads(+)]
+	>=media-libs/glew-1.5
+	>=media-libs/libpng-1.2
+	>=media-libs/libsdl-1.2.10[video,opengl,X]
+	>=media-libs/sdl-image-1.2[jpeg,png]
+	dev-libs/libpcre:3
+	dev-libs/tinyxml
+	media-fonts/freefont
+	media-libs/freetype:2
+	media-libs/mesa
+	virtual/glu
+	virtual/jpeg
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	>=media-libs/glm-0.9.3
+	"
+
+case ${PV} in
+	*_beta*)
+		my_v=$(get_version_component_range 1-3)
+		my_v=${my_v//_/-}
+		S="${WORKDIR}/${PN}-${my_v}" ;;
+	*)
+		S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)" ;;
+esac
+
+src_configure() {
+	# fix bug #386525
+	# this enable gource to be compiled against dev-libs/tinyxml[stl]
+	if has_version dev-libs/tinyxml[stl]; then
+		append-cppflags -DTIXML_USE_STL;
+	fi
+	econf --enable-ttf-font-dir=/usr/share/fonts/freefont/ \
+		--with-tinyxml
+}
+
+DOCS=( README ChangeLog THANKS )
diff --git a/dev-util/gource/gource-0.40.ebuild b/dev-util/gource/gource-0.40.ebuild
new file mode 100644
index 000000000000..94d9704e7154
--- /dev/null
+++ b/dev-util/gource/gource-0.40.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic versionator
+
+MY_P=${P/_p/-}
+MY_P=${MY_P/_/-}
+MY_DATE=${PV/*_p}
+
+DESCRIPTION="A software version control visualization tool"
+HOMEPAGE="http://code.google.com/p/gource/"
+SRC_URI="http://gource.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.46:=[threads(+)]
+	>=media-libs/glew-1.5
+	>=media-libs/libpng-1.2
+	<media-libs/libsdl-2[video,opengl,X]
+	<media-libs/sdl-image-2[jpeg,png]
+	dev-libs/libpcre:3
+	dev-libs/tinyxml
+	media-fonts/freefont
+	media-libs/freetype:2
+	media-libs/mesa
+	virtual/glu
+	virtual/jpeg
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	>=media-libs/glm-0.9.3
+	"
+
+case ${PV} in
+	*_beta*)
+		my_v=$(get_version_component_range 1-3)
+		my_v=${my_v//_/-}
+		S="${WORKDIR}/${PN}-${my_v}" ;;
+	*)
+		S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)" ;;
+esac
+
+src_configure() {
+	# fix bug #386525
+	# this enable gource to be compiled against dev-libs/tinyxml[stl]
+	if has_version dev-libs/tinyxml[stl]; then
+		append-cppflags -DTIXML_USE_STL;
+	fi
+	econf \
+		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
+		--with-tinyxml
+}
+
+DOCS=( README ChangeLog THANKS )
diff --git a/dev-util/gource/gource-0.43.ebuild b/dev-util/gource/gource-0.43.ebuild
new file mode 100644
index 000000000000..a4b4c28dd28f
--- /dev/null
+++ b/dev-util/gource/gource-0.43.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic versionator
+
+MY_P=${P/_p/-}
+MY_P=${MY_P/_/-}
+MY_DATE=${PV/*_p}
+
+DESCRIPTION="A software version control visualization tool"
+HOMEPAGE="http://code.google.com/p/gource/"
+SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.46:=[threads(+)]
+	>=media-libs/glew-1.5
+	>=media-libs/libpng-1.2
+	media-libs/libsdl2[video,opengl,X]
+	media-libs/sdl2-image[jpeg,png]
+	dev-libs/libpcre:3
+	dev-libs/tinyxml
+	media-fonts/freefont
+	media-libs/freetype:2
+	media-libs/mesa
+	virtual/glu
+	virtual/jpeg
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	>=media-libs/glm-0.9.3
+	"
+
+case ${PV} in
+	*_beta*)
+		my_v=$(get_version_component_range 1-3)
+		my_v=${my_v//_/-}
+		S="${WORKDIR}/${PN}-${my_v}" ;;
+	*)
+		S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)" ;;
+esac
+
+src_configure() {
+	# fix bug #386525
+	# this enable gource to be compiled against dev-libs/tinyxml[stl]
+	if has_version dev-libs/tinyxml[stl]; then
+		append-cppflags -DTIXML_USE_STL;
+	fi
+	econf \
+		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
+		--with-tinyxml
+}
+
+DOCS=( README ChangeLog THANKS )
diff --git a/dev-util/gource/metadata.xml b/dev-util/gource/metadata.xml
new file mode 100644
index 000000000000..7775c15af392
--- /dev/null
+++ b/dev-util/gource/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>enrico.tagliavini@gmail.com</email>
+    <name>Enrico Tagliavini</name>
+    <description>Proxied co-maintainer</description>
+  </maintainer>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">gource</remote-id>
+    <remote-id type="github">acaudwell/Gource</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
new file mode 100644
index 000000000000..dec35dbdf93f
--- /dev/null
+++ b/dev-util/gperf/Manifest
@@ -0,0 +1 @@
+DIST gperf-3.0.4.tar.gz 983500 SHA256 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e SHA512 24a65ac93c9d640670b015a76378eb7e0f167bec685d03f7dc68005d5a6d693d98b2189f7a0ab5bb9e5dc700de7d417c215230f9dbe062ba119240a8da535dad WHIRLPOOL 1d5da177f69c1628d08ca146be7637517c0884dd6cd7457e7625ddcf7207cf7697da53d1c62f3a9f8c8dccecc7613d7fdcccaac0e0d2490bafbd42018ad7407a
diff --git a/dev-util/gperf/gperf-3.0.4.ebuild b/dev-util/gperf/gperf-3.0.4.ebuild
new file mode 100644
index 000000000000..b27838e7c7e6
--- /dev/null
+++ b/dev-util/gperf/gperf-3.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A perfect hash function generator"
+HOMEPAGE="http://www.gnu.org/software/gperf/"
+SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	sed -i \
+		-e "/^AR /s:=.*:= $(tc-getAR):" \
+		-e "/^CPPFLAGS /s:=:+=:" \
+		*/Makefile.in || die #444078
+}
+
+src_configure() {
+	econf --htmldir='$(datarootdir)/doc/'"${PF}/html"
+}
diff --git a/dev-util/gperf/metadata.xml b/dev-util/gperf/metadata.xml
new file mode 100644
index 000000000000..b6073e49aff5
--- /dev/null
+++ b/dev-util/gperf/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
new file mode 100644
index 000000000000..f5e3cfc4d54b
--- /dev/null
+++ b/dev-util/gprof2dot/Manifest
@@ -0,0 +1 @@
+DIST gprof2dot-0_p20130517.tar.xz 1080464 SHA256 d491a8048a7ebc169557393ee517ede3c3958696e5257fbe3698bfbab6218691 SHA512 1907cb889d1776723ca944d588fa4185afdeee11cc85ec40c03832568d91612bab708160c69036fc45fef05bca62c5bc8f6ef19cbb45c6bfd1952dda94c54a4b WHIRLPOOL 1f04729faf6fa47921c3b953d4a38db598d9905a35d198ff7680e778f214e5ec54026840de7a8bcfaf351fdceadd3d0ba3865dbbe95cbc28704b6cab9670b2d7
diff --git a/dev-util/gprof2dot/files/gprof2dot-0_p20100216-python3.patch b/dev-util/gprof2dot/files/gprof2dot-0_p20100216-python3.patch
new file mode 100644
index 000000000000..875ccbc1ebd9
--- /dev/null
+++ b/dev-util/gprof2dot/files/gprof2dot-0_p20100216-python3.patch
@@ -0,0 +1,489 @@
+From 6087a16e81d5c41647e05291dd25bb6eac9493eb Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 5 Nov 2010 18:10:29 +0100
+Subject: [PATCH] Support both Python 2.x and 3.x
+
+---
+ gprof2dot.py |  138 ++++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 81 insertions(+), 57 deletions(-)
+
+diff --git a/gprof2dot.py b/gprof2dot.py
+index bf0aba8..888081f 100755
+--- a/gprof2dot.py
++++ b/gprof2dot.py
+@@ -32,6 +32,27 @@ import optparse
+ import xml.parsers.expat
+ 
+ 
++# Python 2.x/3.x compatibility
++if sys.version_info[0] == 3:
++    PYTHON_3 = True
++    def compat_iteritems(x): return x.items()  # No iteritems() in Python 3
++    def compat_itervalues(x): return x.values()  # No itervalues() in Python 3
++    def compat_keys(x): return list(x.keys())  # keys() is a generator in Python 3
++    compat_basestring = str  # No class basestring in Python 3
++
++    CALL_TIMES_FORMAT = "%u\xd7"  # All strings are unicode in Python 3, no u"" marking
++else:
++    PYTHON_3 = False
++    def compat_iteritems(x): return x.iteritems()
++    def compat_itervalues(x): return x.itervalues()
++    def compat_keys(x): return x.keys()
++    compat_basestring = basestring
++
++    # u"" strings not supported in Python 3
++    # By using eval() we don't get a syntax error
++    CALL_TIMES_FORMAT = eval('u"%u\xd7"')
++
++
+ try:
+     # Debugging helper module
+     import debug
+@@ -40,7 +61,7 @@ except ImportError:
+ 
+ 
+ def times(x):
+-    return u"%u\xd7" % (x,)
++    return CALL_TIMES_FORMAT % (x,)
+ 
+ def percentage(p):
+     return "%.02f%%" % (p*100.0,)
+@@ -236,8 +257,8 @@ class Profile(Object):
+     def validate(self):
+         """Validate the edges."""
+ 
+-        for function in self.functions.itervalues():
+-            for callee_id in function.calls.keys():
++        for function in compat_itervalues(self.functions):
++            for callee_id in compat_keys(function.calls):
+                 assert function.calls[callee_id].callee_id == callee_id
+                 if callee_id not in self.functions:
+                     sys.stderr.write('warning: call to undefined function %s from function %s\n' % (str(callee_id), function.name))
+@@ -248,11 +269,11 @@ class Profile(Object):
+ 
+         # Apply the Tarjan's algorithm successively until all functions are visited
+         visited = set()
+-        for function in self.functions.itervalues():
++        for function in compat_itervalues(self.functions):
+             if function not in visited:
+                 self._tarjan(function, 0, [], {}, {}, visited)
+         cycles = []
+-        for function in self.functions.itervalues():
++        for function in compat_itervalues(self.functions):
+             if function.cycle is not None and function.cycle not in cycles:
+                 cycles.append(function.cycle)
+         self.cycles = cycles
+@@ -275,7 +296,7 @@ class Profile(Object):
+         order += 1
+         pos = len(stack)
+         stack.append(function)
+-        for call in function.calls.itervalues():
++        for call in compat_itervalues(function.calls):
+             callee = self.functions[call.callee_id]
+             # TODO: use a set to optimize lookup
+             if callee not in orders:
+@@ -299,10 +320,10 @@ class Profile(Object):
+         for cycle in self.cycles:
+             cycle_totals[cycle] = 0.0
+         function_totals = {}
+-        for function in self.functions.itervalues():
++        for function in compat_itervalues(self.functions):
+             function_totals[function] = 0.0
+-        for function in self.functions.itervalues():
+-            for call in function.calls.itervalues():
++        for function in compat_itervalues(self.functions):
++            for call in compat_itervalues(function.calls):
+                 if call.callee_id != function.id:
+                     callee = self.functions[call.callee_id]
+                     function_totals[callee] += call[event]
+@@ -310,8 +331,8 @@ class Profile(Object):
+                         cycle_totals[callee.cycle] += call[event]
+ 
+         # Compute the ratios
+-        for function in self.functions.itervalues():
+-            for call in function.calls.itervalues():
++        for function in compat_itervalues(self.functions):
++            for call in compat_itervalues(function.calls):
+                 assert call.ratio is None
+                 if call.callee_id != function.id:
+                     callee = self.functions[call.callee_id]
+@@ -332,10 +353,10 @@ class Profile(Object):
+ 
+         # Sanity checking
+         assert outevent not in self
+-        for function in self.functions.itervalues():
++        for function in compat_itervalues(self.functions):
+             assert outevent not in function
+             assert inevent in function
+-            for call in function.calls.itervalues():
++            for call in compat_itervalues(function.calls):
+                 assert outevent not in call
+                 if call.callee_id != function.id:
+                     assert call.ratio is not None
+@@ -343,13 +364,13 @@ class Profile(Object):
+         # Aggregate the input for each cycle 
+         for cycle in self.cycles:
+             total = inevent.null()
+-            for function in self.functions.itervalues():
++            for function in compat_itervalues(self.functions):
+                 total = inevent.aggregate(total, function[inevent])
+             self[inevent] = total
+ 
+         # Integrate along the edges
+         total = inevent.null()
+-        for function in self.functions.itervalues():
++        for function in compat_itervalues(self.functions):
+             total = inevent.aggregate(total, function[inevent])
+             self._integrate_function(function, outevent, inevent)
+         self[outevent] = total
+@@ -360,7 +381,7 @@ class Profile(Object):
+         else:
+             if outevent not in function:
+                 total = function[inevent]
+-                for call in function.calls.itervalues():
++                for call in compat_itervalues(function.calls):
+                     if call.callee_id != function.id:
+                         total += self._integrate_call(call, outevent, inevent)
+                 function[outevent] = total
+@@ -381,7 +402,7 @@ class Profile(Object):
+             total = inevent.null()
+             for member in cycle.functions:
+                 subtotal = member[inevent]
+-                for call in member.calls.itervalues():
++                for call in compat_itervalues(member.calls):
+                     callee = self.functions[call.callee_id]
+                     if callee.cycle is not cycle:
+                         subtotal += self._integrate_call(call, outevent, inevent)
+@@ -390,9 +411,9 @@ class Profile(Object):
+             
+             # Compute the time propagated to callers of this cycle
+             callees = {}
+-            for function in self.functions.itervalues():
++            for function in compat_itervalues(self.functions):
+                 if function.cycle is not cycle:
+-                    for call in function.calls.itervalues():
++                    for call in compat_itervalues(function.calls):
+                         callee = self.functions[call.callee_id]
+                         if callee.cycle is cycle:
+                             try:
+@@ -403,7 +424,7 @@ class Profile(Object):
+             for member in cycle.functions:
+                 member[outevent] = outevent.null()
+ 
+-            for callee, call_ratio in callees.iteritems():
++            for callee, call_ratio in compat_iteritems(callees):
+                 ranks = {}
+                 call_ratios = {}
+                 partials = {}
+@@ -418,7 +439,7 @@ class Profile(Object):
+     def _rank_cycle_function(self, cycle, function, rank, ranks):
+         if function not in ranks or ranks[function] > rank:
+             ranks[function] = rank
+-            for call in function.calls.itervalues():
++            for call in compat_itervalues(function.calls):
+                 if call.callee_id != function.id:
+                     callee = self.functions[call.callee_id]
+                     if callee.cycle is cycle:
+@@ -427,7 +448,7 @@ class Profile(Object):
+     def _call_ratios_cycle(self, cycle, function, ranks, call_ratios, visited):
+         if function not in visited:
+             visited.add(function)
+-            for call in function.calls.itervalues():
++            for call in compat_itervalues(function.calls):
+                 if call.callee_id != function.id:
+                     callee = self.functions[call.callee_id]
+                     if callee.cycle is cycle:
+@@ -438,7 +459,7 @@ class Profile(Object):
+     def _integrate_cycle_function(self, cycle, function, partial_ratio, partials, ranks, call_ratios, outevent, inevent):
+         if function not in partials:
+             partial = partial_ratio*function[inevent]
+-            for call in function.calls.itervalues():
++            for call in compat_itervalues(function.calls):
+                 if call.callee_id != function.id:
+                     callee = self.functions[call.callee_id]
+                     if callee.cycle is not cycle:
+@@ -465,7 +486,7 @@ class Profile(Object):
+         """Aggregate an event for the whole profile."""
+ 
+         total = event.null()
+-        for function in self.functions.itervalues():
++        for function in compat_itervalues(self.functions):
+             try:
+                 total = event.aggregate(total, function[event])
+             except UndefinedEvent:
+@@ -475,11 +496,11 @@ class Profile(Object):
+     def ratio(self, outevent, inevent):
+         assert outevent not in self
+         assert inevent in self
+-        for function in self.functions.itervalues():
++        for function in compat_itervalues(self.functions):
+             assert outevent not in function
+             assert inevent in function
+             function[outevent] = ratio(function[inevent], self[inevent])
+-            for call in function.calls.itervalues():
++            for call in compat_itervalues(function.calls):
+                 assert outevent not in call
+                 if inevent in call:
+                     call[outevent] = ratio(call[inevent], self[inevent])
+@@ -489,13 +510,13 @@ class Profile(Object):
+         """Prune the profile"""
+ 
+         # compute the prune ratios
+-        for function in self.functions.itervalues():
++        for function in compat_itervalues(self.functions):
+             try:
+                 function.weight = function[TOTAL_TIME_RATIO]
+             except UndefinedEvent:
+                 pass
+ 
+-            for call in function.calls.itervalues():
++            for call in compat_itervalues(function.calls):
+                 callee = self.functions[call.callee_id]
+ 
+                 if TOTAL_TIME_RATIO in call:
+@@ -509,24 +530,24 @@ class Profile(Object):
+                         pass
+ 
+         # prune the nodes
+-        for function_id in self.functions.keys():
++        for function_id in compat_keys(self.functions):
+             function = self.functions[function_id]
+             if function.weight is not None:
+                 if function.weight < node_thres:
+                     del self.functions[function_id]
+ 
+         # prune the egdes
+-        for function in self.functions.itervalues():
+-            for callee_id in function.calls.keys():
++        for function in compat_itervalues(self.functions):
++            for callee_id in compat_keys(function.calls):
+                 call = function.calls[callee_id]
+                 if callee_id not in self.functions or call.weight is not None and call.weight < edge_thres:
+                     del function.calls[callee_id]
+     
+     def dump(self):
+-        for function in self.functions.itervalues():
++        for function in compat_itervalues(self.functions):
+             sys.stderr.write('Function %s:\n' % (function.name,))
+             self._dump_events(function.events)
+-            for call in function.calls.itervalues():
++            for call in compat_itervalues(function.calls):
+                 callee = self.functions[call.callee_id]
+                 sys.stderr.write('  Call %s:\n' % (callee.name,))
+                 self._dump_events(call.events)
+@@ -537,7 +558,7 @@ class Profile(Object):
+                 sys.stderr.write('  Function %s\n' % (function.name,))
+ 
+     def _dump_events(self, events):
+-        for event, value in events.iteritems():
++        for event, value in compat_iteritems(events):
+             sys.stderr.write('    %s: %s\n' % (event.name, event.format(value)))
+ 
+ 
+@@ -695,7 +716,7 @@ class XmlTokenizer:
+             self.final = len(data) < size
+             try:
+                 self.parser.Parse(data, self.final)
+-            except xml.parsers.expat.ExpatError, e:
++            except xml.parsers.expat.ExpatError as e:
+                 #if e.code == xml.parsers.expat.errors.XML_ERROR_NO_ELEMENTS:
+                 if e.code == 3:
+                     pass
+@@ -801,7 +822,7 @@ class GprofParser(Parser):
+         """Extract a structure from a match object, while translating the types in the process."""
+         attrs = {}
+         groupdict = mo.groupdict()
+-        for name, value in groupdict.iteritems():
++        for name, value in compat_iteritems(groupdict):
+             if value is None:
+                 value = None
+             elif self._int_re.match(value):
+@@ -977,7 +998,7 @@ class GprofParser(Parser):
+         for index in self.cycles.iterkeys():
+             cycles[index] = Cycle()
+ 
+-        for entry in self.functions.itervalues():
++        for entry in compat_itervalues(self.functions):
+             # populate the function
+             function = Function(entry.index, entry.name)
+             function[TIME] = entry.self
+@@ -1019,7 +1040,7 @@ class GprofParser(Parser):
+ 
+             profile[TIME] = profile[TIME] + function[TIME]
+ 
+-        for cycle in cycles.itervalues():
++        for cycle in compat_itervalues(cycles):
+             profile.add_cycle(cycle)
+ 
+         # Compute derived events
+@@ -1350,7 +1371,7 @@ class OprofileParser(LineParser):
+             self.update_subentries_dict(callees_total, callees)
+     
+     def update_subentries_dict(self, totals, partials):
+-        for partial in partials.itervalues():
++        for partial in compat_itervalues(partials):
+             try:
+                 total = totals[partial.id]
+             except KeyError:
+@@ -1372,7 +1393,7 @@ class OprofileParser(LineParser):
+         
+         # populate the profile
+         profile[SAMPLES] = 0
+-        for _callers, _function, _callees in self.entries.itervalues():
++        for _callers, _function, _callees in compat_itervalues(self.entries):
+             function = Function(_function.id, _function.name)
+             function[SAMPLES] = _function.samples
+             profile.add_function(function)
+@@ -1384,10 +1405,10 @@ class OprofileParser(LineParser):
+                 function.module = os.path.basename(_function.image)
+ 
+             total_callee_samples = 0
+-            for _callee in _callees.itervalues():
++            for _callee in compat_itervalues(_callees):
+                 total_callee_samples += _callee.samples
+ 
+-            for _callee in _callees.itervalues():
++            for _callee in compat_itervalues(_callees):
+                 if not _callee.self:
+                     call = Call(_callee.id)
+                     call[SAMPLES2] = _callee.samples
+@@ -1548,7 +1569,7 @@ class SysprofParser(XmlParser):
+         profile = Profile()
+         
+         profile[SAMPLES] = 0
+-        for id, object in objects.iteritems():
++        for id, object in compat_iteritems(objects):
+             # Ignore fake objects (process names, modules, "Everything", "kernel", etc.)
+             if object['self'] == 0:
+                 continue
+@@ -1558,7 +1579,7 @@ class SysprofParser(XmlParser):
+             profile.add_function(function)
+             profile[SAMPLES] += function[SAMPLES]
+ 
+-        for id, node in nodes.iteritems():
++        for id, node in compat_iteritems(nodes):
+             # Ignore fake calls
+             if node['self'] == 0:
+                 continue
+@@ -1672,7 +1693,7 @@ class SharkParser(LineParser):
+                 
+         profile = Profile()
+         profile[SAMPLES] = 0
+-        for _function, _callees in self.entries.itervalues():
++        for _function, _callees in compat_itervalues(self.entries):
+             function = Function(_function.id, _function.name)
+             function[SAMPLES] = _function.samples
+             profile.add_function(function)
+@@ -1681,7 +1702,7 @@ class SharkParser(LineParser):
+             if _function.image:
+                 function.module = os.path.basename(_function.image)
+ 
+-            for _callee in _callees.itervalues():
++            for _callee in compat_itervalues(_callees):
+                 call = Call(_callee.id)
+                 call[SAMPLES] = _callee.samples
+                 function.add_call(call)
+@@ -1965,7 +1986,8 @@ class PstatsParser:
+         self.profile = Profile()
+         self.function_ids = {}
+ 
+-    def get_function_name(self, (filename, line, name)):
++    def get_function_name(self, info):
++        filename, line, name = info
+         module = os.path.splitext(filename)[0]
+         module = os.path.basename(module)
+         return "%s:%d:%s" % (module, line, name)
+@@ -1986,14 +2008,14 @@ class PstatsParser:
+     def parse(self):
+         self.profile[TIME] = 0.0
+         self.profile[TOTAL_TIME] = self.stats.total_tt
+-        for fn, (cc, nc, tt, ct, callers) in self.stats.stats.iteritems():
++        for fn, (cc, nc, tt, ct, callers) in compat_iteritems(self.stats.stats):
+             callee = self.get_function(fn)
+             callee.called = nc
+             callee[TOTAL_TIME] = ct
+             callee[TIME] = tt
+             self.profile[TIME] += tt
+             self.profile[TOTAL_TIME] = max(self.profile[TOTAL_TIME], ct)
+-            for fn, value in callers.iteritems():
++            for fn, value in compat_iteritems(callers):
+                 caller = self.get_function(fn)
+                 call = Call(callee.id)
+                 if isinstance(value, tuple):
+@@ -2190,7 +2212,7 @@ class DotWriter:
+         self.attr('node', fontname=fontname, shape="box", style="filled", fontcolor="white", width=0, height=0)
+         self.attr('edge', fontname=fontname)
+ 
+-        for function in profile.functions.itervalues():
++        for function in compat_itervalues(profile.functions):
+             labels = []
+             if function.process is not None:
+                 labels.append(function.process)
+@@ -2202,7 +2224,7 @@ class DotWriter:
+                     label = event.format(function[event])
+                     labels.append(label)
+             if function.called is not None:
+-                labels.append(u"%u\xd7" % (function.called,))
++                labels.append(CALL_TIMES_FORMAT % (function.called,))
+ 
+             if function.weight is not None:
+                 weight = function.weight
+@@ -2217,7 +2239,7 @@ class DotWriter:
+                 fontsize = "%.2f" % theme.node_fontsize(weight),
+             )
+ 
+-            for call in function.calls.itervalues():
++            for call in compat_itervalues(function.calls):
+                 callee = profile.functions[call.callee_id]
+ 
+                 labels = []
+@@ -2278,7 +2300,7 @@ class DotWriter:
+             return
+         self.write(' [')
+         first = True
+-        for name, value in attrs.iteritems():
++        for name, value in compat_iteritems(attrs):
+             if first:
+                 first = False
+             else:
+@@ -2291,7 +2313,7 @@ class DotWriter:
+     def id(self, id):
+         if isinstance(id, (int, float)):
+             s = str(id)
+-        elif isinstance(id, basestring):
++        elif isinstance(id, compat_basestring):
+             if id.isalnum() and not id.startswith('0x'):
+                 s = id
+             else:
+@@ -2300,7 +2322,8 @@ class DotWriter:
+             raise TypeError
+         self.write(s)
+ 
+-    def color(self, (r, g, b)):
++    def color(self, rgb):
++        r, g, b = rgb
+ 
+         def float2int(f):
+             if f <= 0.0:
+@@ -2312,7 +2335,8 @@ class DotWriter:
+         return "#" + "".join(["%02x" % float2int(c) for c in (r, g, b)])
+ 
+     def escape(self, s):
+-        s = s.encode('utf-8')
++        if not PYTHON_3:
++            s = s.encode('utf-8')
+         s = s.replace('\\', r'\\')
+         s = s.replace('\n', r'\n')
+         s = s.replace('\t', r'\t')
+@@ -2505,7 +2529,7 @@ class Main:
+         profile = self.profile
+         profile.prune(self.options.node_thres/100.0, self.options.edge_thres/100.0)
+ 
+-        for function in profile.functions.itervalues():
++        for function in compat_itervalues(profile.functions):
+             function.name = self.compress_function_name(function.name)
+ 
+         dot.graph(profile, self.theme)
+-- 
+1.7.3.2
+
diff --git a/dev-util/gprof2dot/files/gprof2dot-0_p20130517-py3-xrange.patch b/dev-util/gprof2dot/files/gprof2dot-0_p20130517-py3-xrange.patch
new file mode 100644
index 000000000000..228b1d8230d7
--- /dev/null
+++ b/dev-util/gprof2dot/files/gprof2dot-0_p20130517-py3-xrange.patch
@@ -0,0 +1,10 @@
+--- gprof2dot.py	2013-05-29 19:18:46.217823810 +0300
++++ gprof2dot.py	2013-06-16 12:12:28.095478734 +0300
+@@ -39,6 +39,7 @@
+     def compat_keys(x): return list(x.keys())  # keys() is a generator in Python 3
+     basestring = str  # No class basestring in Python 3
+     unichr = chr # No unichr in Python 3
++    xrange = range # No xrange in Python 3
+ else:
+     PYTHON_3 = False
+     def compat_iteritems(x): return x.iteritems()
diff --git a/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild b/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
new file mode 100644
index 000000000000..ec4cff4d96dc
--- /dev/null
+++ b/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
@@ -0,0 +1,51 @@
+# 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} )
+PYTHON_REQ_USE='xml'
+
+inherit eutils python-r1
+
+DESCRIPTION="Converts profiling output to dot graphs"
+HOMEPAGE="http://code.google.com/p/jrfonseca/wiki/Gprof2Dot"
+SRC_URI="http://www.hartwork.org/public/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-py3-xrange.patch
+}
+
+_make_call_script() {
+	cat <<-EOF >"${D}/$1"
+	#! /usr/bin/env python
+	from gprof2dot import Main
+	Main().main()
+	EOF
+
+	fperms a+x "$1" || die
+}
+
+src_install() {
+	abi_specific_install() {
+		insinto "$(python_get_sitedir)"
+		doins ${PN}.py || die
+		python_optimize || die
+	}
+	python_parallel_foreach_impl abi_specific_install
+
+	dodir /usr/bin || die
+	_make_call_script /usr/bin/${PN} || die
+	python_replicate_script "${D}"/usr/bin/${PN} || die
+}
diff --git a/dev-util/gprof2dot/metadata.xml b/dev-util/gprof2dot/metadata.xml
new file mode 100644
index 000000000000..16bcc9f800a2
--- /dev/null
+++ b/dev-util/gprof2dot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/gquilt/Manifest b/dev-util/gquilt/Manifest
new file mode 100644
index 000000000000..021330d23b6b
--- /dev/null
+++ b/dev-util/gquilt/Manifest
@@ -0,0 +1 @@
+DIST gquilt-0.25.tar.gz 124957 SHA256 6cc8380e1475166ccd1ea339f691af85b0ca1dd64222046440734f4f4b97d846 SHA512 fd1b98e87b3bc8438620a7105664c487a5fcfed50ade3e144802fc080dfe3a7d94c76f7ff7274d5a98003cffd8305cf9f193b2f799f4846d59e60233f1782f0d WHIRLPOOL d57c63fc877b9d3980589daca53fcd88ccebd108bea9e12ebb873a25b7d5981d89de28cdf24819844704817329b39400cc3536c6f765c4d982b5d0833435e9a6
diff --git a/dev-util/gquilt/files/gquilt-0.25-desktopfile.patch b/dev-util/gquilt/files/gquilt-0.25-desktopfile.patch
new file mode 100644
index 000000000000..e5134a6caa91
--- /dev/null
+++ b/dev-util/gquilt/files/gquilt-0.25-desktopfile.patch
@@ -0,0 +1,17 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Dec  2 13:22:44 UTC 2012
+Subject: match fd.o spec
+
+--- gquilt.desktop
++++ gquilt.desktop
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=gquilt Patch Manager
+ GenericName=Quilt Patch Manager
+ Exec=gquilt
+ Terminal=false
+ Type=Application
+ Icon=gquilt
+-Categories=GNOME;Application;Development;X-Fedora;
++Categories=GNOME;Development;X-Fedora;
diff --git a/dev-util/gquilt/gquilt-0.25-r1.ebuild b/dev-util/gquilt/gquilt-0.25-r1.ebuild
new file mode 100644
index 000000000000..c51f4651eaea
--- /dev/null
+++ b/dev-util/gquilt/gquilt-0.25-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A Python/GTK wrapper for quilt"
+HOMEPAGE="http://gquilt.sourceforge.net/ http://sourceforge.net/projects/gquilt/"
+SRC_URI="mirror://sourceforge/gquilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]
+	|| ( dev-util/quilt dev-vcs/mercurial )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+PATCHES=( "${FILESDIR}"/${P}-desktopfile.patch )
+
+python_install_all() {
+	distutils-r1_python_install_all
+	domenu ${PN}.desktop
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
diff --git a/dev-util/gquilt/metadata.xml b/dev-util/gquilt/metadata.xml
new file mode 100644
index 000000000000..3d6d79c9f3b8
--- /dev/null
+++ b/dev-util/gquilt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>dev-tools</herd>
+	<upstream>
+		<remote-id type="sourceforge">gquilt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
new file mode 100644
index 000000000000..f0e9195a3a8c
--- /dev/null
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -0,0 +1,3 @@
+DIST gtk+-2.24.25.tar.xz 13327832 SHA256 38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d WHIRLPOOL b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3
+DIST gtk+-2.24.27.tar.xz 13349252 SHA256 20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4 SHA512 ffe981a41137302713a411039238604e92d41146e25ea0643857ec40388ddfe69cbb15bdc1aa8300b87ddbb4d6fbcf0054cdb7ba39634fbe4bfd1802f5bc8ac6 WHIRLPOOL 02259afb7a410fe941b9cc20e8031d61d5dd90f2ac532e3b8525b203997cfa57999286cd59e76ef152a68de35f08e8712dc4b9cd107633f2ba2433eba633197c
+DIST gtk+-2.24.28.tar.xz 13354884 SHA256 b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 SHA512 86d563645ca70c1e14afd4b38d925f496e596cbf6181f2e95310f58c2f4152aaecc559e3c513e6d405fcf48d8d413d59a9d72782216529c1280bd8e1947d7760 WHIRLPOOL b4943bb7792f962e0fc50a118f0dbce58a79678e1a98632717a2f3bda4ddd99b62ce9aed3b14f1c0912a4b53eb975991527843985f625c5a9e052db4889acfb0
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.25.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.25.ebuild
new file mode 100644
index 000000000000..ce0b268daa6a
--- /dev/null
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.25.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="gtk+"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Converts Glade files to GtkBuilder XML format"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# gtk-builder-convert was part of gtk+ until 2.24.10-r1
+COMMON_DEPEND="${PYTHON_DEPS}"
+
+RDEPEND="${COMMON_DEPEND}
+	!<=x11-libs/gtk+-2.24.10:2
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	cd gtk || die
+	python_doscript gtk-builder-convert
+}
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.27.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.27.ebuild
new file mode 100644
index 000000000000..712376d52b40
--- /dev/null
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.27.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="gtk+"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Converts Glade files to GtkBuilder XML format"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# gtk-builder-convert was part of gtk+ until 2.24.10-r1
+COMMON_DEPEND="${PYTHON_DEPS}"
+
+RDEPEND="${COMMON_DEPEND}
+	!<=x11-libs/gtk+-2.24.10:2
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	cd gtk || die
+	python_doscript gtk-builder-convert
+}
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.28.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.28.ebuild
new file mode 100644
index 000000000000..cf651b9310c0
--- /dev/null
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.28.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="gtk+"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Converts Glade files to GtkBuilder XML format"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# gtk-builder-convert was part of gtk+ until 2.24.10-r1
+COMMON_DEPEND="${PYTHON_DEPS}"
+
+RDEPEND="${COMMON_DEPEND}
+	!<=x11-libs/gtk+-2.24.10:2
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	cd gtk || die
+	python_doscript gtk-builder-convert
+}
diff --git a/dev-util/gtk-builder-convert/metadata.xml b/dev-util/gtk-builder-convert/metadata.xml
new file mode 100644
index 000000000000..6e0e2ecb48ca
--- /dev/null
+++ b/dev-util/gtk-builder-convert/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>gnome</herd>
+</pkgmetadata>
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
new file mode 100644
index 000000000000..9bb6d3238c39
--- /dev/null
+++ b/dev-util/gtk-doc-am/Manifest
@@ -0,0 +1,2 @@
+DIST gtk-doc-1.21.tar.xz 647484 SHA256 5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e SHA512 caef8f6fd42f2961b6703af6d8b9f003b6e6ba2e9e955b94d9c0ecce8d267b7f4c2315d273dbdca1aff244e81867e675434b09a9410248e93101e86105f60f9d WHIRLPOOL cd72184e6f58745573d8bec785b0a8c61f3f68ff9c20254dd6a03e113aeac1672a8408f03c84918c523e2031a98fd5d75990d9377ea8444c2ce7fdba03dfaccc
+DIST gtk-doc-1.24.tar.xz 669664 SHA256 b420759ea05c760301bada14e428f1b321f5312f44e10a176d6804822dabb58b SHA512 a0095efed339cb101dcd947fdc1789edd4a59d7005f6328c68973133795e34819fffdccb4591725b78f8409be95158604387deb681e78ebce0356503de1377a4 WHIRLPOOL b0af2db253147dbf58738e5e66964e6b2000cd3d30f3ef138c81d544a6c12ba2a3b32f71acf3b7677c8562fe945b1d63fe212b99b4f4bb53ccd256bcacb9ad71
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.21.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.21.ebuild
new file mode 100644
index 000000000000..a39804d8911f
--- /dev/null
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.21.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GNOME_ORG_MODULE="gtk-doc"
+
+inherit gnome.org
+
+DESCRIPTION="Automake files from gtk-doc"
+HOMEPAGE="http://www.gtk.org/gtk-doc/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6"
+DEPEND="${RDEPEND}
+	!<dev-util/gtk-doc-${GNOME_ORG_PVP}
+"
+# pkg-config is used by gtkdoc-rebase at runtime
+# PDEPEND to avoid circular deps, bug 368301
+PDEPEND="virtual/pkgconfig"
+
+# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
+RESTRICT="test"
+
+src_configure() {
+	# Duplicate autoconf checks so we don't have to call configure
+	local PERL=$(type -P perl)
+
+	test -n "${PERL}" || die "Perl not found!"
+	"${PERL}" -e "require v5.6.0" || die "perl >= 5.6.0 is required for gtk-doc"
+
+	# Replicate AC_SUBST
+	sed -e "s:@PERL@:${PERL}:g" -e "s:@VERSION@:${PV}:g" \
+		"${S}/gtkdoc-rebase.in" > "${S}/gtkdoc-rebase" || die "sed failed!"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin gtkdoc-rebase
+
+	insinto /usr/share/aclocal
+	doins gtk-doc.m4
+}
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.24.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.24.ebuild
new file mode 100644
index 000000000000..5421066fb5c5
--- /dev/null
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.24.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GNOME_ORG_MODULE="gtk-doc"
+
+inherit gnome.org
+
+DESCRIPTION="Automake files from gtk-doc"
+HOMEPAGE="http://www.gtk.org/gtk-doc/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6"
+DEPEND="${RDEPEND}
+	!<dev-util/gtk-doc-${GNOME_ORG_PVP}
+"
+# pkg-config is used by gtkdoc-rebase at runtime
+# PDEPEND to avoid circular deps, bug 368301
+PDEPEND="virtual/pkgconfig"
+
+# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
+RESTRICT="test"
+
+src_configure() {
+	# Duplicate autoconf checks so we don't have to call configure
+	local PERL=$(type -P perl)
+
+	test -n "${PERL}" || die "Perl not found!"
+	"${PERL}" -e "require v5.6.0" || die "perl >= 5.6.0 is required for gtk-doc"
+
+	# Replicate AC_SUBST
+	sed -e "s:@PERL@:${PERL}:g" -e "s:@VERSION@:${PV}:g" \
+		"${S}/gtkdoc-rebase.in" > "${S}/gtkdoc-rebase" || die "sed failed!"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin gtkdoc-rebase
+
+	insinto /usr/share/aclocal
+	doins gtk-doc.m4
+}
diff --git a/dev-util/gtk-doc-am/metadata.xml b/dev-util/gtk-doc-am/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/dev-util/gtk-doc-am/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>gnome</herd>
+</pkgmetadata>
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
new file mode 100644
index 000000000000..9bb6d3238c39
--- /dev/null
+++ b/dev-util/gtk-doc/Manifest
@@ -0,0 +1,2 @@
+DIST gtk-doc-1.21.tar.xz 647484 SHA256 5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e SHA512 caef8f6fd42f2961b6703af6d8b9f003b6e6ba2e9e955b94d9c0ecce8d267b7f4c2315d273dbdca1aff244e81867e675434b09a9410248e93101e86105f60f9d WHIRLPOOL cd72184e6f58745573d8bec785b0a8c61f3f68ff9c20254dd6a03e113aeac1672a8408f03c84918c523e2031a98fd5d75990d9377ea8444c2ce7fdba03dfaccc
+DIST gtk-doc-1.24.tar.xz 669664 SHA256 b420759ea05c760301bada14e428f1b321f5312f44e10a176d6804822dabb58b SHA512 a0095efed339cb101dcd947fdc1789edd4a59d7005f6328c68973133795e34819fffdccb4591725b78f8409be95158604387deb681e78ebce0356503de1377a4 WHIRLPOOL b0af2db253147dbf58738e5e66964e6b2000cd3d30f3ef138c81d544a6c12ba2a3b32f71acf3b7677c8562fe945b1d63fe212b99b4f4bb53ccd256bcacb9ad71
diff --git a/dev-util/gtk-doc/files/61gtk-doc-gentoo.el b/dev-util/gtk-doc/files/61gtk-doc-gentoo.el
new file mode 100644
index 000000000000..488a57c02555
--- /dev/null
+++ b/dev-util/gtk-doc/files/61gtk-doc-gentoo.el
@@ -0,0 +1,9 @@
+
+;;; gtk-doc site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'gtk-doc-insert "gtk-doc"
+  "Add a documentation header to the current function." t)
+(autoload 'gtk-doc-insert-section "gtk-doc"
+  "Add a section documentation header at the current position." t)
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch b/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch
new file mode 100644
index 000000000000..bbc989afb2b7
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch
@@ -0,0 +1,17 @@
+--- gtk-doc-1.8-orig/tools/gtk-doc.el	2007-01-03 16:04:14.000000000 +0100
++++ gtk-doc-1.8/tools/gtk-doc.el	2007-07-29 21:56:45.000000000 +0200
+@@ -262,7 +262,7 @@
+ 
+ ;; set global binding for this key (follows the format for
+ ;;   creating a changelog entry ...)
+-(global-set-key "\C-x4h"  'gtk-doc-insert)
++;;(global-set-key "\C-x4h"  'gtk-doc-insert)
+ 
+ 
+ ;; Define another function for inserting a section header.
+@@ -280,4 +280,4 @@
+ 	  " */\n"))
+ 
+ ;; Set the key binding.
+-(global-set-key "\C-x4s" 'gtk-doc-insert-section)
++;;(global-set-key "\C-x4s" 'gtk-doc-insert-section)
diff --git a/dev-util/gtk-doc/gtk-doc-1.21.ebuild b/dev-util/gtk-doc/gtk-doc-1.21.ebuild
new file mode 100644
index 000000000000..7fdf72261791
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.21.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo
+
+DESCRIPTION="GTK+ Documentation Generator"
+HOMEPAGE="http://www.gtk.org/gtk-doc/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+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 ~x86-macos ~sparc-solaris ~x64-solaris"
+
+IUSE="doc emacs highlight vim test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# dev-tex/tex4ht blocker needed due bug #315287
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	>=dev-lang/perl-5.6
+	>=app-text/openjade-1.3.1
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6:2
+	~app-text/docbook-xml-dtd-4.3
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( virtual/emacs )
+	highlight? (
+		vim? ( || ( app-editors/vim app-editors/gvim ) )
+		!vim? ( dev-util/source-highlight )
+	)
+	!!<dev-tex/tex4ht-20090611_p1038-r1
+"
+DEPEND="${RDEPEND}
+	~dev-util/gtk-doc-am-${PV}
+	app-text/yelp-tools
+	>=app-text/scrollkeeper-0.3.14
+	virtual/pkgconfig
+	test? ( app-text/scrollkeeper-dtd )
+"
+
+pkg_setup() {
+	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
+		You may set your own key bindings for \"gtk-doc-insert\" and
+		\"gtk-doc-insert-section\" in your ~/.emacs file."
+	SITEFILE=61${PN}-gentoo.el
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Always disable fop; it is unreliable enough that gtk-doc upstream
+	# commented it out by default, and if it's autodetected, it causes build
+	# failures in other packages, bug #403165
+	sed -e 's:test -n "@FOP@":test -n "":' \
+		-i gtkdoc-mkpdf.in || die "sed failed"
+
+	# Remove global Emacs keybindings, bug #184588
+	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	if use vim; then
+		myconf="${myconf} $(use_with highlight highlight vim)"
+	else
+		G2CONF="${myconf} $(use_with highlight highlight source-highlight)"
+	fi
+
+	gnome2_src_configure \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog" \
+		${myconf}
+}
+
+src_compile() {
+	gnome2_src_compile
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	gnome2_src_install
+
+	python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan
+
+	# Don't install those files, they are in gtk-doc-am now
+	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+	rm "${ED}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		docinto examples
+		dodoc examples/*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use emacs; then
+		elisp-site-regen
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/gtk-doc/gtk-doc-1.24.ebuild b/dev-util/gtk-doc/gtk-doc-1.24.ebuild
new file mode 100644
index 000000000000..46298862228e
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.24.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo
+
+DESCRIPTION="GTK+ Documentation Generator"
+HOMEPAGE="http://www.gtk.org/gtk-doc/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+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 ~x86-macos ~sparc-solaris ~x64-solaris"
+
+IUSE="doc emacs highlight vim"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# dev-tex/tex4ht blocker needed due bug #315287
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	>=dev-lang/perl-5.6
+	>=app-text/openjade-1.3.1
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6:2
+	~app-text/docbook-xml-dtd-4.3
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( virtual/emacs )
+	highlight? (
+		vim? ( || ( app-editors/vim app-editors/gvim ) )
+		!vim? ( dev-util/source-highlight )
+	)
+	!!<dev-tex/tex4ht-20090611_p1038-r1
+"
+DEPEND="${RDEPEND}
+	~dev-util/gtk-doc-am-${PV}
+	app-text/yelp-tools
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
+		You may set your own key bindings for \"gtk-doc-insert\" and
+		\"gtk-doc-insert-section\" in your ~/.emacs file."
+	SITEFILE=61${PN}-gentoo.el
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Always disable fop; it is unreliable enough that gtk-doc upstream
+	# commented it out by default, and if it's autodetected, it causes build
+	# failures in other packages, bug #403165
+	sed -e 's:test -n "@FOP@":test -n "":' \
+		-i gtkdoc-mkpdf.in || die "sed failed"
+
+	# Remove global Emacs keybindings, bug #184588
+	epatch "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	if use vim; then
+		myconf="${myconf} $(use_with highlight highlight vim)"
+	else
+		myconf="${myconf} $(use_with highlight highlight source-highlight)"
+	fi
+
+	gnome2_src_configure \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		${myconf}
+}
+
+src_compile() {
+	gnome2_src_compile
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	gnome2_src_install
+
+	python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan
+
+	# Don't install those files, they are in gtk-doc-am now
+	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+	rm "${ED}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		docinto examples
+		dodoc examples/*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use emacs; then
+		elisp-site-regen
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/gtk-doc/metadata.xml b/dev-util/gtk-doc/metadata.xml
new file mode 100644
index 000000000000..a562fd84b87c
--- /dev/null
+++ b/dev-util/gtk-doc/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+	<flag name="highlight">Enable source code highlighting</flag>
+	<flag name="vim">Enable source code highlighting through
+	<pkg>app-editors/vim</pkg></flag>
+</use>
+<longdescription lang="en">
+	GTK-Doc is used to document C code.
+	It is typically used to document the public API of libraries,
+	such as the GTK+ and GNOME libraries, but it can also be used
+	to document application code.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
new file mode 100644
index 000000000000..42a507e1cd78
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -0,0 +1,4 @@
+DIST gtk-update-icon-cache-2.24.27.tar.xz 285228 SHA256 ae01d2c6aaededa1ddd7aac3ff1e6a7619a8854961ecf2297b72ab0bb36736e4 SHA512 71deed19785244a1af08c71bbbff54436762b95eddecd530ded06190127dff7e1e72dcf764377737bfcbc125528b434be76939cae33e79755fe23da8e503297c WHIRLPOOL 4aa6d8a98972bfe5a99cacf82dccb5e1224a74a198b89a3c33c232b6d08bab547c9dc5748a3c308dd0f38ff2cfa7f908b2e906c212a1e82deea32c91cc92a309
+DIST gtk-update-icon-cache-3.14.13.tar.xz 306376 SHA256 1e054574afc7c954c3d0d231007698a2ec6fd1655dc388572343376157f01f35 SHA512 eb6994a6a7a738e9b50a2c812fa0fb88b3c7516662059190ddeb6d61abdec5f00efcc44fc278bd42b8fca2c171c0746e8412b4b7294b65b75d41fa4289dff175 WHIRLPOOL cf10ae3e8abb6db3eb040d04c2d39a9909fa45935084d6d2591a96e1f4dd58c000d4d1b6af766e9d8402f6409d626f4817bda76d36aaf1a620c49f1738b78355
+DIST gtk-update-icon-cache-3.16.3.tar.xz 316384 SHA256 067a918331acf9fcdb6ef3bfc03274aa9d045cc8d4aa9ba6f21aafb7a088fe7f SHA512 b8e6d127403cb3a9a384822dd93aee6191532746632d4364953df7321b5f0900dffea3617ed8e9ea9cfb3ecd27978f88ddc43e5ec3882c602c37a3b0e6fa1b04 WHIRLPOOL 6b0ed55cb28cca15259b1f349cf04eb3736e0a31a5fff538d143a1d76e0380650cecf4aa0b88c270da3c69dfe0523c698874a8d8e4f0b30d5023a6eb5f72d619
+DIST gtk-update-icon-cache-3.16.4.tar.xz 316704 SHA256 583d03906f8138756c47e682cc4afe255f24c0ac673605d48b7c542205000ec8 SHA512 b2071a39b16176f20e84b0ca73b28d46daba2a6428f57e917f58df2b084698ba20570f2fa9fbecd448936e5af1f528b014275b33c0bf86d1a4559a76f0b56082 WHIRLPOOL 91cc77b09c6c363ff0a70b5614f9f43ca0c1a1dab8610b58b1464e92129a9d600231ad8bd93d65ba61447d6af9c6da1499d24915e2811df0b67cd27cb623b3be
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild
new file mode 100644
index 000000000000..01689e8958fb
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gdk-pixbuf-2.21:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	virtual/pkgconfig
+"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.14.13.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.14.13.ebuild
new file mode 100644
index 000000000000..9ff0b9598ed8
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.14.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.41.2:2
+	>=x11-libs/gdk-pixbuf-2.30:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	virtual/pkgconfig
+"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild
new file mode 100644
index 000000000000..609e36e16af3
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gdk-pixbuf-2.30:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	virtual/pkgconfig
+"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.4.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.4.ebuild
new file mode 100644
index 000000000000..424617c1bfe8
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gdk-pixbuf-2.30:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/dev-util/gtk-update-icon-cache/metadata.xml b/dev-util/gtk-update-icon-cache/metadata.xml
new file mode 100644
index 000000000000..dd9bec3a3e87
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <longdescription lang="en">
+    gtk-update-icon-cache is a tool from GTK+ to update icons and themes
+    caches.
+
+    It is split from the GTK+ sources by the Gentoo Gnome team to help
+    GTK+ 2 and 3 to co-exist better by extracting the single conflicting
+    tool.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild
new file mode 100644
index 000000000000..ef1d0a305ee8
--- /dev/null
+++ b/dev-util/heaptrack/heaptrack-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2015-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.kde.org/heaptrack"
+[[ ${PV} = 9999 ]] && inherit git-r3
+inherit cmake-utils
+
+DESCRIPTION="A fast heap memory profiler"
+HOMEPAGE="http://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
+[[ ${PV} = 9999 ]] || SRC_URI="${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} = 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/libunwind
+	>=dev-libs/boost-1.41.0"
+DEPEND="${RDEPEND}"
+
+DOCS=()
+[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
diff --git a/dev-util/heaptrack/metadata.xml b/dev-util/heaptrack/metadata.xml
new file mode 100644
index 000000000000..9882e0388967
--- /dev/null
+++ b/dev-util/heaptrack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>zzam@gentoo.org</email>
+		<name>Matthias Schwarzott</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
new file mode 100644
index 000000000000..449f1cb1b814
--- /dev/null
+++ b/dev-util/howdoi/Manifest
@@ -0,0 +1,2 @@
+DIST howdoi-1.1.6.tar.gz 6769 SHA256 29b06c588825fb007f111106cfd475fc88dbf4e1329758dcf42e903097872c83 SHA512 369bdbb30fc97b094fe8c1cb49b3dd696f16b1120cb980e6785dcf6c2da56698f3d103a983174d6e4a3cfa7b0bbb3d4109760f5cadaaa365480af9fae8323232 WHIRLPOOL db543d7f93c6bcb5ea3e44d5a8cc3ae15b7f180f2aac59d89b1beffbd1cf192b684d938fe8cad1cb0f1c642c7c894026f53880d79c8214422eac83b0a7fe27b6
+DIST howdoi-1.1.7.tar.gz 7378 SHA256 df4e49a219872324875d588e7699a1a82174a267e8487505e86bfcb180aea9b7 SHA512 5f08a0ee341813ab8dde0528bb6d04e02965dddd30851b8cfa7f92900f60f6d83ff74aaa565e2fc5b7a336ec7cd35ed932bbfecc09064010268a4bdbc521902b WHIRLPOOL 93bf26d7553e05d99f6efbecbdc747301ee628d192c74369b492d5c2fb0def737d83b89baf80b8254701f8923927948610fd4f58c27c698f55843d416b00bf91
diff --git a/dev-util/howdoi/howdoi-1.1.6.ebuild b/dev-util/howdoi/howdoi-1.1.6.ebuild
new file mode 100644
index 000000000000..1a882757eba8
--- /dev/null
+++ b/dev-util/howdoi/howdoi-1.1.6.ebuild
@@ -0,0 +1,23 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A code search tool"
+HOMEPAGE="http://pypi.python.org/pypi/howdoi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyquery[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-cache[${PYTHON_USEDEP}]"
diff --git a/dev-util/howdoi/howdoi-1.1.7.ebuild b/dev-util/howdoi/howdoi-1.1.7.ebuild
new file mode 100644
index 000000000000..87c155957a6c
--- /dev/null
+++ b/dev-util/howdoi/howdoi-1.1.7.ebuild
@@ -0,0 +1,23 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="A code search tool"
+HOMEPAGE="http://pypi.python.org/pypi/howdoi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyquery[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-cache[${PYTHON_USEDEP}]"
diff --git a/dev-util/howdoi/metadata.xml b/dev-util/howdoi/metadata.xml
new file mode 100644
index 000000000000..13f75201385c
--- /dev/null
+++ b/dev-util/howdoi/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">howdoi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/httpup/Manifest b/dev-util/httpup/Manifest
new file mode 100644
index 000000000000..bdf9ee404c2b
--- /dev/null
+++ b/dev-util/httpup/Manifest
@@ -0,0 +1 @@
+DIST httpup-0.4.0k.tar.gz 27167 SHA256 780043fa99e9c1b09b115f4e0a71fc4aeb7278a59fbfcd65c9d34385ee52f3d6 SHA512 9a7299390cd5b5b8cfcfce60ff65eb34f80b96e4a894bd42ac204d2b80d9f9376a892123c161dd1aadf3080d622212bd131e5a61405ef45f6048c360abe512b4 WHIRLPOOL 19c47010f45c7597dce5fcaaa245482743499864bbbe33f02bfe3496cfa6d70f8e384d9c099ac78ffcb60bfbd95cecb2dfafb81768a280cc8ca14494d97c94ca
diff --git a/dev-util/httpup/files/httpup-0.4.0k-Makefile.patch b/dev-util/httpup/files/httpup-0.4.0k-Makefile.patch
new file mode 100644
index 000000000000..9676e8d1b777
--- /dev/null
+++ b/dev-util/httpup/files/httpup-0.4.0k-Makefile.patch
@@ -0,0 +1,26 @@
+--- Makefile
++++ Makefile
+@@ -8,10 +8,10 @@
+ mandir=		$(prefix)/man
+ 
+ 
+-CXX=		g++
+-CXXFLAGS=	-O2 -pipe -DMF_VERSION=\"${version}\"
+-CXXFLAGS+=	-g -Wall -Werror
+-LDFLAGS= 	-lcurl
++CXX?=		g++
++CXXFLAGS+=	-DMF_VERSION=\"${version}\"
++CXXFLAGS+=	-Wall
++LIBS= 		-lcurl
+ 
+ INSTALL=	/usr/bin/install
+ STRIP=		/usr/bin/strip
+@@ -36,7 +36,7 @@
+ 
+ 
+ $(name): $(OBJS)
+-	$(CXX) $(LDFLAGS) $(OBJS) -o $(name)
++	$(CXX) $(LDFLAGS) $(OBJS) -o $(name) $(LIBS)
+ 
+ distclean: clean
+ 	-rm -f Makefile config.log config.h *~ *.core core.*
diff --git a/dev-util/httpup/files/httpup-0.4.0k-gcc-4.7.patch b/dev-util/httpup/files/httpup-0.4.0k-gcc-4.7.patch
new file mode 100644
index 000000000000..c015cecaf538
--- /dev/null
+++ b/dev-util/httpup/files/httpup-0.4.0k-gcc-4.7.patch
@@ -0,0 +1,15 @@
+ main.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/main.cpp b/main.cpp
+index 3040b9d..2d807ed 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -12,6 +12,7 @@
+ #include <iostream>
+ #include <string>
+ #include <cstdlib>
++#include <unistd.h>
+ using namespace std;
+ 
+ #include "httpup.h"
diff --git a/dev-util/httpup/httpup-0.4.0k.ebuild b/dev-util/httpup/httpup-0.4.0k.ebuild
new file mode 100644
index 000000000000..df85092889f1
--- /dev/null
+++ b/dev-util/httpup/httpup-0.4.0k.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="synchronisation tool for http file repositories"
+HOMEPAGE="http://jw.tks6.net/files/crux/httpup_manual.html"
+SRC_URI="http://jw.tks6.net/files/crux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="net-misc/curl"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-gcc-4.7.patch
+	tc-export CC CXX
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		mandir="${EPREFIX}/usr/share/man" \
+		prefix="${EPREFIX}/usr" install
+	dodoc AUTHORS ChangeLog httpup.conf.example README TODO
+}
diff --git a/dev-util/httpup/metadata.xml b/dev-util/httpup/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/httpup/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/huc/Manifest b/dev-util/huc/Manifest
new file mode 100644
index 000000000000..efc4fd9b525f
--- /dev/null
+++ b/dev-util/huc/Manifest
@@ -0,0 +1 @@
+DIST huc-0.1.tar.bz2 8367 SHA256 2966c25164ec4cfa81557ccf30ddf1b2f3ccd37f1362c7a2580c4d81d44298f0 SHA512 711266edfdec572aad877230653248b02cc0b989f1cf2766bf6cc4e196dcd02ba4bf148849d360457fc396de18f0bd0b6f7a26ba3c13a159cf26ece7c356c225 WHIRLPOOL 0f4b66bdd6ce39ad2dbe55f0916c2baea50d5eb9051488ae5269db26a729e8d944a2647f960f9f870f1d82ba97d4dd4d6dbbb11d57e45ec5f833ca3932fba7f4
diff --git a/dev-util/huc/huc-0.1.ebuild b/dev-util/huc/huc-0.1.ebuild
new file mode 100644
index 000000000000..ef3eb84a5251
--- /dev/null
+++ b/dev-util/huc/huc-0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="HTML umlaut conversion tool"
+SRC_URI="http://www.int21.de/huc/${P}.tar.bz2"
+HOMEPAGE="http://www.int21.de/huc/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc sparc x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+
+doecho() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	doecho $(tc-getCXX) \
+		${LDFLAGS} ${CXXFLAGS} \
+		-o ${PN} ${PN}.cpp || die "compile failed"
+}
+
+src_install () {
+	dobin huc || die "dobin failed"
+	dodoc README
+}
diff --git a/dev-util/huc/metadata.xml b/dev-util/huc/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/dev-util/huc/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/hxd/Manifest b/dev-util/hxd/Manifest
new file mode 100644
index 000000000000..adce36401961
--- /dev/null
+++ b/dev-util/hxd/Manifest
@@ -0,0 +1 @@
+DIST hxd-0.70.02.tar.gz 17469 SHA256 2b533e2585bee6c08e7761b6ed67c5ecb01742d2aa3510c45931472512ad2311 SHA512 631b3ea74a7f831984abb1bb0c1a32d38ff2980063321fa1e85fc594fe23407cddf5d61fd1005ec154aecf6be8344e070600faf90d176061f195e6a39d8991af WHIRLPOOL 8b1c8a4e1ecdcb21828fa76f971455bbb8913ce6a24701fc17849e5373c9c9c75f735c2a85a3d686d33b3b35958edce1ed577627441dc83ae92b5430e08286fd
diff --git a/dev-util/hxd/files/hxd-0.70.02-llong-redef.patch b/dev-util/hxd/files/hxd-0.70.02-llong-redef.patch
new file mode 100644
index 000000000000..e9e230c867ac
--- /dev/null
+++ b/dev-util/hxd/files/hxd-0.70.02-llong-redef.patch
@@ -0,0 +1,25 @@
+ general.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/general.h b/general.h
+index 0a2ebe7..b749945 100644
+--- a/general.h
++++ b/general.h
+@@ -56,7 +56,7 @@
+ 
+ #ifdef	HAVE_LONGLONG
+ loff_t	lseek64( int fd, loff_t offset, int whence );
+-#define	LLONG_MAX	0x7fffffffffffffffll
++#define	L_LONG_MAX	0x7fffffffffffffffll
+ #undef	LSEEK
+ #define	LSEEK(A,B,C)	lseek64((A),(B),(C))
+ #undef  STRTOL
+@@ -64,7 +64,7 @@ loff_t	lseek64( int fd, loff_t offset, int whence );
+ #undef	SIZE_MIN
+ #define	SIZE_MIN	( (loff_t) 0 )
+ #undef	SIZE_MAX
+-#define	SIZE_MAX	( LLONG_MAX - 1 )
++#define	SIZE_MAX	( L_LONG_MAX - 1 )
+ #undef	OFF_T
+ #define	OFF_T		loff_t
+ #endif
diff --git a/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch b/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch
new file mode 100644
index 000000000000..f08f2eb18063
--- /dev/null
+++ b/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch
@@ -0,0 +1,56 @@
+ Makefile.Linux |   23 +++++++++++++++--------
+ 1 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.Linux b/Makefile.Linux
+index e3711cd..d5b00cb 100644
+--- a/Makefile.Linux
++++ b/Makefile.Linux
+@@ -1,6 +1,6 @@
+-CC=gcc
+-CFLAGS=-Wall -Wstrict-prototypes -fomit-frame-pointer -pipe -I$(HDDIR) -DOS_TYPE_Linux -DOS_TYPE_STR=\"Linux\"
+-LDFLAGS=-Wl,-warn-common -s -L$(LIBDIR)
++CC ?=gcc
++CFLAGS+=-Wall -Wstrict-prototypes -I$(HDDIR) -DOS_TYPE_Linux -DOS_TYPE_STR=\"Linux\"
++LDFLAGS+=-Wl,-warn-common  -L$(LIBDIR)
+ 
+ LDLIBS = 
+ HDDIR = ./
+@@ -32,26 +32,33 @@ $(PRG_UNDUMP):	$(PRG_UNDUMP).c $(PRG_UNDUMP).h general.h
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_UNDUMP)\" -DMANUAL_NUMBER=$(MAN_NO_UNDUMP) $(LDFLAGS) $(PRG_UNDUMP).c -o $@
+ 
+ 
+-$(MAN_DUMP):	$(PRG_DUMP).man
++mkmkman: $(PRG_DUMP)
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_DUMP)\" -DMANUAL_NUMBER=$(MAN_NO_DUMP) -Dundump_name=\"$(PRG_UNDUMP)\" $(LDFLAGS) mkmkman.c -o mkmkman
++
++mkman.c:	mkmkman $(PRG_DUMP).man
+ 		cat $(PRG_DUMP).man | ./mkmkman > mkman.c
+ 		ln -sf $(PRG_DUMP).h header.h
++
++$(MAN_DUMP): mkman.c
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_DUMP)\" -DMANUAL_NUMBER=$(MAN_NO_DUMP) -Dundump_name=\"$(PRG_UNDUMP)\" $(LDFLAGS) mkman.c -o mkman
+ 		./mkman > $@
+ 
+-
+-$(MAN_UNDUMP):	$(PRG_UNDUMP).man
++mkmkman_u: $(MAN_DUMP) $(PRG_UNDUMP)
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_UNDUMP)\" -DMANUAL_NUMBER=$(MAN_NO_UNDUMP) -Ddump_name=\"$(PRG_DUMP)\" $(LDFLAGS) mkmkman.c -o mkmkman
++
++mkman_u.c:	$(PRG_UNDUMP).man mkmkman_u
+ 		cat $(PRG_UNDUMP).man | ./mkmkman > mkman.c
+ 		ln -sf $(PRG_UNDUMP).h header.h
++
++$(MAN_UNDUMP): $(MAN_UNDUMP) mkman_u.c
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_UNDUMP)\" -DMANUAL_NUMBER=$(MAN_NO_UNDUMP) -Ddump_name=\"$(PRG_DUMP)\" $(LDFLAGS) mkman.c -o mkman
+ 		./mkman > $@
+ 
+ 
+ install:	all
+-		install -s -m 0755 -o root -g root $(PRG_DUMP) $(INSTALLDIR_BIN_DUMP)
++		install -m 0755 -o root -g root $(PRG_DUMP) $(INSTALLDIR_BIN_DUMP)
+ 		install    -m 0644 -o root -g root $(MAN_DUMP) $(INSTALLDIR_MAN_DUMP)
+-		install -s -m 0755 -o root -g root $(PRG_UNDUMP) $(INSTALLDIR_BIN_UNDUMP)
++		install -m 0755 -o root -g root $(PRG_UNDUMP) $(INSTALLDIR_BIN_UNDUMP)
+ 		install    -m 0644 -o root -g root $(MAN_UNDUMP) $(INSTALLDIR_MAN_UNDUMP)
+ 
+ clean:
diff --git a/dev-util/hxd/hxd-0.70.02-r1.ebuild b/dev-util/hxd/hxd-0.70.02-r1.ebuild
new file mode 100644
index 000000000000..8e23f0b3e44e
--- /dev/null
+++ b/dev-util/hxd/hxd-0.70.02-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Binary to hexadecimal converter"
+HOMEPAGE="http://www-tet.ee.tu-berlin.de/solyga/linux/"
+SRC_URI="http://linux.xulin.de/c/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~sparc ~mips ~ppc"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-prll-flags.patch \
+		"${FILESDIR}"/${P}-llong-redef.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin hxd unhxd
+	doman hxd.1 unhxd.1
+	dodoc README TODO
+}
diff --git a/dev-util/hxd/metadata.xml b/dev-util/hxd/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/hxd/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/hxtools/Manifest b/dev-util/hxtools/Manifest
new file mode 100644
index 000000000000..2a1c06596c5a
--- /dev/null
+++ b/dev-util/hxtools/Manifest
@@ -0,0 +1 @@
+DIST hxtools-20121125.tar.xz 287716 SHA256 8153a61254b18415ba862ca3b9db96cc7c8828c7fa78f4808c03f36942ae1b6b SHA512 fa15331d8c961b0a3b1a99f592e2b4f9b0531ac294a2fef0f9a5067b5e427ca57e0c62798b1048a1d6005c9655af45136636255f684a129bc997864e8c7c4915 WHIRLPOOL 7f5258c2e5a5693c018acbb7cc71754c1ae7ca6a5b799d25fdd053a1e148eb6f0c6855920a1a995805675a86fc86d16b49a4e5a020864ad80fccbc1f796c307f
diff --git a/dev-util/hxtools/hxtools-20121125-r1.ebuild b/dev-util/hxtools/hxtools-20121125-r1.ebuild
new file mode 100644
index 000000000000..1b279507e36a
--- /dev/null
+++ b/dev-util/hxtools/hxtools-20121125-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A collection of tools and scripts"
+HOMEPAGE="http://inai.de/projects/hxtools/"
+SRC_URI="http://jftp.inai.de/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	sys-libs/libcap
+	>=sys-libs/libhx-3.12.1
+	sys-apps/pciutils
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+
+	# man2html is provided by man
+	rm -rf "${ED}"/usr/bin/man2html
+	rm -rf "${ED}"/usr/share/man/man1/man2html*
+}
diff --git a/dev-util/hxtools/metadata.xml b/dev-util/hxtools/metadata.xml
new file mode 100644
index 000000000000..9b2336726aa6
--- /dev/null
+++ b/dev-util/hxtools/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+</pkgmetadata>
+
diff --git a/dev-util/icemon/Manifest b/dev-util/icemon/Manifest
new file mode 100644
index 000000000000..b5fcb5d0914a
--- /dev/null
+++ b/dev-util/icemon/Manifest
@@ -0,0 +1 @@
+DIST icemon-20140102.tar.xz 69212 SHA256 6af68804b554dd55fcd89aae8e4032a70df653dc24cb81aa5a8557c7733cdb34 SHA512 96ffa914fb02f4dfefe489b4a55d62db736d71e0df0e613f7d0135b477449e687919001711661f4892fde6cc0d58267ecfd09dad95a4fff84c4381aba705845e WHIRLPOOL bc5f35dd920a59a69849d1bdf5fd9c6e45ea86f6bd66c3abb050276feba984b3c385afc18a4ce08b58068742af867450ebc4a6e97b9af8d569a2361119012336
diff --git a/dev-util/icemon/icemon-20140102.ebuild b/dev-util/icemon/icemon-20140102.ebuild
new file mode 100644
index 000000000000..fcbe450144ba
--- /dev/null
+++ b/dev-util/icemon/icemon-20140102.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Icemon is a KDE monitor program for use with Icecream compile clusters"
+HOMEPAGE="http://www.opensuse.org/icecream"
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-devel/icecream
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+"
diff --git a/dev-util/icemon/metadata.xml b/dev-util/icemon/metadata.xml
new file mode 100644
index 000000000000..e09a4ea6ca94
--- /dev/null
+++ b/dev-util/icemon/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cluster</herd>
+<herd>suse</herd>
+</pkgmetadata>
diff --git a/dev-util/icmake/Manifest b/dev-util/icmake/Manifest
new file mode 100644
index 000000000000..d5a647e4854f
--- /dev/null
+++ b/dev-util/icmake/Manifest
@@ -0,0 +1,3 @@
+DIST icmake_7.21.01.orig.tar.gz 330723 SHA256 30a88a6bc0e0cdc6ad0dfe101834cb2babb70a8e72cfb4872b3f40b0d621a54b SHA512 f5d8e363ccff63c4864d6aa6748e8ad16cb588e06e8a2ea2dbb80ca2642c30fae04649e9f5dd3b24103a53b81c5444e1c071007316504b656b9c3b822b16ada0 WHIRLPOOL 0f29495b5fde5c5dfaeaf1833f31bb016cf05421ee374d0d338fb8c6a3bf32331b2ca8cfd4d0e4a1ab13419134758640d9baa3a3fd43e9ab12fd5cfbbd89e68c
+DIST icmake_7.22.00.orig.tar.gz 331885 SHA256 df60e28997dd6313e6fe5bdeb7f6d6030a5c9243c088f5034a4d3d4fa3ed7b04 SHA512 ce5380e40315e003b124e2508d62777edf9ae4f2b2537ae1d9cdbbf220e8352134cc680d79bb0fbd973999208cded2075900fc5d9ce065f1dd8eee5d69c6ba17 WHIRLPOOL 90dac4bbc59359d0a3879dda98456c15e3e558f5ec540ff63dbdbf8635093b84b123730f731d242be41a9087983b09cfdefc8a45ea58b53376678e4f2c12b5f5
+DIST icmake_7.22.01.orig.tar.gz 331750 SHA256 b522e7937e9d4f0bec738dfce371673e3c4a8bc9f4d209a51631e5ed59ba66c7 SHA512 a17dac0da186202ec5f5962a42963709ebc60f006cea003532b8709242d9e369e71fdc86fffc75ad82620a2c420a8f80c138d31e6570d0055cdfa0b69b63ca3a WHIRLPOOL c20084b28b212739a70f60b5a790461ae3e4b50c9cf9cd37ae50025f835fe4575c927dc5f2335d608436e2f51fb21fdc3eb57ce3ee2881915edec82d2964497e
diff --git a/dev-util/icmake/files/icmake-7.20.00-ar.patch b/dev-util/icmake/files/icmake-7.20.00-ar.patch
new file mode 100644
index 000000000000..e3049f18f745
--- /dev/null
+++ b/dev-util/icmake/files/icmake-7.20.00-ar.patch
@@ -0,0 +1,17 @@
+--- icmake-7.20.00/icm_bootstrap
++++ icmake-7.20.00/icm_bootstrap
+@@ -31,12 +31,13 @@
+ 
+ if [ "${CFLAGS}" == "" ] ; then CFLAGS="-Wall -O2 -g"; fi
+ if [ "${CC}" == "" ] ; then CC="gcc"; fi
++if [ "${AR}" == "" ] ; then AR="ar"; fi
+   
+ echo Creating tmp/libicrss.a
+ 
+ try cd rss
+ try ${CC} -c ${CFLAGS} ${GLB} *.c
+-try ar rs ../tmp/libicrss.a *.o
++try ${AR} rs ../tmp/libicrss.a *.o
+ rm *.o
+ cd ..
+ 
diff --git a/dev-util/icmake/icmake-7.21.01.ebuild b/dev-util/icmake/icmake-7.21.01.ebuild
new file mode 100644
index 000000000000..b2a606b3cfbb
--- /dev/null
+++ b/dev-util/icmake/icmake-7.21.01.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="Hybrid between a make utility and a shell scripting language"
+HOMEPAGE="http://icmake.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
+		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
+		-i INSTALL.im || die
+
+	epatch "${FILESDIR}"/${PN}-7.20.00-ar.patch
+	tc-export AR CC
+}
+
+src_compile() {
+	./icm_bootstrap "${EROOT}" || die
+}
+
+src_install() {
+	./icm_install all "${ED}" || die
+}
diff --git a/dev-util/icmake/icmake-7.22.00.ebuild b/dev-util/icmake/icmake-7.22.00.ebuild
new file mode 100644
index 000000000000..8b1e562a0e52
--- /dev/null
+++ b/dev-util/icmake/icmake-7.22.00.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="Hybrid between a make utility and a shell scripting language"
+HOMEPAGE="http://icmake.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
+		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
+		-i INSTALL.im || die
+
+	epatch "${FILESDIR}"/${PN}-7.20.00-ar.patch
+	tc-export AR CC
+}
+
+src_compile() {
+	./icm_bootstrap "${EROOT}" || die
+}
+
+src_install() {
+	./icm_install all "${ED}" || die
+}
diff --git a/dev-util/icmake/icmake-7.22.01.ebuild b/dev-util/icmake/icmake-7.22.01.ebuild
new file mode 100644
index 000000000000..8b1e562a0e52
--- /dev/null
+++ b/dev-util/icmake/icmake-7.22.01.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="Hybrid between a make utility and a shell scripting language"
+HOMEPAGE="http://icmake.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
+		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
+		-i INSTALL.im || die
+
+	epatch "${FILESDIR}"/${PN}-7.20.00-ar.patch
+	tc-export AR CC
+}
+
+src_compile() {
+	./icm_bootstrap "${EROOT}" || die
+}
+
+src_install() {
+	./icm_install all "${ED}" || die
+}
diff --git a/dev-util/icmake/metadata.xml b/dev-util/icmake/metadata.xml
new file mode 100644
index 000000000000..ecd992c3b2c4
--- /dev/null
+++ b/dev-util/icmake/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">icmake</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/idutils/Manifest b/dev-util/idutils/Manifest
new file mode 100644
index 000000000000..494f1b8b0d72
--- /dev/null
+++ b/dev-util/idutils/Manifest
@@ -0,0 +1,4 @@
+DIST id-utils_4.2-1.diff.gz 6178 SHA256 125cca5aad92bc91348ac1508df2187833d371d08a02aef322e366747f530d82 SHA512 ebeb2f3d35e21d0286d26ea6d703dea1ffbddc943c165ee6414484580a22e2883ace07b8e6670b0e90b6305f0e883fd22d8723c2c62dee664bdd8ab6a2a6106a WHIRLPOOL f6420b25b3b0a0a2db22f890959fb24b4f95bb3e5bc6bbf3eb12b00a4bdeec1143ce081034041eb7c17f8a028cf5dcc56ec170c485d991395ad913758b00e4ab
+DIST idutils-4.2.tar.gz 706193 SHA256 c5740eebf02812e61963a5f90b2e0aed240fe8009853f508fda22b99f7f1fa99 SHA512 319036d449baec65617670fa4ca17e89348f1ed5916731ef2376d96d15f3da032b25ae17234da409c6e439561ccb30056ea22ee37494fd9b196129a21607de3b WHIRLPOOL e2eee7ea6976e3662a4865a3e1e0a6eeb26b37485bbbe2325e0033f1611ab6d42d0d9d9e1bd81d7de731aa6aa1bb85d984bee2b630a79028cad9f543cfef4cd1
+DIST idutils-4.5.tar.gz 1476520 SHA256 58d8a765e14eb436b3646ee13e5476d5042a4c48db94f2459f018dc79b982249 SHA512 c5b50c15cdd92d6caf8748c3b35e9d6f2dafb41abab31d83ed0fe95cffc77e1170ac6512424d94a9a61033a99bda2961a9ab339b66078c417ea39c1bd8fe1e11 WHIRLPOOL 2c8508e756c40248717ec9c713a11dd8709161dd51b92dc501ab5195abaf71c23afa43eba4713a7f4e03243f98922af6d0e6c8799c060239c11c54580e3ff579
+DIST idutils-4.6.tar.xz 1001496 SHA256 8181f43a4fb62f6f0ccf3b84dbe9bec71ecabd6dfdcf49c6b5584521c888aac2 SHA512 830fe4a36693e9bcc8def25982c1a76decac2076165158c39858106f928c1b6ff2bb941fcce7244357c4205c2ecc945b772c9f5a083c4fedb1b75eea0af5445e WHIRLPOOL 305952de779173b698ef8193b23484db2e56dd0fdfde757b1a6660babe638292c6d07005c7c89d3af1b78294ca57872a54507d4c2720fd92fb2609b356a55f0e
diff --git a/dev-util/idutils/files/idutils-4.6-glibc-2.16.patch b/dev-util/idutils/files/idutils-4.6-glibc-2.16.patch
new file mode 100644
index 000000000000..c8659f071e26
--- /dev/null
+++ b/dev-util/idutils/files/idutils-4.6-glibc-2.16.patch
@@ -0,0 +1,15 @@
+--- idutils-4.6_O/lib/stdio.in.h	2012-01-28 17:26:05.000000000 +0100
++++ idutils-4.6/lib/stdio.in.h	2013-06-13 18:38:29.787232848 +0200
+@@ -712,10 +712,12 @@
+ #  undef gets
+ # endif
+ _GL_CXXALIASWARN (gets);
++# if HAVE_RAW_DECL_GETS
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++# endif
+ #endif
+ 
+ 
diff --git a/dev-util/idutils/idutils-4.2.ebuild b/dev-util/idutils/idutils-4.2.ebuild
new file mode 100644
index 000000000000..f2f064eecc07
--- /dev/null
+++ b/dev-util/idutils/idutils-4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils elisp-common
+
+DESCRIPTION="Fast, high-capacity, identifier database tool"
+HOMEPAGE="http://www.gnu.org/software/idutils/"
+DEB_PN="id-utils" # old upstream name for it
+DEB_P="${DEB_PN}_${PV}"
+DEB_PR="1"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+		mirror://debian/pool/main/${PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="emacs nls"
+
+RDEPEND="emacs? ( virtual/emacs )
+		 nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+		nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	epatch "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz
+	epatch "${S}"/debian/patches/*.dpatch
+}
+
+src_compile() {
+	use emacs || export EMACS=no
+	econf \
+		$(use_enable nls) \
+		"$(use_with emacs lispdir "${SITELISP}/${PN}")"
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc NEWS README* ChangeLog AUTHORS THANKS TODO
+}
diff --git a/dev-util/idutils/idutils-4.5.ebuild b/dev-util/idutils/idutils-4.5.ebuild
new file mode 100644
index 000000000000..29881768185b
--- /dev/null
+++ b/dev-util/idutils/idutils-4.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils elisp-common
+
+DESCRIPTION="Fast, high-capacity, identifier database tool"
+HOMEPAGE="http://www.gnu.org/software/idutils/"
+#DEB_PN="id-utils" # old upstream name for it
+#DEB_P="${DEB_PN}_${PV}"
+#DEB_PR="1"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+#mirror://debian/pool/main/${PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs nls"
+
+RDEPEND="emacs? ( virtual/emacs )
+		 nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+		nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if [ -n "${DEB_PR}" ]; then
+		cd "${S}"
+		epatch "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz
+		epatch "${S}"/debian/patches/*.dpatch
+	fi
+}
+
+src_compile() {
+	use emacs || export EMACS=no
+	econf \
+		$(use_enable nls) \
+		"$(use_with emacs lispdir "${SITELISP}/${PN}")"
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc NEWS README* ChangeLog AUTHORS THANKS TODO
+}
diff --git a/dev-util/idutils/idutils-4.6.ebuild b/dev-util/idutils/idutils-4.6.ebuild
new file mode 100644
index 000000000000..210a5e25c8f4
--- /dev/null
+++ b/dev-util/idutils/idutils-4.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit elisp-common eutils
+
+DESCRIPTION="Fast, high-capacity, identifier database tool"
+HOMEPAGE="http://www.gnu.org/software/idutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs nls"
+
+RDEPEND="emacs? ( virtual/emacs )
+	 nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-4.6-glibc-2.16.patch"
+}
+
+src_configure() {
+	use emacs || export EMACS=no
+	econf \
+		$(use_enable nls) \
+		$(use_with emacs lispdir "${SITELISP}/${PN}")
+}
diff --git a/dev-util/idutils/metadata.xml b/dev-util/idutils/metadata.xml
new file mode 100644
index 000000000000..ad8adc2dd20c
--- /dev/null
+++ b/dev-util/idutils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<longdescription>
+	Fast, high-capacity, identifier database tool.
+	Actually, the term `identifier' is too limiting--`mkid' stores tokens, be
+	they program identifiers of any form, literal numbers, or words of
+	human-readable text. Database queries can be issued from the command-line,
+	or from within emacs, serving as an augmented tags facility.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/igprof/Manifest b/dev-util/igprof/Manifest
new file mode 100644
index 000000000000..963b6823596d
--- /dev/null
+++ b/dev-util/igprof/Manifest
@@ -0,0 +1 @@
+DIST igprof-5.9.11.tar.gz 174304 SHA256 af65c7f8ba12730d1e362155c46856b2241c15e0113a2211bb4e75b47b851065 SHA512 1c6a16e286243a997b9ce798f2403597e1d8178a7b4652e38e9afbcd48c84d868dc83ddee7eb76243096f21b9cd9c0337641bba840008c24429e60454cff1444 WHIRLPOOL 88a67dae1b9344c790814dab853303e9d7ded8e23054e1ca74c90c39d8cd8365de47587a152bc64f93aa2ee62e69d5a969fcf4049268d806e3a298bd30461289
diff --git a/dev-util/igprof/igprof-5.9.11.ebuild b/dev-util/igprof/igprof-5.9.11.ebuild
new file mode 100644
index 000000000000..f89b0361356c
--- /dev/null
+++ b/dev-util/igprof/igprof-5.9.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Ignominous Profiler for analysing application memory and performance characteristics"
+HOMEPAGE="http://igprof.org"
+SRC_URI="http://github.com/ktf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# pcre is automagic dependency, let's make it unoptional
+# libatomic_ops is listed as dependency, but isn't actually used by package
+DEPEND="dev-libs/libpcre
+		sys-libs/libunwind"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e 's/-Werror//g' -i CMakeLists.txt
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/igprof/metadata.xml b/dev-util/igprof/metadata.xml
new file mode 100644
index 000000000000..603285e3a421
--- /dev/null
+++ b/dev-util/igprof/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ktf/igprof</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
new file mode 100644
index 000000000000..e55dda71689c
--- /dev/null
+++ b/dev-util/imediff2/Manifest
@@ -0,0 +1 @@
+DIST imediff2_1.1.2.orig.tar.gz 17974 SHA256 08cff1c6638bde687cc8428ed45c3a7947b6d51ff1b1cd613f8d1062f03e8916 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748 WHIRLPOOL 59f934c283bf352fc6fbf8d4ce71fd92cee33dcef18f492f10cbdad3c2dfc6137fb9a175c9915bb7c83cb423f72647d8034f04dc5f449d31fa461cba3f22b666
diff --git a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
new file mode 100644
index 000000000000..20f90f7f5f8b
--- /dev/null
+++ b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-single-r1 versionator
+
+MY_P=${PN}_$(replace_version_separator 3 -)
+
+DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
+HOMEPAGE="http://elonen.iki.fi/code/imediff/"
+SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	# Otherwise the docs get regenerated :)
+	:
+}
+
+src_install() {
+	python_doscript imediff2
+	dodoc AUTHORS README
+	doman imediff2.1
+}
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
new file mode 100644
index 000000000000..5b2a5c55470b
--- /dev/null
+++ b/dev-util/imediff2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
new file mode 100644
index 000000000000..e9719953601c
--- /dev/null
+++ b/dev-util/include-what-you-use/Manifest
@@ -0,0 +1,4 @@
+DIST include-what-you-use-3.3.tar.gz 287279 SHA256 4aa3a4b1f9450c731c9cb125db6906d2b6bce093297dd1811bdc191c35a443be SHA512 70d7052a0cd5d82fc9d8fcec2fa222f38a02517ad1f6aa6bcff1b9a5170372dd090aebe3989746727ec883a21bf44c5d5602ebe0f8a021cfc2124fb81a14a238 WHIRLPOOL 04fbc8bef3b176327f88eb5edae8a14a046803b06a7782c548690e222b00c9f3e8aace71395bbc41ed5b928e60fe2531bbcb9650655386dc5499da14e746f255
+DIST include-what-you-use-3.4.src.tar.gz 291851 SHA256 73cf2c715c8604c4e832d0a63773210a2cd396988c970ddcbe8fe35bc026d0a4 SHA512 bf02abeb3df27d319db8c6ff7d8319f9cfb301206c77378f8a18d2be7b82ecc6179a034eeb52c18cade6d98288abaf9efc534c221fb2ab93730567c41e77ad11 WHIRLPOOL 5e39837909ac36bfc45868723f93593c0366020d3f4f6de3f0258497ad01184e6ae17e9aa8bace1d2b27b77c4351856adf9f07eb9a6ec2d39d23bf9672f30e39
+DIST include-what-you-use-3.5.src.tar.gz 302759 SHA256 bc8475fc853a4b60941eb30ea31c62d096e131e359ac69a5d6a2a237393ad4f1 SHA512 5e5c310dbb673eab7c5e2234fa6a35eebdb208b6b779fcd38503e15617a7a6bea6d6dce081c4620f7ec5895628ed037a091e8917d28538c2fe936d848459ea53 WHIRLPOOL 452ae42b39a4fffbb462bc9e33244bf2dca1e0b8676b015fb08f350ec9249f15aadc706e3dcd62e12b511c2daf96fdbcd2aa97145f64a7d183be2428111af5a1
+DIST include-what-you-use-3.6.src.tar.gz 308678 SHA256 0571fe55c0af5d38bfd5e71d8d4743f09f2d404e3725a027b20665b7f983fca6 SHA512 3d8c80e6f60f24774cb7b6fae53f4fac2ef368737a1cd8646c3b80029b2b1d0e439aa4185935759dc37e2b9a3ee06e79af8b262af8bbfd38597d8c509942356b WHIRLPOOL c886169f7bb1bc1ff8f89e25452558607f1ad9cff5b45bbf5e9a0ee129695a2741baa2c144d1198a488fa0455b055722db4404f8b0e843100891aa19fd2abe58
diff --git a/dev-util/include-what-you-use/files/include-what-you-use-3.3-issue-110-elaboration.patch b/dev-util/include-what-you-use/files/include-what-you-use-3.3-issue-110-elaboration.patch
new file mode 100644
index 000000000000..70a2a5d0f717
--- /dev/null
+++ b/dev-util/include-what-you-use/files/include-what-you-use-3.3-issue-110-elaboration.patch
@@ -0,0 +1,299 @@
+Upstream-bug: http://code.google.com/p/include-what-you-use/issues/detail?id=110
+Index: tests/elaboration-struct.h
+===================================================================
+--- tests/elaboration-struct.h	(revision 0)
++++ tests/elaboration-struct.h	(revision 0)
+@@ -0,0 +1,10 @@
++//===--- elaboration-struct.h - test input file for iwyu ------------------===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++struct ElaborationStruct {};
+
+Property changes on: tests\elaboration-struct.h
+___________________________________________________________________
+Added: svn:eol-style
+   + native
+
+Index: tests/elaboration.cc
+===================================================================
+--- tests/elaboration.cc	(revision 0)
++++ tests/elaboration.cc	(revision 0)
+@@ -0,0 +1,79 @@
++//===--- elaboration.cc - test input file for iwyu ------------------------===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++// Test that elaborated types are handled correctly.
++//
++// An elaborated type is a type prefixed by type kind, e.g. 'class Foo',
++// 'struct Bar' or 'enum Baz'.
++//
++// Clang considers namespace-qualified types elaborated as well, even if they
++// lack actual elaboration, e.g. 'ns::Foo'.
++
++
++#include "tests/elaboration-enum1.h"  // for ElaborationEnum1
++#include "tests/elaboration-enum2.h"  // for ElaborationEnum2
++
++// Make sure both elaborated and bare enums require the full type.
++void bare_enum(ElaborationEnum1 e);
++void elaborated_enum(enum ElaborationEnum2 e);
++
++// For C++ classes, a forward declaration should suffice for
++// bare type names and nothing should be necessary for elaborated ones.
++#include "tests/elaboration-class.h"
++
++void bare_class(ElaborationClass* c);
++void elaborated_class(class UnknownElaborationClass* c);
++
++// Structs should work like classes.
++#include "tests/elaboration-struct.h"
++
++void bare_struct(ElaborationStruct* s);
++void elaborated_struct(struct UnknownElaborationStruct* s);
++
++// And unions.
++#include "tests/elaboration-union.h"
++
++void bare_union(ElaborationUnion* u);
++void elaborated_union(union UnknownElaborationUnion* u);
++
++// Namespace-qualified types must be forward-declared even
++// if they are represented as elaborated types in Clang's AST. 
++#include "tests/elaboration-namespace.h"
++
++void namespace_qualified(Elaboration::Class* c);
++
++// We can use elaborated types for templates, too, but
++// they must also be forward-declared.
++struct Elaboration::Template<int, float>* namespace_qualified_template;
++
++/**** IWYU_SUMMARY
++
++tests/elaboration.cc should add these lines:
++class ElaborationClass;
++namespace Elaboration { class Class; }
++namespace Elaboration { template <typename T, typename U> struct Template; }
++struct ElaborationStruct;
++union ElaborationUnion;
++
++tests/elaboration.cc should remove these lines:
++- #include "tests/elaboration-class.h"  // lines XX-XX
++- #include "tests/elaboration-namespace.h"  // lines XX-XX
++- #include "tests/elaboration-struct.h"  // lines XX-XX
++- #include "tests/elaboration-union.h"  // lines XX-XX
++
++The full include-list for tests/elaboration.cc:
++#include "tests/elaboration-enum1.h"  // for ElaborationEnum1
++#include "tests/elaboration-enum2.h"  // for ElaborationEnum2
++class ElaborationClass;
++namespace Elaboration { class Class; }
++namespace Elaboration { template <typename T, typename U> struct Template; }
++struct ElaborationStruct;
++union ElaborationUnion;
++
++***** IWYU_SUMMARY */
+Index: tests/elaboration-enum1.h
+===================================================================
+--- tests/elaboration-enum1.h	(revision 0)
++++ tests/elaboration-enum1.h	(revision 0)
+@@ -0,0 +1,13 @@
++//===--- elaboration-enum1.h - test input file for iwyu -------------------===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++enum ElaborationEnum1 {
++  EE1_First,
++  EE1_Second
++};
+
+Property changes on: tests\elaboration-enum1.h
+___________________________________________________________________
+Added: svn:eol-style
+   + native
+
+Index: tests/elaboration-class.h
+===================================================================
+--- tests/elaboration-class.h	(revision 0)
++++ tests/elaboration-class.h	(revision 0)
+@@ -0,0 +1,10 @@
++//===--- elaboration-class.h - test input file for iwyu -------------------===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++class ElaborationClass {};
+
+Property changes on: tests\elaboration-class.h
+___________________________________________________________________
+Added: svn:eol-style
+   + native
+
+Index: tests/badinc.cc
+===================================================================
+--- tests/badinc.cc	(revision 485)
++++ tests/badinc.cc	(working copy)
+@@ -317,17 +317,12 @@
+     // IWYU: I2_Class is...*badinc-i2.h.*for autocast
+     // IWYU: I2_Class needs a declaration
+     const I2_Class& i2,
+-    const class I1_Class& elaborated_i1,
+-    // IWYU: I2_Class is...*badinc-i2.h.*for autocast
+-    const class I2_Class& elaborated_i2,
+     // A subtle c++ point: forward-declaring is ok for i2b, because
+     // you can't do implicit conversion to a non-const reference
+     // (implicit conversion involves creating a temporary, which
+     // doesn't bind to non-const references).
+     // IWYU: I2_Class needs a declaration
+     I2_Class& i2_nonconst,
+-    class I2_Class& elaborated_i2_nonconst,
+-    struct i3_ns1::i3_ns2::i3_ns3::I3_ForwardDeclareNamespaceStruct* i3_forward,
+     // Forward-declaring is ok because we a const reference to a *pointer*.
+     // IWYU: I2_Class needs a declaration
+     I2_Class* const & i2_ptrref,
+@@ -897,11 +892,6 @@
+ // IWYU: I3_ForwardDeclareNamespaceTemplateStruct needs a declaration
+ i3_ns1::i3_ns2::i3_ns3::I3_ForwardDeclareNamespaceTemplateStruct<H_Enum, 2>*
+   i3_fdtns_struct;
+-// Even with elaboration, we still need fwd decl.
+-// IWYU: I3_ForwardDeclareNamespaceTemplateStruct needs a declaration
+-struct i3_ns1::i3_ns2::i3_ns3::I3_ForwardDeclareNamespaceTemplateStruct<H_Enum,
+-                                                                        3>*
+-  i3_elaborated_fdtns_struct;
+ 
+ // IWYU: I3_UnnamedNamespaceStruct needs a declaration
+ i3_ns1::I3_UnnamedNamespaceStruct* i3_unnamed_namespace_struct;
+Index: tests/elaboration-enum2.h
+===================================================================
+--- tests/elaboration-enum2.h	(revision 0)
++++ tests/elaboration-enum2.h	(revision 0)
+@@ -0,0 +1,13 @@
++//===--- elaboration-enum2.h - test input file for iwyu -------------------===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++enum ElaborationEnum2 {
++  EE2_First,
++  EE2_Second
++};
+
+Property changes on: tests\elaboration-enum2.h
+___________________________________________________________________
+Added: svn:eol-style
+   + native
+
+Index: tests/elaboration-union.h
+===================================================================
+--- tests/elaboration-union.h	(revision 0)
++++ tests/elaboration-union.h	(revision 0)
+@@ -0,0 +1,10 @@
++//===--- elaboration-union.h - test input file for iwyu -------------------===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++union ElaborationUnion {};
+
+Property changes on: tests\elaboration-union.h
+___________________________________________________________________
+Added: svn:eol-style
+   + native
+
+Index: tests/elaboration-namespace.h
+===================================================================
+--- tests/elaboration-namespace.h	(revision 0)
++++ tests/elaboration-namespace.h	(revision 0)
+@@ -0,0 +1,18 @@
++//===--- elaboration-namespace.h - test input file for iwyu ---------------===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++namespace Elaboration {
++  class Class {};
++
++  template< typename T, typename U >
++  struct Template {
++    typedef T FirstType;
++    typedef U SecondType;
++  };
++}
+
+Property changes on: tests\elaboration-namespace.h
+___________________________________________________________________
+Added: svn:eol-style
+   + native
+
+Index: iwyu.cc
+===================================================================
+--- iwyu.cc	(revision 485)
++++ iwyu.cc	(working copy)
+@@ -166,6 +166,7 @@
+ using clang::DeclContext;
+ using clang::DeclRefExpr;
+ using clang::ElaboratedType;
++using clang::EnumType;
+ using clang::Expr;
+ using clang::FileEntry;
+ using clang::FriendDecl;
+@@ -3454,6 +3455,7 @@
+       preprocessor_info().FileInfoFor(CurrentFileEntry())->AddForwardDeclare(
+           decl_to_fwd_declare, definitely_keep_fwd_decl);
+     }
++
+     return Base::VisitTagDecl(decl);
+   }
+ 
+@@ -3562,13 +3564,17 @@
+     // If we're forward-declarable, then no complicated checking is
+     // needed: just forward-declare.  If we're already elaborated
+     // ('class Foo x') but not namespace-qualified ('class ns::Foo x')
+-    // there's no need even to forward-declare!
++    // or an enum ('enum Foo x') there's no need even to forward-declare!
+     if (CanForwardDeclareType(current_ast_node())) {
+       current_ast_node()->set_in_forward_declare_context(true);
++
++      bool is_enum_type = current_ast_node()->GetAs<EnumType>();
+       if (!IsElaborationNode(current_ast_node()->parent()) ||
+-          IsNamespaceQualifiedNode(current_ast_node()->parent())) {
++          IsNamespaceQualifiedNode(current_ast_node()->parent()) ||
++          is_enum_type) {
+         ReportDeclForwardDeclareUse(CurrentLoc(), type->getDecl());
+       }
++
+       return Base::VisitTagType(type);
+     }
+ 
diff --git a/dev-util/include-what-you-use/include-what-you-use-3.3-r1.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.3-r1.ebuild
new file mode 100644
index 000000000000..5480dbdc8c01
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-3.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="find unused include directives in C/C++ programs"
+HOMEPAGE="https://code.google.com/p/include-what-you-use/"
+# picked from google drive
+SRC_URI="http://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="=sys-devel/llvm-3.3*
+	=sys-devel/clang-3.3*"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-issue-110-elaboration.patch
+	epatch_user
+}
+
+src_configure() {
+	append-ldflags -L$(llvm-config --libdir)
+
+	local mycmakeargs=(
+		-DLLVM_PATH=$(llvm-config --libdir)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/include-what-you-use/include-what-you-use-3.4.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.4.ebuild
new file mode 100644
index 000000000000..42c0c4cdee56
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="find unused include directives in C/C++ programs"
+HOMEPAGE="https://code.google.com/p/include-what-you-use/"
+# picked from google drive
+SRC_URI="http://dev.gentoo.org/~slyfox/distfiles/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="=sys-devel/llvm-3.4*
+	=sys-devel/clang-3.4*"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	append-ldflags -L$(llvm-config --libdir)
+
+	local mycmakeargs=(
+		-DLLVM_PATH=$(llvm-config --libdir)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/include-what-you-use/include-what-you-use-3.5.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.5.ebuild
new file mode 100644
index 000000000000..167af754914f
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-3.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="find unused include directives in C/C++ programs"
+HOMEPAGE="https://code.google.com/p/include-what-you-use/"
+SRC_URI="http://include-what-you-use.com/downloads/include-what-you-use-3.5.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="=sys-devel/llvm-3.5*
+	=sys-devel/clang-3.5*"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	append-ldflags -L$(llvm-config --libdir)
+
+	local mycmakeargs=(
+		-DLLVM_PATH=$(llvm-config --libdir)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/include-what-you-use/include-what-you-use-3.6.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.6.ebuild
new file mode 100644
index 000000000000..f39f4f0e342c
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-3.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils flag-o-matic
+
+WEIRD_UPSREAM_VERSION=0.4
+
+DESCRIPTION="find unused include directives in C/C++ programs"
+HOMEPAGE="https://code.google.com/p/include-what-you-use/"
+SRC_URI="http://include-what-you-use.org/downloads/${PN}-${WEIRD_UPSREAM_VERSION}.src.tar.gz -> ${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="=sys-devel/llvm-3.6*
+	=sys-devel/clang-3.6*"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	append-ldflags -L$(llvm-config --libdir)
+
+	local mycmakeargs=(
+		-DLLVM_PATH=$(llvm-config --libdir)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/include-what-you-use/metadata.xml b/dev-util/include-what-you-use/metadata.xml
new file mode 100644
index 000000000000..49bf44dac71e
--- /dev/null
+++ b/dev-util/include-what-you-use/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
new file mode 100644
index 000000000000..ccd97acc323d
--- /dev/null
+++ b/dev-util/indent/Manifest
@@ -0,0 +1 @@
+DIST indent-2.2.11.tar.gz 778563 SHA256 aaff60ce4d255efb985f0eb78cca4d1ad766c6e051666073050656b6753a0893 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be WHIRLPOOL b50d6af34af8e08febde01fc70a280e8fdce0eb25b2e7e23f9d20bf08afc055c98b01c28f971c05bf4f8f52d9a70af10265329b5e146b2c6e64481aecb9fb8ad
diff --git a/dev-util/indent/files/2.2.11-segfault.patch b/dev-util/indent/files/2.2.11-segfault.patch
new file mode 100644
index 000000000000..e91922480951
--- /dev/null
+++ b/dev-util/indent/files/2.2.11-segfault.patch
@@ -0,0 +1,16 @@
+--- a/man/texinfo2man.c
++++ b/man/texinfo2man.c
+@@ -287,6 +287,13 @@
+    char buf[1024];
+    int line_no = 0;
+ 
++   if (argc != 3)
++   {
++      fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
++      fprintf(stderr, "  The man page will be written to stdout.\n");
++      return -1;
++   }
++
+    texinfoname = argv[2];
+ 
+    in = fopen (argv[2], "r");
diff --git a/dev-util/indent/files/2.2.11-texi2html-5.patch b/dev-util/indent/files/2.2.11-texi2html-5.patch
new file mode 100644
index 000000000000..5bad3da2867b
--- /dev/null
+++ b/dev-util/indent/files/2.2.11-texi2html-5.patch
@@ -0,0 +1,40 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -34,14 +34,14 @@
+ html-split: @PACKAGE@_toc.html
+ 
+ @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
+-	$(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
++	$(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
+ 
+ @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
+ 	case "$(TEXI2HTML)" in \
+ 	  *"/missing texi2html") \
+-	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
++	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
+ 	  *) $(RM) @PACKAGE@_*.html ; \
+-	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
++	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
+ 	esac
+ 
+ install-html-monolithic: @PACKAGE@.html
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -663,14 +663,14 @@
+ html-split: @PACKAGE@_toc.html
+ 
+ @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
+-	$(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
++	$(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
+ 
+ @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
+ 	case "$(TEXI2HTML)" in \
+ 	  *"/missing texi2html") \
+-	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
++	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
+ 	  *) $(RM) @PACKAGE@_*.html ; \
+-	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
++	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
+ 	esac
+ 
+ install-html-monolithic: @PACKAGE@.html
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
new file mode 100644
index 000000000000..6964ee06a46c
--- /dev/null
+++ b/dev-util/indent/indent-2.2.11-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Indent program source files"
+HOMEPAGE="http://indent.isidore-it.eu/beautify.html http://www.gnu.org/software/indent/"
+SRC_URI="http://${PN}.isidore-it.eu/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="
+	nls? ( sys-devel/gettext )
+	app-text/texi2html
+"
+RDEPEND="
+	nls? ( virtual/libintl )
+"
+
+INDENT_LINGUAS="
+	ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW
+"
+
+for indent_lingua in ${INDENT_LINGUAS}; do
+	IUSE+=" linguas_${indent_lingua}"
+done
+
+src_prepare() {
+	# Fix bug #94837
+	local pofile
+	for pofile in po/zh_TW*; do
+		mv ${pofile} ${pofile/.Big5} || die
+	done
+	sed -i po/LINGUAS -e 's|zh_TW\.Big5|zh_TW|g' || die
+
+	epatch \
+		"${FILESDIR}"/${PV}-segfault.patch \
+		"${FILESDIR}"/${PV}-texi2html-5.patch
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautomake
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_test() {
+	emake -C regression/
+}
+
+src_install() {
+	# htmldir as set in configure is ignored in doc/Makefile*
+	emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
+	dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
+}
diff --git a/dev-util/indent/metadata.xml b/dev-util/indent/metadata.xml
new file mode 100644
index 000000000000..c472d21a01a0
--- /dev/null
+++ b/dev-util/indent/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>jer@gentoo.org</email>
+	<name>Jeroen Roovers</name>
+</maintainer>
+<longdescription lang="en">
+Indent is the GNU indenting program. It is used to beautify C program source
+files.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/injectso/Manifest b/dev-util/injectso/Manifest
new file mode 100644
index 000000000000..ceb2694d6209
--- /dev/null
+++ b/dev-util/injectso/Manifest
@@ -0,0 +1 @@
+DIST injectso-0.2.tar.gz 80367 SHA256 86ed5a565b200987649f97d7851229c076e37c2ddfedbb27bc8483bd7203e7a6 SHA512 7c305b0305aff49da9c6673f753d21472c007042dc58ff8df7c08773c5b38aef2f230c06943f1ce5c0024804515d61c11ae6ed48af65404b783fc0c11f10aa4b WHIRLPOOL 144eb9212afcbe8f816a7dae242679688e5dc32fb16ef815a3246a48cb6131c1bd7e996fecd3cfb4a6b40c574a505915e79d5375c2b4e7be11fafb812cb45aad
diff --git a/dev-util/injectso/files/injectso-0.2-gcc4.patch b/dev-util/injectso/files/injectso-0.2-gcc4.patch
new file mode 100644
index 000000000000..f814d961f624
--- /dev/null
+++ b/dev-util/injectso/files/injectso-0.2-gcc4.patch
@@ -0,0 +1,32 @@
+diff -x 'config*' -ur /var/tmp/portage/dev-util/injectso-0.2/work/injectso-0.2/procdbg.c /tmp/injectso-0.2/procdbg.c
+--- a/injectso-0.2/procdbg.c	2002-07-13 06:06:00.000000000 +0100
++++ b/injectso-0.2/procdbg.c	2006-12-17 22:20:59.000000000 +0000
+@@ -146,7 +146,7 @@
+ 
+    /* Now subtract the amount of space we need for the                     */
+    /* data to be pushed                                                    */
+-   (unsigned long) pvEsp -= iSize;
++   pvEsp -= (unsigned long) iSize;
+ 
+    /* Round it to a multiple of 8 (if it isn't already)                    */
+    /* (We use 8 since Sparc requires double word alignment)                */
+@@ -241,7 +241,7 @@
+          ptProcStatus->regs.eax = EINTR;
+       } else {
+          show_debug(3, "Restoring EIP to retry\n");
+-         (unsigned long) ptProcStatus->regs.eip = (unsigned long) ptProcStatus->regs.eip - 2; 
++         ptProcStatus->regs.eip = (unsigned long) ptProcStatus->regs.eip - 2; 
+          ptProcStatus->regs.eax = ptProcStatus->regs.orig_eax;
+       }
+    }
+diff -x 'config*' -ur /var/tmp/portage/dev-util/injectso-0.2/work/injectso-0.2/readargs.c /tmp/injectso-0.2/readargs.c
+--- a/injectso-0.2/readargs.c	2002-06-30 10:45:47.000000000 +0100
++++ b/injectso-0.2/readargs.c	2006-12-17 22:19:54.000000000 +0000
+@@ -115,7 +115,6 @@
+             }
+             iError = 1;
+             break;
+-         default:
+       }
+    }
+ 
diff --git a/dev-util/injectso/injectso-0.2-r1.ebuild b/dev-util/injectso/injectso-0.2-r1.ebuild
new file mode 100644
index 000000000000..010367e2ffb3
--- /dev/null
+++ b/dev-util/injectso/injectso-0.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Inject shared libraries into running processes under Solaris and Linux"
+HOMEPAGE="http://www.securereality.com.au/"
+SRC_URI="http://www.securereality.com.au/archives/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+IUSE=""
+
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+}
+
+src_configure() {
+	tc-export CC
+	default_src_configure
+}
+
+src_install() {
+	dobin injectso
+
+	dodir /usr/lib/injectso
+	insinto /usr/lib/injectso
+	doins libtest.so libtest.c
+
+	dodoc ChangeLog README.txt
+	dohtml README.html
+}
+
+pkg_postinst() {
+	echo
+	elog "Read the documentation for instructions on how to use this tool."
+	elog "The sample library \"libtest.so\" and its source file \"libtest.c\""
+	elog "be found in /usr/lib/injectso."
+	echo
+}
diff --git a/dev-util/injectso/metadata.xml b/dev-util/injectso/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/dev-util/injectso/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/insight/Manifest b/dev-util/insight/Manifest
new file mode 100644
index 000000000000..0d09cf05fbd6
--- /dev/null
+++ b/dev-util/insight/Manifest
@@ -0,0 +1,3 @@
+DIST insight-6.8-1a.tar.bz2 23900337 SHA256 51216df73adc4f68c67b60356270d5073f0ff094c1b477ecd96560f49707ea2a SHA512 ce9d5ea0ef651dbeda24f042417e6d30dd4734af5da6a02dfbdcdc777b44d816597c2f81a8beaf8b74cec07c38f3671fd38d9a39527d9ece899f5f3785d0254d WHIRLPOOL ea27f3de71460f40e78621878abad2cbfe94bc46cff0f741bf7401d8dfef79288748efb33271a48ad2eac026bec1a4728e48723ae19046def6501688eb290511
+DIST insight-6.8.1-patchset-01.tar.xz 324484 SHA256 54ca13a95d46941ebd25b8db2e31f6dcad9201dd0a414af296057b9fa91a9d0e SHA512 98551f1bdb77568ccdaf0217942cef2b3a4e6b5e5e6c27985ea805da54481fa680daaf7cc7331bc6f0a1c765d93fc8e2d8a5f76d4f56ec548e40406756aebb32 WHIRLPOOL d91122cb92078984d9d4904cb1d2a93d3c7485a37519b948be4d725ca0cd039dae57f419a242b466ce2224d2dac41d948afaded960559700e7c9f1ea8a5aeef2
+DIST insight-6.8.1-patchset-02.tar.xz 325772 SHA256 294c80770a1dab976d0daf1439b5721d57b0d89aa164d39f7cfb3f6c3109712d SHA512 1759e9d19115da634b3e57cd3aa6d628b2fbcea1666d5f34ce81c87d03112dc257a84c02fe87cc903fe505631310b72b0e0b60bace79932446bd1f864cf1c2a7 WHIRLPOOL 09b1681efc0d1f0a7b2c4bdaae8b80334af5db8c031ad9b8d70df77b0e272137854df4356562ad903afd285be1943d53dd2afd4b89a97cefb84e3ab4bfac6227
diff --git a/dev-util/insight/files/99insight b/dev-util/insight/files/99insight
new file mode 100644
index 000000000000..07f191fa5b0b
--- /dev/null
+++ b/dev-util/insight/files/99insight
@@ -0,0 +1,3 @@
+PATH=/opt/insight/bin
+LDPATH=/opt/insight/lib
+MANPATH=/opt/insight/man
\ No newline at end of file
diff --git a/dev-util/insight/files/insight-6.8.1-automake-1.13.patch b/dev-util/insight/files/insight-6.8.1-automake-1.13.patch
new file mode 100644
index 000000000000..3211c1b40a03
--- /dev/null
+++ b/dev-util/insight/files/insight-6.8.1-automake-1.13.patch
@@ -0,0 +1,123 @@
+From a38e3fb554ceeb9b50ed576f45893b01bfc993d8 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Sun, 3 Nov 2013 18:03:05 +0100
+Subject: [PATCH] BUILD: fix autoreconf with automake-1.13
+
+cygnus flavor has been removed from automake-1.13
+---
+ bfd/Makefile.am               | 2 +-
+ bfd/doc/Makefile.am           | 2 +-
+ gdb/gdbtk/Makefile.am         | 2 +-
+ gdb/gdbtk/plugins/Makefile.am | 2 +-
+ libgui/Makefile.am            | 2 +-
+ libgui/library/Makefile.am    | 2 +-
+ libgui/src/Makefile.am        | 2 +-
+ opcodes/Makefile.am           | 2 +-
+ tcl/cygwin/Makefile.am        | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/bfd/Makefile.am b/bfd/Makefile.am
+index 8e0a79c..129270c 100644
+--- a/bfd/Makefile.am
++++ b/bfd/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to generate Makefile.in
+ 
+-AUTOMAKE_OPTIONS = 1.9 cygnus
++AUTOMAKE_OPTIONS = 1.9
+ ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+ 
+ # Uncomment the following line when doing a release.
+diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
+index 6ff434a..83f0ba4 100644
+--- a/bfd/doc/Makefile.am
++++ b/bfd/doc/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to generate Makefile.in
+ 
+-AUTOMAKE_OPTIONS = 1.9 cygnus
++AUTOMAKE_OPTIONS = 1.9
+ 
+ DOCFILES = aoutx.texi  archive.texi archures.texi \
+ 	bfdt.texi  cache.texi coffcode.texi \
+diff --git a/gdb/gdbtk/Makefile.am b/gdb/gdbtk/Makefile.am
+index 530ab66..1361b84 100644
+--- a/gdb/gdbtk/Makefile.am
++++ b/gdb/gdbtk/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ SUBDIRS = plugins
+diff --git a/gdb/gdbtk/plugins/Makefile.am b/gdb/gdbtk/plugins/Makefile.am
+index 03fabe7..538681e 100644
+--- a/gdb/gdbtk/plugins/Makefile.am
++++ b/gdb/gdbtk/plugins/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ SUBDIRS = @make_subdirs@
+diff --git a/libgui/Makefile.am b/libgui/Makefile.am
+index c2604ed..b99c5a2 100644
+--- a/libgui/Makefile.am
++++ b/libgui/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in.
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ SUBDIRS = library src
+diff --git a/libgui/library/Makefile.am b/libgui/library/Makefile.am
+index a0aae95..9dba223 100644
+--- a/libgui/library/Makefile.am
++++ b/libgui/library/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in.
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ 
+ ## Convenience variables.
+ TCL = advice.tcl balloon.tcl bbox.tcl bgerror.tcl bindings.tcl \
+diff --git a/libgui/src/Makefile.am b/libgui/src/Makefile.am
+index 1c42b85..8362012 100644
+--- a/libgui/src/Makefile.am
++++ b/libgui/src/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in.
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ 
+ noinst_LIBRARIES = libgui.a
+ 
+diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
+index 8cd2be1..6b2ab00 100644
+--- a/opcodes/Makefile.am
++++ b/opcodes/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to generate Makefile.in
+ 
+-AUTOMAKE_OPTIONS = 1.9 cygnus
++AUTOMAKE_OPTIONS = 1.9
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+ 
+ SUBDIRS = po
+diff --git a/tcl/cygwin/Makefile.am b/tcl/cygwin/Makefile.am
+index dd1f243..686ba57 100644
+--- a/tcl/cygwin/Makefile.am
++++ b/tcl/cygwin/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in.
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ 
+ updir=$(srcdir)/..
+ vpath % $(updir)/generic:$(updir)/unix
+-- 
+1.8.4.2
+
diff --git a/dev-util/insight/insight-6.8.1-r1.ebuild b/dev-util/insight/insight-6.8.1-r1.ebuild
new file mode 100644
index 000000000000..ca166c73bd49
--- /dev/null
+++ b/dev-util/insight/insight-6.8.1-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils autotools versionator
+
+MY_P="${PN}-$(replace_version_separator 2 -)"
+
+DESCRIPTION="A graphical interface to the GNU debugger"
+HOMEPAGE="http://sourceware.org/insight/"
+SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${MY_P}a.tar.bz2
+	http://dev.gentoo.org/~xarthisius/distfiles/${P}-patchset-02.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-libs/expat
+	dev-tcltk/iwidgets
+	sys-libs/ncurses
+	sys-libs/readline
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	dev-lang/tcl:0
+	dev-lang/tk:0
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	sys-devel/bison
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local location
+
+	# Messes with internal glibc defines which fails w/newer glibc.
+	rm "${WORKDIR}/patches/0016-insight-6.8.1-sbrk.patch"
+
+	EPATCH_FORCE="yes" \
+	EPATCH_SOURCE="${WORKDIR}/patches" \
+	EPATCH_SUFFIX="patch" \
+	epatch
+
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
+	# remove bundled stuff
+	rm -rf "${S}"/{itcl,tcl,tk,readline} || die
+
+	for location in gdb/gdbtk/plugins libgui; do
+		pushd ${location} >/dev/null
+		eautoreconf
+		popd >/dev/null
+	done
+
+	# disable regeneration of info pages we never install. #465460
+	sed -i -e '/^SUBDIRS/s:doc::' bfd/Makefile.in || die
+	sed -i -e '/^AC_CONFIG_SUBDIRS/s:doc::' gdb/configure.ac || die
+
+	cd gdb
+	eautoconf
+
+	sed -i \
+		-e 's:tk.h:tkInt.h:g' \
+		-e 's:ITCL_BUILD_LIB_SPEC:ITCL_LIB_SPEC:g' \
+		-e 's:ITK_BUILD_LIB_SPEC:ITK_LIB_SPEC:g' \
+		"${S}/gdb/configure" || die
+}
+
+src_configure() {
+	export ac_cv_c_itclh="${EPREFIX}/usr/include/"
+	export ac_cv_c_itkh="${EPREFIX}/usr/include/"
+
+	. "${EPREFIX}/usr/$(get_libdir)/tclConfig.sh"
+	. "${EPREFIX}/usr/$(get_libdir)/tkConfig.sh"
+	. "${EPREFIX}/usr/$(get_libdir)/itclConfig.sh"
+
+	# there will be warning about undefined options
+	# because it is passed only to some subdir configures
+	econf \
+		--disable-static \
+		--with-system-readline \
+		--disable-rpath \
+		--disable-werror \
+		$(use_enable nls) \
+		--enable-gdbtk \
+		--enable-sim \
+		--with-expat \
+		--datadir="${EPREFIX}/usr/share" \
+		--with-tclinclude="${TCL_SRC_DIR}" \
+		--with-tkinclude="${TK_SRC_DIR}"
+}
+
+src_install() {
+	# the tcl-related subdirs are not parallel safe
+	emake -j1 DESTDIR="${D}" install
+
+	find "${ED}" -name '*.la' -delete
+
+	dodoc gdb/gdbtk/{README,TODO}
+
+	# scrub all the cruft we dont want
+	rm -f "${ED}"/usr/bin/{gdb,gdbtui,gdbserver} || die
+	rm -f "${ED}"/usr/$(get_libdir)/*.a || die
+	rm -f "${ED}"/usr/$(get_libdir)/*.sh || die
+	rm -rf "${ED}"/usr/include || die
+	rm -rf "${ED}"/usr/man || die
+	rm -rf "${ED}"/usr/share/{man,info,locale} || die
+
+	# regen pkgIndex.tcl
+	echo "pkg_mkIndex \"${ED}/usr/share/${PN}/gui\"" | tclsh
+}
diff --git a/dev-util/insight/insight-6.8.1.ebuild b/dev-util/insight/insight-6.8.1.ebuild
new file mode 100644
index 000000000000..ebe1522408bf
--- /dev/null
+++ b/dev-util/insight/insight-6.8.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils autotools versionator
+
+MY_P="${PN}-$(replace_version_separator 2 -)"
+
+DESCRIPTION="A graphical interface to the GNU debugger"
+HOMEPAGE="http://sourceware.org/insight/"
+SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${MY_P}a.tar.bz2
+	http://dev.gentooexperimental.org/~scarabeus/${P}-patchset-01.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-libs/expat
+	dev-tcltk/iwidgets
+	sys-libs/ncurses
+	sys-libs/readline
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	dev-lang/tcl:0
+	dev-lang/tk:0
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	sys-devel/bison
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local location
+
+	EPATCH_FORCE="yes" \
+	EPATCH_SOURCE="${WORKDIR}/patches" \
+	EPATCH_SUFFIX="patch" \
+	epatch
+
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
+	# remove bundled stuff
+	rm -rf "${S}"/{itcl,tcl,tk,readline} || die
+
+	for location in gdb/gdbtk/plugins libgui; do
+		pushd ${location} > /dev/null
+		eautoreconf
+		popd > /dev/null
+	done
+
+	cd gdb
+	eautoconf
+
+	sed -i \
+		-e 's:tk.h:tkInt.h:g' \
+		-e 's:ITCL_BUILD_LIB_SPEC:ITCL_LIB_SPEC:g' \
+		-e 's:ITK_BUILD_LIB_SPEC:ITK_LIB_SPEC:g' \
+		"${S}/gdb/configure" || die
+}
+
+src_configure() {
+	export ac_cv_c_itclh="${EPREFIX}/usr/include/"
+	export ac_cv_c_itkh="${EPREFIX}/usr/include/"
+
+	. "${EPREFIX}/usr/$(get_libdir)/tclConfig.sh"
+	. "${EPREFIX}/usr/$(get_libdir)/tkConfig.sh"
+	. "${EPREFIX}/usr/$(get_libdir)/itclConfig.sh"
+
+	# there will be warning about undefined options
+	# because it is passed only to some subdir configures
+	econf \
+		--disable-static \
+		--with-system-readline \
+		--disable-rpath \
+		--disable-werror \
+		$(use_enable nls) \
+		--enable-gdbtk \
+		--enable-sim \
+		--with-expat \
+		--datadir=/usr/share \
+		--with-tclinclude="${TCL_SRC_DIR}" \
+		--with-tkinclude="${TK_SRC_DIR}"
+}
+
+src_install() {
+	# the tcl-related subdirs are not parallel safe
+	emake -j1 DESTDIR="${D}" install
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	dodoc gdb/gdbtk/{README,TODO}
+
+	# scrub all the cruft we dont want
+	rm -f "${ED}"/usr/bin/{gdb,gdbtui,gdbserver} || die
+	rm -f "${ED}"/usr/$(get_libdir)/*.a || die
+	rm -f "${ED}"/usr/$(get_libdir)/*.sh || die
+	rm -rf "${ED}"/usr/include || die
+	rm -rf "${ED}"/usr/man || die
+	rm -rf "${ED}"/usr/share/{man,info,locale} || die
+
+	# regen pkgIndex.tcl
+	echo "pkg_mkIndex \"${ED}/usr/share/${PN}/gui\"" | tclsh
+}
diff --git a/dev-util/insight/metadata.xml b/dev-util/insight/metadata.xml
new file mode 100644
index 000000000000..392e8535ccce
--- /dev/null
+++ b/dev-util/insight/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>dev-tools</herd>
+<longdescription>Graphical front-end to GDB</longdescription>
+</pkgmetadata>
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
new file mode 100644
index 000000000000..4d12968a8685
--- /dev/null
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -0,0 +1,2 @@
+DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 SHA256 2044a9a62f40788b0dc4f4ea77a3d85df14e7909258e37eed3e63f7254a0bcc9 SHA512 6974dd67d8292400f1d0c80fd137f39290fe7dcab5146b9f0613ae48484f84e1b523f710dcc07c8600919ce01ab2dd91ab0e2d693e3723ffa9a744fcc52151dd WHIRLPOOL bf474c5959d9b19b40491a68355c2f36bdd0b98facae75aef4f488726b9589555d49f4bf8eb47f52524be6d354addbc945621a97b6f5412162e5b0c8aa03243e
+DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 SHA256 23402790acc5bfe4949f48f02ce2c13f188588a5721690e04526e4bddb93c7ea SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9 WHIRLPOOL 6cc25a3f193314c8aa32612fa901deb6782f42f51b7b1578778d8e8273b7161802619b1a533dad0de9757d31d40a3ce910517c9794bdc2763b4fefe28a7cb968
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
new file mode 100644
index 000000000000..acfed9be595e
--- /dev/null
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P=${PN//-/_}_2012_x64
+
+inherit rpm multilib
+
+INTEL_CL=usr/$(get_libdir)/OpenCL/vendors/intel/
+
+DESCRIPTION="Intel's implementation of the OpenCL standard optimized for Intel processors"
+HOMEPAGE="http://software.intel.com/en-us/articles/opencl-sdk/"
+SRC_URI="http://registrationcenter.intel.com/irc_nas/2563/intel_sdk_for_ocl_applications_2012_x64.tgz"
+
+LICENSE="Intel-SDP"
+SLOT="0"
+IUSE="tools"
+KEYWORDS="amd64 -x86"
+
+RDEPEND="app-eselect/eselect-opencl
+	dev-cpp/tbb
+	sys-process/numactl
+	tools? (
+		sys-devel/llvm
+		>=virtual/jre-1.6
+	)"
+DEPEND=""
+
+RESTRICT="mirror"
+QA_EXECSTACK="${INTEL_CL/\//}libcpu_device.so
+	${INTEL_CL/\//}libOclCpuBackEnd.so
+	${INTEL_CL/\//}libtask_executor.so"
+QA_PREBUILT="${INTEL_CL}*"
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	rpm_unpack ./${MY_P}.rpm
+}
+
+src_prepare() {
+	# Remove unnecessary and bundled stuff
+	rm -rf ${INTEL_CL}/{docs,version.txt,llc}
+	rm -f ${INTEL_CL}/libboost*.so
+	rm -f ${INTEL_CL}/libtbb*
+	if ! use tools; then
+		rm -rf usr/bin
+		rm -f ${INTEL_CL}/{ioc64,ioc.jar}
+		rm -f ${INTEL_CL}/libboost*
+	fi
+}
+
+src_install() {
+	doins -r etc
+
+	insinto ${INTEL_CL}
+	doins -r usr/include
+
+	insopts -m 755
+	newins usr/$(get_libdir)/libOpenCL.so libOpenCL.so.1
+	dosym libOpenCL.so.1 ${INTEL_CL}/libOpenCL.so
+
+	doins ${INTEL_CL}/*
+}
+
+pkg_postinst() {
+	eselect opencl set --use-old intel
+}
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
new file mode 100644
index 000000000000..1db1d9392488
--- /dev/null
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit rpm multilib
+
+DESCRIPTION="Intel's implementation of the OpenCL standard"
+HOMEPAGE="http://software.intel.com/en-us/articles/opencl-sdk/"
+SRC_URI="http://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64.tgz"
+
+LICENSE="Intel-SDP"
+SLOT="0"
+IUSE="android +system-tbb system-clang +system-boost +system-qt"
+KEYWORDS="-* ~amd64"
+RESTRICT="mirror"
+
+RDEPEND="app-eselect/eselect-opencl
+	sys-process/numactl
+	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
+	system-clang? ( =sys-devel/clang-3.4* )
+	system-boost? ( >=dev-libs/boost-1.52.0:= )
+	system-qt? (
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtcore-4.8.5:4
+		)
+	"
+DEPEND=""
+
+S=${WORKDIR}/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64/
+INTEL_CL=opt/intel/opencl-1.2-${PV}
+INTEL_VENDOR_DIR=usr/$(get_libdir)/OpenCL/vendors/intel/
+
+QA_PREBUILT="${INTEL_OCL}/*"
+
+src_unpack() {
+	default
+
+	PKGS="base devel intel-cpu intel-devel"
+
+	use android && PKGS="$PKGS intel-devel-android"
+
+	for PKG in ${PKGS}; do
+		FILENAME="opencl-1.2-${PKG}-4.4.0.117-1.x86_64.deb"
+		einfo "Extracting \"${FILENAME}\"..."
+		ar x "${S}/$FILENAME" || die
+		unpack ./data.tar.gz
+	done
+}
+
+src_prepare() {
+	# Remove bundled stuff
+	if use system-boost; then
+		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libboost*.so*
+	fi
+	if use system-clang; then
+		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libclang*
+	fi
+	if use system-qt; then
+		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libQt*
+	fi
+	if use system-tbb; then
+		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb*
+	fi
+}
+
+src_install() {
+	insinto /etc/OpenCL/vendors/
+	doins "${WORKDIR}/${INTEL_CL}"/etc/intel64.icd
+
+	insinto /"${INTEL_CL}"/lib64
+	insopts -m 755
+	doins "${WORKDIR}/${INTEL_CL}"/lib64/*
+
+	insinto /"${INTEL_CL}"/bin
+	doins "${WORKDIR}"/"${INTEL_CL}"/bin/*
+
+	# TODO put this somewhere
+	# doins ${INTEL_CL}/eclipse-plug-in/OpenCL_SDK_0.1.0.jar
+
+	dodir "${INTEL_VENDOR_DIR}"
+	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so"     "${INTEL_VENDOR_DIR}/libOpenCL.so"
+	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1"   "${INTEL_VENDOR_DIR}/libOpenCL.so.1"
+	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1.2" "${INTEL_VENDOR_DIR}/libOpenCL.so.1.2"
+}
+
+pkg_postinst() {
+	eselect opencl set --use-old intel
+}
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
new file mode 100644
index 000000000000..4064b68412b1
--- /dev/null
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dev@kicherer.org</email>
+		<name>anYc</name>
+	</maintainer>
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<use>
+		<flag name='android'>Install android related files</flag>
+		<flag name='tools'>Install Intel Offline Compiler</flag>
+		<flag name='system-boost'>Use system boost (dev-libs/boost) instead of bundled one</flag>
+		<flag name='system-clang'>Use system clang (sys-devel/clang) instead of bundled one</flag>
+		<flag name='system-qt'>Use system Qt (sys-devel-qtcore, sys-devel/qtgui) instead of bundled one</flag>
+		<flag name='system-tbb'>Use sytem Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/intel2gas/Manifest b/dev-util/intel2gas/Manifest
new file mode 100644
index 000000000000..41837b7da891
--- /dev/null
+++ b/dev-util/intel2gas/Manifest
@@ -0,0 +1 @@
+DIST intel2gas-1.3.3.tar.gz 48460 SHA256 8abb55437cb14c148e878cf40c8be8208ffbbe0e38d35a5e08c206f28b669538 SHA512 62d6462291404220630e0d6d27f6b95ec2b332aa5c783f7fb416832990cb31f21f1a2826466bd45e5c0035472bddb4354f7f170ea3fc70fb2ecc785dd66db518 WHIRLPOOL 86e6b1045b5425d1dc197cf129e7086d7f0d483282e4fc468d88b79d803d44ff66a3c6ed84514592be10d997b4f09115eac1127875cc8edbc1016ae792b2a634
diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-constchar.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-constchar.patch
new file mode 100644
index 000000000000..f749f9255d7c
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-1.3.3-constchar.patch
@@ -0,0 +1,71 @@
+--- intel2gas-1.3.3/intel2gas.cc.orig	2009-01-26 12:21:11.000000000 +1100
++++ intel2gas-1.3.3/intel2gas.cc	2009-01-26 12:38:54.000000000 +1100
+@@ -57,10 +57,6 @@
+   int counter = 0;
+   char* prev = 0;
+   while (l) {
+-    if (int(l->name) > 0x10000000) {
+-      printf("Error %d, prev=%s\n", counter, prev);
+-      break;
+-    }
+     if (!strcasecmp(name,l->name))
+       return l;
+     counter++;
+@@ -255,7 +251,7 @@
+   return len;
+ }
+ 
+-static int str_parse(syntaxlist_t *s, char *parse, char *outline);
++static int str_parse(syntaxlist_t *s, const char *parse, char *outline);
+ 
+ static int parsematch(char *text, char *parse)
+ {
+@@ -394,10 +390,10 @@
+ }
+ 
+ 
+-static int str_parse(syntaxlist_t *sl, char *parse, char *outline)
++static int str_parse(syntaxlist_t *sl, const char *parse, char *outline)
+ {
+   *outline = '\0';
+-  parse = str_skipspace(parse);
++  parse = str_skipspace((char *)parse);
+   if (str_empty(parse))
+     return 0;
+     
+@@ -412,7 +408,7 @@
+       return 0;
+     }
+     strcpy(tempstr, s->parseline);
+-    int size = parsematch(parse, tempstr);
++    int size = parsematch((char *)parse, tempstr);
+     if (size) {
+       setTheseVars(s->assignments);
+       if (!str_empty(s->output))
+@@ -535,7 +531,7 @@
+   if (str_empty(var)) return;
+     
+   static struct {
+-    char *reg;
++    const char *reg;
+     int   mask;
+   } reglist[] = {
+     {"bp",0x40000},{"ebp",0xc0000},
+@@ -717,7 +713,7 @@
+ static int load_syntax_files(char modedir[])
+ {
+   // Override the compiled in path
+-  char *resource_path = getenv("I2G_DATA");
++  const char *resource_path = getenv("I2G_DATA");
+   if (resource_path == NULL)
+     resource_path = RESOURCE_PATH;
+     
+@@ -768,7 +764,7 @@
+ 
+ static bool is_a_define_line(char const *line)
+ {
+-  static char *keywords[] = {
++  static const char *keywords[] = {
+     "if","define","else","endif",NULL,
+   };
+   for (int i=0; keywords[i]; i++) {
diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch
new file mode 100644
index 000000000000..6197f299ef10
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch
@@ -0,0 +1,10 @@
+--- intel2gas-1.3.3/Makefile.in.orig	2009-01-26 12:15:41.000000000 +1100
++++ intel2gas-1.3.3/Makefile.in	2009-01-26 12:15:50.000000000 +1100
+@@ -1,7 +1,6 @@
+ # intel2gas 1.3.3 (c)1999 Mikko Tiihonen (mikko.tiihonen@hut.fi)
+ # Makefile by brn (c.nentwich@cs.ucl.ac.uk)
+ 
+-CXX = g++
+ 
+ # CXXFLAGS = -O6 -mpentium -malign-jumps=2 -malign-functions=2 -malign-loops=2 
+ # Just kidding :)
diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-glibc210.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-glibc210.patch
new file mode 100644
index 000000000000..1a79a84c5461
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-1.3.3-glibc210.patch
@@ -0,0 +1,32 @@
+diff -NrU5 intel2gas-1.3.3.original/intel2gas.cc intel2gas-1.3.3/intel2gas.cc
+--- intel2gas-1.3.3.original/intel2gas.cc	2009-08-09 15:36:40.000000000 -0600
++++ intel2gas-1.3.3/intel2gas.cc	2009-08-09 15:44:33.000000000 -0600
+@@ -440,11 +440,11 @@
+ 
+ static void findComment(char const *source, comment_match_t &match)
+ {
+   match.at = NULL;
+   for (int c=0; c<comments; c++) {
+-    char *pos = strstr(source, comment[c].src);
++    char *pos = const_cast<char*>(strstr(source, comment[c].src));
+     if (!match.at || (pos && pos < match.at)) {
+       match.at = pos;
+       match.data = &comment[c];
+     }
+   }
+diff -NrU5 intel2gas-1.3.3.original/strhandle.cc intel2gas-1.3.3/strhandle.cc
+--- intel2gas-1.3.3.original/strhandle.cc	2009-08-09 15:36:40.000000000 -0600
++++ intel2gas-1.3.3/strhandle.cc	2009-08-09 15:41:14.000000000 -0600
+@@ -22,11 +22,11 @@
+ 
+ 
+ /* Like str_cutat, but the beginning of str is copied to buffer at left */
+ char *str_splitat(char const * const str, char *left, char cut)
+ {
+-    char *pos = strchr(str,cut);
++    char *pos = const_cast<char*>(strchr(str,cut));
+     if (!pos) {
+         strcpy(left,str);
+         return NULL;
+     }
+     strncpy(left,str,pos-str);
diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-segfault.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-segfault.patch
new file mode 100644
index 000000000000..d095f8f38c6e
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-1.3.3-segfault.patch
@@ -0,0 +1,34 @@
+--- intel2gas-1.3.3/loaddata.cc	2000-06-20 21:57:28.000000000 +0200
++++ intel2gas-1.3.3-r1/loaddata.cc	2005-09-29 13:29:05.000000000 +0200
+@@ -13,6 +13,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <errno.h>
+ #ifdef USE_GLOB
+ #include <glob.h>         //  Find files
+ #else
+@@ -155,7 +156,10 @@
+ // where filename is listname.nn.list
+ {
+     FILE *f;
+-    f = fopen(filename,"r");
++	 if((f = fopen(filename,"r")) == NULL) {
++		 perror("fopen");
++		 exit(errno);
++	 }
+     current_line = 0;
+     
+     list_t *l = newList();
+@@ -213,7 +217,10 @@
+ // where filename is syntaxname.syntax
+ {
+     FILE *f;
+-    f = fopen(filename,"r");
++	 if((f = fopen(filename,"r")) == NULL) {
++		 perror("fopen");
++		 exit(errno);
++	 }
+     current_line = 0;
+     
+     char name[STR_LEN+1];
diff --git a/dev-util/intel2gas/files/intel2gas-nostrip.patch b/dev-util/intel2gas/files/intel2gas-nostrip.patch
new file mode 100644
index 000000000000..86f9f6844117
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-nostrip.patch
@@ -0,0 +1,12 @@
+diff -ru a/Makefile.in b/Makefile.in
+--- intel2gas-1.3.3/Makefile.in	2000-11-14 12:53:25.000000000 -0600
++++ intel2gas-1.3.3-r1/Makefile.in	2009-01-21 18:34:44.000000000 -0600
+@@ -45,7 +45,7 @@
+ 	  cp -a $$datadir/* $(data_prefix)/$$datadir; \
+ 	done
+ 	install -m 755 -d $(prefix)/bin
+-	install -s -m 755 intel2gas $(prefix)/bin
++	install -m 755 intel2gas $(prefix)/bin
+ 
+ uninstall:
+ 	for datadir in $(DATADIRS); do \
diff --git a/dev-util/intel2gas/intel2gas-1.3.3-r3.ebuild b/dev-util/intel2gas/intel2gas-1.3.3-r3.ebuild
new file mode 100644
index 000000000000..daa008344075
--- /dev/null
+++ b/dev-util/intel2gas/intel2gas-1.3.3-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools toolchain-funcs
+
+DESCRIPTION="Converts assembler source from Intel (NASM), to AT&T (gas)"
+HOMEPAGE="http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/"
+SRC_URI="http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-segfault.patch
+	epatch "${FILESDIR}"/${PN}-nostrip.patch
+	epatch "${FILESDIR}"/${P}-cxx.patch
+	epatch "${FILESDIR}"/${P}-constchar.patch
+	epatch "${FILESDIR}"/${P}-glibc210.patch
+	eautomake
+	sed -i -e "s:\$(CXXFLAGS):& ${LDFLAGS} :" \
+		-e "/^${PN}/{n; s:\$(CXX) :& ${CXXFLAGS} ${LDFLAGS} :}" \
+		"${S}"/Makefile.in
+}
+
+src_compile() {
+	tc-export CXX
+	econf
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		install || die
+	fperms ugo+r /usr/share/intel2gas/i2g/main.syntax
+	dodoc README DATAFILES BUGS
+}
diff --git a/dev-util/intel2gas/metadata.xml b/dev-util/intel2gas/metadata.xml
new file mode 100644
index 000000000000..4d1a7b0fd439
--- /dev/null
+++ b/dev-util/intel2gas/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<longdescription>Intel2GAS is a converter that will convert assembler source files written for 
+NASM to files that can be assembled using the GNU Assembler (GAS), on the i386 platform. It 
+provides support for basic MMX instructions as well.</longdescription>
+</pkgmetadata>
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
new file mode 100644
index 000000000000..7e9e239e98eb
--- /dev/null
+++ b/dev-util/intltool/Manifest
@@ -0,0 +1,2 @@
+DIST intltool-0.50.2.tar.gz 189483 SHA256 67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406 SHA512 9f7f0746e77a1a6765b49e16f65438103bc031f3fa8cac42c061deade4291703b95aa336eba2500c8f05d19e35620cf01a120c71a7b6816c1bfecbb9fd747b11 WHIRLPOOL b026ab99921aaddb376823f1eb06e7d669bcc0a3cfb12431676e4e041343a370d7f715d39d60ef991e86e4f8441228713fc82a7ecb3cae2dc3273f7f01ce66a3
+DIST intltool-0.51.0.tar.gz 162286 SHA256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf WHIRLPOOL f0cf9a23c7f7dd9d4ec504709c447de1895bf5bdb10fe2000f9ebc8d93b0be204bb4bc1a54a1c3e981a9f8754cc354224e8411711e4996fc7ffd56335cb300cd
diff --git a/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch b/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch
new file mode 100644
index 000000000000..117f4a30c29b
--- /dev/null
+++ b/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch
@@ -0,0 +1,63 @@
+From c262cb09fa9f4dad056ba5b25a8627408bcf909a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Apr 2013 20:41:41 +0200
+Subject: [PATCH] Fix handling absolute paths in single file key output.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+Fixes: https://bugs.gentoo.org/show_bug.cgi?id=464954
+---
+ intltool-merge.in | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/intltool-merge.in b/intltool-merge.in
+index 1afa2a4..47dbbdf 100644
+--- a/intltool-merge.in
++++ b/intltool-merge.in
+@@ -1108,13 +1108,20 @@ sub keys_merge_translation
+ {
+     my ($lang) = @_;
+ 
+-    if ( ! -d $lang && $MULTIPLE_OUTPUT)
++    my $outpath = "$OUTFILE";
++
++    if ($MULTIPLE_OUTPUT)
+     {
+-        mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++        $outpath = "$lang/$outpath";
++
++        if ( ! -d $lang )
++        {
++            mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++        }
+     }
+ 
+     open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
+-    open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
++    open OUTPUT, ">$outpath" or die "Cannot open $outpath: $!\n";
+     binmode (OUTPUT) if $^O eq 'MSWin32';
+ 
+     while (<INPUT>)
+@@ -1159,7 +1166,7 @@ sub keys_merge_translation
+     close OUTPUT;
+     close INPUT;
+ 
+-    print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
++    print "CREATED $outpath\n" unless $QUIET_ARG;
+ }
+ 
+ sub keys_merge_translations
+@@ -1174,7 +1181,7 @@ sub keys_merge_translations
+     }
+     else
+     {
+-        keys_merge_translation (".");
++        keys_merge_translation ();
+     }
+ }
+ 
+-- 
+1.8.1.5
+
diff --git a/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch b/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch
new file mode 100644
index 000000000000..a887c41d3b52
--- /dev/null
+++ b/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch
@@ -0,0 +1,70 @@
+=== modified file 'Makefile.in.in'
+--- Makefile.in.in	2013-05-12 18:38:08 +0000
++++ Makefile.in.in	2013-05-22 13:43:26 +0000
+@@ -33,8 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++localedir = @localedir@
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+@@ -108,7 +107,7 @@
+ install-data-yes: all
+ 	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
++	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkdir_p) $$dir; \
+ 	  if test -r $$lang.gmo; then \
+ 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+@@ -142,8 +141,8 @@
+ uninstall:
+ 	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ 	done
+ 
+ check: all $(GETTEXT_PACKAGE).pot
+
+=== modified file 'intltool.m4'
+--- intltool.m4	2012-02-20 14:50:33 +0000
++++ intltool.m4	2013-05-12 17:08:09 +0000
+@@ -155,31 +155,6 @@
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+ 
+-# Set DATADIRNAME correctly if it is not set yet
+-# (copied from glib-gettext.m4)
+-if test -z "$DATADIRNAME"; then
+-  AC_LINK_IFELSE(
+-    [AC_LANG_PROGRAM([[]],
+-                     [[extern int _nl_msg_cat_cntr;
+-                       return _nl_msg_cat_cntr]])],
+-    [DATADIRNAME=share],
+-    [case $host in
+-    *-*-solaris*)
+-    dnl On Solaris, if bind_textdomain_codeset is in libc,
+-    dnl GNU format message catalog is always supported,
+-    dnl since both are added to the libc all together.
+-    dnl Hence, we'd like to go with DATADIRNAME=share
+-    dnl in this case.
+-    AC_CHECK_FUNC(bind_textdomain_codeset,
+-      [DATADIRNAME=share], [DATADIRNAME=lib])
+-    ;;
+-    *)
+-    [DATADIRNAME=lib]
+-    ;;
+-    esac])
+-fi
+-AC_SUBST(DATADIRNAME)
+-
+ IT_PO_SUBDIR([po])
+ 
+ ])
+
diff --git a/dev-util/intltool/intltool-0.50.2-r1.ebuild b/dev-util/intltool/intltool-0.50.2-r1.ebuild
new file mode 100644
index 000000000000..7b6f95c35107
--- /dev/null
+++ b/dev-util/intltool/intltool-0.50.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Internationalization Tool Collection"
+HOMEPAGE="https://launchpad.net/intltool/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+"
+RDEPEND="${DEPEND}
+	sys-devel/gettext
+"
+DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
+
+src_prepare() {
+	# Use plain localedir to install mo files to, rather than trying to
+	# guess one, bug #432848#c11
+	epatch "${FILESDIR}/${P}-localedir-fix.patch"
+
+	# Fix handling absolute paths in single file key output, bug #470040
+	epatch "${FILESDIR}/${PN}-0.50.2-absolute-paths.patch"
+}
diff --git a/dev-util/intltool/intltool-0.51.0.ebuild b/dev-util/intltool/intltool-0.51.0.ebuild
new file mode 100644
index 000000000000..8d02a40c7b35
--- /dev/null
+++ b/dev-util/intltool/intltool-0.51.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Internationalization Tool Collection"
+HOMEPAGE="https://launchpad.net/intltool/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+"
+RDEPEND="${DEPEND}
+	sys-devel/gettext
+"
+DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
+
+src_prepare() {
+	# Fix handling absolute paths in single file key output, bug #470040
+	# https://bugs.launchpad.net/intltool/+bug/1168941
+	epatch "${FILESDIR}/${PN}-0.50.2-absolute-paths.patch"
+}
diff --git a/dev-util/intltool/metadata.xml b/dev-util/intltool/metadata.xml
new file mode 100644
index 000000000000..ab11cfdf2c80
--- /dev/null
+++ b/dev-util/intltool/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>freedesktop</herd>
+	<maintainer>
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">intltool</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/its4/Manifest b/dev-util/its4/Manifest
new file mode 100644
index 000000000000..c42070e059d3
--- /dev/null
+++ b/dev-util/its4/Manifest
@@ -0,0 +1 @@
+DIST its4-1.1.1.tgz 59759 RMD160 7f3fef7b7f5c6cf4f7e203481a44957bcf74e606 SHA1 f95711fad1a10ca127514132db04791a01088d77 SHA256 386ca694c969108863f3e5c0571ea8c5cbdc288dd13e12ba573a592844682df4
diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1.ebuild
new file mode 100644
index 000000000000..6a988f3f49d0
--- /dev/null
+++ b/dev-util/its4/its4-1.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="ITS4: Software Security Tool"
+HOMEPAGE="http://www.cigital.com/its4/"
+SRC_URI="${P}.tgz"
+LICENSE="ITS4"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE=""
+DEPEND="sys-devel/gcc"
+RESTRICT="mirror fetch"
+#RDEPEND=""
+S="${WORKDIR}/${PN}"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE} to download the source, and place it in"
+	einfo "${DISTDIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	sed -i \
+		-e 's,iostream.h,iostream,g'\
+		"${S}"/configure
+}
+
+src_compile() {
+	# WARNING
+	# non-standard configure
+	# do NOT use econf
+	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed"
+	emake OPTIMIZATION="${CXXFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	# WARNING
+	# non-standard, do NOT use einstall or 'make install DESTDIR=...'
+	make install INSTALL_BINDIR="${D}/usr/bin" INSTALL_MANDIR="${D}/usr/share/man" INSTALL_DATADIR="${D}/usr/share/its4" || die "install failed"
+}
diff --git a/dev-util/its4/metadata.xml b/dev-util/its4/metadata.xml
new file mode 100644
index 000000000000..8d7b356d6845
--- /dev/null
+++ b/dev-util/its4/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<longdescription>
+ITS4 scans source code, looking for function calls that are potentially
+dangerous. For some calls, ITS4 tries to perform some code analysis to
+determine how risky the call is. In each case, ITS4 provides a problem report,
+including a short description of the potential problem and suggestions on how
+to fix the code.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
new file mode 100644
index 000000000000..e97bda2eb23b
--- /dev/null
+++ b/dev-util/itstool/Manifest
@@ -0,0 +1,2 @@
+DIST itstool-1.2.0.tar.bz2 82479 SHA256 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa SHA512 d738c8d2ba610e723b241a02c3f15fea038df54361abd4b63350887d9a14ce3306e05d7389388f898ec37ef25afc29601810e9fe4ff1f010502a081c13f1a8a6 WHIRLPOOL f241b15f60af8b309278092e6ff7670f00d5f2b0b2f251a733268abdddff2d0ccee702e042e8583f5b112e258a425d0f2a0df912aa32e2f43907e4dd76ef2bc6
+DIST itstool-2.0.2.tar.bz2 96748 SHA256 bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2 WHIRLPOOL 9e027e9e01cdfd5d4e14b83d2cf85e2c6b9778f5f966de50fe501e56547a4c014b68cc242b33f073756cdf8d217f0171baaff5a8f1b86c47aab1f31437b4773e
diff --git a/dev-util/itstool/itstool-1.2.0-r1.ebuild b/dev-util/itstool/itstool-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..568baf5b7fd3
--- /dev/null
+++ b/dev-util/itstool/itstool-1.2.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit python-single-r1
+
+DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
+HOMEPAGE="http://itstool.org/"
+SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
+
+# files in /usr/share/itstool/its are HPND/as-is || GPL-3
+LICENSE="GPL-3+ || ( HPND GPL-3+ )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~arm-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	DOCS=(ChangeLog NEWS) # AUTHORS, README are empty
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+}
diff --git a/dev-util/itstool/itstool-2.0.2.ebuild b/dev-util/itstool/itstool-2.0.2.ebuild
new file mode 100644
index 000000000000..a5e01ec02a19
--- /dev/null
+++ b/dev-util/itstool/itstool-2.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit python-single-r1
+
+DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
+HOMEPAGE="http://itstool.org/"
+SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
+
+# files in /usr/share/itstool/its are HPND/as-is || GPL-3
+LICENSE="GPL-3+ || ( HPND GPL-3+ )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~arm-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	DOCS=(ChangeLog NEWS) # AUTHORS, README are empty
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+}
diff --git a/dev-util/itstool/metadata.xml b/dev-util/itstool/metadata.xml
new file mode 100644
index 000000000000..dcf8006540cb
--- /dev/null
+++ b/dev-util/itstool/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <longdescription lang="en">ITS Tool allows you to translate your XML documents
+  with gettext PO files, using rules from the W3C Internationalization Tag Set
+  (ITS) to determine what to translate and how to separate it into PO file
+  messages.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/jarwizard/Manifest b/dev-util/jarwizard/Manifest
new file mode 100644
index 000000000000..86306fb3f48e
--- /dev/null
+++ b/dev-util/jarwizard/Manifest
@@ -0,0 +1 @@
+DIST jarwizard_250_src.zip 169540 SHA256 0f32f4d0e817674929d03cdb2e33c4c7dee8418ccbf8ef9dfb4266c068d39645 SHA512 8d40cecd339e8e50b58c2c78a3c53b712275d95393d8ace4799b55a7f66f6e2a4bfd3348f92d6022d1d48c6edf17117c2b1bb1defc55e73fbdcf541907eeef1f WHIRLPOOL 172bd8098a0860b89318f0672011d3052c9e16312bdb3d47ea0623d18bc824fd3257fa02c9ade316b95109d2cfebd0440b99554fda11c456a022f971d968d646
diff --git a/dev-util/jarwizard/jarwizard-2.50.ebuild b/dev-util/jarwizard/jarwizard-2.50.ebuild
new file mode 100644
index 000000000000..73df40ea5701
--- /dev/null
+++ b/dev-util/jarwizard/jarwizard-2.50.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Takes the hassle out of creating executable JAR files for your Java programs"
+SRC_URI="mirror://sourceforge/jarwizard/${PN}_${PV/./}_src.zip"
+HOMEPAGE="http://sourceforge.net/projects/jarwizard/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc x86"
+DEPEND=">=virtual/jdk-1.5
+		app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	java-ant_bsfix_one "${S}/nbproject/build-impl.xml"
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+	java-pkg_dolauncher ${PN} --main JarWizard
+}
diff --git a/dev-util/jarwizard/metadata.xml b/dev-util/jarwizard/metadata.xml
new file mode 100644
index 000000000000..1613b38b18cb
--- /dev/null
+++ b/dev-util/jarwizard/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jarwizard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/jay/Manifest b/dev-util/jay/Manifest
new file mode 100644
index 000000000000..f32c64684120
--- /dev/null
+++ b/dev-util/jay/Manifest
@@ -0,0 +1,2 @@
+DIST jay-1.1.1-mono.snk.bz2 785 SHA256 0cc2ca58f90773eafa8460dfb8ff4ac6238b68106eb1631348a800091a6ff3de SHA512 de64da7a9e4fa53e5a5abaee00aae05ce3560c72ad8251fd79e2ff9ffa7fb2d5e7c1a4bdb2dbc2eeeeac6450aaad8c40649ff4675ddf95365ef8604a93333224 WHIRLPOOL 05882dd5cc9e2b99b78dc882fed49547dc6b6c133616574987322623e3bd734dc74435b69a6c864f928eb087df7a1ab42910adc47a7d0e70d54178e6b319f628
+DIST jay-1.1.1.zip 679556 SHA256 f4da396c80578653685d287cea1e32669ebdf148cc17eed9ba88e895942bd571 SHA512 5715d675f818310337738e98ca291c005caefd2e3903b8c29f13e5d9fd90e12b7de7c94ae6bfb4f4be4309af060ad39388789fba038ebf19a2a9fe7ca1ce915f WHIRLPOOL 938abbcb36977d8bf3f5cacce61b45e6e81121e4afa05ba79f0cfbee965e1d2ef417b896ac8837d429b583c73c43ce8601170fe5bd60984133123736def9829c
diff --git a/dev-util/jay/jay-1.1.1-r2.ebuild b/dev-util/jay/jay-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..fce84e00b677
--- /dev/null
+++ b/dev-util/jay/jay-1.1.1-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit mono java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="A LALR(1) parser generator: Berkeley yacc retargeted to C# and Java"
+HOMEPAGE="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/package-summary.html"
+SRC_URI="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/doc-files/src.zip -> ${P}.zip
+	http://dev.gentoo.org/~ssuominen/${P}-mono.snk.bz2"
+
+LICENSE="public-domain BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="java mono"
+
+COMMON_DEPEND="!<=dev-lang/mono-2.4
+	mono? ( >dev-lang/mono-2.4 )"
+RDEPEND="${COMMOND_DEPEND}
+	java? (	>=virtual/jre-1.4 )"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+RESTRICT="test"
+
+java_prepare() {
+	sed -i -r \
+		-e 's:^v4\s*=.*:v4 = ${JAVA_HOME}/bin:' \
+		-e 's:JAVAC\s*=.*:\0 ${JAVACFLAGS}:' \
+		yydebug/makefile || die
+}
+
+src_prepare() {
+	sed -i -r \
+		-e "s:^CC\s*=.*:CC = `tc-getCC`:" \
+		-e 's/^jay:.* \$e /\0$(LDFLAGS) /' \
+		-e '/^CFLAGS\s*=/d' \
+		 src/makefile || die
+
+	java-utils-2_src_prepare
+}
+
+src_compile() {
+	emake -C src jay
+	use java && emake -C yydebug yydebug.jar
+
+	if use mono; then
+		pushd cs >/dev/null
+		"${EPREFIX}"/usr/bin/gmcs /target:library /out:yydebug.dll /keyfile:"${WORKDIR}"/${P}-mono.snk yyDebug.cs || die
+		popd >/dev/null
+	fi
+}
+
+src_install() {
+	dobin src/jay
+
+	doman jay.1
+	dodoc README
+
+	if use java; then
+		java-pkg_dojar yydebug/yydebug.jar
+		insinto /usr/share/jay
+		doins java/skeleton.{java,tables}
+	fi
+
+	if use mono; then
+		egacinstall cs/yydebug.dll
+		insinto /usr/share/jay
+		doins cs/skeleton.cs
+	fi
+}
diff --git a/dev-util/jay/metadata.xml b/dev-util/jay/metadata.xml
new file mode 100644
index 000000000000..331dbe87a1f3
--- /dev/null
+++ b/dev-util/jay/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<herd>dotnet</herd>
+</pkgmetadata>
diff --git a/dev-util/jconfig/Manifest b/dev-util/jconfig/Manifest
new file mode 100644
index 000000000000..e1949d7ffff4
--- /dev/null
+++ b/dev-util/jconfig/Manifest
@@ -0,0 +1,3 @@
+DIST jconfig-src-v2.8.5.tar.gz 1171848 SHA256 3c3e1bd918a5ddff03bc7177b79962742b56101ce30355b2f10051ed3911019f SHA512 c6c1af63069ccaf7cfd2fe625318fec4ed3f82671754956f8d861c3254a748bbc8a7b8e63e36cf8abc436d4ced732d8ea04f770551428b04d3078293dc77d6ff WHIRLPOOL 17f00ea090b25783e11c1a670fbf13a74e98ef5b8f36322db2cf0f2e80dcb0c4dc0e1dff64f4aea652a0713f8e1b44537061d54126f27b5000e8474c80150200
+DIST jconfig-src-v2.8.tar.gz 1155906 SHA256 cba610b110de21936ecabd4db00ce18035c4ee14fcde9e9a3fa6c2d722477dae SHA512 ed84e3be2334caa9a7edf0308c6a2cc07c1462235ce27c39ec180c535f163447373f82a0c9f6ad144ec16cc013658e0f23e98e2f2089c7a680d1728a812d49c5 WHIRLPOOL b930879751980285b21dde61cfa23d31e5490c267d2aad50c1fd314fccc800f90537c08e20508f757b60d0802cb79d1d50815a0dec01e2754a84eeaf5a2eedc2
+DIST jconfig-src-v2.9.tar.gz 1202738 SHA256 4e4ee16b2bfec7d73ede45f0c42960cb4a907396d29123c2e0060c5ff83cc616 SHA512 fb3c171f8204bd41d7b0183707b6f524dbf27d8c82335cce5f9b4070b77ea1c86345692e533f1a6d64e0334e0bfc88f4cc47828aea6b4b56058197122c675b2c WHIRLPOOL 962a07b0206b899b583da4586193500740d092f26ee0a741b65dee412aef66fe07f21efea1a8c55e809534bbc22236e2d8b959ba5c7c5e2918b662e3ff71bc5f
diff --git a/dev-util/jconfig/jconfig-2.8-r3.ebuild b/dev-util/jconfig/jconfig-2.8-r3.ebuild
new file mode 100644
index 000000000000..dd099beb8d05
--- /dev/null
+++ b/dev-util/jconfig/jconfig-2.8-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
+HOMEPAGE="http://www.jconfig.org/"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+COMMON_DEP="java-virtuals/jmx"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN/c/C}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v dist/*.jar || die
+	rm -v lib/*.jar || die
+
+	java-pkg_jar-from --into lib jmx
+}
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+src_install() {
+	java-pkg_dojar dist/jconfig.jar
+
+	dodoc README || die
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/*
+
+}
diff --git a/dev-util/jconfig/jconfig-2.8.5.ebuild b/dev-util/jconfig/jconfig-2.8.5.ebuild
new file mode 100644
index 000000000000..84a5a0a4277c
--- /dev/null
+++ b/dev-util/jconfig/jconfig-2.8.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
+HOMEPAGE="http://www.jconfig.org/"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+COMMON_DEP="java-virtuals/jmx"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN/c/C}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v dist/*.jar || die
+	rm -v lib/*.jar || die
+
+	java-pkg_jar-from --into lib jmx
+}
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+src_install() {
+	java-pkg_dojar dist/jconfig.jar
+
+	dodoc README || die
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/*
+
+}
diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild
new file mode 100644
index 000000000000..6d831fb7a88f
--- /dev/null
+++ b/dev-util/jconfig/jconfig-2.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
+HOMEPAGE="http://www.jconfig.org/"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CDEPEND="java-virtuals/jmx"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN/c/C}"
+
+java_prepare() {
+	cd "${S}"
+
+	rm -v dist/*.jar || die
+	rm -v lib/*.jar || die
+
+	java-pkg_jar-from --into lib jmx
+}
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+src_install() {
+	java-pkg_dojar dist/jconfig.jar
+
+	dodoc README || die
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/*
+
+}
diff --git a/dev-util/jconfig/metadata.xml b/dev-util/jconfig/metadata.xml
new file mode 100644
index 000000000000..3eb786ee584c
--- /dev/null
+++ b/dev-util/jconfig/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jconfig</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
new file mode 100644
index 000000000000..e0ecc56e46cf
--- /dev/null
+++ b/dev-util/jenkins-bin/Manifest
@@ -0,0 +1,4 @@
+DIST jenkins-bin-1.609.1.war 68908995 SHA256 7e150cc9dd3d9089d82fecbf5b1d0ffa5cc33782637338c418c324715e329bd5 SHA512 909496a0b3757c8187cf9bad6374ea4faf57979eafcd91d9793d57bcc3bfc7e821755fbc321a104b14acc2ddbd319c30e40cc52fb0456eeea4ad2f23d9d6ae1c WHIRLPOOL 951f2307d439c22b202082614b16df201b61ca0478eb2666aaba9a1140a6323eee3193dc38586c222424ea1d63431e8aee228523714837a5889f1703620ca932
+DIST jenkins-bin-1.609.2.war 68976099 SHA256 60e775b1d5df417370a1768496fa3ccc9d17f9a093bf87f543765f9d4e401578 SHA512 f8d58fc5d8bb094932823ec40e53ef71412c44de2a82478fbc53c9f87e724597ab5afcba79fb776e69a42dd66529f0c31e875fafc305d411533dfb33afeb1948 WHIRLPOOL 107f47e16f91d98119564545d4b6c078d343690da558c7080471d4f0e3633b954257c290cc85200500165e2f145e7742509a27aa82cf2c9ea279ef27af3461d6
+DIST jenkins-bin-1.620.war 63264175 SHA256 94f71bb1f08e73262ff40b412303b03558ba21ca106251d1ed1f77791f6ab728 SHA512 056d81a9a5cce862d37578ec5fbba3ba31a6987ce133d6421b2ed930b3d877fc5d022d32e7ed8cc1be794938ae559cd9bb5abb2890353b16e9e32634733c8605 WHIRLPOOL 731e612d52e3aa0d6ca9c250ec98e06047adc00b23c7b27adc80df7e136e782c61185d8d4b2d53e3442154255b2e7b25f1577538daa39d76c9682c31d95da608
+DIST jenkins-bin-1.622.war 62881823 SHA256 e219546e9db0bdf913ceee04ab3f79fcbbb27ac7ca27619d184b82f93457b899 SHA512 7ff6be395527dc3f512ad8fb1c1d8a5294aac9108ead851e7a8479cac58ab9b2ee28e0c0f87a70896be62096e92cdb8843d529d62ac73ce22a23f259a7106368 WHIRLPOOL b29ed678c8da5a1004a54b3cd3e7e93c4d9a7bcf834670d01d7a347ec7f102f4ebe0894753bd98a6dc6badd8a69c909b05826c68d928bafa59387b8c4017670b
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate b/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
new file mode 100644
index 000000000000..33b16600452e
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
@@ -0,0 +1,17 @@
+/var/log/jenkins/jenkins.log /var/log/jenkins/access_log {
+    compress
+    dateext
+    maxage 365
+    rotate 99
+    size=+4096k
+    notifempty
+    missingok
+    create 644
+    postrotate
+        [ -r /etc/conf.d/jenkins ] && . /etc/conf.d/jenkins
+        if [ -s /var/run/jenkins.pid ]; then
+            JPID=$(cat /var/run/jenkins.pid)
+            test -n "$(find /proc/$JPID -maxdepth 0 -user ${RUN_AS:-jenkins} 2>/dev/null)" && kill -s ALRM $JPID || :
+        fi
+    endscript
+}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.confd b/dev-util/jenkins-bin/files/jenkins-bin.confd
new file mode 100644
index 000000000000..f84e3463e359
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin.confd
@@ -0,0 +1,62 @@
+# Config file for /etc/init.d/jenkins
+
+#
+# Directory where Jenkins store its configuration and working
+# files (checkouts, build reports, artifacts, ...).
+#
+JENKINS_HOME="/var/lib/jenkins/home"
+
+#
+# Options to pass to java when running Jenkins.
+#
+JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
+
+#
+# Port Jenkins is listening on.
+#
+JENKINS_PORT="8080"
+
+#
+# Debug level for logs -- the higher the value, the more verbose.
+# 5 is INFO.
+#
+JENKINS_DEBUG_LEVEL="5"
+
+#
+# Whether to enable access logging or not.
+#
+JENKINS_ENABLE_ACCESS_LOG="no"
+
+#
+# Maximum number of HTTP worker threads.
+#
+JENKINS_HANDLER_MAX="100"
+
+#
+# Maximum number of idle HTTP worker threads.
+#
+JENKINS_HANDLER_IDLE="20"
+
+#
+# Pass arbitrary arguments to Jenkins.
+# Eg.: --httpListenAddress=127.0.0.1 --prefix=/jenkins
+# Full option list: java -jar jenkins.war --help
+#
+JENKINS_ARGS=""
+
+#
+# User
+#
+JENKINS_USER=jenkins
+
+
+
+#
+# Pid File 
+#
+JENKINS_PIDFILE="/var/run/jenkins.pid"
+
+#
+# War File
+#
+JENKINS_WAR="/opt/jenkins/jenkins.war"
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.init2 b/dev-util/jenkins-bin/files/jenkins-bin.init2
new file mode 100644
index 000000000000..9e326a569350
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin.init2
@@ -0,0 +1,52 @@
+#!/sbin/runscript
+
+depend() {
+    need net
+    use dns logger mysql postgresql
+}
+
+checkconfig() {
+    if [ ! -n "$JENKINS_HOME" ] ; then
+        eerror "JENKINS_HOME not configured"
+        return 1
+    fi
+    if [ ! -d "$JENKINS_HOME" ] ; then
+        checkpath -q -d -o jenkins:jenkins -m 0755 "$JENKINS_HOME" || return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return 1
+
+    JAVA_HOME=`java-config --jre-home`
+    COMMAND=$JAVA_HOME/bin/java
+
+    JAVA_PARAMS="$JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR"
+
+    # Don't use --daemon here, because in this case stop will not work
+    PARAMS="--logfile=/var/log/jenkins/jenkins.log"
+    [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
+    [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
+    [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
+    [ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX"
+    [ -n "$JENKINS_HANDLER_IDLE" ] && PARAMS="$PARAMS --handlerCountMaxIdle=$JENKINS_HANDLER_IDLE"
+    [ -n "$JENKINS_ARGS" ] && PARAMS="$PARAMS $JENKINS_ARGS"
+
+    if [ "$JENKINS_ENABLE_ACCESS_LOG" = "yes" ]; then
+        PARAMS="$PARAMS --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log"
+    fi
+
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon --start --quiet --background \
+        --make-pidfile --pidfile $JENKINS_PIDFILE \
+        --user ${JENKINS_USER} \
+        --exec "${COMMAND}" -- $JAVA_PARAMS $PARAMS
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop --quiet --pidfile $JENKINS_PIDFILE
+    eend $?
+}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service b/dev-util/jenkins-bin/files/jenkins-bin.service
new file mode 100644
index 000000000000..5edaac7da40a
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Jenkins Daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/java -Djava.awt.headless=true -DJENKINS_HOME=/var/lib/jenkins/home -jar /opt/jenkins/jenkins.war --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=8080 --debug=5 --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log
+User=jenkins
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.609.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.609.1.ebuild
new file mode 100644
index 000000000000..b3839a98bae8
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-1.609.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	virtual/jre"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.609.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.609.2.ebuild
new file mode 100644
index 000000000000..b3839a98bae8
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-1.609.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	virtual/jre"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.620.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.620.ebuild
new file mode 100644
index 000000000000..37fc08477727
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-1.620.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.7.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.622.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.622.ebuild
new file mode 100644
index 000000000000..37fc08477727
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-1.622.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.7.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/metadata.xml b/dev-util/jenkins-bin/metadata.xml
new file mode 100644
index 000000000000..858224bb4838
--- /dev/null
+++ b/dev-util/jenkins-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<maintainer>
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/jif/Manifest b/dev-util/jif/Manifest
new file mode 100644
index 000000000000..55c35cbb7dde
--- /dev/null
+++ b/dev-util/jif/Manifest
@@ -0,0 +1 @@
+DIST JIF31_src_RC1.zip 261645 SHA256 7c4e2c500fc35dcef3e37af8268c2dd8b47599ef727b90cbd2f912106064e0ea SHA512 167d6c9c5870902209df02b253afd81c07776ee878fccc3dbc9c67834a86f9044f13f6fda5daecf65e26027b57a4fc153e0303b11f5cd0d129f0d291274840cf WHIRLPOOL 84e1b06058ca46340d75be3ad52f8d133c1d0e7943ff97de4ba263cd4b7a403cc08c37b23a5e4766ed92c5558d9b0ec6d57b708e7d1249af280cecfcd3ec07c5
diff --git a/dev-util/jif/files/jif b/dev-util/jif/files/jif
new file mode 100755
index 000000000000..6d6b06ef9205
--- /dev/null
+++ b/dev-util/jif/files/jif
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+wd=`pwd`
+
+cd ${HOME}
+
+java -jar /usr/share/jif/lib/Jif.jar &
+
+cd ${wd}
diff --git a/dev-util/jif/jif-3.1_rc1.ebuild b/dev-util/jif/jif-3.1_rc1.ebuild
new file mode 100644
index 000000000000..124d2702741b
--- /dev/null
+++ b/dev-util/jif/jif-3.1_rc1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+MY_PN=${PN/jif/JIF}
+MY_PV=${PV/rc/RC}
+MY_PV=${MY_PV/./}
+MY_PV_MAJOR=${MY_PV/_*/}
+MY_PV_MINOR=${MY_PV/*_/}
+MY_P=${MY_PN}${MY_PV_MAJOR}_src_${MY_PV_MINOR}
+
+IUSE=""
+
+DESCRIPTION="JIF is an IDE for the creation of text adventures based on Graham Nelson's Inform standard"
+HOMEPAGE="http://www.slade.altervista.org/JIF/"
+SRC_URI="http://www.slade.altervista.org/downloads/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+DEPEND=">=virtual/jdk-1.4
+	>=sys-apps/sed-4.1.4
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.4
+	>=dev-lang/inform-6.21.4
+	>=games-engines/gargoyle-2010.1"
+
+S=${WORKDIR}/src
+
+src_compile()
+{
+	# Compile classes just as it is done upstream
+	javac -source 1.4 -O -classpath . *.java
+
+	# Adapt default Jif.cfg file to Gentoo
+	sed -i -e "s:\[EXECUTE\]e\,explorer.exe:#\[EXECUTE\]e\,explorer.exe:" Jif.cfg
+	sed -i -e "s:\[EXECUTE\]d\,hh.exe\ C\:\\\Jif\\\doc\\\prova.chm:#\[EXECUTE\]d\,hh.exe\ C\:\\\Jif\\\doc\\\prova.chm:" Jif.cfg
+	sed -i -e "s:C\:\\\Inform\\\Lib\\\Base:/usr/share/inform/6.21/module:" Jif.cfg
+	sed -i -e "s:C\:\\\Inform\\\Lib\\\Contrib::" Jif.cfg
+	sed -i -e "s:C\:\\\Inform\\\Games::" Jif.cfg
+	sed -i -e "s:C\:\\\Inform\\\Bin\\\interpreter\\\Frotz\\\Frotz.exe:/usr/games/bin/frotz:" Jif.cfg
+	sed -i -e "s:C\:\\\Inform\\\Bin\\\interpreter\\\Gargoyle\\\Gargoyle.exe:/usr/bin/gargoyle:" Jif.cfg
+	sed -i -e "s:C\:\\\Inform\\\Bin\\\compiler\\\inform.exe:/usr/bin/inform:" Jif.cfg
+	sed -i -e "s:C\:\\\Inform\\\Bin\\\tools\\\Blorb\\\bres.exe::" Jif.cfg
+	sed -i -e "s:C\:\\\Inform\\\Bin\\\tools\\\Blorb\\\blc.exe::" Jif.cfg
+	sed -i -e "s:Italian,on:Italian,off:" Jif.cfg
+	sed -i -e "s:English,off:English,on:" Jif.cfg
+
+	# Pack them as upstream
+	jar cvfm Jif.jar MANIFEST.MF *.class *.properties images/*.png readme.txt Jif.cfg
+}
+
+src_install()
+{
+	java-pkg_dojar Jif.jar
+	dobin "${FILESDIR}"/jif
+	dodoc CHANGELOG.txt readme.txt
+}
diff --git a/dev-util/jif/metadata.xml b/dev-util/jif/metadata.xml
new file mode 100644
index 000000000000..3f214a6af7d2
--- /dev/null
+++ b/dev-util/jif/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<longdescription>
+JIF is an Integrated Development Environment (IDE), written entirely in Java,
+for the creation of text adventures based on Graham Nelson's Inform standard.
+With JIF it's possible to edit, compile and run a text adventure in the z-code
+and glulx formats.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
new file mode 100644
index 000000000000..52025f0e509d
--- /dev/null
+++ b/dev-util/kbuild/Manifest
@@ -0,0 +1,2 @@
+DIST kBuild-0.1.9998-pre20120806-src.tar.xz 1665728 SHA256 c8e1c78513b6a8c32cc9a4998f2645a17054b1740bc5f13f587bb8de23840d03 SHA512 61e3fb2405dbfdd464eec580a9b2ed953533abdb07b4aad051029e46a1cccb1cef9037c2f9d0b1a06b3e505e8b484f060bec1d97f10ef7933de484429efa281e WHIRLPOOL c88b2e0996905137bbf773c219a53a025cadb1a5362236b891b2d38e0ad0a9264d330f1a258a4c6d6cc3ffde3475fe9d7ae794f8a9b6f017ea1f4fab000fe978
+DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 SHA256 def0a44cc0a91b6aa8a80f73ace0cfc315f298ba3e0d3d81fe52834091b68586 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047 WHIRLPOOL 95caf78eaa6ead0d9a009879a2ba9a01b138760345eb38a6786ceaf0262520e1827b5e4401884cd6d3849bfa5528f45a9a5cdac5ae61e6cbd1753dec0ba0da2f
diff --git a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
new file mode 100644
index 000000000000..4f1653973bfe
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
@@ -0,0 +1,11 @@
+--- Config.kmk
++++ Config.kmk
+@@ -147,7 +147,7 @@
+   MY_INST_DATA := $(MY_INST_ROOT)share/kBuild/
+  endif
+  ifndef MY_INST_DOC
+-  MY_INST_DOC := $(MY_INST_ROOT)share/doc/kBuild-$(KBUILD_VERSION)/
++  MY_INST_DOC := $(MY_INST_ROOT)share/doc/$(PF)/
+  endif
+  if !defined(MY_INST_BIN_MODE) && defined(MY_INST_MODE)
+   MY_INST_BIN_MODE := $(MY_INST_MODE),a+x
diff --git a/dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch b/dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch
new file mode 100644
index 000000000000..706c3a7fd538
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch
@@ -0,0 +1,26 @@
+* warning: implicit declaration of function ‘unlink’
+* warning: too few arguments for format
+--- a/src/sed/lib/utils.c
++++ b/src/sed/lib/utils.c
+@@ -35,6 +35,10 @@
+ # include <stdlib.h>
+ #endif /* HAVE_STDLIB_H */
+ 
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif /* HAVE_UNISTD_H */
++
+ #include "utils.h"
+ 
+ const char *myname;
+--- a/src/kmk/kmkbuiltin/printf.c
++++ b/src/kmk/kmkbuiltin/printf.c
+@@ -206,7 +206,7 @@
+ 
+ 	(void)funcname;
+ 	if (rc != 0)
+-		fatal (NILF, _("$(%s): failure rc=%d\n"), rc);
++		fatal (NILF, _("$(%s): failure rc=%d\n"), funcname, rc);
+ 	return o;
+ }
+ #endif
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
new file mode 100644
index 000000000000..435b3f57fbd2
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff -urN kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
+--- kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c	2011-08-17 14:28:42.000000000 -0700
++++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c	2012-06-16 13:55:05.341176965 -0700
+@@ -781,7 +781,7 @@
+ }
+ 
+ static unsigned char
+-internal_function __attribute ((pure))
++internal_function
+ re_string_fetch_byte_case (re_string_t *pstr)
+ {
+   if (BE (!pstr->mbs_allocated, 1))
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
new file mode 100644
index 000000000000..8ad2ab3269cf
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
@@ -0,0 +1,16 @@
+ src/kmk/Makefile.kmk |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
+index fe2cd43..135431e 100644
+--- a/src/kmk/Makefile.kmk
++++ b/src/kmk/Makefile.kmk
+@@ -59,7 +59,7 @@ TEMPLATE_BIN-KMK_INCS.dragonfly = glob
+ TEMPLATE_BIN-KMK_INCS.freebsd = glob
+ TEMPLATE_BIN-KMK_INCS.openbsd = glob
+ TEMPLATE_BIN-KMK_INCS.solaris = glob
+-TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
++TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
+ ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
+ ifeq ($(KBUILD_TARGET),win)
+  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch
new file mode 100644
index 000000000000..d2b20176ca82
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch
@@ -0,0 +1,10 @@
+--- kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk
++++ kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk
+@@ -59,6 +59,7 @@
+ if "$(USER)" == "bird" && "$(KBUILD_TARGET)" != "win"
+ kash_CFLAGS += -std=gnu99
+ endif
++kash_LIBS += pthread
+ kash_CFLAGS.win.amd64 = -GS-
+ kash_SOURCES = \
+ 	main.c \
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch
new file mode 100644
index 000000000000..9b0df4204e35
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch
@@ -0,0 +1,13 @@
+--- kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c
++++ kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c
+@@ -35,6 +35,10 @@
+ # include <stdlib.h>
+ #endif /* HAVE_STDLIB_H */
+ 
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif /* HAVE_UNISTD_H */
++
+ #include "utils.h"
+ 
+ const char *myname;
diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
new file mode 100644
index 000000000000..a1d17d7d6497
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
@@ -0,0 +1,33 @@
+diff -ruN kBuild-0.1.5-orig/src/ash/output.c kBuild-0.1.5/src/ash/output.c
+--- kBuild-0.1.5-orig/src/ash/output.c	2009-04-08 18:21:26.000000000 -0400
++++ kBuild-0.1.5/src/ash/output.c	2009-05-22 20:11:49.000000000 -0400
+@@ -230,6 +230,7 @@
+ 	va_end(ap);
+ }
+ 
++#if 0
+ void
+ dprintf(const char *fmt, ...)
+ {
+@@ -240,6 +241,7 @@
+ 	va_end(ap);
+ 	flushout(out2);
+ }
++#endif
+ 
+ void
+ fmtstr(char *outbuf, size_t length, const char *fmt, ...)
+diff -ruN kBuild-0.1.5-orig/src/ash/output.h kBuild-0.1.5/src/ash/output.h
+--- kBuild-0.1.5-orig/src/ash/output.h	2009-04-08 18:21:26.000000000 -0400
++++ kBuild-0.1.5/src/ash/output.h	2009-05-22 20:12:28.000000000 -0400
+@@ -65,8 +65,10 @@
+     __attribute__((__format__(__printf__,2,3)));
+ void out1fmt(const char *, ...)
+     __attribute__((__format__(__printf__,1,2)));
++#if 0
+ void dprintf(const char *, ...)
+     __attribute__((__format__(__printf__,1,2)));
++#endif
+ void fmtstr(char *, size_t, const char *, ...)
+     __attribute__((__format__(__printf__,3,4)));
+ void doformat(struct output *, const char *, va_list);
diff --git a/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
new file mode 100644
index 000000000000..c9a8994ea33c
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
@@ -0,0 +1,12 @@
+diff -urN ./kBuild-0.1.5.orig/bootstrap.gmk ./kBuild-0.1.5/bootstrap.gmk
+--- ./bootstrap.gmk	2009-01-10 03:24:02.000000000 +0100
++++ ./bootstrap.gmk	2009-03-11 10:39:25.679010950 +0100
+@@ -179,7 +179,7 @@
+ 	echo done > $@
+ 
+ $(OUTDIR)/sed/ts-configured: $(OUTDIR)/sed/ts-autoreconf
+-	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --without-libintl --disable-nls
++	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --disable-nls
+ 	echo done > $@
+ 
+ $(OUTDIR)/sed/config.h: $(OUTDIR)/sed/ts-configured
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20120806.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20120806.ebuild
new file mode 100644
index 000000000000..6edec30eb700
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20120806.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils autotools toolchain-funcs
+
+MY_P=kBuild-${PV/_/-}-src
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="sys-devel/flex
+	sys-devel/gettext
+	virtual/yacc"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/-src}
+
+src_prepare() {
+	rm -rf "${S}/kBuild/bin"
+
+	epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch" \
+		"${FILESDIR}/${PN}-glibc-2.10.patch" \
+		"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" \
+		"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" \
+		"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" \
+		"${FILESDIR}/${PN}-0.1.9998_pre20110817-gold.patch" \
+		"${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch"
+
+	cd "${S}/src/kmk" || die
+	eautoreconf
+	cd "${S}/src/sed" || die
+	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
+	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+	eautoreconf
+
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i "${S}"/Config.kmk || die #332225
+	tc-export CC RANLIB #AR does not work here
+}
+
+src_compile() {
+	kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
+}
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild
new file mode 100644
index 000000000000..240b4d9aecda
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils autotools toolchain-funcs
+
+MY_P=kBuild-${PV/_/-}-src
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="sys-devel/flex
+	sys-devel/gettext
+	virtual/yacc"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/-src}
+
+src_prepare() {
+	rm -rf "${S}/kBuild/bin"
+
+	epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch" \
+		"${FILESDIR}/${PN}-glibc-2.10.patch" \
+		"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" \
+		"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" \
+		"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" \
+		"${FILESDIR}/${PN}-0.1.9998_pre20110817-gold.patch" \
+		"${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch"
+
+	cd "${S}/src/kmk" || die
+	eautoreconf
+	cd "${S}/src/sed" || die
+	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
+	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+	eautoreconf
+
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i "${S}"/Config.kmk || die #332225
+	tc-export CC RANLIB #AR does not work here
+}
+
+src_compile() {
+	kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
+}
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
new file mode 100644
index 000000000000..cc506f9d284a
--- /dev/null
+++ b/dev-util/kbuild/kbuild-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+WANT_AUTOMAKE=1.9
+
+inherit autotools eutils subversion
+
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="sys-devel/gettext
+	virtual/yacc"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/-src}
+
+src_prepare() {
+		rm -rf "${S}/kBuild/bin"
+
+		cd "${S}/src/kmk"
+		eautoreconf
+		cd "${S}/src/sed"
+		eautoreconf
+}
+
+src_compile() {
+		kBuild/env.sh --full \
+		make -f bootstrap.gmk AUTORECONF=true \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+		kBuild/env.sh kmk \
+		NIX_INSTALL_DIR=/usr \
+		PATH_INS="${D}" \
+		install || die "install failed"
+}
diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
new file mode 100644
index 000000000000..365af956a76a
--- /dev/null
+++ b/dev-util/kbuild/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>swapon@gmail.com</email>
+		<name>Alessio Cassibba</name>
+	</maintainer>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
new file mode 100644
index 000000000000..4d019193a353
--- /dev/null
+++ b/dev-util/kdbg/Manifest
@@ -0,0 +1,2 @@
+DIST kdbg-2.5.4.tar.gz 408683 SHA256 82a9ac163311319ae83002b7f250eac02fd4be176d037519adc38e107caaa6e5 SHA512 4855d8aada59dd201b24d8640d597dddef710efccf5caf450e9119bd5a01de5e1d62ccbfecb385f6a5b78fb6d761ead153c963cc882246e742e58db51e4d59ae WHIRLPOOL ecb99ee2a830008e56c8eccf264e2decdc548cb2bc0e06f831dcdfc885c6b3f186abe6c88240b3545c0cc6b79f9e18a9287f033675fcf184affcc0a8e7ec8f13
+DIST kdbg-2.5.5.tar.gz 417327 SHA256 983e4c89258d752f42449e2d257c9e40352b516328132ca5b0b1991b91878879 SHA512 f855063c0ea55a624ced3d6ff52466bc7240e2b79d76b43d73d224348f1b7c179fd1d53391e0e7039a2222659b7d6c3aba9f423f565b073073d636c28cc323f6 WHIRLPOOL 2fc9f7d092e3584216701bee57b11982c0ab4047090de3e43d1136ac5b8dd86e39a12db7f89e6664adf4e477cecdc4217421161c1458b75d5ff65180b8b89108
diff --git a/dev-util/kdbg/kdbg-2.5.4.ebuild b/dev-util/kdbg/kdbg-2.5.4.ebuild
new file mode 100644
index 000000000000..44b5ce76f1c3
--- /dev/null
+++ b/dev-util/kdbg/kdbg-2.5.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="cs da de es fr hr hu it ja nb nn pl pt ro ru sk sr sv tr zh_CN"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A graphical debugger interface"
+HOMEPAGE="http://www.kdbg.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="sys-devel/gdb"
+DEPEND="${RDEPEND}"
+
+DOCS=( BUGS README ReleaseNotes-${PV} TODO )
+
+src_prepare() {
+	# allow documentation to be handled by eclass
+	mv kdbg/doc . || die
+	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
+	echo "add_subdirectory ( doc ) " >> CMakeLists.txt || die
+	kde4-base_src_prepare
+}
+
+ssrc_install() {
+	kde4-base_src_install
+
+	# hack since ChangeLog-* is automagically installed by eclass
+	rm -f "${ED}"usr/share/doc/${PF}/ChangeLog-pre*
+}
diff --git a/dev-util/kdbg/kdbg-2.5.5.ebuild b/dev-util/kdbg/kdbg-2.5.5.ebuild
new file mode 100644
index 000000000000..3600f6197fe4
--- /dev/null
+++ b/dev-util/kdbg/kdbg-2.5.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="cs da de es fr hr hu it ja nb nn pl pt ro ru sk sr sv tr zh_CN"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A graphical debugger interface"
+HOMEPAGE="http://www.kdbg.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="sys-devel/gdb"
+DEPEND="${RDEPEND}"
+
+DOCS=( BUGS README ReleaseNotes-${PV} TODO )
+
+src_prepare() {
+	# allow documentation to be handled by eclass
+	mv kdbg/doc . || die
+	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
+	echo "add_subdirectory ( doc ) " >> CMakeLists.txt || die
+	kde4-base_src_prepare
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# hack since ChangeLog-* is automagically installed by eclass
+	rm -f "${ED}"usr/share/doc/${PF}/ChangeLog-pre*
+}
diff --git a/dev-util/kdbg/metadata.xml b/dev-util/kdbg/metadata.xml
new file mode 100644
index 000000000000..82cdedc036ae
--- /dev/null
+++ b/dev-util/kdbg/metadata.xml
@@ -0,0 +1,8 @@
+<?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">kdbg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
new file mode 100644
index 000000000000..f7761fa3aa0d
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -0,0 +1,2 @@
+DIST kdevelop-pg-qt-1.0.0.tar.bz2 830040 SHA256 49b395f5b45bc0aa094d6a283627bc53581a5eaae7892fd850df2f97d68bcdcc SHA512 1e3a41cd5570a2bdba98ebdf55b89cc2992ddd4859bd672ea1b8215d47db2203ec685717787f90cf382168495b4b53cc42a9089c4a92e17286eca6cf17c1bb27 WHIRLPOOL 04ee7d992535713d99b77da888207ce5924f6409fafc363d6b00bd695fe39e3896dc8eb9433c71b60c4a45137593896b6eebbec2dde1386866c5c87223bda056
+DIST kdevelop-pg-qt-1.1.0.tar.gz 1091846 SHA256 30f78dcf08e9da88bb0643629e17dd8e360afea40370b8772afff197cb2f1685 SHA512 e43f7be38ba50ced6c15988266ee6163cfdcf1fe1b26b02a1c4586394378234eb7a76d7fbc84fc9e395121e916515e4950de672959c9e1ebc72332a0ecdaf364 WHIRLPOOL 3830ce0e3b3ad27a9613efe07d7d4a19d88100cef393ca74af4bce54261e7f52a71dee0351f415e4ca26f7e95a0281ecc26713c02313732887272adcd0e4aa18
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch
new file mode 100644
index 000000000000..3651ec471603
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch
@@ -0,0 +1,45 @@
+commit ac587957cd0cabbc668604507e2cfebb6810ed09
+Author: Milian Wolff <mail@milianw.de>
+Date:   Thu Nov 29 15:56:40 2012 +0100
+
+    fix some warnings
+
+diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp
+index e06c6be..badb461 100644
+--- a/kdev-pg/kdev-pg-code-gen.cpp
++++ b/kdev-pg/kdev-pg-code-gen.cpp
+@@ -51,7 +51,7 @@ namespace KDevPG
+ 
+   void generateCondition(const World::NodeSet& s, QTextStream& out)
+   {
+-    if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
++    if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
+     {
+       out << "true /*epsilon*/";
+       return;
+diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll
+index a0864af..9261d71 100644
+--- a/kdev-pg/kdev-pg-lexer.ll
++++ b/kdev-pg/kdev-pg-lexer.ll
+@@ -425,7 +425,7 @@ void appendLineBuffer()
+   strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
+   /* strcpy is faster than strcat */
+   
+-  Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
++  Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
+   
+   lastTextLeng = strlen(yytext);
+   yymoreFlag = false;
+diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy
+index d5a25f5..8f8d604 100644
+--- a/kdev-pg/kdev-pg-parser.yy
++++ b/kdev-pg/kdev-pg-parser.yy
+@@ -309,7 +309,7 @@ opt_lexer_action
+     | T_CONTINUE {
+         r = "\nlxCONTINUE;\n";
+       }
+-    | /* empty */ { r = "\nlxSKIP\n" }
++    | /* empty */ { r = "\nlxSKIP\n"; }
+     ;
+ 
+ regexp
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..a0a2a19da3e9
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
+HOMEPAGE="http://www.kdevelop.org"
+LICENSE="LGPL-2"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND=""
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=( "${FILESDIR}/${P}-bison3.patch" )
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild
new file mode 100644
index 000000000000..ad3e8cb1f2de
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDEBASE="kdevelop"
+inherit kde4-base
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	SRC_URI="http://quickgit.kde.org/?p=${PN}.git&a=snapshot&h=${PV%%.0} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
+LICENSE="LGPL-2"
+IUSE="debug"
+
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="dev-util/kdevelop:4"
+
+S="${WORKDIR}/${PN}"
diff --git a/dev-util/kdevelop-pg-qt/metadata.xml b/dev-util/kdevelop-pg-qt/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/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>kde</herd>
+</pkgmetadata>
diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
new file mode 100644
index 000000000000..f497ccb895f3
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -0,0 +1,3 @@
+DIST kdevelop-php-docs-1.5.2.tar.xz 32368 SHA256 1b8dbecbb0ad74910754b839fc29621aaf942792f9f30fd32521598d28711425 SHA512 ab92477a1ab5bad2f769afc11e76cb293e59243c608c7330caed01b94b6bfc2cd89ea152e86652adec18281c755ba0c8691f4ac6f1d15963fcb6a927f2ecc5d4 WHIRLPOOL a408f6505920dd16d10ee961a8da11a02df1aa1babc9ec2310c9520bc72df52cffb23ed145c0c7a22e9412a77f2e4d03b7025c02045891b7a3424b45add0fed1
+DIST kdevelop-php-docs-1.6.0.tar.xz 32580 SHA256 fd3958cbf667f795bb42a6e6ee2e9779b6b3f4cca3dde0781b5d6972f609e2df SHA512 764127595b3094220d6ea87e32328ebadba012846fd029924670ab46f8f870909cead74ea28126f19703e482c4f8d608070ace225d478401de3eea2388d65c4a WHIRLPOOL b374e142cb6d94244bb70ea4e94bc118811a701014479a9a7fea938fd15de017a3ec72e684e8354656a516960fbe993891e20c27e5cc6873cdb54959b16f6644
+DIST kdevelop-php-docs-1.7.1.tar.xz 32840 SHA256 ae8acbffb882cdc20c32a22a8e522e0aea0c69b3d93376afa79e7b3bcad47568 SHA512 9a78b2d3051fe81b0fc91cb7cea586d0d3391959f55fc5cc05c3ff1f9c4d2a9a83957e50a9feac050d6d01a831fdfd7fa8e0f9dcd6f801723f8b638f60663592 WHIRLPOOL 97e77ce5019ba707b3d37c058a16edd1788055a83f24bdcc6058197e723161dcbc484a8557d32dadc02dd98c1acbd2a5dc732f122bca5e10bcd482e92fb43a5a
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild
new file mode 100644
index 000000000000..a67df6af846c
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de en_GB es et fi fr gl hu it nb nds nl pl pt
+pt_BR ru sk sl sv tr uk zh_CN zh_TW"
+KMNAME="kdevelop"
+EGIT_REPONAME="kdev-php-docs"
+inherit kde4-base
+
+DESCRIPTION="PHP documentation plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug"
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="amd64 x86"
+fi
+
+RDEPEND="
+	!=dev-util/kdevelop-plugins-1.0.0
+"
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.6.0.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.6.0.ebuild
new file mode 100644
index 000000000000..3b59d3fd18dd
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW"
+KMNAME="kdevelop"
+EGIT_REPONAME="kdev-php-docs"
+inherit kde4-base
+
+DESCRIPTION="PHP documentation plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug"
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	!=dev-util/kdevelop-plugins-1.0.0
+"
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.1.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.1.ebuild
new file mode 100644
index 000000000000..6ebff0e8e75c
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW"
+KMNAME="kdevelop"
+EGIT_REPONAME="kdev-php-docs"
+EGIT_BRANCH="1.7"
+inherit kde4-base
+
+DESCRIPTION="PHP documentation plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="amd64 ~x86"
+fi
+
+RDEPEND="
+	!=dev-util/kdevelop-plugins-1.0.0
+"
diff --git a/dev-util/kdevelop-php-docs/metadata.xml b/dev-util/kdevelop-php-docs/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/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>kde</herd>
+</pkgmetadata>
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
new file mode 100644
index 000000000000..8a1a7d56de7e
--- /dev/null
+++ b/dev-util/kdevelop-php/Manifest
@@ -0,0 +1,3 @@
+DIST kdevelop-php-1.5.2.tar.xz 649044 SHA256 2ee676dd81af01a36c042248300ef1c5d27dfa1d5e29aa2e03749db8f4808f2d SHA512 7d1648b531cb039f8535739b08deff08429c93d173034e29e61e5eb795c192d59309adfa3403eccb5705c16bc55eb46ddd70375732606c6705bafe0163efff48 WHIRLPOOL 9a73d72ca2d27413220387043b4319a5dcce0b007b1aac5e814c27a73bd0cef6403998ee72f870d97d9b8628e00452d9bd2b12b9673f40d2fad55bf14bb999ec
+DIST kdevelop-php-1.6.0.tar.xz 649816 SHA256 5f128ccffbe210e24b438411e8e068b622791913310e5796f59350af20c2ff23 SHA512 d86a7d286e59119e38a01f5a7c0669ae4b8e781f13ac90fba26b00b740a0d466a9dc2edae325f0aabd739514df27bb6878c3bfdd8125a2dcd90109efe41e5cf6 WHIRLPOOL 1a53ee5347a2148ff5b863669cfef689332db5b2005eef7b5d0cb3e6cab246f08ee75d842dd9b086630f0695af2a6486a2fd727bdee856151681e116c43c3e9c
+DIST kdevelop-php-1.7.1.tar.xz 658088 SHA256 396300d605032ac458489fb760801233e94117825ca6a3251ee02090aa694826 SHA512 7602d905cd33299e071452e98539886110bf1f3fbbee3025a6ec2218aac8fef16665b81d23a1810ee22e9eb3eedbe55c00c8951a56b86fad2955ed4846959866 WHIRLPOOL 7e235c05bb0618365752c6c721fea1fd462eba7098e77ca303885c4bb50faf3d2f695f01fed982bc34827bb04f84490eaf5dfa4a37ed29875c1a8493d797b68e
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
new file mode 100644
index 000000000000..4e64c9fad50f
--- /dev/null
+++ b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-parmake.patch
@@ -0,0 +1,12 @@
+diff -ruN kdevelop-php-1.2.0.orig/parser/CMakeLists.txt kdevelop-php-1.2.0/parser/CMakeLists.txt
+--- kdevelop-php-1.2.0.orig/parser/CMakeLists.txt	2011-01-23 20:42:54.000000000 +0100
++++ kdevelop-php-1.2.0/parser/CMakeLists.txt	2011-04-25 22:29:05.486182541 +0200
+@@ -21,6 +21,8 @@
+     ${KDE4_KTEXTEDITOR_LIBS}
+ )
+ 
++add_dependencies( kdev4phpparser php-parser-generated )
++
+ kde4_add_executable( php-parser main.cpp )
+ target_link_libraries(php-parser ${QT_QTCORE_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} kdev4phpparser)
+ 
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild
new file mode 100644
index 000000000000..40e80abe47df
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sl sv th uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
+KDEBASE="kdevelop"
+KMNAME="kdev-php"
+EGIT_REPONAME="${KMNAME}"
+inherit kde4-base
+
+DESCRIPTION="PHP plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug doc"
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
+
+if [[ $PV != *9999* ]]; then
+	KEYWORDS="amd64 x86"
+else
+	KEYWORDS=""
+fi
+
+DEPEND="
+	>=dev-util/kdevelop-pg-qt-1.0.0:4
+"
+RDEPEND="
+	dev-util/kdevelop:${SLOT}
+	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
+"
+PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )
+
+RESTRICT="test"
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.6.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.6.0.ebuild
new file mode 100644
index 000000000000..eb9bbbf50ed8
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-1.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nds nl pl
+pt pt_BR ru sl sv uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
+KDEBASE="kdevelop"
+KMNAME="kdev-php"
+EGIT_REPONAME="${KMNAME}"
+inherit kde4-base
+
+DESCRIPTION="PHP plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug doc"
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
+
+if [[ $PV != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+else
+	KEYWORDS=""
+fi
+
+DEPEND="
+	>=dev-util/kdevelop-pg-qt-1.0.0:4
+"
+RDEPEND="
+	dev-util/kdevelop:${SLOT}
+	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
+"
+PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )
+
+RESTRICT="test"
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.7.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.7.1.ebuild
new file mode 100644
index 000000000000..6407675e5047
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-1.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nl pl pt
+pt_BR ru sk sl sv tr uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
+KDEBASE="kdevelop"
+KMNAME="kdev-php"
+EGIT_REPONAME="${KMNAME}"
+EGIT_BRANCH="1.7"
+inherit kde4-base
+
+DESCRIPTION="PHP plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug doc"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="amd64 ~x86"
+fi
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-util/kdevelop-pg-qt-1.0.0:4
+"
+RDEPEND="
+	dev-util/kdevelop:${SLOT}
+	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
+"
+
+PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )
diff --git a/dev-util/kdevelop-php/metadata.xml b/dev-util/kdevelop-php/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/dev-util/kdevelop-php/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>kde</herd>
+</pkgmetadata>
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
new file mode 100644
index 000000000000..143e34db3343
--- /dev/null
+++ b/dev-util/kdevelop-python/Manifest
@@ -0,0 +1,3 @@
+DIST kdev-python-1.6.0.tar.xz 3655648 SHA256 92d383ea821a6b8e09f699b085357048eb30323a9fd58660f963865822f9327c SHA512 e0e477549e107dbd7f4b60771a940c2d1e5ab0316060b1d194495b973330936e547bd9cb827bcc7e42cac2ed08d9eaf49e64ad70da2a73706393fc3510aa6a85 WHIRLPOOL 682aa3059101a6f229b038c409dea5c14cdeb7b316de270f3fbcd8b5fde35b0d02f58a0b5103ee4c721f543b124faa73ccda3205a6acdc8a2a8cd0072566e411
+DIST kdev-python-1.7.1.tar.xz 3666536 SHA256 6d95834ffbdc9c74f0c5cca589344b02189902e01901169615484c5b163dbc06 SHA512 f40fad121d5a8106c25fa5b8827f34074f8add115db9a26282b7bb087df2b57665b4bc6d772cd72784e5989eb6319d2807ac7278012b0be4e29ccb6864e79349 WHIRLPOOL 81feab1b3262aa406f4c59989be59d5a73bd8fbd0fed62e207434c0d65656ef10b7ccdcd54c2d1e4b7bab6e7213ef7e0b2638021823507cdc0750e091a88f09f
+DIST kdev-python-v1.5.2.tar.xz 4004660 SHA256 84ae7015623a3848b1c1ce8e8f958c32778e9ba0afafa3ea3b3dd70687e1fe40 SHA512 c9c1fc13a8a66fa409dc7c336488607318a7fc87b107b987349a0d5279f5c24e1132ecb232111ef84aae8bdd132686a1b9fb6aaceb864b83b5a557fca165fe0b WHIRLPOOL c56a4e18894411e752cfca6fbbe968c1cbb6ed4cd5e8ea9cf99c33640a1e032ec4af11c2bbf133bc85668abdd03ee3a379ed5b924c577a9c37ddd097d964ba0c
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild
new file mode 100644
index 000000000000..d427132deca1
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+KDE_LINGUAS="bs ca ca@valencia cs da de en_GB eo es et fi fr ga gl hu it ja lt
+mai mr nds nl pl pt pt_BR ro ru sk sl sv th tr ug uk zh_CN zh_TW"
+inherit kde4-base
+
+MY_PN="${KMNAME}"
+MY_PV="v${PV}"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ $PV != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
+	KEYWORDS="amd64 x86"
+	S=${WORKDIR}/${MY_P}
+else
+	EGIT_REPO_URI="git://anongit.kde.org/kdev-python.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Python plugin for KDevelop 4"
+HOMEPAGE="http://www.kdevelop.org"
+
+LICENSE="GPL-2"
+IUSE="debug"
+
+DEPEND="
+	>=dev-util/kdevelop-pg-qt-1.0.0:4
+"
+RDEPEND="
+	dev-util/kdevelop:4
+"
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "${WORKDIR}"/${P}_build > /dev/null
+	emake parser
+	popd > /dev/null
+
+	kde4-base_src_compile
+}
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.6.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.6.0.ebuild
new file mode 100644
index 000000000000..aa614eae1d01
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-1.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+KDE_LINGUAS="bs ca ca@valencia da de es fi fr gl it kk nl pt pt_BR sk sl sv uk
+zh_TW"
+inherit kde4-base
+
+MY_PN="${KMNAME}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ $PV != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+else
+	EGIT_REPO_URI="git://anongit.kde.org/kdev-python.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Python plugin for KDevelop 4"
+HOMEPAGE="http://www.kdevelop.org"
+
+LICENSE="GPL-2"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND="
+	dev-util/kdevelop:4
+"
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "${WORKDIR}"/${P}_build > /dev/null
+	emake parser
+	popd > /dev/null
+
+	kde4-base_src_compile
+}
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.7.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.7.1.ebuild
new file mode 100644
index 000000000000..d49dff596adc
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-1.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+KDE_LINGUAS="ca de en_GB es et fi fr it nl pl pt pt_BR sk sl sv tr uk"
+PYTHON_COMPAT=( python2_7 )
+EGIT_BRANCH="1.7"
+MY_P="${KMNAME}-${PV}"
+inherit kde4-base python-any-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${MY_P}.tar.xz"
+	KEYWORDS="amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="Python plugin for KDevelop 4"
+IUSE="debug"
+
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	dev-util/kdevelop:4
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	kde4-base_pkg_setup
+}
+
+src_compile() {
+	pushd "${WORKDIR}"/${P}_build > /dev/null
+	emake parser
+	popd > /dev/null
+
+	kde4-base_src_compile
+}
diff --git a/dev-util/kdevelop-python/metadata.xml b/dev-util/kdevelop-python/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/dev-util/kdevelop-python/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>kde</herd>
+</pkgmetadata>
diff --git a/dev-util/kdevelop-qmake/Manifest b/dev-util/kdevelop-qmake/Manifest
new file mode 100644
index 000000000000..1a909e1d20c3
--- /dev/null
+++ b/dev-util/kdevelop-qmake/Manifest
@@ -0,0 +1,2 @@
+DIST kdevelop-qmake-1.6.0.tar.gz 65997 SHA256 d6e1988014d2dd3ec88835aec557f5c95a307276beb6315cf839ba7330028e96 SHA512 ff96cb0351edbdfea5a7040f663a808fb4bc6cf44bb1e54c4bf1ad2c836f29073734e140196ab5b20e393f6ad795a179e53f92d5e293658d80becf09d0b99852 WHIRLPOOL da3bc56f13ed67d1278d6a106baa5ad99a3c252cea11e86c464fa20985c30c7bd9cb17c5e126463905034aa8ef74d1734183ab32222e67a5b3fd6f5033f578dd
+DIST kdevelop-qmake-1.7.0.tar.gz 65864 SHA256 f0ae7b9ef570b755773c8c53917e1352dddc37fe061611fdebb3b4a1a8c62f1a SHA512 eadeefb3b927710ea5ec365e3d3e99d4f0af2a995cc18ddeeb437c0ee946b61f25b574846c8dff39bf6e0bcafce8adeb9a8ca787a429498b3cc15a7e78225e9f WHIRLPOOL aa551982dfb47b6820eed0f8fd0e7b3d08425406b6b2b6616257ea5ea47e2aed881791de0cc1b5b6b5ffa4bb60e13b7968c3a244e62cef284fe6fc2f7ce70b99
diff --git a/dev-util/kdevelop-qmake/kdevelop-qmake-1.6.0.ebuild b/dev-util/kdevelop-qmake/kdevelop-qmake-1.6.0.ebuild
new file mode 100644
index 000000000000..aea78458e194
--- /dev/null
+++ b/dev-util/kdevelop-qmake/kdevelop-qmake-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDEBASE="kdevelop"
+KMNAME="kdev-qmake"
+inherit kde4-base
+
+MY_PN="${KMNAME}"
+S=${WORKDIR}/${MY_PN}
+DESCRIPTION="Qt's qmake build system plugin for KDevelop"
+HOMEPAGE="http://www.kdevelop.org/"
+SRC_URI="http://quickgit.kde.org/?p=${MY_PN}.git&a=snapshot&h=${PV%%.0} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-util/kdevelop:4
+	dev-util/kdevelop-pg-qt:4
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	kde4-base_src_install
+	rm "${D}/usr/share/apps/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2"
+}
diff --git a/dev-util/kdevelop-qmake/kdevelop-qmake-1.7.0.ebuild b/dev-util/kdevelop-qmake/kdevelop-qmake-1.7.0.ebuild
new file mode 100644
index 000000000000..a2a4d7295eba
--- /dev/null
+++ b/dev-util/kdevelop-qmake/kdevelop-qmake-1.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDEBASE="kdevelop"
+KMNAME="kdev-qmake"
+inherit kde4-base
+
+DESCRIPTION="qmake plugin for KDevelop 4"
+SRC_URI="http://quickgit.kde.org/?p=${KMNAME}.git&a=snapshot&h=${PV%%.0} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug tools"
+
+DEPEND="
+	dev-util/kdevelop:4
+	dev-util/kdevelop-pg-qt:4
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${KMNAME}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build tools qmake_parser)
+	)
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+	#Move this file to prevent a collision with kappwizard
+	mv "${D}"/usr/share/apps/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2 \
+		"${D}"/usr/share/apps/kdevappwizard/templates/kdevelop-qmake_qt4guiapp.tar.bz2 \
+		|| die
+}
diff --git a/dev-util/kdevelop-qmake/metadata.xml b/dev-util/kdevelop-qmake/metadata.xml
new file mode 100644
index 000000000000..5a8fd6011702
--- /dev/null
+++ b/dev-util/kdevelop-qmake/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<use>
+		<flag name="tools">Build and install the qmake-parser debugging tool</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/kdevelop-qmljs/Manifest b/dev-util/kdevelop-qmljs/Manifest
new file mode 100644
index 000000000000..ae35ab5736ab
--- /dev/null
+++ b/dev-util/kdevelop-qmljs/Manifest
@@ -0,0 +1 @@
+DIST kdev-qmljs-1.7.0.tar.xz 245968 SHA256 70927785de7791335eda43b55ef7742af7915425823d5f70b97edac1828681e1 SHA512 844f6dbf7f9f30a5361556edb7d7872250bb9999846b156465785d013c5be162e019019c364832d87f034c1d4ffdbf9f7ef5a1c7b54d676739776bdef1b13940 WHIRLPOOL 63fd36d00c966bdc6e957f004656d63bdc01f1f070a55d90130cb9f55398263526e08b2d6f2524aeb2dbcf15972463fc0bb2dade236c71a8feaacbd46e82e6d1
diff --git a/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild b/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild
new file mode 100644
index 000000000000..e5ac39a64b2c
--- /dev/null
+++ b/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDEBASE="kdevelop"
+KMNAME="kdev-qmljs"
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nds nl pl
+pt pt_BR ru sl sv uk zh_CN zh_TW"
+MY_P="${KMNAME}-${PV}"
+
+inherit kde4-base
+
+DESCRIPTION="QML and javascript plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug"
+SRC_URI="mirror://kde/stable/kdevelop/${KMNAME}/${PV}/src/${MY_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="
+	>=dev-util/kdevplatform-${PV}:4
+"
+RDEPEND="${DEPEND}
+	dev-util/kdevelop:4
+"
diff --git a/dev-util/kdevelop-qmljs/metadata.xml b/dev-util/kdevelop-qmljs/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/dev-util/kdevelop-qmljs/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>kde</herd>
+</pkgmetadata>
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
new file mode 100644
index 000000000000..47350368c439
--- /dev/null
+++ b/dev-util/kdevelop/Manifest
@@ -0,0 +1,3 @@
+DIST kdevelop-4.5.2.tar.xz 4901660 SHA256 d157224a81c886cbe32d25600a29042a6fec1e0c535202dc85748cd15877fe30 SHA512 6bb1103e739f33f07e7c5278b284a5f991c9537acb94b7e103a449a7702ea97a0daf2d4fe7c24aeb45e6dfff3af7fc7accc67815283d28e20bf1c15206dbdc0e WHIRLPOOL 5de50b372b75f29118aef58114d5ac3f7a69b043a95c1233f11886412625ccaca6090bc28426eaf31cb26c30a0177bc4c7753b2fec26ae019120cde7fa9c4217
+DIST kdevelop-4.6.0.tar.xz 4867960 SHA256 1ee9e7b8c46f575dd29d920cfd6284130f2e738a2e1f52dfd97b075fab2e4c73 SHA512 0d2239f4fdf9b78e757161911e44cbf9543347cf291504adde8b5d46390993ba907b55aa0653ba3b0de3d9aad949a7c7135b6626c1e733f9f2b7cc013b09eb77 WHIRLPOOL 8cf4562fbe0a3d87bd5ab0c03b0907fa7777db2909f0511f065cc6ec52deb24a12cd7d234125d000803f4897ffada0b614b1a0eefcc3acec558d05192670ce91
+DIST kdevelop-4.7.1.tar.xz 4441540 SHA256 e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1 SHA512 a5fcdb4b83f6b9512350d73314df3ed8fd4f8a6544f358c480295f1f1f81799f18e30b44c24b73b4db244e63f01c29990854532688bf0a866c7fe83f924a48bd WHIRLPOOL 630802a540db94a6f56b0c15ff8910ea6168401f88aaf3e14476461d169f4e456f83444fbf8f9c927c7c196b0797c40d58972d1b05a912eeb18d8d5b1239e4f9
diff --git a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
new file mode 100644
index 000000000000..b45623623a23
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
@@ -0,0 +1,32 @@
+commit fb4234cd72ceebb200bef13234ea9c36c9a62046
+Author: Kevin Funk <kevin@kfunk.org>
+Date:   Sun Nov 3 22:09:56 2013 +0100
+
+    Check if kdevplatform has JSON support
+    
+    BUG: 327095
+
+diff --git a/languages/cpp/tests/CMakeLists.txt b/languages/cpp/tests/CMakeLists.txt
+index 84ce3ee..fbdd4db 100644
+--- a/languages/cpp/tests/CMakeLists.txt
++++ b/languages/cpp/tests/CMakeLists.txt
+@@ -55,7 +55,9 @@ target_link_libraries(buddiestest
+ ########### next target ###############
+ 
+ find_package(QJSON)
+-if(QJSON_FOUND)
++# Also check that kdevplatform is built with JSON support
++# see: https://bugs.kde.org/show_bug.cgi?id=327095
++if(QJSON_FOUND AND KDEVPLATFORM_JSONTESTS_LIBRARIES)
+   set(cppfilestest_SRCS test_cppfiles.cpp)
+   kde4_add_unit_test(cppfilestest ${cppfilestest_SRCS})
+   configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES)
+@@ -67,7 +69,7 @@ if(QJSON_FOUND)
+       ${KDEVPLATFORM_JSONTESTS_LIBRARIES}
+       kdev4cppduchain
+   )
+-endif(QJSON_FOUND)
++endif()
+ 
+ ########### next target ###############
+ 
diff --git a/dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch b/dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch
new file mode 100644
index 000000000000..4643310bfffc
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch
@@ -0,0 +1,30 @@
+From 633b49c4bd7e434185c69a3dea1841755b75dcba Mon Sep 17 00:00:00 2001
+From: Fernando Rodriguez <frodriguez.developer@outlook.com>
+Date: Sun, 2 Aug 2015 16:20:37 +0200
+Subject: [PATCH] Set the replyReceived flag only if the current command is
+ exec-run.
+
+Fixes various MI errors in remote debugging scenarios.
+
+BUG: 346827
+---
+ debuggers/gdb/gdb.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/debuggers/gdb/gdb.cpp b/debuggers/gdb/gdb.cpp
+index 4642087..df9f3b0 100644
+--- a/debuggers/gdb/gdb.cpp
++++ b/debuggers/gdb/gdb.cpp
+@@ -255,7 +255,8 @@ void GDB::processLine(const QByteArray& line)
+                emit internalCommandOutput(QString::fromUtf8(line) + '\n');
+ 
+                if (result.reason == "thread-group-started") {
+-                   receivedReply_ = true;
++                   if (currentCmd_->cmdToSend().contains("exec-run"))
++                       receivedReply_ = true;
+                    //     (gdb) -exec-run
+                    //     =thread-group-started,id="i1",pid="16768"
+                    if (line.contains("pid=\"")) {
+-- 
+2.4.6
+
diff --git a/dev-util/kdevelop/kdevelop-4.5.2.ebuild b/dev-util/kdevelop/kdevelop-4.5.2.ebuild
new file mode 100644
index 000000000000..58f0d403a8db
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-4.5.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
+inherit kde4-base
+
+DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+cmake +cxx debug okteta qthelp reviewboard"
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="amd64 ppc x86"
+fi
+
+DEPEND="
+	>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?]
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	okteta? ( $(add_kdeapps_dep okteta) )
+	qthelp? ( dev-qt/qthelp:4 )
+	reviewboard? ( dev-libs/qjson )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kdebase-kioslaves)
+	dev-qt/qtdeclarative:4[webkit]
+	cxx? ( >=sys-devel/gdb-7.0[python] )
+"
+RESTRICT="test"
+# see bug 366471
+
+PATCHES=( "${FILESDIR}/${P}-kdevplatform-without-qjson.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build cmake)
+		$(cmake-utils_use_build cmake cmakebuilder)
+		$(cmake-utils_use_build cxx cpp)
+		$(cmake-utils_use_with okteta LibKasten)
+		$(cmake-utils_use_with okteta LibOkteta)
+		$(cmake-utils_use_with okteta LibOktetaKasten)
+		$(cmake-utils_use_build qthelp)
+		$(cmake-utils_use_find_package reviewboard QJSON)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevelop/kdevelop-4.6.0.ebuild b/dev-util/kdevelop/kdevelop-4.6.0.ebuild
new file mode 100644
index 000000000000..9161fabaf991
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-4.6.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv th uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
+inherit kde4-base
+
+DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+cmake +cxx debug okteta qthelp"
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DEPEND="
+	dev-libs/qjson
+	>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	okteta? ( $(add_kdeapps_dep okteta) )
+	qthelp? ( dev-qt/qthelp:4 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kdebase-kioslaves)
+	dev-qt/qtdeclarative:4[webkit]
+	cxx? ( >=sys-devel/gdb-7.0[python] )
+"
+RESTRICT="test"
+# see bug 366471
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build cmake)
+		$(cmake-utils_use_build cmake cmakebuilder)
+		$(cmake-utils_use_build cxx cpp)
+		$(cmake-utils_use_with okteta LibKasten)
+		$(cmake-utils_use_with okteta LibOkteta)
+		$(cmake-utils_use_with okteta LibOktetaKasten)
+		$(cmake-utils_use_build qthelp)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
new file mode 100644
index 000000000000..e327ccc48589
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
+VIRTUALX_REQUIRED="test"
+EGIT_BRANCH="4.7"
+inherit kde4-base
+
+DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+cmake +cxx debug +gdbui okteta qthelp"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="amd64 ~ppc ~x86"
+fi
+
+DEPEND="
+	dev-libs/qjson
+	dev-qt/qtdeclarative:4[webkit]
+	gdbui? (
+		$(add_kdebase_dep ksysguard)
+		$(add_kdebase_dep libkworkspace)
+	)
+	okteta? ( $(add_kdeapps_dep okteta) )
+	qthelp? ( dev-qt/qthelp:4 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kdebase-kioslaves)
+	cxx? ( >=sys-devel/gdb-7.0[python] )
+"
+RESTRICT="test"
+# see bug 366471
+
+PATCHES=( "${FILESDIR}/${P}-gdb.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build cmake)
+		$(cmake-utils_use_build cmake cmakebuilder)
+		$(cmake-utils_use_build cxx cpp)
+		$(cmake-utils_use_with gdbui KDE4Workspace)
+		$(cmake-utils_use_with okteta LibKasten)
+		$(cmake-utils_use_with okteta LibOkteta)
+		$(cmake-utils_use_with okteta LibOktetaKasten)
+		$(cmake-utils_use_build qthelp)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevelop/kdevelop-4.7.1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1.ebuild
new file mode 100644
index 000000000000..addf588c8ccd
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-4.7.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
+VIRTUALX_REQUIRED="test"
+EGIT_BRANCH="4.7"
+inherit kde4-base
+
+DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+cmake +cxx debug +gdbui okteta qthelp"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DEPEND="
+	dev-libs/qjson
+	dev-qt/qtdeclarative:4[webkit]
+	gdbui? (
+		$(add_kdebase_dep ksysguard)
+		$(add_kdebase_dep libkworkspace)
+	)
+	okteta? ( $(add_kdeapps_dep okteta) )
+	qthelp? ( dev-qt/qthelp:4 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kdebase-kioslaves)
+	cxx? ( >=sys-devel/gdb-7.0[python] )
+"
+RESTRICT="test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build cmake)
+		$(cmake-utils_use_build cmake cmakebuilder)
+		$(cmake-utils_use_build cxx cpp)
+		$(cmake-utils_use_with gdbui KDE4Workspace)
+		$(cmake-utils_use_with okteta LibKasten)
+		$(cmake-utils_use_with okteta LibOkteta)
+		$(cmake-utils_use_with okteta LibOktetaKasten)
+		$(cmake-utils_use_build qthelp)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
new file mode 100644
index 000000000000..ced196a367bd
--- /dev/null
+++ b/dev-util/kdevelop/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<use>
+	<flag name="cmake">Enable support for CMake build system</flag>
+	<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
+	<flag name="okteta">Enable hex editor plugin</flag>
+	<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
+	<flag name="reviewboard">Enable reviewboard support</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
new file mode 100644
index 000000000000..5429a3f0190c
--- /dev/null
+++ b/dev-util/kdevplatform/Manifest
@@ -0,0 +1,3 @@
+DIST kdevplatform-1.5.2.tar.xz 1895448 SHA256 a12656cfe137172db5feed9795b4f40b7fb42a93b6caf90838e5f9c205ee186a SHA512 019f7df0ca232d6627517c8677633f44807dddf6efc610df8b96a548f5280cce331e0afc8b4743f7badbe3fd7918def6c6c9b0c5806e9a8be2c9dafed4a95f03 WHIRLPOOL b6ba6103a8146912fe49d84cc21373746804cfaa4b607a63c7db7e92df5b44884b7f3880cc01399ba7eb3618b216e1d2b727cefdc24ee50d8c22c6206b34450b
+DIST kdevplatform-1.6.0.tar.xz 1889840 SHA256 cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80 SHA512 3f9d6aeb5fdb12dc0a719343ac81b8852d1680f2637fea8f3a8b97eaa32af38bd799e215a539792ec2e33dc0c0f53ba5f9347abc3633c4c31a71422bd2a8065f WHIRLPOOL 897cdb1f0893bd22e73c68ed3860cc8953c78ce8406eb0d41442d1402395cf4e00f17bf27a804f67857e160311aa979d178c2700b0370eea66d92759194a7b65
+DIST kdevplatform-1.7.1.tar.xz 1930560 SHA256 dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac SHA512 b19c925c973ab00b25b03f1bcf1e34a98b8108728f20e7b058bd391a1dde78e33b80705c39632ff594ecf834878e1c54732031b8110400433266c258632468d0 WHIRLPOOL 9e687644b1f31ca317bb3fa0000f388aca80ee305eaa3b43d044181d2b2374ad57613104a400a8a052ed07e5157fbbdc26b7174314cc04ca5b8c788afe4c8f4f
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch b/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch
new file mode 100644
index 000000000000..d4f93f66277f
--- /dev/null
+++ b/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch
@@ -0,0 +1,24 @@
+commit 33b660dfefe02ecd4391a284f6fd6de9439b2b45
+Author: Milian Wolff <mail@milianw.de>
+Date:   Thu Mar 20 11:50:07 2014 +0100
+
+    Keep backwards compatibility: replace "dest" variable.
+    
+    Its an alias for PROJECTDIR and used in quite some templates
+    apparently.
+    
+    BUG: 329392
+
+diff --git a/plugins/appwizard/appwizardplugin.cpp b/plugins/appwizard/appwizardplugin.cpp
+index 3e22183..7948e47 100644
+--- a/plugins/appwizard/appwizardplugin.cpp
++++ b/plugins/appwizard/appwizardplugin.cpp
+@@ -238,6 +238,8 @@ QString AppWizardPlugin::createProject(const ApplicationInfo& info)
+     m_variables["APPNAMELC"] = info.name.toLower();
+     m_variables["APPNAMEID"] = generateIdentifier(info.name);
+     m_variables["PROJECTDIR"] = dest.toLocalFile();
++    // backwards compatibility
++    m_variables["dest"] = m_variables["PROJECTDIR"];
+     m_variables["PROJECTDIRNAME"] = dest.fileName();
+     m_variables["VERSIONCONTROLPLUGIN"] = info.vcsPluginName;
+ 
diff --git a/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild
new file mode 100644
index 000000000000..b5a21316cdb9
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="kdevelop"
+KDE_MINIMAL="4.7"
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nds nl pl
+pt pt_BR ru sk sl sv th uk zh_CN zh_TW"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+EGIT_REPONAME="${PN}"
+inherit kde4-base
+
+DESCRIPTION="KDE development support libraries and apps"
+LICENSE="GPL-2 LGPL-2"
+IUSE="cvs debug reviewboard subversion"
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="amd64 ppc x86"
+fi
+
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/grantlee:0
+	reviewboard? ( dev-libs/qjson )
+	subversion? (
+		dev-libs/apr
+		dev-libs/apr-util
+		dev-vcs/subversion
+	)
+"
+RDEPEND="${DEPEND}
+	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
+	$(add_kdeapps_dep konsole)
+	cvs? ( dev-vcs/cvs )
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build cvs)
+		$(cmake-utils_use_find_package reviewboard QJSON)
+		$(cmake-utils_use_build subversion)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild b/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..f817a721be32
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="kdevelop"
+KDE_LINGUAS="bs ca ca@valencia da de el es et fi fr gl it kk nb nl pl pt pt_BR
+ru sk sl sv th uk zh_CN zh_TW"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+EGIT_REPONAME="${PN}"
+inherit kde4-base
+
+DESCRIPTION="KDE development support libraries and apps"
+LICENSE="GPL-2 LGPL-2"
+IUSE="cvs debug reviewboard subversion"
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/grantlee:0
+	reviewboard? ( dev-libs/qjson )
+	subversion? (
+		dev-libs/apr
+		dev-libs/apr-util
+		dev-vcs/subversion
+	)
+"
+RDEPEND="${DEPEND}
+	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
+	$(add_kdeapps_dep konsole)
+	cvs? ( dev-vcs/cvs )
+"
+
+PATCHES=( "${FILESDIR}/${P}-appwizard.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build cvs)
+		$(cmake-utils_use_find_package reviewboard QJSON)
+		$(cmake-utils_use_build subversion)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
new file mode 100644
index 000000000000..4e4b48df76ea
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+KMNAME="kdevelop"
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nl pl pt
+pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+EGIT_REPONAME="${PN}"
+EGIT_BRANCH="1.7"
+inherit kde4-base
+
+DESCRIPTION="KDE development support libraries and apps"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+classbrowser cvs debug +konsole reviewboard subversion"
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="amd64 ~ppc ~x86"
+fi
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-libs/grantlee:0
+	reviewboard? ( dev-libs/qjson )
+	subversion? (
+		dev-libs/apr
+		dev-libs/apr-util
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	classbrowser? ( dev-libs/boost )
+"
+RDEPEND="${COMMON_DEPEND}
+	konsole? ( $(add_kdeapps_dep konsole) )
+	cvs? ( dev-vcs/cvs )
+	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build classbrowser)
+		$(cmake-utils_use_build cvs)
+		$(cmake-utils_use_build konsole)
+		$(cmake-utils_use_find_package reviewboard QJSON)
+		$(cmake-utils_use_build subversion)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/dev-util/kdevplatform/metadata.xml b/dev-util/kdevplatform/metadata.xml
new file mode 100644
index 000000000000..6acfb42b2ac0
--- /dev/null
+++ b/dev-util/kdevplatform/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<use>
+		<flag name="classbrowser">Enable the class browser plugin</flag>
+		<flag name="konsole">Enable <pkg>kde-apps/konsole</pkg> integration</flag>
+		<flag name="reviewboard">Enable reviewboard support</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/kdoc/Manifest b/dev-util/kdoc/Manifest
new file mode 100644
index 000000000000..923c7c4432af
--- /dev/null
+++ b/dev-util/kdoc/Manifest
@@ -0,0 +1 @@
+DIST kdoc-2.0a54.tar.bz2 92430 SHA256 2946b520042dc57d9ca8a5ef789fa372d7a004d6e07f18efa55c0d61b5936451 SHA512 268cb2d422d84f449c543007068c89e49f6d673ecbe0476cf12708ebd8802602dad67b66bbb862a99a52e6e4edabc3c639043f0834750976bf0ff642bfefb978 WHIRLPOOL 62762562fe987e8191942e006fdef809012ca050db932e1272091018435be4e0cf064ea616341eba4858b004adbac3112e36a2e549e67fdbd893ca003c1c3e7e
diff --git a/dev-util/kdoc/kdoc-2.0_alpha54.ebuild b/dev-util/kdoc/kdoc-2.0_alpha54.ebuild
new file mode 100644
index 000000000000..0cffb4e32a06
--- /dev/null
+++ b/dev-util/kdoc/kdoc-2.0_alpha54.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P=${P/_alph/}
+
+DESCRIPTION="C++ and IDL Source Documentation System"
+HOMEPAGE="http://www.ph.unimelb.edu.au/~ssk/kde/kdoc/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+RESTRICT="test" #279709
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	use prefix || ED="${D}"
+	emake DESTDIR="${D}" install || die
+	dodoc README TODO
+	rm -rf "${ED}"/usr/share/doc/kdoc
+}
diff --git a/dev-util/kdoc/metadata.xml b/dev-util/kdoc/metadata.xml
new file mode 100644
index 000000000000..9df351b326cc
--- /dev/null
+++ b/dev-util/kdoc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+    <name>Default assignee for orphaned packages</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/kelbt/Manifest b/dev-util/kelbt/Manifest
new file mode 100644
index 000000000000..fc1a3de93935
--- /dev/null
+++ b/dev-util/kelbt/Manifest
@@ -0,0 +1 @@
+DIST kelbt-0.15.tar.gz 232537 SHA256 000ae8e0906f34de13c3448f2422065e48407b6d85c61bbe51490ffdab0bc565 SHA512 2f203d3c3a12cc03d96a4d650dde3902d6815a3978af6f78f759b8dfce7971e2799e1325dc043cbc8a5b1fedaf9553a8f1693a159afa4f3601b3bdbc844df647 WHIRLPOOL d0285767d020c8eeae12adf5c9c776703c7ae35095da3ecb7fa10535f67b37ef802824f0955e0db313be6a19c79722f53cc570fc1928506fb3d87270f15f7dfe
diff --git a/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch b/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
new file mode 100644
index 000000000000..80eb29a46f05
--- /dev/null
+++ b/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
@@ -0,0 +1,178 @@
+From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Tue, 22 May 2012 16:25:37 -0700
+Subject: [PATCH] aapl: fix building with gcc-4.7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with GCC 4.7, you have to explicit methods inherited from
+base templates, otherwise it will refuse to build.
+
+---
+
+The URL reported in the README is no longer registered, so I couldn't
+find a way to report this to an upstream project.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ aapl/avlcommon.h  |   12 ++++++------
+ aapl/bstcommon.h  |   16 ++++++++--------
+ aapl/bubblesort.h |    2 +-
+ aapl/mergesort.h  |    2 +-
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
+index 06983bc..2e3c190 100644
+--- a/aapl/avlcommon.h
++++ b/aapl/avlcommon.h
+@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 		}
+ 
+ #ifdef AVL_BASIC
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ #else
+-		keyRelation = compare( element->BASEKEY(getKey()), 
++		keyRelation = this->compare( element->BASEKEY(getKey()),
+ 				curEl->BASEKEY(getKey()) );
+ #endif
+ 
+@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare(key, curEl->getKey());
++		keyRelation = this->compare(key, curEl->getKey());
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h
+index 888717f..7c53ff3 100644
+--- a/aapl/bstcommon.h
++++ b/aapl/bstcommon.h
+@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
+ 
+ 			lower = mid - 1;
+ 			while ( lower != lowEnd && 
+-					compare(key, GET_KEY(*lower)) == 0 )
++					this->compare(key, GET_KEY(*lower)) == 0 )
+ 				lower--;
+ 
+ 			upper = mid + 1;
+ 			while ( upper != highEnd && 
+-					compare(key, GET_KEY(*upper)) == 0 )
++					this->compare(key, GET_KEY(*upper)) == 0 )
+ 				upper++;
+ 			
+ 			low = (Element*)lower + 1;
+@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h
+index bcc2fb6..f0f4ce5 100644
+--- a/aapl/bubblesort.h
++++ b/aapl/bubblesort.h
+@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>::
+ 		changed = false;
+ 		for ( long i = 0; i < len-pass; i++ ) {
+ 			/* Do we swap pos with the next one? */
+-			if ( compare( data[i], data[i+1] ) > 0 ) {
++			if ( this->compare( data[i], data[i+1] ) > 0 ) {
+ 				char tmp[sizeof(T)];
+ 
+ 				/* Swap the two items. */
+diff --git a/aapl/mergesort.h b/aapl/mergesort.h
+index 68b8426..8cefa73 100644
+--- a/aapl/mergesort.h
++++ b/aapl/mergesort.h
+@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>::
+ 		}
+ 		else {
+ 			/* Both upper and lower left. */
+-			if ( compare(*lower, *upper) <= 0 )
++			if ( this->compare(*lower, *upper) <= 0 )
+ 				memcpy( dest++, lower++, sizeof(T) );
+ 			else
+ 				memcpy( dest++, upper++, sizeof(T) );
+-- 
+1.7.8.6
+
diff --git a/dev-util/kelbt/kelbt-0.15.ebuild b/dev-util/kelbt/kelbt-0.15.ebuild
new file mode 100644
index 000000000000..ed8b2b4de07d
--- /dev/null
+++ b/dev-util/kelbt/kelbt-0.15.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A backtracking LR parser by the author of Ragel"
+HOMEPAGE="http://www.complang.org/kelbt/"
+SRC_URI="http://www.complang.org/kelbt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86-fbsd"
+IUSE="vim-syntax"
+
+RDEPEND=""
+
+src_prepare() {
+	find "${S}" -iname "Makefile*" -exec sed -i \
+		-e '/\$(CXX)/s:CFLAGS:CXXFLAGS:' \
+		{} \;
+
+	epatch "${FILESDIR}"/ragel-6.7+gcc-4.7.patch
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+	cd "${S}"/test
+	./runtests || die "tests failed"
+}
+
+src_install() {
+	dobin kelbt/kelbt
+	dodoc TODO CREDITS ChangeLog
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins ${PN}.vim
+	fi
+}
diff --git a/dev-util/kelbt/metadata.xml b/dev-util/kelbt/metadata.xml
new file mode 100644
index 000000000000..2ba6e4da9d2c
--- /dev/null
+++ b/dev-util/kelbt/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>lu_zero@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/ketchup/Manifest b/dev-util/ketchup/Manifest
new file mode 100644
index 000000000000..5d71dafc337a
--- /dev/null
+++ b/dev-util/ketchup/Manifest
@@ -0,0 +1,3 @@
+DIST ketchup-0.9.8.tar.bz2 7678 SHA256 4be84243d03bed168a754c1dde8ef19e6898e67c55cd7aca340f09c138a964f8 SHA512 8f14cf4c6b8b8697da638230960a8fb947af8927218daefb092e1bad5a274cd769ab46d997884e43126394531ede7b81a19d42849db707935d4f3f717dbbc492 WHIRLPOOL e09f411ec90b53b71121d4f6564cdee2665b511a539df8b8148769eb75a60719458bae7073e8a29526772502091f9be30c2383be351ae89593a65ae4b56b9b1a
+DIST ketchup-1.0.tar.xz 7652 SHA256 9781e2a5e30e48ce73b1464a2ab562ea8d40258d6c81a57a3a3aca1171b8db44 SHA512 44b1ed07e49112f670bf1402d276c1fa92ced89ad39caff5de33cb4dda0549c189ee19d567ce7f299db8c65df85412b3d7bd9d909b9929bd3a5fae3054b49255 WHIRLPOOL dac0c6b19b4a4a7a62d5333f67fd2eb8b3a9f8d26e86aa19ef5fde23983653b61ce0e8d0c4f3fb2a304c8dd0f033045bcd32635780d67c6a3e13768399d1e720
+DIST ketchup-1.1_beta3.tar.gz 10142 SHA256 6bc2de9088adbe7379f7b6b0e85afd4d3ae6da987dbd8ad6b677ce4ead68e306 SHA512 3b5a660704ab4f850f2574baa04d87be026beff4c87c5a7b740f320a78b8a76b8df3705d6e5491aa0e86f933e2542e9211a567a8a8002f3e1c42698070da712c WHIRLPOOL ceb4de15df4a24a9b1dcf1cd6ba8a30c8b4abf8ea9729c023279b8e9209b9c38fae1db5039d2e180b3c1596256592a3156f5265faed15444beaa93505af1e2f1
diff --git a/dev-util/ketchup/ketchup-0.9.8.ebuild b/dev-util/ketchup/ketchup-0.9.8.ebuild
new file mode 100644
index 000000000000..59388634f603
--- /dev/null
+++ b/dev-util/ketchup/ketchup-0.9.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Tool for updating or switching between versions of the Linux kernel source"
+HOMEPAGE="http://www.selenic.com/ketchup/"
+
+if [[ $PV == *_p* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else
+	SRC_URI="http://www.selenic.com/ketchup/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
+IUSE="doc"
+
+S=${WORKDIR}
+
+src_install() {
+	if [[ $PV == *_p* ]]; then
+		cd Ketchup* 2>/dev/null	# nightly snapshots unpack into a directory
+	else
+		cd "${S}"
+	fi
+
+	dobin ./ketchup || die "could not install script"
+
+	if use doc; then
+		doman ketchup.1 || die "could not install ketchup manual"
+	fi
+}
diff --git a/dev-util/ketchup/ketchup-1.0.ebuild b/dev-util/ketchup/ketchup-1.0.ebuild
new file mode 100644
index 000000000000..00e2bc3d03d7
--- /dev/null
+++ b/dev-util/ketchup/ketchup-1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Tool for updating or switching between versions of the Linux kernel source"
+HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/rostedt/ketchup.git;a=summary"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/ketchup/ketchup-1.1_beta3.ebuild b/dev-util/ketchup/ketchup-1.1_beta3.ebuild
new file mode 100644
index 000000000000..3509d922bec8
--- /dev/null
+++ b/dev-util/ketchup/ketchup-1.1_beta3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Tool for updating or switching between versions of the Linux kernel source"
+HOMEPAGE="http://github.com/psomas/ketchup"
+SRC_URI="http://dev.gentoo.org/~psomas/${PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_install() {
+	dobin "${PN}"
+
+	insinto "/etc"
+	doins "${PN}rc"
+
+	doman "${PN}.1"
+}
diff --git a/dev-util/ketchup/ketchup-9999.ebuild b/dev-util/ketchup/ketchup-9999.ebuild
new file mode 100644
index 000000000000..3125a1aaa940
--- /dev/null
+++ b/dev-util/ketchup/ketchup-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit git-2 eutils
+
+DESCRIPTION="tool for updating or switching between versions of the Linux kernel source"
+HOMEPAGE="http://github.com/psomas/ketchup"
+SRC_URI=""
+EGIT_REPO_URI="git://github.com/psomas/ketchup.git"
+EGIT_MASTER="experimental"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin "${PN}"
+
+	insinto "/etc"
+	doins "${PN}rc"
+
+	doman "${PN}.1"
+}
diff --git a/dev-util/ketchup/metadata.xml b/dev-util/ketchup/metadata.xml
new file mode 100644
index 000000000000..397dab6aa65c
--- /dev/null
+++ b/dev-util/ketchup/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>psomas@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Ketchup allows quick and easy following of/or switching between stable,
+		-git, -rc, -mm, -rt (Ingo Molnar's realtime kernel), -ck, and other
+		kernel source trees
+	</longdescription>
+	<upstream>
+		<remote-id type="github">psomas/ketchup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/kscope/Manifest b/dev-util/kscope/Manifest
new file mode 100644
index 000000000000..9fe7a8e8de8d
--- /dev/null
+++ b/dev-util/kscope/Manifest
@@ -0,0 +1 @@
+DIST kscope-1.9.4.tar.gz 127892 SHA256 7bd35960afa29026f8e0c4a827868e93b4d7c6e81796ceb89f086efbc24636df SHA512 744bd8a57031c0253e37521ddc42ee1cc173bfb8490130592a1a6478525c3ea0bcc17d2c2e01adb72cc14adc96298ee69a235c16fc2a42b301de4d30ef287a3b WHIRLPOOL 9a589021253cae7625178cc3e90db9537cc795c967c45e408d10e50d305624c8dfc92208bc64331f4478b46eede5da08b2109ba42f4e990140f2736694c10d2b
diff --git a/dev-util/kscope/files/kscope-1.9.4-actions.patch b/dev-util/kscope/files/kscope-1.9.4-actions.patch
new file mode 100644
index 000000000000..d333efb0ab09
--- /dev/null
+++ b/dev-util/kscope/files/kscope-1.9.4-actions.patch
@@ -0,0 +1,90 @@
+--- trunk/app/actions.cpp	2009/08/26 13:17:03	203
++++ trunk/app/actions.cpp	2009/09/07 19:58:30	204
+@@ -264,69 +264,58 @@
+ 	QActionGroup* queryGroup = new QActionGroup(this);
+ 	connect(queryGroup, SIGNAL(triggered(QAction*)), this,
+ 	        SLOT(query(QAction*)));
++	connect(ProjectManager::signalProxy(), SIGNAL(hasProject(bool)),
++			queryGroup, SLOT(setEnabled(bool)));
++	queryGroup->setEnabled(false);
+ 
+ 	// Query references.
+-	action = new QAction(tr("&References"), this);
++	action = new QAction(tr("&References"), queryGroup);
+ 	action->setShortcut(tr("Ctrl+0"));
+ 	action->setStatusTip(tr("Find all symbol references"));
+ 	action->setData(Core::Query::References);
+ 	menu->addAction(action);
+-	projectGroup->addAction(action);
+-	queryGroup->addAction(action);
+ 
+ 	// Query definition.
+-	action = new QAction(tr("&Definition"), this);
++	action = new QAction(tr("&Definition"), queryGroup);
+ 	action->setShortcut(tr("Ctrl+1"));
+ 	action->setStatusTip(tr("Find symbol definition"));
+ 	action->setData(Core::Query::Definition);
+ 	menu->addAction(action);
+-	projectGroup->addAction(action);
+-	queryGroup->addAction(action);
+ 
+ 	// Query called functions.
+-	action = new QAction(tr("&Called Functions"), this);
++	action = new QAction(tr("&Called Functions"), queryGroup);
+ 	action->setShortcut(tr("Ctrl+2"));
+ 	action->setStatusTip(tr("Show functions called from function"));
+ 	action->setData(Core::Query::CalledFunctions);
+ 	menu->addAction(action);
+-	projectGroup->addAction(action);
+-	queryGroup->addAction(action);
+ 
+ 	// Query calling functions.
+-	action = new QAction(tr("C&alling Functions"), this);
++	action = new QAction(tr("C&alling Functions"), queryGroup);
+ 	action->setShortcut(tr("Ctrl+3"));
+ 	action->setStatusTip(tr("Find functions calling function"));
+ 	action->setData(Core::Query::CallingFunctions);
+ 	menu->addAction(action);
+-	projectGroup->addAction(action);
+-	queryGroup->addAction(action);
+ 
+ 	// Query text.
+-	action = new QAction(tr("&Text"), this);
++	action = new QAction(tr("&Text"), queryGroup);
+ 	action->setShortcut(tr("Ctrl+4"));
+ 	action->setStatusTip(tr("Find text in files"));
+ 	action->setData(Core::Query::Text);
+ 	menu->addAction(action);
+-	projectGroup->addAction(action);
+-	queryGroup->addAction(action);
+ 
+ 	// Find file.
+-	action = new QAction(tr("&File"), this);
++	action = new QAction(tr("&File"), queryGroup);
+ 	action->setShortcut(tr("Ctrl+7"));
+ 	action->setStatusTip(tr("Find a file"));
+ 	action->setData(Core::Query::FindFile);
+ 	menu->addAction(action);
+-	projectGroup->addAction(action);
+-	queryGroup->addAction(action);
+ 
+ 	// Find including files.
+-	action = new QAction(tr("&Including Files"), this);
++	action = new QAction(tr("&Including Files"), queryGroup);
+ 	action->setShortcut(tr("Ctrl+8"));
+ 	action->setStatusTip(tr("Find files #including a given file"));
+ 	action->setData(Core::Query::IncludingFiles);
+ 	menu->addAction(action);
+-	projectGroup->addAction(action);
+-	queryGroup->addAction(action);
+ 
+ 	// Show local tags.
+ 	action = new QAction(tr("Local &Tags"), this);
+@@ -348,6 +337,7 @@
+ 	action->setStatusTip(tr("Create a call tree"));
+ 	connect(action, SIGNAL(triggered()), mainWnd(), SLOT(promptCallTree()));
+ 	menu->addAction(action);
++	projectGroup->addAction(action);
+ 
+ 	// Settings menu.
+ 	menu = mainWnd()->menuBar()->addMenu(tr("&Settings"));
diff --git a/dev-util/kscope/files/kscope-1.9.4-underlinking.patch b/dev-util/kscope/files/kscope-1.9.4-underlinking.patch
new file mode 100644
index 000000000000..90b6fc365594
--- /dev/null
+++ b/dev-util/kscope/files/kscope-1.9.4-underlinking.patch
@@ -0,0 +1,13 @@
+diff -ruN kscope-1.9.4.orig/app/app.pro kscope-1.9.4/app/app.pro
+--- kscope-1.9.4.orig/app/app.pro	2009-03-14 12:45:48.000000000 +0100
++++ kscope-1.9.4/app/app.pro	2011-08-07 20:33:04.540575855 +0200
+@@ -58,7 +58,8 @@
+     -L../cscope \
+     -lkscope_cscope \
+     -L../editor \
+-    -lkscope_editor
++    -lkscope_editor \
++    -lqscintilla2
+ RESOURCES = app.qrc
+ target.path = $${INSTALL_PATH}/bin
+ INSTALLS += target
diff --git a/dev-util/kscope/kscope-1.9.4-r1.ebuild b/dev-util/kscope/kscope-1.9.4-r1.ebuild
new file mode 100644
index 000000000000..2a68bc3ca96c
--- /dev/null
+++ b/dev-util/kscope/kscope-1.9.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib qt4-r2
+
+DESCRIPTION="Source Editing Environment based on Qt"
+HOMEPAGE="http://kscope.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kscope/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	x11-libs/qscintilla"
+DEPEND="${RDEPEND}"
+
+DOCS="ChangeLog"
+
+src_prepare() {
+	sed -i -e "s:/usr/local:/usr:" config || die
+	sed -i \
+		-e "s:\$\${QSCI_ROOT_PATH}/include/Qsci:& /usr/include/qt4/Qsci:g" \
+		-e "s:\$\${QSCI_ROOT_PATH}/lib:& -L/usr/lib/qt4:g" \
+		-e "s:/lib:/$(get_libdir):g" \
+		app/app.pro core/core.pro cscope/cscope.pro editor/editor.pro \
+		|| die
+
+	# fix build failure with parallel make
+	echo "CONFIG += ordered" >> kscope.pro
+
+	epatch "${FILESDIR}/${P}"-{actions,underlinking}.patch
+}
diff --git a/dev-util/kscope/metadata.xml b/dev-util/kscope/metadata.xml
new file mode 100644
index 000000000000..1857d0bcc627
--- /dev/null
+++ b/dev-util/kscope/metadata.xml
@@ -0,0 +1,8 @@
+<?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">kscope</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/kup/Manifest b/dev-util/kup/Manifest
new file mode 100644
index 000000000000..603f02f7089b
--- /dev/null
+++ b/dev-util/kup/Manifest
@@ -0,0 +1 @@
+DIST kup-0.3.4.tar.gz 45996 SHA256 2a7f96084ca241e7d5ed5aa11dee8c04422b84645b05091ac5512b09ca0d03e2 SHA512 fde61de2978f8ba76c4b89a84313aa8b8651cc2610b1512ba1d662fbd0675f269959dd66ef5e1e0ce216ba66e12f5735e58bb36f4ba1a14d90269da1a6fcee46 WHIRLPOOL 29fbade9007be2ec3ba71861e10af228a3684e6486aafeed311806fb0088baf2c67999da30a65bc716ab1ed877cfced0bd2c81a46371875366615efb61531e41
diff --git a/dev-util/kup/kup-0.3.4.ebuild b/dev-util/kup/kup-0.3.4.ebuild
new file mode 100644
index 000000000000..d5d30c82d431
--- /dev/null
+++ b/dev-util/kup/kup-0.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="kernel.org uploader tool"
+HOMEPAGE="http://www.kernel.org/pub/software/network/kup"
+SRC_URI="mirror://kernel/software/network/kup/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/BSD-Resource
+	dev-perl/Config-Simple
+"
+
+src_install () {
+	dobin kup
+	dobin gpg-sign-all
+	dobin kup-server
+	doman kup.1
+	dodoc README
+}
diff --git a/dev-util/kup/metadata.xml b/dev-util/kup/metadata.xml
new file mode 100644
index 000000000000..a44f8b1aad3c
--- /dev/null
+++ b/dev-util/kup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>gregkh@gentoo.org</email>
+	<name>Greg Kroah-Hartman</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
new file mode 100644
index 000000000000..d6a19c0f6a3d
--- /dev/null
+++ b/dev-util/lcov/Manifest
@@ -0,0 +1,3 @@
+DIST lcov-1.10.tar.gz 150174 SHA256 8a4661becc95fafad7875786672f7f29b080437825c3ff31d55a49492c15b88f SHA512 0fd94b04677dfaadc49a1c936638bbd09dff1fba07f3b2e7789ba6f6f7e2c58c5f5e69341bf33c9a3c3d8b3590a37cf87d1fbc04083736179a6cc56fc70c3c3f WHIRLPOOL fd89e3d3fd55dc4f92a8a216b88d4a99e1660efaa6097492b680a2e4293eac29fd88dcbbf83ec0b6a2b742d3dd76796e6ad9ce0e6306c2d88ae69b978f4f96aa
+DIST lcov-1.11.tar.gz 155906 SHA256 c282de8d678ecbfda32ce4b5c85fc02f77c2a39a062f068bd8e774d29ddc9bf8 SHA512 db42256c7fbe00d17256ad4944b7e658e65f2dc2b9df1814e25d46a652e92a0ff8bacd4e68de743681df22f4352ffc82b3ccdc0a85723546d7eb64c92e28c0fe WHIRLPOOL 8309d97546a228e3c2c6a4cb95d2dc409be1dde46bd96821c83c3a8105e7026a64b2121f954fbe569f99a70ae4de3b936d7199ff8099bdedf3aee29ba684b3d0
+DIST lcov-1.9.tar.gz 140035 SHA256 c37e125d4f0773339de3600d45ad325fe710ea2f0051d7ee2b8a168f450f1aca SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee WHIRLPOOL 2b7e6f1d743ded96e3ecc16c7733b8c76fccbf0aff07a02c02f3e3e08c9fb8f85aa35d4258830f17291fa5d4eedc554c808528b4158919c65439f524c5fd78c7
diff --git a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch b/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
new file mode 100644
index 000000000000..1b9d6ac0ff21
--- /dev/null
+++ b/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
@@ -0,0 +1,29 @@
+fix from upstream to work with gcc-4.7
+
+Index: bin/geninfo
+===================================================================
+RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
+retrieving revision 1.95
+retrieving revision 1.96
+diff -u -p -r1.95 -r1.96
+--- bin/geninfo	20 Jan 2012 11:53:57 -0000	1.95
++++ bin/geninfo	10 Apr 2012 11:48:52 -0000	1.96
+@@ -61,6 +61,7 @@ if( $^O eq "msys" )
+ our $gcov_tool		= "gcov";
+ our $tool_name		= basename($0);
+ 
++our $GCOV_VERSION_4_7_0	= 0x40700;
+ our $GCOV_VERSION_3_4_0	= 0x30400;
+ our $GCOV_VERSION_3_3_0	= 0x30300;
+ our $GCNO_FUNCTION_TAG	= 0x01000000;
+@@ -3023,5 +3024,10 @@ sub read_gcno_function_record(*$$$$)
+ 	graph_expect("function record");
+ 	# Skip ident and checksum
+ 	graph_skip($handle, 8, "function ident and checksum") or return undef;
++	if ($gcov_version >= $GCOV_VERSION_4_7_0) {
++		# Skip extra checksum added by android 4.4.0 / gcc >= 4.7
++		# toolchains.
++		graph_skip($handle, 4, "function extra checksum");
++	}
+ 	# Read function name
+ 	graph_expect("function name");
diff --git a/dev-util/lcov/lcov-1.10.ebuild b/dev-util/lcov/lcov-1.10.ebuild
new file mode 100644
index 000000000000..a79b90279f67
--- /dev/null
+++ b/dev-util/lcov/lcov-1.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5
+	dev-perl/GD[png]"
+
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${ED}" install
+}
diff --git a/dev-util/lcov/lcov-1.11.ebuild b/dev-util/lcov/lcov-1.11.ebuild
new file mode 100644
index 000000000000..51dadaae6e96
--- /dev/null
+++ b/dev-util/lcov/lcov-1.11.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5
+	dev-perl/GD[png]"
+
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${ED}" install
+}
diff --git a/dev-util/lcov/lcov-1.9-r1.ebuild b/dev-util/lcov/lcov-1.9-r1.ebuild
new file mode 100644
index 000000000000..ae20a944fe65
--- /dev/null
+++ b/dev-util/lcov/lcov-1.9-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc x86 ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5
+	dev-perl/GD[png]"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${ED}" install
+}
diff --git a/dev-util/lcov/metadata.xml b/dev-util/lcov/metadata.xml
new file mode 100644
index 000000000000..a38465452764
--- /dev/null
+++ b/dev-util/lcov/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>dev-tools</herd>
+	<upstream>
+		<remote-id type="sourceforge">ltp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/leaktracer/Manifest b/dev-util/leaktracer/Manifest
new file mode 100644
index 000000000000..5da8ec668b4f
--- /dev/null
+++ b/dev-util/leaktracer/Manifest
@@ -0,0 +1 @@
+DIST leaktracer-2.4-gentoo_p2.tbz2 11957 SHA256 21ed81f47654ae03211c1ee0655bf0f1d5cdbe433fbe3424d0b4738506deced8 SHA512 12f348564933c8cf372208f846bb21b175f041e7687811e9c6ce8062e7f285b9d2395e7853a20df11d9b0d5b8fff89efc76ccbac9f8b7c0bc4fd4ea25d476718 WHIRLPOOL 16cf715ad6d5690040d59c913ba9360249842de587ad57fa2e4182614fba10ffdf5850cf9d80f09a692f3064ed7f3af59f80e0aa3ba73ee219855d34af60abcb
diff --git a/dev-util/leaktracer/files/LeakCheck-gentoo.patch b/dev-util/leaktracer/files/LeakCheck-gentoo.patch
new file mode 100644
index 000000000000..fc88ba6d16a4
--- /dev/null
+++ b/dev-util/leaktracer/files/LeakCheck-gentoo.patch
@@ -0,0 +1,11 @@
+--- LeakCheck.orig	2003-09-06 13:24:05.000000000 +0300
++++ LeakCheck	2003-09-06 13:24:36.000000000 +0300
+@@ -7,7 +7,7 @@
+ # this looks in the same directory, this
+ # LeakCheck script resides; modify to your
+ # needs:
+-SHLIB=`dirname $0`/LeakTracer.so
++SHLIB=/usr/lib/LeakTracer.so
+ if [ ! -x $SHLIB ] ; then
+     echo "$SHLIB not found"
+     exit 1
diff --git a/dev-util/leaktracer/leaktracer-2.4-r2.ebuild b/dev-util/leaktracer/leaktracer-2.4-r2.ebuild
new file mode 100644
index 000000000000..9bb9e04c037f
--- /dev/null
+++ b/dev-util/leaktracer/leaktracer-2.4-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib toolchain-funcs
+
+# Upstream-package has no version in it's name.
+# We therefore repackage it directly, together with the patches.
+PATCH_LEVEL="2"
+
+DESCRIPTION="trace and analyze memory leaks in C++ programs"
+HOMEPAGE="http://www.andreasen.org/LeakTracer/"
+SRC_URI="mirror://gentoo/${P}-gentoo_p${PATCH_LEVEL}.tbz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5
+	sys-devel/gdb"
+RDEPEND="${DEPEND}"
+
+# leaktracer is being realized using LD_PRELOAD and segfaults
+# when being run in the sandbox and the library is _not_ in
+# /usr/$(get_libdir) which is not possible before installation
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SOURCE="${WORKDIR}/patches"
+	EPATCH_SUFFIX="patch"
+	epatch
+
+	sed -i \
+		-e "s|%LIBDIR%|$(get_libdir)|" \
+		LeakCheck || die "sed for setting lib path failed"
+}
+
+src_compile() {
+	emake CXX=$(tc-getCXX) || die "emake failed"
+}
+
+src_install() {
+	dobin LeakCheck leak-analyze || die "dobin failed"
+	dolib.so LeakTracer.so || die "dolib.so failed"
+	dohtml README.html
+	dodoc README test.cc
+}
+
+pkg_postinst() {
+	elog "To use LeakTracer, run LeakCheck my_prog and then leak-analyze my_prog leak.out"
+	elog "Please reffer to README file for more info."
+}
diff --git a/dev-util/leaktracer/metadata.xml b/dev-util/leaktracer/metadata.xml
new file mode 100644
index 000000000000..8434377a6047
--- /dev/null
+++ b/dev-util/leaktracer/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>cpp</herd>
+</pkgmetadata>
diff --git a/dev-util/linklint/Manifest b/dev-util/linklint/Manifest
new file mode 100644
index 000000000000..5da84d7fbad6
--- /dev/null
+++ b/dev-util/linklint/Manifest
@@ -0,0 +1 @@
+DIST linklint-2.3.5.tar.gz 113256 SHA256 ecaee456a3c2d6a3bd18a580d6b09b6b7b825df3e59f900270fe3f84ec3ac9c7 SHA512 723aa5be27c563755ef488bb586eabcd8ef92569f5391be988b19317da6fc93983ad1231d650a07728face0af01c80ada4b1867de81be9cd27952a762dc41e73 WHIRLPOOL ed97cf826661fe500efa20857581d358dafc074e58edc249c39b1c6ae98f84702f90347ea919ba69ac9797710781f59cc03ac34cd3b75fd6598ca5a3fa8e6bfd
diff --git a/dev-util/linklint/linklint-2.3.5.ebuild b/dev-util/linklint/linklint-2.3.5.ebuild
new file mode 100644
index 000000000000..ecb42b532f15
--- /dev/null
+++ b/dev-util/linklint/linklint-2.3.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A Perl program that checks links on web sites"
+HOMEPAGE="http://www.linklint.org/"
+SRC_URI="http://www.linklint.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl"
+
+src_install() {
+	newbin ${P} ${PN}
+	dodoc INSTALL.unix INSTALL.windows READ_ME.txt CHANGES.txt
+	dohtml -r doc/*
+}
diff --git a/dev-util/linklint/metadata.xml b/dev-util/linklint/metadata.xml
new file mode 100644
index 000000000000..1470e032181b
--- /dev/null
+++ b/dev-util/linklint/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/lockrun/files/lockrun.c-20120508 b/dev-util/lockrun/files/lockrun.c-20120508
new file mode 100644
index 000000000000..0b0034d7bc25
--- /dev/null
+++ b/dev-util/lockrun/files/lockrun.c-20120508
@@ -0,0 +1,294 @@
+/*
+ * $Id$
+ *
+ * written by :	Stephen J. Friedl
+ *              Software Consultant
+ *              steve@unixwiz.net
+ *		http://www.unixwiz.net/tools/
+ *
+ *	===================================================================
+ *	======== This software is in the public domain, and can be ========
+ *	======== used by anybody for any purpose                   ========
+ *	===================================================================
+ *
+ *	Lockrun: This program is used to launch a program out with a lockout
+ *	so that only one can run at a time. It's mainly intended for use out
+ *	of cron so that our five-minute running jobs which run long don't get
+ *	walked on. We find this a *lot* with Cacti jobs which just get hung
+ *	up: it's better to miss a polling period than to stack them up and
+ *	slow each other down.
+ *
+ *	So we use a file which is used for locking: this program attempts to
+ *	lock the file, and if the lock exists, we have to either exit with
+ *	an error, or wait for it to release.
+ *
+ *		lockrun --lockfile=FILE -- my command here
+ *
+ * COMMAND LINE
+ * ------------
+ *
+ * --lockfile=F
+ *
+ *	Specify the name of a file which is used for locking. The file is
+ *	created if necessary (with mode 0666), and no I/O of any kind is
+ *	done. The file is never removed.
+ *
+ * --maxtime=N
+ *
+ *	The script being controlled should run for no more than <N> seconds,
+ *	and if it's beyond that time, we should report it to the standard
+ *	error (which probably gets routed to the user via cron's email).
+ *
+ * --wait
+ *
+ *	When a lock is hit, we normally exit with error, but --wait causes
+ *	it to loop until the lock is released.
+ *
+ * --verbose
+ *
+ *	Show a bit more runtime debugging.
+ *
+ * --quiet
+ *
+ *	Don't show "run is locked" error if things are busy; keeps cron from
+ *	overwhelming you with messages if lockrun overlap is not uncommon.
+ *
+ * --
+ *
+ *	Mark the end of the options: the command to run follows.
+ *	
+ */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/file.h>
+
+#ifndef __GNUC__
+# define __attribute__(x)	/* nothing */
+#endif
+
+
+#define STRMATCH(a,b)		(strcmp((a),(b)) == 0)
+
+#define UNUSED_PARAMETER(v)	((void)(v))
+
+#define	TRUE	1
+#define	FALSE	0
+
+static const char	*lockfile = 0;
+static int		wait_for_lock = FALSE;
+static mode_t		openmode = 0666;
+static int		sleeptime = 10;		/* seconds */
+static int		Verbose = FALSE;
+static int		Maxtime  = 0;
+static int		Quiet = FALSE;
+
+static char *getarg(char *opt, char ***pargv);
+
+static void die(const char *format, ...)
+		__attribute__((noreturn))
+		__attribute__((format(printf, 1, 2)));
+
+#ifdef __sun
+# define WAIT_AND_LOCK(fd) lockf(fd, F_TLOCK,0)
+#else
+# define WAIT_AND_LOCK(fd) flock(fd, LOCK_EX | LOCK_NB)
+#endif
+
+int main(int argc, char **argv)
+{
+	char	*Argv0 = *argv;
+	int	rc;
+	int	lfd;
+	pid_t	childpid;
+	time_t	starttime;
+
+	UNUSED_PARAMETER(argc);
+
+	time(&starttime);
+
+	for ( argv++ ; *argv ; argv++ )
+	{
+		char    *arg = *argv;
+		char	*opt = strchr(arg, '=');
+
+		/* the -- token marks the end of the list */
+
+		if ( strcmp(*argv, "--") == 0 )
+		{
+			argv++;
+			break;
+		}
+
+		if (opt) *opt++ = '\0'; /* pick off the =VALUE part */
+
+		if ( STRMATCH(arg, "-L") || STRMATCH(arg, "--lockfile"))
+		{
+			lockfile = getarg(opt, &argv);
+		}
+
+		else if ( STRMATCH(arg, "-W") || STRMATCH(arg, "--wait"))
+		{
+			wait_for_lock = TRUE;
+		}
+
+		else if ( STRMATCH(arg, "-S") || STRMATCH(arg, "--sleep"))
+		{
+			sleeptime = atoi(getarg(opt, &argv));
+		}
+
+		else if ( STRMATCH(arg, "-T") || STRMATCH(arg, "--maxtime"))
+		{
+			Maxtime = atoi(getarg(opt, &argv));
+		}
+
+		else if ( STRMATCH(arg, "-V") || STRMATCH(arg, "--verbose"))
+		{
+			Verbose++;
+		}
+
+		else if ( STRMATCH(arg, "-q") || STRMATCH(arg, "--quiet"))
+		{
+			Quiet = TRUE;
+		}
+
+		else
+		{
+			die("ERROR: \"%s\" is an invalid cmdline param", arg);
+		}
+	}
+
+	/*----------------------------------------------------------------
+	 * SANITY CHECKING
+	 *
+	 * Make sure that we have all the parameters we require
+	 */
+	if (*argv == 0)
+		die("ERROR: missing command to %s (must follow \"--\" marker) ", Argv0);
+
+	if (lockfile == 0)
+		die("ERROR: missing --lockfile=F parameter");
+
+	/*----------------------------------------------------------------
+	 * Open or create the lockfile, then try to acquire the lock. If
+	 * the lock is acquired immediately (==0), then we're done, but
+	 * if the lock is not available, we have to wait for it.
+	 *
+	 * We can either loop trying for the lock (for --wait), or exit
+	 * with error.
+	 */
+
+	if ( (lfd = open(lockfile, O_RDWR|O_CREAT, openmode)) < 0)
+		die("ERROR: cannot open(%s) [err=%s]", lockfile, strerror(errno));
+
+	while ( WAIT_AND_LOCK(lfd) != 0 )
+	{
+		if ( ! wait_for_lock )
+		{
+			if ( Quiet)
+				exit(EXIT_SUCCESS);
+			else
+				die("ERROR: cannot launch %s - run is locked", argv[0]);
+		}
+
+		/* waiting */
+		if ( Verbose ) printf("(locked: sleeping %d secs)\n", sleeptime);
+
+		sleep(sleeptime);
+	}
+
+	fflush(stdout);
+
+	/* run the child */
+
+
+	if ( (childpid = fork()) == 0 )
+	{
+		close(lfd);		// don't need the lock file
+
+		execvp(argv[0], argv);
+	}
+	else if ( childpid > 0 )
+	{
+		time_t endtime;
+		pid_t  pid;
+
+		if ( Verbose )
+		    printf("Waiting for process %ld\n", (long) childpid);
+
+		pid = waitpid(childpid, &rc, 0);
+
+		time(&endtime);
+
+		endtime -= starttime;
+
+		if ( Verbose || (Maxtime > 0  &&  endtime > Maxtime) )
+		    printf("pid %d exited with status %d (time=%ld sec)\n", pid, rc, endtime);
+	}
+	else
+	{
+		die("ERROR: cannot fork [%s]", strerror(errno));
+	}
+
+	exit(rc);
+}
+
+
+/*! \fn static char *getarg(char *opt, char ***pargv)
+ *  \brief A function to parse calling parameters
+ *
+ *	This is a helper for the main arg-processing loop: we work with
+ *	options which are either of the form "-X=FOO" or "-X FOO"; we
+ *	want an easy way to handle either one.
+ *
+ *	The idea is that if the parameter has an = sign, we use the rest
+ *	of that same argv[X] string, otherwise we have to get the *next*
+ *	argv[X] string. But it's an error if an option-requiring param
+ *	is at the end of the list with no argument to follow.
+ *
+ *	The option name could be of the form "-C" or "--conf", but we
+ *	grab it from the existing argv[] so we can report it well.
+ *
+ * \return character pointer to the argument
+ *
+ */
+static char *getarg(char *opt, char ***pargv)
+{
+	const char *const optname = **pargv;
+
+	/* option already set? */
+	if (opt) return opt;
+
+	/* advance to next argv[] and try that one */
+	if ((opt = *++(*pargv)) == 0)
+		die("ERROR: option %s requires a parameter", optname);
+
+	return opt;
+}
+
+/*
+ * die()
+ *
+ *	Given a printf-style argument list, format it to the standard error,
+ *	append a newline, then exit with error status.
+ */
+
+static void die(const char *format, ...)
+{
+va_list	args;
+
+	va_start(args, format);
+	vfprintf(stderr, format, args);
+	putc('\n', stderr);
+	va_end(args);
+
+	exit(EXIT_FAILURE);
+}
diff --git a/dev-util/lockrun/lockrun-20120508.ebuild b/dev-util/lockrun/lockrun-20120508.ebuild
new file mode 100644
index 000000000000..5e7e1ef7e0d5
--- /dev/null
+++ b/dev-util/lockrun/lockrun-20120508.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="Lockrun - runs cronjobs with overrun protection"
+HOMEPAGE="http://www.unixwiz.net/tools/lockrun.html"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${FILESDIR}"/${PN}.c-${PV} "${S}"/${PN}.c || die
+	cp "${FILESDIR}"/${PN}.c-${PV} "${S}"/README || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) ${PN}
+	sed -i README -e '60q;s|^ \*||g' || die
+}
+
+src_install () {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/dev-util/lockrun/metadata.xml b/dev-util/lockrun/metadata.xml
new file mode 100644
index 000000000000..a40624fba8f0
--- /dev/null
+++ b/dev-util/lockrun/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/lsuio/Manifest b/dev-util/lsuio/Manifest
new file mode 100644
index 000000000000..7d441d25307b
--- /dev/null
+++ b/dev-util/lsuio/Manifest
@@ -0,0 +1 @@
+DIST lsuio-0.2.0.tar.gz 202584 SHA256 c88b3850248b2d3419e025abd7b9b0991c8bd33a2d4983f9608408a29900bfb5 SHA512 55567b9028a22ae3058439135117d1537c972e875d864a1d7f6611f815461e17ecd6d953cc6abc129208241c1ba7fbeb9a2a62b5b9102a8429ccf270a93741f3 WHIRLPOOL d123480d277b5a78e8da4c9143fa22478423c0b3e373bb410b31b26d0f944094374c25375bf54d55305240e9a1ecdd293fe4460af61e8ac0d480deba45d9edf2
diff --git a/dev-util/lsuio/files/lsuio-0.2.0-build.patch b/dev-util/lsuio/files/lsuio-0.2.0-build.patch
new file mode 100644
index 000000000000..cef204c786f5
--- /dev/null
+++ b/dev-util/lsuio/files/lsuio-0.2.0-build.patch
@@ -0,0 +1,9 @@
+--- uio_helper.h
++++ uio_helper.h
+@@ -68,5 +68,6 @@
+ void uio_free_dev_attrs(struct uio_info_t* info);
+ void uio_free_info(struct uio_info_t* info);
+ struct uio_info_t* uio_find_devices(int filter_num);
++void uio_mmap_test(struct uio_info_t* info);
+ 
+ #endif
diff --git a/dev-util/lsuio/lsuio-0.2.0.ebuild b/dev-util/lsuio/lsuio-0.2.0.ebuild
new file mode 100644
index 000000000000..8b34a6d283b6
--- /dev/null
+++ b/dev-util/lsuio/lsuio-0.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="list available userspace I/O (UIO) devices"
+HOMEPAGE="http://www.osadl.org/UIO.uio.0.html"
+SRC_URI="http://www.osadl.org/projects/downloads/UIO/user/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS NEWS README
+}
diff --git a/dev-util/lsuio/metadata.xml b/dev-util/lsuio/metadata.xml
new file mode 100644
index 000000000000..effbbf33eac8
--- /dev/null
+++ b/dev-util/lsuio/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
new file mode 100644
index 000000000000..d48671321d3b
--- /dev/null
+++ b/dev-util/ltrace/Manifest
@@ -0,0 +1,6 @@
+DIST ltrace-0.7.2.tar.bz2 483806 SHA256 bd9e7bd94ba6728fd3ec57f4bcfef8240260bea8f4fcebbc9c454d07ccc11894 SHA512 ec86f08d0c18579ff05f8be23ef3c7309c76c647a0d952fbc627e8095b6ce52b2552e152dc0ec9c6098039c2d50d549a1d218f56a13f75f28bc7b03eb39e94e0 WHIRLPOOL 4989b8d7a2d3986e39f9db134ebbe4fdb4cea48f216267e324a88ee67f4b18b4d2d8e3bcbb90dfacb04ecde6ac74afe079c64f9efb330ca61c7e694d425834a8
+DIST ltrace-0.7.3.tar.bz2 482658 SHA256 0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d WHIRLPOOL 081460150cf67c2c12ae81db4596a51d13e930f37ec143df1b0d1cb2ade6d1cec4445b127b822d5e3e776f3cd5f33fb9d23689f10d1da4adef73463bbd4e7fd2
+DIST ltrace_0.5-3.1.diff.gz 14318 SHA256 907831bcf7d796ab585ebcad68e7e650efd243f875b1720cfccba3e973f21cb1 SHA512 b493a4cc379f252a437af21d827ab77d914b25e7b8fd26825b0249e7d4a1c8fa352e8738a2be2fba3dbd6bad4130f98645325fbd7491e8f0061c8ce918170dfa WHIRLPOOL 720acffb22b9e60fa6ea1f336273bb862902f87237317f6a066b0501a87c5b955c253b4fc5991f77125d8a4dccf5283bbd36f55103d8b01c57587fe5d1144ed5
+DIST ltrace_0.5.orig.tar.gz 169203 SHA256 7b28cadbf4ad5f4730cd9fbca43b991879ab220e0ec3f302b98303f6a36572d9 SHA512 4c533a132481e9c2a5607d73dbc8858e1cc6fe2092db78bc3fee9efafe85f6c0df0c77b941a1c1ea9713ab77e872e536422b4200b2aa76812a2a20762c930c55 WHIRLPOOL 37e4febb0bd9c843de766ec3a5eab85f85ec9581e529699175cfc5f2742e4fc7b6ffc49e16f5b10856151d2edc831c2380bcbef040162aaf2dcf504372fcc3dd
+DIST ltrace_0.7.3-4.debian.tar.gz 11373 SHA256 44dab94f96f1427ecdff1a08148e81b11eafacb542400fc7067c750590c7e5b9 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b WHIRLPOOL ecaf6a2314b5add5af488e4654a4b76e543bf3444345bdd0a496ba57d1509451c50e9e1e33dd40976e8176e0d92a6270a4d28b5d63d04fa1aa8a6ee0af9989d8
+DIST ltrace_0.7.3.orig.tar.bz2 482658 SHA256 0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d WHIRLPOOL 081460150cf67c2c12ae81db4596a51d13e930f37ec143df1b0d1cb2ade6d1cec4445b127b822d5e3e776f3cd5f33fb9d23689f10d1da4adef73463bbd4e7fd2
diff --git a/dev-util/ltrace/files/0.4-parallel-make.patch b/dev-util/ltrace/files/0.4-parallel-make.patch
new file mode 100644
index 000000000000..3fd3624477ab
--- /dev/null
+++ b/dev-util/ltrace/files/0.4-parallel-make.patch
@@ -0,0 +1,11 @@
+--- ltrace-0.3.36.orig/Makefile.in	2004-11-10 01:12:03.000000000 +0200
++++ ltrace-0.3.36/Makefile.in	2006-09-02 11:10:57.000000000 +0300
+@@ -35,6 +35,8 @@
+ ltrace:		sysdeps/sysdep.o $(OBJ)
+ 		$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
++$(OBJ):		sysdeps/sysdep.o
++
+ sysdeps/sysdep.o: dummy
+ 		$(MAKE) -C sysdeps/$(OS)
+ 
diff --git a/dev-util/ltrace/files/ltrace-0.5.3-cross.patch b/dev-util/ltrace/files/ltrace-0.5.3-cross.patch
new file mode 100644
index 000000000000..610bbccf1fd8
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.5.3-cross.patch
@@ -0,0 +1,20 @@
+--- configure.ac
++++ configure.ac
+@@ -8,6 +8,8 @@
+ AC_CANONICAL_HOST
+ HOST_OS="$host_os"
+ AC_SUBST(HOST_OS)
++HOST_CPU="$host_cpu"
++AC_SUBST(HOST_CPU)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+@@ -84,7 +86,7 @@
+ dnl of libelf and ltrace matches.
+ AC_SYS_LARGEFILE
+ fi
+-AC_OUTPUT(Makefile testsuite/Makefile \
++AC_OUTPUT(Makefile sysdeps/linux-gnu/Makefile testsuite/Makefile \
+ 	  testsuite/ltrace.main/Makefile testsuite/ltrace.minor/Makefile \
+ 	  testsuite/ltrace.torture/Makefile )
+ 
diff --git a/dev-util/ltrace/files/ltrace-0.5.3-ppc.patch b/dev-util/ltrace/files/ltrace-0.5.3-ppc.patch
new file mode 100644
index 000000000000..e344c3e28f5b
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.5.3-ppc.patch
@@ -0,0 +1,10 @@
+diff -Naur ltrace-0.5.old/sysdeps/linux-gnu/Makefile.in ltrace-0.5/sysdeps/linux-gnu/Makefile.in
+--- ltrace-0.5.old/sysdeps/linux-gnu/Makefile.in	2007-12-26 18:55:42.000000000 +0000
++++ ltrace-0.5/sysdeps/linux-gnu/Makefile.in	2007-12-26 18:55:55.000000000 +0000
+@@ -1,5 +1,6 @@
+ ARCH		:=	$(shell echo @HOST_CPU@ | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+-			-e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
++			-e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/ \
++			-e s/powerpc64/ppc/ -e s/powerpc/ppc/)
+ 
+ CPPFLAGS	+=	-I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
diff --git a/dev-util/ltrace/files/ltrace-0.5.3.1-gcc43-testsuite.patch b/dev-util/ltrace/files/ltrace-0.5.3.1-gcc43-testsuite.patch
new file mode 100644
index 000000000000..e115c97322fd
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.5.3.1-gcc43-testsuite.patch
@@ -0,0 +1,9 @@
+diff -Naurp ltrace-0.5-orig/testsuite/ltrace.minor/demangle-lib.cpp ltrace-0.5/testsuite/ltrace.minor/demangle-lib.cpp
+--- ltrace-0.5-orig/testsuite/ltrace.minor/demangle-lib.cpp	2006-03-13 17:12:01.000000000 -0600
++++ ltrace-0.5/testsuite/ltrace.minor/demangle-lib.cpp	2009-07-27 13:47:43.876929485 -0600
+@@ -1,4 +1,5 @@
+ #include<stddef.h>
++#include<stdlib.h>
+ #include<iostream>
+ 
+ #include"demangle.h"
diff --git a/dev-util/ltrace/ltrace-0.5.3.1.ebuild b/dev-util/ltrace/ltrace-0.5.3.1.ebuild
new file mode 100644
index 000000000000..3a5bf839c39b
--- /dev/null
+++ b/dev-util/ltrace/ltrace-0.5.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools
+
+MY_PV=${PV%.?.?}
+MY_P=${PN}_${MY_PV}
+DEB_P=${MY_P}-${PV##?.?.}
+
+DESCRIPTION="trace library calls made at runtime"
+HOMEPAGE="http://ltrace.alioth.debian.org/"
+SRC_URI="mirror://debian/pool/main/l/ltrace/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/l/ltrace/${DEB_P}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND="dev-libs/elfutils"
+DEPEND="${RDEPEND}
+		test? ( dev-util/dejagnu )"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${WORKDIR}"/${DEB_P}.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/0.4-parallel-make.patch
+
+	epatch "${FILESDIR}"/${PN}-0.5.3-cross.patch
+	sed \
+		-e 's:uname -m:echo @HOST_CPU@:' \
+		sysdeps/linux-gnu/Makefile > sysdeps/linux-gnu/Makefile.in
+	epatch "${FILESDIR}"/${PN}-0.5.3-ppc.patch
+	epatch "${FILESDIR}"/${P}-gcc43-testsuite.patch
+	eautoconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install || die "make install failed"
+	prepalldocs
+}
diff --git a/dev-util/ltrace/ltrace-0.7.2.ebuild b/dev-util/ltrace/ltrace-0.7.2.ebuild
new file mode 100644
index 000000000000..d5421cb395a7
--- /dev/null
+++ b/dev-util/ltrace/ltrace-0.7.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+NUM="3848"
+
+DESCRIPTION="trace library calls made at runtime"
+HOMEPAGE="http://ltrace.alioth.debian.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/${NUM}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 x86"
+IUSE="debug selinux test unwind"
+
+RDEPEND="dev-libs/elfutils
+	selinux? ( sys-libs/libselinux )
+	unwind? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )"
+
+src_prepare() {
+	sed -i '/^dist_doc_DATA/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	ac_cv_header_selinux_selinux_h=$(usex selinux) \
+	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with unwind libunwind)
+}
diff --git a/dev-util/ltrace/ltrace-0.7.3.ebuild b/dev-util/ltrace/ltrace-0.7.3.ebuild
new file mode 100644
index 000000000000..3ed1b8fd29dc
--- /dev/null
+++ b/dev-util/ltrace/ltrace-0.7.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+NUM="3947"
+
+DESCRIPTION="trace library calls made at runtime"
+HOMEPAGE="http://ltrace.alioth.debian.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/file/${NUM}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug selinux test unwind"
+
+RDEPEND="dev-libs/elfutils
+	selinux? ( sys-libs/libselinux )
+	unwind? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )"
+
+src_prepare() {
+	sed -i '/^dist_doc_DATA/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	ac_cv_header_selinux_selinux_h=$(usex selinux) \
+	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with unwind libunwind)
+}
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
new file mode 100644
index 000000000000..8611887d3264
--- /dev/null
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+LTRACE_V=${PV/_p*/}
+DB_V=${PV/*_p/}
+
+DESCRIPTION="trace library calls made at runtime"
+HOMEPAGE="http://ltrace.alioth.debian.org/"
+SRC_URI="
+	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}.orig.tar.bz2
+	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}-${DB_V}.debian.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux test unwind"
+
+RDEPEND="dev-libs/elfutils
+	selinux? ( sys-libs/libselinux )
+	unwind? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )"
+
+S=${WORKDIR}/${PN}-${LTRACE_V}
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/[0-9]*
+	sed -i '/^dist_doc_DATA/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	ac_cv_header_selinux_selinux_h=$(usex selinux) \
+	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with unwind libunwind)
+}
diff --git a/dev-util/ltrace/metadata.xml b/dev-util/ltrace/metadata.xml
new file mode 100644
index 000000000000..dce9e2ed8fa4
--- /dev/null
+++ b/dev-util/ltrace/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>dev-tools</herd>
+	<use>
+		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for frame unwinding support</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
new file mode 100644
index 000000000000..58df523a2559
--- /dev/null
+++ b/dev-util/lttng-modules/Manifest
@@ -0,0 +1,3 @@
+DIST lttng-modules-2.5.0.tar.bz2 275319 SHA256 3dfa268024834a4598bbd356d2ae7ea1e2ad828c625943ea5f5ead484e8ad82b SHA512 c266d51af66958f25137db352e2df4497126afc4d448a226b1a03e422702e2aba8fed10ace68c50408ccdc99380f8cf4e85b44f08f9f1dd17efdb6f7d051ac0d WHIRLPOOL 87a21dd546342d8448ab1f7f4870c970d35133c1c1876b6d6147f50dd4ab8a86bd500fc6df208425a08348058d4e5f9da65f39ae481f54cdd268dcb7525f866c
+DIST lttng-modules-2.5.1.tar.bz2 277110 SHA256 962238175f0959ac71b97fdde144a3f76a84f63aea6b3645f94da88512bcccdb SHA512 f144710483660edd59e328fae89a72510a8e295aa29c3c7d6ff2da5900fe6d7f746970068e7a43c18ec6f987635563629c918471cdd7e2b2f6a2bc8fffdeefb4 WHIRLPOOL 29bd62f0b87c19f14278cc82c61c8c11c78a9c3fbd1548b7c2a6c9fae0c612849d00ff8acbb454389e8fa298cfad4bcbfefb5d001514be1b17bfa1f23ed754e3
+DIST lttng-modules-2.6.0-rc1.tar.bz2 295707 SHA256 5faf1a460b34235574c71acfb97ba93bce2e8b4b79c17735939d4cd849a4e439 SHA512 995544f9e966cfc7ba2a2e1d510d70eba4101117ea877e11597654768e2a2ec7f09c5ff2280a3d51a99b3b32918d5a3ff7e16d2e0de70cb5abe412a13a8f8a79 WHIRLPOOL 253ffb2f23db074a286a570bc2e9f66aa7e7198d0911565b472b122ed4d8b460c88ebfa62d35cfdf1b7aa19cdd8f8d5114004a4c0487cee42c7bc3d0836a0aec
diff --git a/dev-util/lttng-modules/lttng-modules-2.5.0.ebuild b/dev-util/lttng-modules/lttng-modules-2.5.0.ebuild
new file mode 100644
index 000000000000..14fd7addac85
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-mod
+
+MY_P="${P/_rc/-rc}"
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+MODULE_NAMES="true"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 27; then
+		eerror "${PN} require Linux kernel >= 2.6.27"
+		die "Please update your kernel!"
+	fi
+}
+
+src_install() {
+	for i in $(find "${S}" -name "*.ko" -print); do
+		local val=${i##${S}/}
+		local modules+="${val%%.ko}(misc:) "
+	done
+	MODULE_NAMES=${modules}
+
+	linux-mod_src_install
+	dodoc ChangeLog README TODO
+}
diff --git a/dev-util/lttng-modules/lttng-modules-2.5.1.ebuild b/dev-util/lttng-modules/lttng-modules-2.5.1.ebuild
new file mode 100644
index 000000000000..14fd7addac85
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-mod
+
+MY_P="${P/_rc/-rc}"
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+MODULE_NAMES="true"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 27; then
+		eerror "${PN} require Linux kernel >= 2.6.27"
+		die "Please update your kernel!"
+	fi
+}
+
+src_install() {
+	for i in $(find "${S}" -name "*.ko" -print); do
+		local val=${i##${S}/}
+		local modules+="${val%%.ko}(misc:) "
+	done
+	MODULE_NAMES=${modules}
+
+	linux-mod_src_install
+	dodoc ChangeLog README TODO
+}
diff --git a/dev-util/lttng-modules/lttng-modules-2.6.0_rc1.ebuild b/dev-util/lttng-modules/lttng-modules-2.6.0_rc1.ebuild
new file mode 100644
index 000000000000..048c6a77c95c
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.6.0_rc1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-mod
+
+MY_P="${P/_rc/-rc}"
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+MODULE_NAMES="true"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 27; then
+		eerror "${PN} require Linux kernel >= 2.6.27"
+		die "Please update your kernel!"
+	fi
+}
+
+src_install() {
+	for i in $(find "${S}" -name "*.ko" -print); do
+		local val=${i##${S}/}
+		local modules+="${val%%.ko}(misc:) "
+	done
+	MODULE_NAMES=${modules}
+
+	linux-mod_src_install
+	dodoc ChangeLog README.md TODO
+}
diff --git a/dev-util/lttng-modules/metadata.xml b/dev-util/lttng-modules/metadata.xml
new file mode 100644
index 000000000000..09cc9fe8072a
--- /dev/null
+++ b/dev-util/lttng-modules/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+
+	<longdescription>
+		Use the kernel tracer if you are debugging a system-wide performance problem or a kernel problem. This tracer comes with an instrumentation patch for most kernel subsystems, which is enough to debug many problems. This includes system calls, IRQs, traps, memory management, softIRQs, scheduling and many others. Of course, the kernel tracer allows you to add your own instrumentation anywhere in the kernel code.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
new file mode 100644
index 000000000000..df1c1c0a926d
--- /dev/null
+++ b/dev-util/lttng-tools/Manifest
@@ -0,0 +1,3 @@
+DIST lttng-tools-2.5.0.tar.bz2 867879 SHA256 dad8b8f9d7209dcf91b2bf6ec34a0b31d1cf3c6a81698492a6e9cff2d11e1ca7 SHA512 91ccdcd2f02999c97bb218147aab28a4e8c5e6b4813e97c690da965f8f54c312fc1e0487a200558e2101938096f2ba3e22f09fbbcd6b7abcdd800215f328dfd5 WHIRLPOOL d9af3d5c4267acaadb5296db42322e7a475e1366f4ff7f83b3dcfe7fa5507261eb938920c2bdc95395eff528a1022cee33665f1781a2172958b4e57d96ab764c
+DIST lttng-tools-2.5.2.tar.bz2 876344 SHA256 1f52d342fb5b56a6675748f0b8e8557ec7c4e90732c3d8f5732bd10b920b233d SHA512 c556b54d1b571f9f5e3b95b729536ada179d899227b6fd0f0fb3482572ca775d4d8212aab4782d6048587df225846d90ba947730e1ca0101f4c54de0819f421d WHIRLPOOL e0552e68a2c3b4c50cefafd600c1dd6e5e586e16eb1c64d5b0b6749e197a754a982f2e8a3915ab5f76f92295cb4bcb9a20266a32a178bfbc4adc4c14a3ec3206
+DIST lttng-tools-2.6.0-rc3.tar.bz2 913287 SHA256 c11d6158d8865b6329d9e1eabc938fc81f33b18634d7c9a2a27a82cea1c63f2d SHA512 db40ee1fe0ec7d93a7e35a742f945cbb89399f56c406f276512e5f9a44907ce0dd195c5f6d763adb13015c8beef74e09019ca3535d7be619dd072e5cf5650dab WHIRLPOOL aa331e76cd4f9b035a50a2b65778cf602f9c7f34d318338d2ad20baa95cb798a9077518966fc4a14b5e288be21246ec9ac403c2fca2b37e277e26d0091bb0e48
diff --git a/dev-util/lttng-tools/lttng-tools-2.5.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.5.0.ebuild
new file mode 100644
index 000000000000..b2fdfcd49ec0
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info
+
+MY_P="${P/_rc/-rc}"
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="dev-libs/userspace-rcu
+	dev-libs/popt
+	dev-libs/libxml2
+	ust? ( dev-util/lttng-ust )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is -lt 2 6 27; then
+		ewarn "${PN} require Linux kernel >= 2.6.27"
+		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
+		ewarn "   the session daemon. There were introduce in the 2.6.27"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable ust lttng-ust)
+}
diff --git a/dev-util/lttng-tools/lttng-tools-2.5.2.ebuild b/dev-util/lttng-tools/lttng-tools-2.5.2.ebuild
new file mode 100644
index 000000000000..b2fdfcd49ec0
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info
+
+MY_P="${P/_rc/-rc}"
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="dev-libs/userspace-rcu
+	dev-libs/popt
+	dev-libs/libxml2
+	ust? ( dev-util/lttng-ust )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is -lt 2 6 27; then
+		ewarn "${PN} require Linux kernel >= 2.6.27"
+		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
+		ewarn "   the session daemon. There were introduce in the 2.6.27"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable ust lttng-ust)
+}
diff --git a/dev-util/lttng-tools/lttng-tools-2.6.0_rc3.ebuild b/dev-util/lttng-tools/lttng-tools-2.6.0_rc3.ebuild
new file mode 100644
index 000000000000..b2fdfcd49ec0
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.6.0_rc3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info
+
+MY_P="${P/_rc/-rc}"
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="dev-libs/userspace-rcu
+	dev-libs/popt
+	dev-libs/libxml2
+	ust? ( dev-util/lttng-ust )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is -lt 2 6 27; then
+		ewarn "${PN} require Linux kernel >= 2.6.27"
+		ewarn "   pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
+		ewarn "   the session daemon. There were introduce in the 2.6.27"
+	fi
+}
+
+src_configure() {
+	econf $(use_enable ust lttng-ust)
+}
diff --git a/dev-util/lttng-tools/metadata.xml b/dev-util/lttng-tools/metadata.xml
new file mode 100644
index 000000000000..c177fda161df
--- /dev/null
+++ b/dev-util/lttng-tools/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+
+	<longdescription>
+		LTTng, the Linux Trace Toolkit Next Generation, is a project that aims at producing a highly efficient full system tracing solution
+	</longdescription>
+	<use>
+		<flag name='ust'>Support LTTng-UST (Userspace Tracing)</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
new file mode 100644
index 000000000000..dabba7ec1bc2
--- /dev/null
+++ b/dev-util/lttng-ust/Manifest
@@ -0,0 +1,3 @@
+DIST lttng-ust-2.5.0.tar.bz2 583293 SHA256 dcd0bb81a12833e6edea110a0cc97108a7e55b1dc95ff2c97d06796866f5c3aa SHA512 15e614a0b66d668e00de56275f80f67a3ee159642e06a5c2981ac3bd2266c0f3c2cbad8dd3e4b5158ef85070bdcf9b513e17de346dbc628878c2de68768dd634 WHIRLPOOL 3cac7a2d905a2ab913220d13ffd295e442e7e0b676b68e501542b799092a7d6d8e45211fd8cf98939478958aee739e86041b797229207820172cce2726c86677
+DIST lttng-ust-2.5.1.tar.bz2 589487 SHA256 fbd9e2d78641e5c659f1d51f8097c8279c155ff50f8e38a4c57f188ca4b84546 SHA512 718f0f50077ed7d1c9647de7714c237fde619ea23de8160af508fd1e6a60fb3594b0424b93a7ad5cbc47f4106721e7ef75ea82f1976a0a8fbf3305e8179769b6 WHIRLPOOL 38ea8fbdc6461f3a8af914b289cf8496c6a6fa48efcb0ed29be6f404310624602e7b8402b3ec2ad89a2a45c1a441afc162e83b09ecd9cd3654cf1e2638599575
+DIST lttng-ust-2.6.0-rc2.tar.bz2 608934 SHA256 664fabe883c863f8ba1f83b2fa030c097181aed44bd75979431c0fc0e1e71598 SHA512 a7ccf10e03693397168cca34b5008609a2c6dbf1bd88b84e42014861af432379efdbb040a31c77bf20014838d491fcb05ab67ca47c6924c7f74ca539c3019f3b WHIRLPOOL 7fd15c99e57cc21c6d9ce46ecab07da2389a2364d7de5a0b34357465a404bbd15d756d4ce54460ae52a923bb644e6719fcf4527773400e2aeef4c1a70bf84c5f
diff --git a/dev-util/lttng-ust/lttng-ust-2.5.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.5.0.ebuild
new file mode 100644
index 000000000000..88522a591bec
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+MY_P="${P/_rc/-rc}"
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-libs/userspace-rcu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if ! use examples; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+	eautoreconf
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.5.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.5.1.ebuild
new file mode 100644
index 000000000000..88522a591bec
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+MY_P="${P/_rc/-rc}"
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-libs/userspace-rcu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if ! use examples; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+	eautoreconf
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.6.0_rc2.ebuild b/dev-util/lttng-ust/lttng-ust-2.6.0_rc2.ebuild
new file mode 100644
index 000000000000..136b7571b825
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.6.0_rc2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+MY_P="${P/_rc/-rc}"
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-libs/userspace-rcu"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	if ! use examples; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+	eautoreconf
+}
diff --git a/dev-util/lttng-ust/metadata.xml b/dev-util/lttng-ust/metadata.xml
new file mode 100644
index 000000000000..1c98ff2ecd20
--- /dev/null
+++ b/dev-util/lttng-ust/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+
+	<longdescription>
+		The userspace tracer is designed to provide detailed information about userspace activity. UST is a port of the LTTng kernel tracer to userspace. Like the LTTng kernel tracer, performance is the main goal. Tracing does not require system calls or traps. UST instrumentation points may be added in any userspace code including signal handlers and libraries­.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/makeheaders/Manifest b/dev-util/makeheaders/Manifest
new file mode 100644
index 000000000000..5595b04671c6
--- /dev/null
+++ b/dev-util/makeheaders/Manifest
@@ -0,0 +1,2 @@
+DIST makeheaders-0_p4.c 99253 SHA256 a03498d80e29c836b1525cd2aad7f2f75c80e8dfcd533dd619ac0fe0c5cef2cd SHA512 d46a23a4ee1436f1bad2f0d26e7de9be47a84b0c163430bdaf360c4c6a94b84949f2a427683265898312e56e9dda316992857e488202aa74afcc3939fa712a35 WHIRLPOOL 7ac59e936cd81923024ce27b82561ce6eaffe56abd20f1f419cc8373644312ff331be0edc5649ee6f327772188ee6667696f70934ef3118c58e36e2e407e24b5
+DIST makeheaders-0_p4.html 35481 SHA256 dad57fe035cf440d28878ff31ae30a188b8935aeb68f3f6ee08f3001a1c19008 SHA512 903437c9d4b280af1cb9d5e29df150fb347ef9c62ec146daecfb5c4093554531c206bc73885cc7aacea1b7c24fb473e240a03a31c139caf6bc0e42901b518597 WHIRLPOOL 548d486201d2bcdc8c2445e986e55a904c237e41b99f229a91cb6e19c9ecb95ea5a8b1f529d8bc536e2feb210ee4f1e2ee7cbd04ab30a18aeb008620e2e01c30
diff --git a/dev-util/makeheaders/makeheaders-0_p4.ebuild b/dev-util/makeheaders/makeheaders-0_p4.ebuild
new file mode 100644
index 000000000000..8196522e2d83
--- /dev/null
+++ b/dev-util/makeheaders/makeheaders-0_p4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit toolchain-funcs
+
+DESCRIPTION="simple utility that will automatically generate header files"
+HOMEPAGE="http://www.hwaci.com/sw/mkhdr/"
+SRC_URI="http://www.hwaci.com/sw/mkhdr/makeheaders.c -> ${P}.c
+	http://www.hwaci.com/sw/mkhdr/makeheaders.html -> ${P}.html"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	local my_a
+	for my_a in ${A} ; do
+		cp -v "${DISTDIR}"/"${my_a}" . || die
+	done
+}
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} -o ${PN} ${P}.c ${LDFLAGS} || die
+}
+
+src_install() {
+	dobin ${PN} || die
+	dohtml ${P}.html || die
+}
diff --git a/dev-util/makeheaders/metadata.xml b/dev-util/makeheaders/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/dev-util/makeheaders/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
new file mode 100644
index 000000000000..372c94eb42d2
--- /dev/null
+++ b/dev-util/makepp/Manifest
@@ -0,0 +1,6 @@
+DIST makepp-1.18.tar.gz 236990 SHA256 0a1ee878452d44ecdf52dae928418ed2c426b5bbb95bc223b787329f9f5cc2be SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9 WHIRLPOOL 278fd69d575e7c9fcbed168d43da031740b5c9fc8c1bf5f97b16e4ab8b3d0b5d65d0a8a3764a72b212137b1958a9fe69a67c7ef649a713aff669cc50597e7ac1
+DIST makepp-1.40.1a.tar.gz 278170 SHA256 eb9991e9c726836e9b214377976dc15f66f4f6045f9713cd36c8c6b73c1f8e83 SHA512 554987f1ff51fd4d984d54a8bf1c36182418f57820899567aba8d961753ab4daa4f4fee9591557dac199c0a2e4ba33f5b2a789e237ae9684e5168201d0a152ef WHIRLPOOL 1ac773abd2f384c020c54264e700c32c84021b07f43e13c7e7474579bb99aee018321f5476441942ef891a8b1840e6195cb89260e837fbb49d0d5e651eddb0b0
+DIST makepp-1.50-110621.txz 496296 SHA256 70d6af24020bcdc1ad4607817163e18c952792a39f67674ee60562545c940330 SHA512 fca88aa5abad01f02edd59060cafd0f0e1ecd4335c2af556e04890d07f48bc07027e9fe533ad2c0d125b35b2da90a775d09b6401fce22e539df4843fc7704966 WHIRLPOOL b55572e05b3152552fb9fbd2b5c80cde82d3006024e8763d1b7eba3873f5108a606bfa3dc420b36bafe8b1bd72f7424e226130fd6df9019637738c6a0a625fd9
+DIST makepp-2.0.98.4.txz 528092 SHA256 e37f6d4374c64f0ebe2146af044514ab531ad0dea5701b31ca059a337e935f68 SHA512 c04e67f62155ce398c1fccba350354b163367ef5a6db961277433a7c733a71512a48cf3427d02a7b6874ab33047f6b7082105ed78b8397dc430c9d6a34ad9d38 WHIRLPOOL f75be059e04aa139f2ebe47acb8f64815b6f0e95c3ade0a24d00bfb437962292eb2e264f774a4f4d3eee65aa836f7a129d97eeaf99a4439b0d1ddde42cb2171e
+DIST makepp-2.0.98.5.txz 529556 SHA256 ae62717cf37da1788b46fa7c90511e399a6e545798d8c12531d33b2be0ac62bb SHA512 f4ad5ab3800148fc4527558374be765e0b7ac731220192c1105e9c688c5961b8d5dd42ed2177db2aadc879b2c66e4bde14428eaf3055a6ba52163d908c576b5a WHIRLPOOL debdd1d25d1ab4822b38cda3a72bad1975fb759c6526332cea65b6dedc4644554662667562024949bc3ed725f03990cb647aa487a1c083e98d9411e0e4aff719
+DIST makepp-2.0.txz 534708 SHA256 0c617b1c23b537070d43ace2501ac1b30503b126a729206a7853933485d2bc78 SHA512 b8327fe475cb323352c6b89f1dc5e4a3fbbc71ee8b53777340449f610e3276465680ba3bc3bba905bb00754ca52ca56b82b9b1184db7bf7b272a47822b86aa49 WHIRLPOOL 79c69783a64c3f42184f5d72b19374251e8e88eab2e08c73e8442908eafac4cc7f3a8a64a36bf45c68d1a5d9b5eeab08b799e26a85a14f4bbfe320fd34a77ee4
diff --git a/dev-util/makepp/files/makepp-1.18-install.patch b/dev-util/makepp/files/makepp-1.18-install.patch
new file mode 100644
index 000000000000..7d90e2166223
--- /dev/null
+++ b/dev-util/makepp/files/makepp-1.18-install.patch
@@ -0,0 +1,69 @@
+--- install.pl.orig	2003-02-18 13:15:15.000000000 -0800
++++ install.pl	2003-02-18 13:49:10.000000000 -0800
+@@ -31,9 +31,24 @@
+ #
+ # Now figure out where everything goes:
+ #
+-$prefix = "/usr/local";
++$prefix = shift(@ARGV) ||
++	read_with_prompt( "
++You can specify a prefix directory that will simplify defaults for
++further questions.
++
++What should be the prefix directory [$prefix]? ") ||
++	"/usr/local";
++
++$inst_prefix = shift(@ARGV) ||
++	read_with_prompt( "
++You can specify an install prefix that is prefixed to the runtime
++prefix for the install phase only.  This is useful when installing
++into staging directories for packaging systems.
+ 
+-$bindir = shift(@_) ||
++What should the install prefix be []? ") ||
++	"";
++
++$bindir = shift(@ARGV) ||
+   read_with_prompt("
+ Makepp needs to know where you want to install it and its data files.
+ makepp is written in perl, but there is no particular reason to install
+@@ -43,10 +58,7 @@
+ Where should the makepp executable be installed [$prefix/bin]? ") ||
+   "$prefix/bin";
+ 
+-$bindir =~ m@(.*)/bin@ and $prefix = $1;
+-				# See if a prefix was specified.
+-
+-$datadir = shift @_ || read_with_prompt("
++$datadir = shift @ARGV || read_with_prompt("
+ Makepp has a number of library files that it needs to install somewhere.  Some
+ of these are perl modules, but they can't be used by other perl programs, so
+ there's no point in installing them in the perl modules hierarchy; they are
+@@ -55,14 +67,24 @@
+ Where should the library files be installed [$prefix/share/makepp]? ") ||
+   "$prefix/share/makepp";
+ 
+-$htmldir = shift @_ || read_with_prompt("
++$htmldir = shift @ARGV || read_with_prompt("
+ Where should the HTML documentation be installed?
+ Enter \"none\" if you do not want any documentation installed.
+ HTML documentation directory [$prefix/share/makepp/html]: ") ||
+   "$prefix/share/makepp/html";
+ 
+-substitute_file("makepp", $bindir, 0755);
+-substitute_file("recursive_makepp", $datadir, 0644);
++substitute_file("makepp", "$inst_prefix/$bindir", 0755);
++substitute_file("recursive_makepp", "$inst_prefix/$datadir", 0644);
++
++if( $inst_prefix ) {
++	$bindir = join( '/', $inst_prefix, $bindir );
++	$datadir = join( '/', $inst_prefix, $datadir );
++	$htmldir = join( '/', $inst_prefix, $htmldir );
++}
++
++print STDERR "bindir now $bindir\n";
++print STDERR "datadir now $datadir\n";
++print STDERR "htmldir now $htmldir\n";
+ 
+ make_dir("$datadir/Signature");
+ foreach $module (qw(FileInfo FileInfo_makepp MakeEvent Glob Makefile Makesubs Rule
diff --git a/dev-util/makepp/files/makepp-1.40.1a-install.patch b/dev-util/makepp/files/makepp-1.40.1a-install.patch
new file mode 100644
index 000000000000..b1ee013add3e
--- /dev/null
+++ b/dev-util/makepp/files/makepp-1.40.1a-install.patch
@@ -0,0 +1,12 @@
+--- makepp-1.40/config.pl
++++ makepp-1.40/config.pl
+@@ -34,7 +34,7 @@
+ 	cd makepp-$(VERSION) && make test    # Make sure it all runs.
+ 	rm -rf makepp-$(VERSION)
+ 
+-install: all
+-	$(PERL) install.pl $(BINDIR) $(DATADIR) $(MANDIR) $(HTMLDIR) $(FINDBIN)
++install:
++	$(PERL) install.pl $(DESTDIR)$(BINDIR) $(DESTDIR)$(DATADIR) $(DESTDIR)$(MANDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(FINDBIN)
+ 
+ .PHONY: all distribution install test
diff --git a/dev-util/makepp/files/makepp-2.0-destdir.patch b/dev-util/makepp/files/makepp-2.0-destdir.patch
new file mode 100644
index 000000000000..7d7950b2dff4
--- /dev/null
+++ b/dev-util/makepp/files/makepp-2.0-destdir.patch
@@ -0,0 +1,13 @@
+don't break install paths when DESTDIR is set
+
+--- a/install.pl
++++ b/install.pl
+@@ -131,7 +131,7 @@
+ 
+ if( $destdir ) {
+   for( $bindir, $datadir, $mandir, $htmldir_val ) {
+-    s/$prefix/$destdir/o if defined;
++    s/^/$destdir/o if defined;
+   }
+ }
+ 
diff --git a/dev-util/makepp/makepp-1.18.ebuild b/dev-util/makepp/makepp-1.18.ebuild
new file mode 100644
index 000000000000..dd21a8e6983c
--- /dev/null
+++ b/dev-util/makepp/makepp-1.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc alpha"
+IUSE=""
+DEPEND=">=dev-lang/perl-5.6.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-install.patch
+	# There is a sandbox violation in this test.
+	# In future versions, this ebuild should try to find
+	# a better way of avoiding this, but the current version
+	# appears to have garbage NUL characters all over the test files,
+	# making them complicated to edit.
+	# Robert Coie <rac@gentoo.org> 2002.02.18
+	rm "${S}"/makepp_tests/include.test
+}
+
+src_compile() {
+	make test || die
+}
+
+src_install() {
+	perl install.pl /usr "${D}" /usr/bin /usr/share/makepp /usr/share/doc/makepp
+}
diff --git a/dev-util/makepp/makepp-1.40.1a.ebuild b/dev-util/makepp/makepp-1.40.1a.ebuild
new file mode 100644
index 000000000000..b4a9c7cdf94f
--- /dev/null
+++ b/dev-util/makepp/makepp-1.40.1a.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.0"
+
+S=${WORKDIR}/${P%.*}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-install.patch
+	# remove ones which cause sandbox violations
+	rm makepp_tests/wildcard_repositories.test
+}
+
+src_compile() {
+	# not an autoconf configure script
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share/makepp \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog README
+}
diff --git a/dev-util/makepp/makepp-1.50_pre110621.ebuild b/dev-util/makepp/makepp-1.50_pre110621.ebuild
new file mode 100644
index 000000000000..7c48c4b1a671
--- /dev/null
+++ b/dev-util/makepp/makepp-1.50_pre110621.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit eutils
+
+MY_PV=${PV/_pre/-}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV%_pre*}/${MY_P}.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
+	unpack ./${P}.tar.xz
+}
+
+src_prepare() {
+#	epatch "${FILESDIR}"/${P}-install.patch
+	# remove ones which cause sandbox violations
+#	rm makepp_tests/wildcard_repositories.test
+	# default "all" rule is to run tests :x
+	sed -i '/^all:/s:test::' config.pl || die
+}
+
+src_configure() {
+	# not an autoconf configure script
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share/makepp \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog README
+}
diff --git a/dev-util/makepp/makepp-2.0-r1.ebuild b/dev-util/makepp/makepp-2.0-r1.ebuild
new file mode 100644
index 000000000000..d51fbff2573d
--- /dev/null
+++ b/dev-util/makepp/makepp-2.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+MY_PV=${PV/_}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV%_*}/${MY_P}.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
+	unpack ./${P}.tar.xz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0-destdir.patch
+
+	# default "all" rule is to run tests :x
+	sed -i '/^all:/s:test::' config.pl || die
+}
+
+src_configure() {
+	# not an autoconf configure script
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--datadir="${EPREFIX}"/usr/share/makepp \
+		|| die "configure failed"
+}
+
+src_test() {
+	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
+	export CCACHE_UNIFY=1
+	ROOT= default
+}
diff --git a/dev-util/makepp/makepp-2.0.98.4.ebuild b/dev-util/makepp/makepp-2.0.98.4.ebuild
new file mode 100644
index 000000000000..f022a189b356
--- /dev/null
+++ b/dev-util/makepp/makepp-2.0.98.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+MY_PV=${PV/_}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
+	unpack ./${P}.tar.xz
+}
+
+src_prepare() {
+	# default "all" rule is to run tests :x
+	sed -i '/^all:/s:test::' config.pl || die
+}
+
+src_configure() {
+	# not an autoconf configure script
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--datadir="${EPREFIX}"/usr/share/makepp \
+		|| die "configure failed"
+}
+
+src_test() {
+	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
+	export CCACHE_UNIFY=1
+	ROOT= default
+}
diff --git a/dev-util/makepp/makepp-2.0.98.5.ebuild b/dev-util/makepp/makepp-2.0.98.5.ebuild
new file mode 100644
index 000000000000..f022a189b356
--- /dev/null
+++ b/dev-util/makepp/makepp-2.0.98.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+MY_PV=${PV/_}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
+	unpack ./${P}.tar.xz
+}
+
+src_prepare() {
+	# default "all" rule is to run tests :x
+	sed -i '/^all:/s:test::' config.pl || die
+}
+
+src_configure() {
+	# not an autoconf configure script
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--datadir="${EPREFIX}"/usr/share/makepp \
+		|| die "configure failed"
+}
+
+src_test() {
+	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
+	export CCACHE_UNIFY=1
+	ROOT= default
+}
diff --git a/dev-util/makepp/metadata.xml b/dev-util/makepp/metadata.xml
new file mode 100644
index 000000000000..a575b05d4cca
--- /dev/null
+++ b/dev-util/makepp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="sourceforge">makepp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
new file mode 100644
index 000000000000..cd58451961d3
--- /dev/null
+++ b/dev-util/mdds/Manifest
@@ -0,0 +1,4 @@
+DIST mdds_0.10.3.tar.bz2 151389 SHA256 db10932dbe7e9b5b9b3f513bc8165ab7e29c3bf75702b3c3cfff6956c521e0c2 SHA512 52be0fe4eedc8a44f61944e078d8f0d2490bfea27451c5d4772b6d46d71562702d3b90b34c5721d8bdf6de2ea32a4a9126e310614bb36e0d573c047dfc9f3fcb WHIRLPOOL 17a461cf01f286ccb0e8b351e627dc870db5676a3698cf99f1520b01562138a8d74fa99ccca901d81b5f354abf95ff35d2a7957a3bf2dae16d92aee12e62f8b1
+DIST mdds_0.11.2.tar.bz2 154444 SHA256 cd0a0dc8b35d6582efad6898546c86714eb058696ba26b0e7f8914faa002a5ab SHA512 b0e00d50be9b8319dabfe7e607849af27a52be9b46d770849b919444b905bf198d99edcefe1be15e6018b79839443b3a709fe22b84ac11e2267f02bec5139633 WHIRLPOOL a505c4b746c7ffefe3ea74fd0eb7c2ae46b4c598e1136cf9e9cfe44a4c48db2bb1b84528a5f0a86cc1b7a5c9d5b7d82522bd7836ed5e4de61d9664a863e1b014
+DIST mdds_0.12.0.tar.bz2 152285 SHA256 2a22de23ca828886625120e9d40fccd6333458a1934a13d2c982b6f9403e5981 SHA512 462f6e3701eb7cce872ce0a76d826886eedccf5ca20293d03744b6d6d5ff1ef16770c6abce1c9118829e252e90783e206d281006d0d4e7e9b328ed9ae37264c1 WHIRLPOOL f86314644d80ae1b75a4cc1af6ebc4a3df3b65eac4244abc0fbf69893020509abae3be7e758d90a07eafffb866d67dcb75968b38a411e747d7f361a7d2905f0b
+DIST mdds_0.12.1.tar.bz2 153265 SHA256 23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d SHA512 852f58e1f3c18aef78646c2bd6b34dc544fc06cba7ef6bda2a44fd5e681bf47bbf7389505061ddd81797b0bdf343e55f060397a1ccc582c73990bc74d36575a6 WHIRLPOOL d4f144e59806310c6a719600b88b4a0d9816d94dd48298458f459bc696b97ab4e82152ac7e4d9dcb3e8aa66a5fd67377c82c6bb161bf93135e0c6b73d01fb02e
diff --git a/dev-util/mdds/files/mdds-0.11.2-include_algorithm_unconditionally.patch b/dev-util/mdds/files/mdds-0.11.2-include_algorithm_unconditionally.patch
new file mode 100644
index 000000000000..9b0f09705407
--- /dev/null
+++ b/dev-util/mdds/files/mdds-0.11.2-include_algorithm_unconditionally.patch
@@ -0,0 +1,33 @@
+From c45e0499dded11dc2aacea40b470ab1431ea535a Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 29 Jan 2015 10:04:56 +0100
+Subject: [PATCH] <algorithm> is needed unconditionally
+
+---
+ include/mdds/multi_type_vector_types.hpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp
+index db8d584..0a36333 100644
+--- a/include/mdds/multi_type_vector_types.hpp
++++ b/include/mdds/multi_type_vector_types.hpp
+@@ -32,6 +32,8 @@
+ #include "compat/unique_ptr.hpp"
+ #include "global.hpp"
+ 
++#include <algorithm>
++
+ #ifdef MDDS_MULTI_TYPE_VECTOR_USE_DEQUE
+ #include <deque>
+ #else
+@@ -40,7 +42,6 @@
+ #include <boost/noncopyable.hpp>
+ 
+ #if defined(MDDS_UNIT_TEST) || defined (MDDS_MULTI_TYPE_VECTOR_DEBUG)
+-#include <algorithm>
+ #include <iostream>
+ #include <sstream>
+ using std::cout;
+-- 
+2.2.2
+
diff --git a/dev-util/mdds/mdds-0.10.3.ebuild b/dev-util/mdds/mdds-0.10.3.ebuild
new file mode 100644
index 000000000000..cdccda48b71f
--- /dev/null
+++ b/dev-util/mdds/mdds-0.10.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="http://code.google.com/p/multidimalgorithm/"
+SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="<dev-libs/boost-1.57.0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/-/_}
+
+src_configure() {
+	econf \
+		--with-hash-container=boost \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() { :; }
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/mdds-0.11.2-r1.ebuild b/dev-util/mdds/mdds-0.11.2-r1.ebuild
new file mode 100644
index 000000000000..6bb1766c2b6e
--- /dev/null
+++ b/dev-util/mdds/mdds-0.11.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="http://code.google.com/p/multidimalgorithm/"
+SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/-/_}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-include_algorithm_unconditionally.patch"
+}
+
+src_configure() {
+	econf \
+		--with-hash-container=boost \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() { :; }
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/mdds-0.12.0.ebuild b/dev-util/mdds/mdds-0.12.0.ebuild
new file mode 100644
index 000000000000..f3b70fdb805d
--- /dev/null
+++ b/dev-util/mdds/mdds-0.12.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="http://code.google.com/p/multidimalgorithm/"
+SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/-/_}
+
+src_configure() {
+	econf \
+		--with-hash-container=boost \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() { :; }
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/mdds-0.12.1.ebuild b/dev-util/mdds/mdds-0.12.1.ebuild
new file mode 100644
index 000000000000..295fefb5ae43
--- /dev/null
+++ b/dev-util/mdds/mdds-0.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+
+inherit eutils toolchain-funcs ${GITECLASS}
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE=""
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+[[ ${PV} == 9999 ]] || S=${WORKDIR}/${P/-/_}
+
+src_prepare(){
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-hash-container=boost \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() { :; }
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
new file mode 100644
index 000000000000..e0db9959c3b9
--- /dev/null
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+
+inherit eutils toolchain-funcs ${GITECLASS}
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE=""
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+[[ ${PV} == 9999 ]] || S=${WORKDIR}/${P/-/_}
+
+src_prepare(){
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-hash-container=boost \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() { :; }
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml
new file mode 100644
index 000000000000..4409d6128912
--- /dev/null
+++ b/dev-util/mdds/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+	<upstream>
+		<remote-id type="google-code">multidimalgorithm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
new file mode 100644
index 000000000000..868489a9a8ed
--- /dev/null
+++ b/dev-util/meld/Manifest
@@ -0,0 +1,2 @@
+DIST meld-3.12.3.tar.xz 462856 SHA256 db3572c5c6905b09f4fc28415a7f6f223014391492dd2165ed1bc8512ac4e6fd SHA512 ea462ece2dcc1a6843ac6ce557aa0ed09c320078b1945d40f2436bbd9f953bf2d826043fc5ee18e4840210cb1da8dd6031f2922109f457400b292d044fd3d27e WHIRLPOOL e1a84aafc16b0cdf4f64f524abd4972b32a37504b9810252161e03feb27a975f29f6d3926d66a99cd9e005613fdb77dabb7367243a1d3d137585c8829e2ec28e
+DIST meld-3.14.0.tar.xz 495168 SHA256 430e2936b787c90ffa0999d3c94611fcaa64ca1920933f31550d5b931b4f103c SHA512 3d64ad5e9c7b1a061b7ffd3b41343e521533a507aa90063499ab314339f541fc2099d17e570dd4c8f3d52e59a62d39e7b5e19c9a4d98dac5182c5080fbb43325 WHIRLPOOL 8cac08b5f3b8a577cb68148c0654d2e1dbd01a97f9768a5801e0e5ffc577af5535c3306972ada300d3dd7bb93e9528802e55dd0f11ae48490298b6e2efd63a6d
diff --git a/dev-util/meld/meld-3.12.3.ebuild b/dev-util/meld/meld-3.12.3.ebuild
new file mode 100644
index 000000000000..bcd495f1e7eb
--- /dev/null
+++ b/dev-util/meld/meld-3.12.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.36:2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.6:3[introspection]
+	>=x11-libs/gtksourceview-3.6:3.0[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/meld/meld-3.14.0.ebuild b/dev-util/meld/meld-3.14.0.ebuild
new file mode 100644
index 000000000000..3ed56a0e0aff
--- /dev/null
+++ b/dev-util/meld/meld-3.14.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.36:2[dbus]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.12:3[introspection]
+	>=x11-libs/gtksourceview-3.10:3.0[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/meld/metadata.xml b/dev-util/meld/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/dev-util/meld/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>gnome</herd>
+</pkgmetadata>
diff --git a/dev-util/memprof/Manifest b/dev-util/memprof/Manifest
new file mode 100644
index 000000000000..c054f2ab01fc
--- /dev/null
+++ b/dev-util/memprof/Manifest
@@ -0,0 +1 @@
+DIST memprof-0.6.2.tar.gz 534543 SHA256 5d505f536753036b1b8777fb865b5bce1972a14bfa640cc15da2aa0bc5a0aef3 SHA512 cecfeb88f10f11fc4df106367871487453ddd9cb502ef96a6f120ee8889cfa96e8463f260c853abb351c7864e68904cf6e833864d561f9e7b09a785f4c315ca7 WHIRLPOOL 81afc8800dbf00750c4816b762f395fd45b3a4dfab4def956f1535e416747b8de4f282792a955764894ba40e2b9e1aeb8a30b70988f594348073121087ed39fd
diff --git a/dev-util/memprof/files/memprof-0.6.2-binutils.patch b/dev-util/memprof/files/memprof-0.6.2-binutils.patch
new file mode 100644
index 000000000000..2a7f80993d5e
--- /dev/null
+++ b/dev-util/memprof/files/memprof-0.6.2-binutils.patch
@@ -0,0 +1,10 @@
+--- src/memprof.h
++++ src/memprof.h
+@@ -24,6 +24,7 @@
+ #include <gtk/gtkwidget.h>
+ #include <stdio.h>
+ #include <sys/types.h>
++#include "config.h"
+ #include "bfd.h"
+ #include "stackstash.h"
+ #include "binfile.h"
diff --git a/dev-util/memprof/files/memprof-0.6.2-desktop.patch b/dev-util/memprof/files/memprof-0.6.2-desktop.patch
new file mode 100644
index 000000000000..a49b5697aaca
--- /dev/null
+++ b/dev-util/memprof/files/memprof-0.6.2-desktop.patch
@@ -0,0 +1,24 @@
+--- memprof.desktop
++++ memprof.desktop
+@@ -11,17 +11,13 @@
+ Name[uk]=MemProf
+ Comment=Check a program for leaks and analyze its memory usage
+ Comment[sl]=Orodje za profiliranje pomnilnika
+-Comment[da]=V�rkt�j til hukommelsesprofilering
+-Comment[el]=�������� ����������� ������
+ Comment[fr]=Outil de profilage de memoire
+ Comment[it]=Strumento di profilo della memoria
+ Comment[nl]=Gereedschap voor geheugen profilering
+-Comment[no]=Verkt�y for minneprofilering
+ Comment[pt_BR]=Ferramenta de 
+ Comment[sv]=Minnesprofileringsverktyg
+-Comment[uk]=��Ӧ� ���Ʀ������� ���'�Ԧ
+ Exec=memprof
+-Terminal=0
++Terminal=false
+ Type=Application
+-Icon=memprof.png
+-Categories=Application;Development;
+\ No newline at end of file
++Icon=memprof
++Categories=Development;
diff --git a/dev-util/memprof/memprof-0.6.2-r1.ebuild b/dev-util/memprof/memprof-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..d51343f70dd4
--- /dev/null
+++ b/dev-util/memprof/memprof-0.6.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Profiling and leak detection tool"
+HOMEPAGE="http://www.secretlabs.de/projects/memprof/"
+SRC_URI="http://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND="dev-libs/glib:2
+	>=gnome-base/libglade-2
+	>=x11-libs/gtk+-2.6:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool
+		sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog README NEWS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-binutils.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/dev-util/memprof/metadata.xml b/dev-util/memprof/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/dev-util/memprof/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/metadata.xml b/dev-util/metadata.xml
new file mode 100644
index 000000000000..b57240b4ca92
--- /dev/null
+++ b/dev-util/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The dev-util category contains various miscellaneous development
+		utilities.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-util enthält verschiedene Programmierwerkzeuge.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-util contiene varias utilidades de desarrollo mixtas.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-util カテゴリーには多種多様な開発ユーティリティが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-util categorie bevat verschillende hulpmiddelen voor gebruik
+		bij het programmeren.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-util chứa các tiện ích phát triển khác nhau.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-util contiene varie utilità di sviluppo software.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria dev-util contém vários utilitários de
+		desenvolvimento mistos.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria dev-util zawiera różne dodatkowe narzędzia związane z
+		rozwijaniem programów.
+	</longdescription>
+	<longdescription lang="ru">
+		Категория dev-util содержит различные утилиты для разработки,
+		не попадающие в другие категории.
+	</longdescription>
+</catmetadata>
+
diff --git a/dev-util/metro/Manifest b/dev-util/metro/Manifest
new file mode 100644
index 000000000000..c7a7049fff5c
--- /dev/null
+++ b/dev-util/metro/Manifest
@@ -0,0 +1 @@
+DIST metro-1.5.1.tar.bz2 40418 SHA256 2119d0fc7ef329a2a9477231bac8ec75c8950378b08d32ae99b7e8c5ae671811 SHA512 e1c7adfa3ca98f658a2c9f3f4f40bbcb514570e825fd895809db2732b29ec82fda4fe77eb5f4bb85d8d262d7380fb3eb0682edf19e2ff00843c9fb005d80ad0e WHIRLPOOL 44f89d2ac520a90a3b3388b1e143c7b6b0682daab13b6fc077f8cc5aaf1fd2d39152411123ce7df0ca2104ce742b9b9f6d633aab8b4d8d0232e7bfb77a24505c
diff --git a/dev-util/metro/metadata.xml b/dev-util/metro/metadata.xml
new file mode 100644
index 000000000000..0640a09e1466
--- /dev/null
+++ b/dev-util/metro/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Metro is a build tool that can build Gentoo Linux OS releases and OpenVZ
+		templates. It’s designed to interface with a package manager such as
+		Portage/emerge so that users can build their own releases of Gentoo or
+		other Linux-based operating systems.
+
+		The heart of Metro is its data-oriented recipe language and associated
+		parser, which has been designed to keep operating system builds
+		organized, consistent, maintainable and reliable.
+
+		From a Gentoo perspective, you can view Metro as a complete re-thinking
+		and redesign of Gentoo’s Catalyst build tool – building on its strengths
+		and addessing its weaknesses.
+	</longdescription>
+	<use>
+		<flag name="ccache">Enable support for ccache</flag>
+		<flag name="git">Enable support for git snapshots</flag>
+		<flag name="threads">Enable support for pbzip2 tarball packing/unpacking</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/metro/metro-1.5.1.ebuild b/dev-util/metro/metro-1.5.1.ebuild
new file mode 100644
index 000000000000..da845d1d3e92
--- /dev/null
+++ b/dev-util/metro/metro-1.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit python
+
+DESCRIPTION="release metatool used for creating Gentoo and Funtoo releases"
+HOMEPAGE="http://www.github.com/funtoo/metro"
+SRC_URI="http://www.funtoo.org/archive/metro/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+ccache +git threads"
+
+DEPEND=""
+RDEPEND="threads? ( app-arch/pbzip2 )
+	ccache? ( dev-util/ccache )
+	git? ( dev-vcs/git )"
+
+src_install() {
+	insinto /usr/lib/metro
+	doins -r .
+	fperms 0755 /usr/lib/metro/metro
+	dosym /usr/lib/metro/metro /usr/bin/metro
+	python_convert_shebangs -r 2 "${ED}"
+}
diff --git a/dev-util/min-cscope/Manifest b/dev-util/min-cscope/Manifest
new file mode 100644
index 000000000000..5c582841ab97
--- /dev/null
+++ b/dev-util/min-cscope/Manifest
@@ -0,0 +1 @@
+DIST min-cscope-16.1.0.tar.gz 382326 SHA256 2d316736d468205abac3343aa9f5795228a6846c86d8d86484ca04f490b6c74b SHA512 434d6333758dbf72c320e08b3b705bbff6c67de8a1380295fe5971af1a2c4659dd3201c726fd318d7715b90f8a693a76599a8659ac45c76568e5a29a399a9c0a WHIRLPOOL a52e4a78579b2f40b3c61e43c53c2c671cdfe0e2b8a3e20c1c3dc5a553ae79768dd273aca1659ccbeb81eccd595484ae0dd1e7d546ec727e0975ea7b0228e730
diff --git a/dev-util/min-cscope/metadata.xml b/dev-util/min-cscope/metadata.xml
new file mode 100644
index 000000000000..35840fce9f6b
--- /dev/null
+++ b/dev-util/min-cscope/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">kscope</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/min-cscope/min-cscope-16.1.0.ebuild b/dev-util/min-cscope/min-cscope-16.1.0.ebuild
new file mode 100644
index 000000000000..075d2ae1486c
--- /dev/null
+++ b/dev-util/min-cscope/min-cscope-16.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Interactively examine a C program"
+HOMEPAGE="http://sourceforge.net/projects/kscope/"
+SRC_URI="mirror://sourceforge/kscope/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+S=${WORKDIR}/${PN}
+
+DOCS="AUTHORS README* TODO"
+
+src_prepare() {
+	echo 'INSTALL(TARGETS min-cscope RUNTIME DESTINATION bin)' \
+		>> src/CMakeLists.txt
+}
+
+src_configure() {
+	append-flags -I"${S}/sort"
+	cmake-utils_src_configure
+}
diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
new file mode 100644
index 000000000000..cc3e91f1a597
--- /dev/null
+++ b/dev-util/mingw-runtime/Manifest
@@ -0,0 +1,4 @@
+DIST mingwrt-3.18-mingw32-src.tar.gz 391939 SHA256 de4979fd6eedeb21d2d506fe4880a838706dc88cbebe031e38561967fb7cbd42 SHA512 87778f08469a806dda606b0945d00511fccd0f7e0d545a33e2b4685db2490ec6a3e5e4267090b79a88eb963f97035fe8149097892f1f4a6e85f3a4661eb5e977 WHIRLPOOL c8883fcb3a4d04e9bf28e8ee15c9d5eb1fea62d7d3aed1dcfd4ae90f7186468296dc67dcd27f2e11b4af762e0fd833749a0065f4744992295c45a881aa58817a
+DIST mingwrt-3.20-2-mingw32-src.tar.lzma 302072 SHA256 398d300407861dda1d11cc5e2a4e44a1798503f364169459633020ea224a987c SHA512 ffb8e3d46a4646b236b67df0d9d21571a0ee8b78125989d506c176e03922e520201770a03093f27789f0e4373bf64f69d41e377d861ddd008b5e29da65fb1d55 WHIRLPOOL 46efda9e299fb29d538b4bb3aba9743f141e96bb60b15c62668a0b565bb84825d5a0e6accc97dafba5ec51dac904c917d6cea7c1e48676050be8ef3b7744c2e7
+DIST mingwrt-3.20-mingw32-src.tar.gz 393946 SHA256 f1869483318ed1df5e15e49b8315173e90c1caa2968c4956b7657854c36bfe0a SHA512 2d2d3c7decc7b35ab4759034dcd291c8e322a46205ae70fd4c4d68224c9d7c75454b908f61ba8ca7e0fdf18ff121c5b7ffd02e0658b7557e3af1f89ed28ed58c WHIRLPOOL c66a805cdd4500f142e0d38cd3add06046608addba67e1c0167d96dc4838eacd938c6d38c5d423ab7dd6344070445df5105eeac9bbe3529ca528d02c3f31bad3
+DIST mingwrt-4.0.3-1-mingw32-src.tar.lzma 1341612 SHA256 409be571382cad83a7304d37e13c620aa98757014b0107efe7e2895a1feafcc2 SHA512 2aa429f939038c86441ccfd32b4ddd40347582557f9427df92ea7454eb5bf743b8e1aafbb627b527be755976be807f415aad3920f700d93aa86d07bf40f12bde WHIRLPOOL 12be2c230370ff794a79635d8f12861f022f2551ff7d009882df6c358dd2bbaf1ae16e2944136055948a44b5f187893f9bedacdc49122570324cb726f38addd2
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.12-DESTDIR.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.12-DESTDIR.patch
new file mode 100644
index 000000000000..f5c52ba6b1e2
--- /dev/null
+++ b/dev-util/mingw-runtime/files/mingw-runtime-3.12-DESTDIR.patch
@@ -0,0 +1,22 @@
+--- Makefile.in
++++ Makefile.in
+@@ -58,5 +58,11 @@
+ endif
+ 
++inst_bindir:=$(DESTDIR)$(inst_bindir)
++inst_includedir:=$(DESTDIR)$(inst_includedir)
++inst_libdir:=$(DESTDIR)$(inst_libdir)
++inst_docdir:=$(DESTDIR)$(inst_docdir)
++mandir:=$(DESTDIR)$(mandir)
++
+ # The Mingw headers are installed under a subdirectory of
+ # $(tooldir)/include when configuring in Cygwin.
+ HEADER_SUBDIR = @HEADER_SUBDIR@
+@@ -199,6 +199,6 @@
+ all_dlls_host: $(DLLS)
+ 
+-install_dlls_host:
++install_dlls_host: install-dirs
+ 	for i in $(DLLS); do \
+ 		$(INSTALL_PROGRAM) $$i $(inst_bindir)/$$i ; \
+ 	done
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
new file mode 100644
index 000000000000..8b2418178857
--- /dev/null
+++ b/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
@@ -0,0 +1,27 @@
+http://sourceforge.net/tracker/?func=detail&aid=3446009&group_id=2435&atid=302435
+https://bugs.gentoo.org/419627
+
+--- a/tlssup.c
++++ b/tlssup.c
+@@ -84,6 +84,7 @@ BOOL WINAPI
+ __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
+ {
+   _PVFV *pfunc;
++  int nfuncs, ifunc;
+ 
+   /* We don't let us trick here.  */
+   if (_CRT_MT != 2)
+@@ -96,8 +97,12 @@ __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
+       return TRUE;
+     }
+ 
+-  for (pfunc = &__xd_a + 1; pfunc != &__xd_z; ++pfunc)
++  /* Use the nfuncs variable to iterate the TLS functions instead of pfunc to
++     avoid nasty compiler optimizations when comparing two global pointers. */
++  nfuncs = &__xd_z - (&__xd_a + 1);
++  for (ifunc=0; ifunc < nfuncs; ++ifunc)
+     {
++      pfunc = (&__xd_a + 1) + ifunc;
+       if (*pfunc != NULL)
+         (*pfunc)();
+     }
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch
new file mode 100644
index 000000000000..8c409569238d
--- /dev/null
+++ b/dev-util/mingw-runtime/files/mingw-runtime-3.20-LDBL_MIN_EXP.patch
@@ -0,0 +1,145 @@
+http://sourceforge.net/tracker/?func=detail&atid=102435&aid=3441135&group_id=2435
+https://bugs.gentoo.org/395893
+
+????-??-??  Keith Marshall  <keithmarshall@...>
+
+	Support pragmatic identification for w32api source directory.
+
+	* aclocal.m4 (MINGW_AC_W32API_SRCDIR): New macro; implement it.
+	* configure.in (W32API_INCLUDE): Assign using MINGW_AC_W32API_SRCDIR.
+	* Makefile.in (W32API_INCLUDE): Prefix -I flag to AC_SUBST value.
+	* mingwex/Makefile.in (W32API_INCLUDE): Likewise.
+	* profile/Makefile.in (W32API_INCLUDE): Likewise.
+
+diff -r 62c176864807 Makefile.in
+--- a/Makefile.in	Mon Nov 28 11:32:25 2011 +0000
++++ b/Makefile.in	Mon Nov 28 21:18:55 2011 +0000
+@@ -166,9 +166,9 @@ THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_
+ # Various libraries.
+ LIBM_A=@LIBM_A@
+ 
+-W32API_INCLUDE = @W32API_INCLUDE@
+-INCLUDES = -I$(srcdir)/include \
+-  -I$(srcdir)/../include \
++W32API_INCLUDE = -I @W32API_INCLUDE@
++INCLUDES = -I $(srcdir)/include \
++  -I $(srcdir)/../include \
+   -nostdinc \
+   -iwithprefixbefore include
+ ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
+diff -r 62c176864807 aclocal.m4
+--- a/aclocal.m4	Mon Nov 28 11:32:25 2011 +0000
++++ b/aclocal.m4	Mon Nov 28 21:18:55 2011 +0000
+@@ -15,7 +15,65 @@ AC_DEFUN([MINGW_AC_CONFIG_SRCDIR],
+  AC_MSG_CHECKING([package version])
+  PACKAGE_VERSION=`awk '$[2] == "'"$1"'" { print $[3] }' ${srcdir}/$2`
+  AC_MSG_RESULT([$PACKAGE_VERSION])dnl
+-]) #MINGW_AC_CONFIG_SRCDIR
++])# MINGW_AC_CONFIG_SRCDIR
++
++# MINGW_AC_W32API_SRCDIR
++# ----------------------
++# Attempt to identify the location of the w32api sources.
++# Accept an explicit location specified by to user, as argument
++# to --with-w32api-srcdir; if unspecified, fall back to standard
++# location relative to ${srcdir}.  Identification requires that
++# include/windows.h is present within the nominated directory.
++# This is naive, but AC_CHECK_HEADER cannot be used because
++# the system's w32api headers will interfere.
++#
++AC_DEFUN([MINGW_AC_W32API_SRCDIR],
++[AC_ARG_WITH([w32api-srcdir],
++ [AS_HELP_STRING([--with-w32api-srcdir=DIR],
++  [locate w32api sources in DIR [SRCDIR/../w32api]])
++ ],[],[with_w32api_srcdir=NONE])
++ AS_IF([test "x${with_w32api_srcdir}" = xNONE],
++ [AC_MSG_CHECKING([include path for w32api headers])
++  for with_w32api_srcdir in ${srcdir}/../w32api*; do
++    test -f "${with_w32api_srcdir}/include/windows.h" && break
++    with_w32api_srcdir=NONE
++  done
++  AS_IF([test "x${with_w32api_srcdir}" = xNONE],
++  [AC_MSG_RESULT([none found])
++   AC_MSG_RESULT
++   AC_MSG_WARN([source directory containing include/windows.h not found])
++   AC_MSG_WARN([ensure w32api sources are installed at \${top_srcdir}/../w32api*])
++   AC_MSG_WARN([or use --with-w32api-srcdir=DIR to specify an alternative])
++  ],
++  [case "${with_w32api_srcdir}" in
++     "${srcdir}/"*) with_w32api_srcdir="`echo "${with_w32api_srcdir}"dnl
++       | sed s,"^${srcdir}/",'${top_srcdir}/',`" ;;
++   esac
++   AC_MSG_RESULT([${with_w32api_srcdir}/include])
++  ])
++ ],
++ [AC_MSG_CHECKING([for windows.h in ${with_w32api_srcdir}/include])
++  AS_IF([test -f "${with_w32api_srcdir}/include/windows.h"],
++  [AC_MSG_RESULT([yes])
++   case "${with_w32api_srcdir}" in /*) ;;
++     *) with_w32api_srcdir='${top_builddir}/'"${with_w32api_srcdir}" ;;
++   esac
++  ],
++  [AC_MSG_RESULT([no])
++   AC_MSG_RESULT
++   AC_MSG_WARN([the nominated directory, ${with_w32api_srcdir}])
++   AC_MSG_WARN([does not appear to contain valid w32api source code])
++   AC_MSG_WARN([(file '${with_w32api_srcdir}/include/windows.h' is not present)])
++   with_w32api_srcdir=NONE
++  ])
++ ])
++ AS_IF([test "x${with_w32api_srcdir}" = xNONE],
++ [AC_MSG_WARN([please correct this omission and run configure again])
++  AC_MSG_RESULT
++  AC_MSG_ERROR([unable to continue until this issue is resolved])
++ ])
++ W32API_INCLUDE="${with_w32api_srcdir}/include"
++])# MINGW_AC_W32API_SRCDIR
+ 
+ # The following is copied from `no-executables.m4', in the top
+ # `src/config' directory.
+diff -r 62c176864807 configure.in
+--- a/configure.in	Mon Nov 28 11:32:25 2011 +0000
++++ b/configure.in	Mon Nov 28 21:18:55 2011 +0000
+@@ -44,7 +44,7 @@ AC_CHECK_TOOL([WINDRES], [windres], [win
+ 
+ AC_SUBST([NO_CYGWIN])
+ AC_SUBST([HEADER_SUBDIR])
+-AC_SUBST([W32API_INCLUDE], ['-I ${top_srcdir}/../w32api/include'])
++AC_SUBST([W32API_INCLUDE], [MINGW_AC_W32API_SRCDIR])
+ 
+ # The following are used by the GCC profiling hooks...
+ #
+diff -r 62c176864807 mingwex/Makefile.in
+--- a/mingwex/Makefile.in	Mon Nov 28 11:32:25 2011 +0000
++++ b/mingwex/Makefile.in	Mon Nov 28 21:18:55 2011 +0000
+@@ -126,10 +126,9 @@ ifdef NO_CYGWIN
+ override CC := ${NO_CYGWIN} $(firstword $(filter-out ${NO_CYGWIN},${CC}))
+ endif
+ 
+-W32API_INCLUDE = @W32API_INCLUDE@
+-INCLUDES = -I${srcdir} -I${top_srcdir} -I${top_srcdir}/include \
+-  -nostdinc \
+-  -iwithprefixbefore include
++W32API_INCLUDE = -I @W32API_INCLUDE@
++INCLUDES = -I ${srcdir} -I ${top_srcdir} -I ${top_srcdir}/include \
++  -nostdinc -isystem @W32API_INCLUDE@ -iwithprefixbefore include
+ ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE)
+ ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
+ 
+diff -r 62c176864807 profile/Makefile.in
+--- a/profile/Makefile.in	Mon Nov 28 11:32:25 2011 +0000
++++ b/profile/Makefile.in	Mon Nov 28 21:18:55 2011 +0000
+@@ -65,10 +65,9 @@ THREAD_DLL = @THREAD_DLL@
+ THREAD_DLL_VERSION = 10
+ THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
+ 
+-W32API_INCLUDE = @W32API_INCLUDE@
+-INCLUDES = -I${srcdir} -I${top_srcdir}/include \
+-  -nostdinc \
+-  -iwithprefixbefore include
++W32API_INCLUDE = -I @W32API_INCLUDE@
++INCLUDES = -I ${srcdir} -I ${top_srcdir}/include \
++  -nostdinc -iwithprefixbefore include
+ ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
+ ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
+ 
diff --git a/dev-util/mingw-runtime/metadata.xml b/dev-util/mingw-runtime/metadata.xml
new file mode 100644
index 000000000000..a4d63710b914
--- /dev/null
+++ b/dev-util/mingw-runtime/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>toolchain</herd>
+	<upstream>
+		<remote-id type="sourceforge">mingw</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
new file mode 100644
index 000000000000..cda4ddde95ff
--- /dev/null
+++ b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit flag-o-matic eutils
+
+MY_P="mingwrt-${PV}-mingw32"
+DESCRIPTION="Free Win32 runtime and import library definitions"
+HOMEPAGE="http://www.mingw.org/"
+SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+S=${WORKDIR}/${MY_P}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc-4.6.patch #419627
+	sed -i \
+		-e "/W32API_INCLUDE/s:=.*:='-I /usr/${CTARGET}/usr/include':" \
+		$(find -name configure) || die
+	sed -i \
+		-e '/^install_dlls_host:/s:$: install-dirs:' \
+		Makefile.in || die # fix parallel install
+}
+
+src_compile() {
+	just_headers && return 0
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	econf --host=${CTARGET} || die
+	emake || die
+}
+
+src_install() {
+	if just_headers ; then
+		insinto /usr/${CTARGET}/usr/include
+		doins -r include/* || die
+	else
+		local insdir
+		is_crosscompile \
+			&& insdir="${D}/usr/${CTARGET}" \
+			|| insdir="${D}"
+		emake install DESTDIR="${insdir}" || die
+		env -uRESTRICT CHOST=${CTARGET} prepallstrip
+		rm -rf "${insdir}"/usr/doc
+		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
+	fi
+	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
+}
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
new file mode 100644
index 000000000000..bab3a288d05e
--- /dev/null
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit flag-o-matic autotools versionator eutils
+
+MY_P="mingwrt-$(version_format_string '$1.$2-$3')-mingw32"
+DESCRIPTION="Free Win32 runtime and import library definitions"
+HOMEPAGE="http://www.mingw.org/"
+# http://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
+SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+DEPEND="app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.20-LDBL_MIN_EXP.patch #395893
+	eautoconf
+	sed -i \
+		-e '/^install_dlls_host:/s:$: install-dirs:' \
+		Makefile.in || die # fix parallel install
+}
+
+src_configure() {
+	just_headers && return 0
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	econf \
+		--host=${CTARGET} \
+		--with-w32api-srcdir="/usr/${CTARGET}/usr"
+}
+
+src_install() {
+	if just_headers ; then
+		insinto /usr/${CTARGET}/usr/include
+		doins -r include/* || die
+	else
+		local insdir
+		is_crosscompile \
+			&& insdir="${D}/usr/${CTARGET}" \
+			|| insdir="${D}"
+		emake install DESTDIR="${insdir}" || die
+		env -uRESTRICT CHOST=${CTARGET} prepallstrip
+		rm -rf "${insdir}"/usr/doc
+		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
+		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
+	fi
+	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
+}
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
new file mode 100644
index 000000000000..efcd8eeeeafe
--- /dev/null
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit flag-o-matic autotools eutils
+
+MY_P="mingwrt-${PV}-mingw32"
+DESCRIPTION="Free Win32 runtime and import library definitions"
+HOMEPAGE="http://www.mingw.org/"
+# http://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
+SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+S=${WORKDIR}/${MY_P}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.20-LDBL_MIN_EXP.patch #395893
+	eautoconf
+	sed -i \
+		-e '/^install_dlls_host:/s:$: install-dirs:' \
+		Makefile.in || die # fix parallel install
+}
+
+src_configure() {
+	just_headers && return 0
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	econf \
+		--host=${CTARGET} \
+		--with-w32api-srcdir="/usr/${CTARGET}/usr"
+}
+
+src_install() {
+	if just_headers ; then
+		insinto /usr/${CTARGET}/usr/include
+		doins -r include/* || die
+	else
+		local insdir
+		is_crosscompile \
+			&& insdir="${D}/usr/${CTARGET}" \
+			|| insdir="${D}"
+		emake install DESTDIR="${insdir}" || die
+		env -uRESTRICT CHOST=${CTARGET} prepallstrip
+		rm -rf "${insdir}"/usr/doc
+		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
+		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
+	fi
+	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
+}
diff --git a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
new file mode 100644
index 000000000000..dea6916c28cb
--- /dev/null
+++ b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit flag-o-matic toolchain-funcs versionator
+
+MY_P="mingwrt-$(version_format_string '$1.$2.$3-$4')-mingw32"
+DESCRIPTION="Free Win32 runtime and import library definitions"
+HOMEPAGE="http://www.mingw.org/"
+# http://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/
+SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
+
+LICENSE="BSD"
+SLOT="0"
+# Collides with w32api-4.x
+#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+DEPEND="app-arch/xz-utils"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}-src
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e '/^install_dlls_host:/s:$: install-dirs:' \
+		Makefile.in || die # fix parallel install
+}
+
+src_configure() {
+	just_headers && return 0
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	filter-flags -frecord-gcc-switches
+	tc-export AR
+	econf \
+		--host=${CTARGET} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	if just_headers ; then
+		insinto /usr/${CTARGET}/usr/include
+		doins -r include/*
+	else
+		local insdir
+		is_crosscompile \
+			&& insdir="${D}/usr/${CTARGET}" \
+			|| insdir="${D}"
+		emake -j1 install DESTDIR="${insdir}"
+		env -uRESTRICT CHOST=${CTARGET} prepallstrip
+		rm -rf "${insdir}"/usr/doc
+		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
+	fi
+	is_crosscompile && dosym usr /usr/${CTARGET}/mingw
+}
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
new file mode 100644
index 000000000000..9911b6f526a6
--- /dev/null
+++ b/dev-util/mingw64-runtime/Manifest
@@ -0,0 +1,5 @@
+DIST mingw-w64-v2.0.8.tar.gz 7017057 SHA256 1a5a2c57f90c7f1b5eb8402a52f93de645925a8af62c2cfe748f39ce66008cf4 SHA512 c526bad968c74d86e740862f5e492329b32a1782c69b3a22f7203ac7e38697ba2017f95ed7bf519b737328a92d7c1b4e519f9103d634550f30bdb4a21921303e WHIRLPOOL 913bc444941c4c9c630404847cfb9bb54083fcd366a240e47992d3ee65cfc4c86f340099970243d3d251d5a1e5a00005c09e9d1aecb884256e125155bbcfbd0e
+DIST mingw-w64-v3.0.0.tar.bz2 7012419 SHA256 ffd381a53cb774843667ccdaeb3a23f86be77b0344355e1a5947b3ceb8343c67 SHA512 7fc438908328ae4429f79dfaaae92bc7e88bc0f46517bdebdc3c45b3e8062ff6c27f166eb51103c2d49aae01851d82f33e0b031c8d98198baaeb119e19221989 WHIRLPOOL ea2820ab24dcd6f35fab0404b2bd26273b117731bb25e2e3ef753e9a3a9b6661564605cdae7ed5e6e4f9fc6b3c3d000761fa44afa19f79b5d6deaebca44f709c
+DIST mingw-w64-v3.1.0.tar.bz2 7021162 SHA256 ece7a7e7e1ab5e25d5ce469f8e4de7223696146fffa71c16e2a9b017d0e017d2 SHA512 9f418694aa0f072e2f08766fcee8929ac3022187750028781336243e050495b9709bb9ae87b4a83a8e9d3856478c525d8636277a4c219e282421b269dafa68d8 WHIRLPOOL 90a3a7056df7c4da2e605da1578e65b16e0f831370d8b1d399fed48945828604a94f9402b2d53bc4ca26623f1d34e6c45c862bf1f7590ddf9325fd4a053a18fb
+DIST mingw-w64-v3.2.0.tar.bz2 7053254 SHA256 78a0de610829a1145ae12c4a29603344963a0b8156ba39a9a31a0e79c3b29142 SHA512 dd483bcf7ba0e698a33a0b02a811b181e601cd344b87dafd0f6c477f68efb9a617a4109046fd06735242623f87833cf97688f057583e1378d6d84e7818927593 WHIRLPOOL 99ba5ddaa99c40309d12d75d3953deaf9cc31280ad2446793d1525702963edd1b33e91053e99bdfd06d37980049d30b7fb4e9f3a5358f8277c2fabe587c56037
+DIST mingw-w64-v4.0.1.tar.bz2 10803072 SHA256 89d2524a071b6337dfd9f3b6e6f46d8002b2633f928c833dc4e873a13e045b17 SHA512 a216a09a460c56c29208aee1e1cdb428e856f9c8d59dd399723ccf6d549368f0a13a6aacb046d211ddec7c0a1f1c227d5dd599e4f0c33ba4b6d9c92bd0a7fa1b WHIRLPOOL e021031e2820e918fe0f291624335fadc08641e811f6cf19d45b1586d2ac96c6bff4fb936bcd154a7b48711db9f5faabd27bfdced3a38073b4a20c8471a91915
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
new file mode 100644
index 000000000000..6461b98e5044
--- /dev/null
+++ b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
@@ -0,0 +1,88 @@
+From 67434f57cbb5aba791e9ca973a86859e0736f829 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Mon, 4 May 2015 21:31:10 +0300
+Subject: [PATCH 2/2] build: autoconf: enable multiple tools and libs
+
+this somewhat reduces the error checking, but makes code and usage nicer.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 55 ++++++++++++-------------------------------------------
+ 1 file changed, 12 insertions(+), 43 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 468d1b1..1b59821 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,32 +56,12 @@ AC_ARG_WITH([libraries],
+     [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
+   [],
+   [with_libraries=no])
+-AS_CASE([$with_libraries],
+-  [yes|all],[
+-    with_libraries="libmangle,pseh,winpthreads"
+-    with_libraries_winpthreads=yes
+-    with_libraries_mangle=yes
+-    with_libraries_pseh=yes],
+-  [libmangle],[
+-    with_libraries="libmangle"
+-    with_libraries_winpthreads=no
+-    with_libraries_mangle=yes
+-    with_libraries_pseh=no],
+-  [pseh],[
+-    with_libraries="pseh"
+-    with_libraries_winpthreads=no
+-    with_libraries_mangle=no
+-    with_libraries_pseh=yes],
+-  [winpthreads],[
+-    with_libraries="winpthreads"
+-    with_libraries_winpthreads=yes
+-    with_libraries_mangle=no
+-    with_libraries_pseh=no],
+-  [no],[
+-    with_libraries_winpthreads=no
+-    with_libraries_mangle=no
+-    with_libraries_pseh=no],
+-  [MW64_OPTION_ERROR([with-libraries])])
++for l in winpthreads mangle pseh; do
++  res=`echo "${with_libraries}" | grep $l > /dev/null && echo yes || echo no`
++  AS_CASE([$with_libraries],
++    [all|yes],[res=yes])
++    AS_VAR_COPY([with_libraries_$l], [res])
++done
+ AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
+ AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
+ AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
+@@ -96,23 +76,12 @@ AC_ARG_WITH([tools],
+     [Build the extra mingw-w64 tools, where ARG is one of gendef, genidl, or all])],
+   [],
+   [with_tools=no])
+-AS_CASE([$with_tools],
+-  [yes|all],[
+-    with_tools="gendef,genidl"
+-    with_tools_gendef=yes
+-    with_tools_genidl=yes],
+-  [gendef],[
+-    with_tools="gendef"
+-    with_tools_gendef=yes
+-    with_tools_genidl=no],
+-  [genidl],[
+-    with_tools="genidl"
+-    with_tools_gendef=no
+-    with_tools_genidl=yes],
+-  [no],[
+-    with_tools_gendef=no
+-    with_tools_genidl=no],
+-  [MW64_OPTION_ERROR([with-tools])])
++for t in gendef genidl; do
++  res=`echo "${with_tools}" | grep $t > /dev/null && echo yes || echo no`
++  AS_CASE([$with_tools],
++    [all|yes],[res=yes])
++    AS_VAR_COPY([with_tools_$t], [res])
++done
+ AM_CONDITIONAL([TOOLS_GENDEF],[test "x$with_tools_gendef" = xyes])
+ AM_CONDITIONAL([TOOLS_GENIDL],[test "x$with_tools_genidl" = xyes])
+ AM_COND_IF([TOOLS_GENDEF],[AC_CONFIG_SUBDIRS([mingw-w64-tools/gendef])])
+-- 
+2.3.6
+
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
new file mode 100644
index 000000000000..0d3e59dc9dd5
--- /dev/null
+++ b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
@@ -0,0 +1,86 @@
+From 0adec5d0e1c65fc4ce4f84f3d4bb6738e923e1de Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Mon, 4 May 2015 20:39:52 +0300
+Subject: [PATCH 1/2] build: autoconf: support winpthreads library
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ Makefile.am  |  6 +++++-
+ configure.ac | 15 +++++++++++++--
+ 2 files changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 26a7606..308b6fd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,6 +14,10 @@ if LIBRARIES_PSEH
+   MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh
+ endif
+ 
++if LIBRARIES_WINPTHREADS
++  MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads
++endif
++
+ if TOOLS_GENDEF
+   MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef
+ endif
+@@ -22,7 +26,7 @@ if TOOLS_GENIDL
+   MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl
+ endif
+ 
+-SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
++SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_LIBRARIES_WINPTHREADS) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all
+ 
+diff --git a/configure.ac b/configure.ac
+index 4bb3926..468d1b1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,30 +53,41 @@ AC_MSG_RESULT([$with_crt])
+ AC_MSG_CHECKING([whether to build the optional libraries])
+ AC_ARG_WITH([libraries],
+   [AS_HELP_STRING([--with-libraries=ARG],
+-    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, or all])],
++    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
+   [],
+   [with_libraries=no])
+ AS_CASE([$with_libraries],
+   [yes|all],[
+-    with_libraries="libmangle,pseh"
++    with_libraries="libmangle,pseh,winpthreads"
++    with_libraries_winpthreads=yes
+     with_libraries_mangle=yes
+     with_libraries_pseh=yes],
+   [libmangle],[
+     with_libraries="libmangle"
++    with_libraries_winpthreads=no
+     with_libraries_mangle=yes
+     with_libraries_pseh=no],
+   [pseh],[
+     with_libraries="pseh"
++    with_libraries_winpthreads=no
+     with_libraries_mangle=no
+     with_libraries_pseh=yes],
++  [winpthreads],[
++    with_libraries="winpthreads"
++    with_libraries_winpthreads=yes
++    with_libraries_mangle=no
++    with_libraries_pseh=no],
+   [no],[
++    with_libraries_winpthreads=no
+     with_libraries_mangle=no
+     with_libraries_pseh=no],
+   [MW64_OPTION_ERROR([with-libraries])])
+ AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
+ AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
++AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
+ AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])
+ AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])
++AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])])
+ AC_MSG_RESULT([$with_libraries])
+ 
+ AC_MSG_CHECKING([whether to build the optional tools])
+-- 
+2.3.6
+
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
new file mode 100644
index 000000000000..b6f2f9e194ac
--- /dev/null
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>toolchain</herd>
+  <use>
+    <flag name="idl">
+    Install idl files.
+  </flag>
+    <flag name="libraries">
+    Build extra libraries.
+  </flag>
+    <flag name="tools">
+    Build extra tools.
+  </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">mingw-w64</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild
new file mode 100644
index 000000000000..66af6446edee
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64-v${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+S=${WORKDIR}/mingw-w64-v${PV}/mingw-w64-crt
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	find "${WORKDIR}" -type f -exec touch -r . {} +
+}
+
+src_compile() {
+	# install the local headers as the crt step wants latest
+	pushd ../mingw-w64-headers >/dev/null
+	CHOST=${CTARGET} econf --enable-sdk || die
+	emake install DESTDIR="${WORKDIR}/sysroot" || die
+	popd >/dev/null
+
+	just_headers && return 0
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	append-cppflags -isystem "${WORKDIR}/sysroot/usr/${CTARGET}/include"
+	CHOST=${CTARGET} econf || die
+	emake || die
+}
+
+src_install() {
+	insinto /usr/${CTARGET}/usr/include
+	doins -r "${WORKDIR}"/sysroot/usr/${CTARGET}/include/* || die
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+	just_headers && return 0
+
+	emake install DESTDIR="${D}" || die
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${D}"/usr/doc
+}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
new file mode 100644
index 000000000000..b7755236a41e
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crosscompile_opts_headers-only idl"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_configure() {
+	local extra_conf=()
+
+	if just_headers; then
+		extra_conf+=( --without-crt )
+	else
+		extra_conf+=( --with-crt )
+	fi
+
+	case ${CTARGET} in
+	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
+	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
+	*) die "Unsupported ${CTARGET}" ;;
+	esac
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	CHOST=${CTARGET} econf \
+		--prefix=/usr/${CTARGET} \
+		--includedir=/usr/${CTARGET}/usr/include \
+		--with-headers \
+		--enable-sdk \
+		$(use_enable idl) \
+		"${extra_conf[@]}"
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
new file mode 100644
index 000000000000..b7755236a41e
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crosscompile_opts_headers-only idl"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_configure() {
+	local extra_conf=()
+
+	if just_headers; then
+		extra_conf+=( --without-crt )
+	else
+		extra_conf+=( --with-crt )
+	fi
+
+	case ${CTARGET} in
+	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
+	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
+	*) die "Unsupported ${CTARGET}" ;;
+	esac
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	CHOST=${CTARGET} econf \
+		--prefix=/usr/${CTARGET} \
+		--includedir=/usr/${CTARGET}/usr/include \
+		--with-headers \
+		--enable-sdk \
+		$(use_enable idl) \
+		"${extra_conf[@]}"
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..b7755236a41e
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crosscompile_opts_headers-only idl"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_configure() {
+	local extra_conf=()
+
+	if just_headers; then
+		extra_conf+=( --without-crt )
+	else
+		extra_conf+=( --with-crt )
+	fi
+
+	case ${CTARGET} in
+	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
+	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
+	*) die "Unsupported ${CTARGET}" ;;
+	esac
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	CHOST=${CTARGET} econf \
+		--prefix=/usr/${CTARGET} \
+		--includedir=/usr/${CTARGET}/usr/include \
+		--with-headers \
+		--enable-sdk \
+		$(use_enable idl) \
+		"${extra_conf[@]}"
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
new file mode 100644
index 000000000000..f0836e69a1c9
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+WANT_AUTOMAKE="1.15"
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crosscompile_opts_headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-winpthreads.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
+	eautoreconf
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	local extra_conf=()
+
+	case ${CTARGET} in
+	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
+	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
+	*) die "Unsupported ${CTARGET}" ;;
+	esac
+
+	CHOST=${CTARGET} econf \
+		--prefix=/usr/${CTARGET} \
+		--includedir=/usr/${CTARGET}/usr/include \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl) \
+		$(crt_use_with libraries libraries winpthreads,libmangle) \
+		$(crt_use_with tools) \
+		"${extra_conf[@]}"
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/mock/Manifest b/dev-util/mock/Manifest
new file mode 100644
index 000000000000..5da79979fa4c
--- /dev/null
+++ b/dev-util/mock/Manifest
@@ -0,0 +1 @@
+DIST mock-1.0.3.tar.gz 237654 SHA256 7b0c29920f97d4cf51d9f29eb4728e514eadfefea3b8d9888f228bc91f97eb54 SHA512 da95fd3a43236f6919416c66d49467daaf0562d7d4e06c4ab9f8a9e4906e9f6e5ac4c5cab4638d2d2ec6dbbc6a3f2a6c2d0436347aeaa553c6dd57daf0212eab WHIRLPOOL 2ffafd13560988b4d8185d28eccac3c04f8c2ba2b910590d3f229013d211723a5b05253a74559281ec0d0d6badd5211af57e198505910110b48b59a0291a234c
diff --git a/dev-util/mock/metadata.xml b/dev-util/mock/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/dev-util/mock/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/mock/mock-1.0.3.ebuild b/dev-util/mock/mock-1.0.3.ebuild
new file mode 100644
index 000000000000..d500c3055f1a
--- /dev/null
+++ b/dev-util/mock/mock-1.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils user
+
+DESCRIPTION="create chroots and build packages in them for Fedora and RedHat"
+HOMEPAGE="http://fedoraproject.org/wiki/Projects/Mock"
+SRC_URI="https://fedorahosted.org/mock/attachment/wiki/MockTarballs/mock-${PV}.tar.gz?format=raw -> mock-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/yum
+	dev-python/decoratortools"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
+
+pkg_postinst() {
+	enewgroup mock
+}
diff --git a/dev-util/molecule-core/Manifest b/dev-util/molecule-core/Manifest
new file mode 100644
index 000000000000..d359ac004ea2
--- /dev/null
+++ b/dev-util/molecule-core/Manifest
@@ -0,0 +1 @@
+DIST molecule-core-1.0.2.tar.bz2 30616 SHA256 141817590a4501c49fb3d25fb8ffd4737023c52216b3b80677ecbbca5e71872c SHA512 1f501960e4029cb993680c7356aa8fc0ac7afa249d106b4ce97afb39f58cd666640bcf9fd8cee64482077ad23f91da743d6ce54e82863faab20d68a1814d92cb WHIRLPOOL c5f6da62c164488543cce45b0f4485c5d4d3ea15d474f06b65f00c685fef22851d5b43234da54d4324e4cce2bbc01b1cbe0c639dd97ac5f17a4128004166aadd
diff --git a/dev-util/molecule-core/metadata.xml b/dev-util/molecule-core/metadata.xml
new file mode 100644
index 000000000000..35e5f4052d96
--- /dev/null
+++ b/dev-util/molecule-core/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>lxnay@gentoo.org</email>
+		<name>Fabio Erculiani</name>
+	</maintainer>
+	<longdescription lang="en">
+		Molecule is a build tool that can build, rebuild or extend Sabayon Linux or
+		Gentoo Linux OS releases OpenVZ templates and stage4 tarballs.
+		It doesn't contain any specific package manager bit and can work with
+		your favourite one. The philosophy of Molecule is simple: ease of use and
+		modularity.
+		Just like Catalyst, Molecule uses its own .spec file format and learning
+		how to write one is just about reading examples provided at
+		http://git.sabayon.org/molecules.git/.
+		You can tweak your ISO image or create one off your chroot (stage4) in no
+		time. Molecule uses a plugin-based system to implement support for new
+		execution patterns (like ISO to ISO, ISO to Tar, Chroot to ISO, etc).
+		Molecule is born inside Sabayon and is used in its release cycle for both
+		daily(live) and versioned ISO images.
+		Molecule developers are looking for help for writing user docs and HOWTOs.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/molecule-core/molecule-core-1.0.2.ebuild b/dev-util/molecule-core/molecule-core-1.0.2.ebuild
new file mode 100644
index 000000000000..bbef4ea95787
--- /dev/null
+++ b/dev-util/molecule-core/molecule-core-1.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_DEPEND="*"
+
+inherit python
+
+DESCRIPTION="Sabayon distro-agnostic images build tool"
+HOMEPAGE="http://www.sabayon.org"
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/intltool
+	sys-devel/gettext"
+RDEPEND="!<dev-util/molecule-1
+	sys-process/lsof"
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
+		PREFIX="/usr" SYSCONFDIR="/etc" install \
+		|| die "emake install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/molecule"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/molecule"
+}
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
new file mode 100644
index 000000000000..42fc84e168b4
--- /dev/null
+++ b/dev-util/molecule-plugins/Manifest
@@ -0,0 +1 @@
+DIST molecule-plugins-1.0.2.tar.bz2 17428 SHA256 1e2c8de1e4c8dd3b8623bb048527153bef147e15d01d13e61575711561703b4d SHA512 65b75c23f3c662812be2ab4fe0c92bd99aba48da6e05aad6175ba3fe1cd8106d9085ed53f27c738ef6af1b327ac8ac872ef7c3c48728366b510b7a82bb90c866 WHIRLPOOL 90f1f22c0e3514ac3ba658b9de32ca71eafa60ba7e5a6e212d0b1fbcbcd4cd22a6be405c9dad06179e1db9d09e161fb50cf57d3307b8a8a950fe6366e5e788b1
diff --git a/dev-util/molecule-plugins/metadata.xml b/dev-util/molecule-plugins/metadata.xml
new file mode 100644
index 000000000000..084e4ee0d117
--- /dev/null
+++ b/dev-util/molecule-plugins/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>lxnay@gentoo.org</email>
+		<name>Fabio Erculiani</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.2.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.2.ebuild
new file mode 100644
index 000000000000..a68a9c387ae1
--- /dev/null
+++ b/dev-util/molecule-plugins/molecule-plugins-1.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_DEPEND="*"
+
+inherit python
+
+DESCRIPTION="A set fo base plugins for Molecule"
+HOMEPAGE="http://www.sabayon.org"
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-util/molecule-core-1.0.1 !<dev-util/molecule-1"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/rsync
+	sys-fs/squashfs-tools
+	sys-process/lsof
+	virtual/cdrtools"
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
+		PREFIX="/usr" SYSCONFDIR="/etc" install \
+		|| die "emake install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/molecule"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/molecule"
+}
diff --git a/dev-util/molecule/Manifest b/dev-util/molecule/Manifest
new file mode 100644
index 000000000000..ff16f6a3179f
--- /dev/null
+++ b/dev-util/molecule/Manifest
@@ -0,0 +1,2 @@
+DIST molecule-0.9.24.6.tar.bz2 273770 SHA256 36f9dcc8e99d417c77d11713bfb78f65c949eeb48e934378d6dc3dd2dae2d483 SHA512 581166362b470b7ce9b8c72e4bfbd99fd2e9209cbd304d6ff8cddd51dbade7b94ff59591f123b9425a91a4596993a4e873c9ede9ce28320af687c060647c551a WHIRLPOOL d54ba2bc9eb7028f67639634d214c21b106010fc8d532adee610f0594a9f61293d320bf57b83a2857d4ea161b66c5afd6cec69c2c54c3d274e60a6ab4eafc359
+DIST molecule-0.9.24.8.tar.bz2 273967 SHA256 c02f0ea9f1df377975e8f85397544443ff613479695f58c761a810358113aa51 SHA512 0c3161e0639542e57116583ce97634c56f3506f7658cc7085e883435e7c9d5696ab83ca52004a303f45b5872bba150cf209be2a9dbf39a70d65318435d4b7ddc WHIRLPOOL 984442ac2d5e6b3589b8eac8cbafa0f26d4bc036b94124ed1de4083a90b50bf8669cdeff9586b8c77dea8778a55d84933c7fe06e2cc78370ee78e5a3ddcb1eb2
diff --git a/dev-util/molecule/metadata.xml b/dev-util/molecule/metadata.xml
new file mode 100644
index 000000000000..25eddff37146
--- /dev/null
+++ b/dev-util/molecule/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>lxnay@gentoo.org</email>
+		<name>Fabio Erculiani</name>
+	</maintainer>
+	<use>
+		<flag name='plugins'>Add plugins provided by dev-util/molecule-plugins</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/molecule/molecule-0.9.24.6.ebuild b/dev-util/molecule/molecule-0.9.24.6.ebuild
new file mode 100644
index 000000000000..7f4032dbcc57
--- /dev/null
+++ b/dev-util/molecule/molecule-0.9.24.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="*"
+
+inherit python
+
+DESCRIPTION="Release metatool used for creating Sabayon (and Gentoo) releases"
+HOMEPAGE="http://www.sabayon.org"
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/intltool
+	sys-devel/gettext"
+RDEPEND="net-misc/rsync
+	sys-fs/squashfs-tools
+	sys-process/lsof
+	virtual/cdrtools"
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
+		PREFIX="/usr" SYSCONFDIR="/etc" install \
+		|| die "emake install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/molecule"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/molecule"
+}
diff --git a/dev-util/molecule/molecule-0.9.24.8.ebuild b/dev-util/molecule/molecule-0.9.24.8.ebuild
new file mode 100644
index 000000000000..61c26e1a0a53
--- /dev/null
+++ b/dev-util/molecule/molecule-0.9.24.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="*"
+
+inherit python
+
+DESCRIPTION="Release metatool used for creating Sabayon (and Gentoo) releases"
+HOMEPAGE="http://www.sabayon.org"
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/intltool
+	sys-devel/gettext"
+RDEPEND="net-misc/rsync
+	sys-fs/squashfs-tools
+	sys-process/lsof
+	virtual/cdrtools"
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
+		PREFIX="/usr" SYSCONFDIR="/etc" install \
+		|| die "emake install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/molecule"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/molecule"
+}
diff --git a/dev-util/molecule/molecule-2.ebuild b/dev-util/molecule/molecule-2.ebuild
new file mode 100644
index 000000000000..090b36b12e75
--- /dev/null
+++ b/dev-util/molecule/molecule-2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Meta package for dev-util/molecule-core and dev-util/molecule-plugins"
+HOMEPAGE="http://www.sabayon.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins"
+
+DEPEND=""
+RDEPEND=">=dev-util/molecule-core-1.0.2
+	plugins? ( >=dev-util/molecule-plugins-1.0.2 )"
diff --git a/dev-util/monkeystudio/Manifest b/dev-util/monkeystudio/Manifest
new file mode 100644
index 000000000000..2fee9ff1e0a0
--- /dev/null
+++ b/dev-util/monkeystudio/Manifest
@@ -0,0 +1 @@
+DIST mks_1.9.0.4-src.tar.gz 7553485 SHA256 cfd3517ac6d4a5d8ffdf7ec9995a624b6cef13aa00163e46a9b54b1f52164ffd SHA512 57503ef55856d6ba651c58b6f21a84900bab8c86687de114feaa15e914bd99a4661e3617ddc7a6dcca2dbedaac8b19e244e17362aa1bc54f2c9bcd96087d8eae WHIRLPOOL 70a96c26411527c83b7219459a3ba91ee4d907a3e1389c9a543da38b681fabafaef23b9dc510ebbbd667c4e8c2303b55b15926662628ef53bec18d527e1083c6
diff --git a/dev-util/monkeystudio/files/monkeystudio-1.9.0.4-install.patch b/dev-util/monkeystudio/files/monkeystudio-1.9.0.4-install.patch
new file mode 100644
index 000000000000..0a657d48f208
--- /dev/null
+++ b/dev-util/monkeystudio/files/monkeystudio-1.9.0.4-install.patch
@@ -0,0 +1,26 @@
+* Don't install unneeded docs
+* Don't install all translations
+
+--- installs.pri
++++ installs.pri
+@@ -31,19 +31,9 @@
+     !exists( $${toolsFolder} ):toolsFolder    = tools
+     toolsDataFolder = $${toolsFolder}/data/$${dataFolder}
+     
+-    # licenses, readme, changelog
+-    monkey_docs.path = $${PACKAGE_DOCS}
+-    monkey_docs.files = GPL-2 \
+-        GPL-3 \
+-        LGPL-3 \
+-        dev-readme \
+-        readme.txt \
+-        ChangeLog
+-    install_folders *= $${monkey_docs.path}
+-
+     # datas
+     monkey_datas.path   = $${PACKAGE_DATAS}
+-    monkey_datas.files  = datas/*
++    monkey_datas.files  = datas/apis datas/scripts datas/templates
+     monkey_datas.CONFIG *= no_check_exist
+     install_folders *= $${monkey_datas.path}
+ 
diff --git a/dev-util/monkeystudio/metadata.xml b/dev-util/monkeystudio/metadata.xml
new file mode 100644
index 000000000000..79f13541af69
--- /dev/null
+++ b/dev-util/monkeystudio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<use>
+		<flag name="plugins">Build and install additional plugins</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">monkeystudio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/monkeystudio/monkeystudio-1.9.0.4.ebuild b/dev-util/monkeystudio/monkeystudio-1.9.0.4.ebuild
new file mode 100644
index 000000000000..4acbb446e978
--- /dev/null
+++ b/dev-util/monkeystudio/monkeystudio-1.9.0.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+LANGS="be es fr ru"
+
+inherit qt4-r2
+
+MY_P="mks_${PV}-src"
+
+DESCRIPTION="A cross platform Qt 4 IDE"
+HOMEPAGE="http://www.monkeystudio.org"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc plugins"
+
+RDEPEND="
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qthelp:4
+	dev-qt/qtsql:4
+	x11-libs/qscintilla:=
+	plugins? ( dev-qt/qtwebkit:4 )
+"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.5.8 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-install.patch" )
+DOCS=( ChangeLog readme.txt )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Revert upstream change designed to permit shadow building
+	# which is causing build failure
+	sed -e '/PACKAGE_BUILD_PATH  = $$(PWD)\/build/d' \
+		-e 's/#PACKAGE_BUILD_PATH/PACKAGE_BUILD_PATH/' \
+		-i config.pri || die
+
+	rm -r qscintilla/QScintilla-gpl-snapshot \
+		|| die "failed removing bundled qscintilla"
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	eqmake4 prefix=/usr system_qscintilla=1
+
+	if use plugins ; then
+		eqmake4 plugins/plugins.pro
+	fi
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	if use plugins ; then
+		insinto /usr/lib64/monkeystudio
+		doins -r bin/plugins/*
+	fi
+
+	insinto /usr/share/${PN}/translations
+	local lang
+	for lang in ${LANGS} ; do
+		if use linguas_${lang} ; then
+			doins datas/translations/monkeystudio_${lang}.qm
+		fi
+	done
+
+	fperms 755 /usr/bin/${PN}
+
+	if use doc ; then
+		doxygen || die "doxygen failed"
+		dohtml -r doc/html/*
+	fi
+}
diff --git a/dev-util/mono-debugger/Manifest b/dev-util/mono-debugger/Manifest
new file mode 100644
index 000000000000..c8dc52ddb89c
--- /dev/null
+++ b/dev-util/mono-debugger/Manifest
@@ -0,0 +1 @@
+DIST mono-debugger-2.10.tar.bz2 1424640 SHA256 6896ae43ab7c8b302364e95725b7675b1642e77d22bcf96b5990c01652d23715 SHA512 a71d20b76c29b3b2dab06112c6c34ffe94a21bc4cef4693a177a62b23da0b728667075918cd8919e370a6c37debfd0e828ac4439da0051900420a59cb5802cc6 WHIRLPOOL af46221d3bbd6c9bf3f03da8111dba3e78f50821ef5019c2b5f5e172c72c9d6538692536c48f08d0c84b7035f45868a3c0fe4b3c8cf9a1f3bba24200bff2b711
diff --git a/dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch b/dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch
new file mode 100644
index 000000000000..ea0538a51def
--- /dev/null
+++ b/dev-util/mono-debugger/files/mono-debugger-2.10-glib2.32.patch
@@ -0,0 +1,11 @@
+diff -uNr mono-debugger-2.10.old/sysdeps/server/breakpoints.c mono-debugger-2.10/sysdeps/server/breakpoints.c
+--- mono-debugger-2.10.old/sysdeps/server/breakpoints.c	2011-01-13 23:41:31.000000000 +0100
++++ mono-debugger-2.10/sysdeps/server/breakpoints.c	2011-11-12 15:46:57.909192866 +0100
+@@ -1,6 +1,6 @@
+ #include <server.h>
+ #include <breakpoints.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <sys/stat.h>
+ #include <signal.h>
+ #ifdef HAVE_UNISTD_H
diff --git a/dev-util/mono-debugger/files/mono-debugger-2.8-system-bfd.patch b/dev-util/mono-debugger/files/mono-debugger-2.8-system-bfd.patch
new file mode 100644
index 000000000000..3925606c1fde
--- /dev/null
+++ b/dev-util/mono-debugger/files/mono-debugger-2.8-system-bfd.patch
@@ -0,0 +1,97 @@
+diff --git a/configure.in b/configure.in
+index c643e64..402be56 100644
+--- a/configure.in
++++ b/configure.in
+@@ -64,6 +64,19 @@ case "$host" in
+ esac
+ AC_MSG_RESULT(ok)
+ 
++AC_ARG_WITH([system-libbfd],
++	AS_HELP_STRING([--with-system-libbfd], [Use the system copy of libbfd and libopcodes.]))
++
++AS_IF([test "x$with_system_libbfd" = "xyes"],
++	[
++		AC_CHECK_HEADERS([bfd.h], [], [AC_MSG_ERROR([Missing bfd.h header])])
++		AC_CHECK_LIB([bfd], [bfd_init], [:], [AC_MSG_ERROR([Missing libbfd library])])
++		AC_CHECK_LIB([opcodes], [init_disassemble_info], [:], [AC_MSG_ERROR([Missing libopcodes library])])
++		AC_CHECK_MEMBERS([asection.rawsize], [], [], [[#include <bfd.h>]])
++	])
++
++AM_CONDITIONAL([SYSTEM_LIBBFD], [test "x$with_system_libbfd" = "xyes"])
++
+ AC_ARG_WITH(bfd-target,
+ [  --with-bfd-target       Manually override the BFD target],
+ 	if test x$with_bfd_target != "x"; then
+diff --git a/sysdeps/Makefile.am b/sysdeps/Makefile.am
+index 017026f..f63c181 100644
+--- a/sysdeps/Makefile.am
++++ b/sysdeps/Makefile.am
+@@ -1 +1,5 @@
++if !SYSTEM_LIBBFD
+ SUBDIRS = bfd server
++else
++SUBDIRS = server
++endif
+diff --git a/sysdeps/server/Makefile.am b/sysdeps/server/Makefile.am
+index dad57ab..8e7ac68 100644
+--- a/sysdeps/server/Makefile.am
++++ b/sysdeps/server/Makefile.am
+@@ -6,10 +6,9 @@ libmonodebuggerbfdglue_la_SOURCES = \
+ 	bfdglue.c \
+ 	bfdglue.h
+ 
++if !SYSTEM_LIBBFD
+ libmonodebuggerbfdglue_la_LIBADD = \
+ 	../../sysdeps/bfd/opcodes/libopcodes.la ../../sysdeps/bfd/libbfd.la
+-libmonodebuggerbfdglue_la_LDFLAGS = \
+-	-no-undefined -module -export-dynamic -shared
+ 
+ libmonodebuggerbfdglue_la_CPPFLAGS = \
+ 	-I$(top_srcdir)/sysdeps/bfd \
+@@ -17,6 +16,17 @@ libmonodebuggerbfdglue_la_CPPFLAGS = \
+ 	-I$(top_srcdir)/sysdeps/bfd/opcodes \
+ 	@SERVER_DEPENDENCIES_CFLAGS@ @server_cflags@
+ 
++else
++libmonodebuggerbfdglue_la_LIBADD = -lopcodes -lbfd
++
++libmonodebuggerbfdglue_la_CPPFLAGS = \
++	@SERVER_DEPENDENCIES_CFLAGS@ @server_cflags@
++
++endif
++
++libmonodebuggerbfdglue_la_LDFLAGS = \
++	-no-undefined -module -export-dynamic -shared
++
+ EXTRA_libmonodebuggerserver_la_SOURCES = \
+ 	i386-arch.c			\
+ 	i386-arch.h			\
+diff --git a/sysdeps/server/bfdglue.c b/sysdeps/server/bfdglue.c
+index 9a741ac..e2138e7 100644
+--- a/sysdeps/server/bfdglue.c
++++ b/sysdeps/server/bfdglue.c
+@@ -1,3 +1,5 @@
++#include <config.h>
++
+ #include <bfdglue.h>
+ #include <signal.h>
+ #include <string.h>
+@@ -246,7 +248,11 @@ bfd_glue_get_errormsg (void)
+ guint32
+ bfd_glue_get_section_size (asection *p)
+ {
++#ifdef HAVE_ASECTION_RAWSIZE
++	return p->rawsize ? p->rawsize : p->size;
++#else
+ 	return p->_raw_size;
++#endif
+ }
+ 
+ BfdGlueSectionFlags
+@@ -350,4 +356,4 @@ guint64
+ bfd_glue_get_start_address (bfd *abfd)
+ {
+ 	return bfd_get_start_address (abfd);
+-}
+\ No newline at end of file
++}
diff --git a/dev-util/mono-debugger/metadata.xml b/dev-util/mono-debugger/metadata.xml
new file mode 100644
index 000000000000..e85974a7fa17
--- /dev/null
+++ b/dev-util/mono-debugger/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>dotnet</herd>
+</pkgmetadata>
diff --git a/dev-util/mono-debugger/mono-debugger-2.10.ebuild b/dev-util/mono-debugger/mono-debugger-2.10.ebuild
new file mode 100644
index 000000000000..d3afab099b90
--- /dev/null
+++ b/dev-util/mono-debugger/mono-debugger-2.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit go-mono mono autotools flag-o-matic eutils
+
+DESCRIPTION="Debugger for .NET managed and unmanaged applications"
+HOMEPAGE="http://www.mono-project.com/"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+# bah, tests fail. Needs to be fixed ...
+RESTRICT="test"
+
+#Bundles jay
+# Binutils is needed for libbfd
+RDEPEND="!!=dev-lang/mono-2.2
+	sys-devel/binutils
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	!dev-lang/mercury"
+
+src_prepare() {
+	go-mono_src_prepare
+
+	epatch "${FILESDIR}/${P}-glib2.32.patch"
+
+	# Allow compilation against system libbfd, bnc#662581
+	epatch "${FILESDIR}/${PN}-2.8-system-bfd.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# Let's go for extra safety to avoid runtime errors, until
+	# upstream applies it.
+	append-ldflags -Wl,--no-undefined
+
+	go-mono_src_configure \
+		--with-system-libbfd \
+		--disable-static
+}
+
+src_compile() {
+	emake -j1
+}
diff --git a/dev-util/monodevelop-database/Manifest b/dev-util/monodevelop-database/Manifest
new file mode 100644
index 000000000000..2967dab97af2
--- /dev/null
+++ b/dev-util/monodevelop-database/Manifest
@@ -0,0 +1 @@
+DIST monodevelop-database-3.0.2.tar.bz2 432109 SHA256 1d447100f8998016aa7e4601832b6faad8469b5646f3d5d3e45d7b674c6ba925 SHA512 637938983d6100cd8a407d87be3869c51f99c74cf9eaf5b45a7c71cf87dbb42c23c7755f4ad3e12e9cea689bb7002329b61024417af08e6d43a29086adeaf4cb WHIRLPOOL faced66e627c4930bee1fa0067e3087a987e370ccf7d9470d969008d849885b2cf5b70aaf733f4c63515819e52fa5cbde2998fbbdac3699ecf72d868c3896fa3
diff --git a/dev-util/monodevelop-database/metadata.xml b/dev-util/monodevelop-database/metadata.xml
new file mode 100644
index 000000000000..e85974a7fa17
--- /dev/null
+++ b/dev-util/monodevelop-database/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>dotnet</herd>
+</pkgmetadata>
diff --git a/dev-util/monodevelop-database/monodevelop-database-3.0.2.ebuild b/dev-util/monodevelop-database/monodevelop-database-3.0.2.ebuild
new file mode 100644
index 000000000000..53c2a6a35315
--- /dev/null
+++ b/dev-util/monodevelop-database/monodevelop-database-3.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit mono multilib versionator
+
+DESCRIPTION="Database Browser Extension for MonoDevelop"
+HOMEPAGE="http://www.monodevelop.com/"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="=dev-util/monodevelop-$(get_version_component_range 1-2)*"
+
+DEPEND="${RDEPEND}
+	x11-misc/shared-mime-info
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_install() {
+	default
+	mono_multilib_comply
+}
diff --git a/dev-util/monodevelop-debugger-gdb/Manifest b/dev-util/monodevelop-debugger-gdb/Manifest
new file mode 100644
index 000000000000..b8f00aa3df6f
--- /dev/null
+++ b/dev-util/monodevelop-debugger-gdb/Manifest
@@ -0,0 +1 @@
+DIST monodevelop-debugger-gdb-3.0.2.tar.bz2 16301 SHA256 e4b37adbbaa56775f35c34e5fd89876879671c82b92691119d9a57b47a229aec SHA512 b6141472a746678083c45401aa171011e1e325b46acd6f50675be22e447cbe4d7a1fb904920495f2e3b73404cb759fe82de0deeaeceaf70d9baf7850e9e66a85 WHIRLPOOL c071c641b2147fe7ce2e02f46620999f833c4b008ac6374a8278e451ed6e586750f345573fa777e7ca246591cf67d83d8c120ce9c1ba5acd16b3b9509e3b1b88
diff --git a/dev-util/monodevelop-debugger-gdb/metadata.xml b/dev-util/monodevelop-debugger-gdb/metadata.xml
new file mode 100644
index 000000000000..d35e9300c540
--- /dev/null
+++ b/dev-util/monodevelop-debugger-gdb/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>dotnet</herd>
+</pkgmetadata>
diff --git a/dev-util/monodevelop-debugger-gdb/monodevelop-debugger-gdb-3.0.2.ebuild b/dev-util/monodevelop-debugger-gdb/monodevelop-debugger-gdb-3.0.2.ebuild
new file mode 100644
index 000000000000..019c636413ee
--- /dev/null
+++ b/dev-util/monodevelop-debugger-gdb/monodevelop-debugger-gdb-3.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit mono multilib versionator
+
+DESCRIPTION="GDB Extension for MonoDevelop"
+HOMEPAGE="http://www.monodevelop.com/"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/mono-2.4
+	=dev-util/monodevelop-$(get_version_component_range 1-2)*
+	sys-devel/gdb"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_configure() {
+	./configure --prefix=/usr
+}
+
+src_install() {
+	default
+	mono_multilib_comply
+}
diff --git a/dev-util/monodevelop/Manifest b/dev-util/monodevelop/Manifest
new file mode 100644
index 000000000000..159601d531b4
--- /dev/null
+++ b/dev-util/monodevelop/Manifest
@@ -0,0 +1 @@
+DIST monodevelop-3.0.2.tar.bz2 17499208 SHA256 e214f5170c3d57a5ce1a9d9000b043f257d0b5f0bba985875010fc8217e27ff5 SHA512 e2bb19b1968dec96e0dcca0370bcda6666bad6e45ae8749ec2b65b96d7e7312e63c551c3fc7a508ea08c44e5bb3ee06d5c91123c3b74936eb50504263581f12f WHIRLPOOL 64d94a9506a5c6bacfa569a0bd896f85b134d585a6f54fa896da163fe384712432d02ad60c2b56518a44139fef53f47dc61728e84b181bb3d44d558ff69682f3
diff --git a/dev-util/monodevelop/files/monodevelop-3.0.2-nowarningerrors.patch b/dev-util/monodevelop/files/monodevelop-3.0.2-nowarningerrors.patch
new file mode 100644
index 000000000000..897528aff493
--- /dev/null
+++ b/dev-util/monodevelop/files/monodevelop-3.0.2-nowarningerrors.patch
@@ -0,0 +1,22 @@
+--- a/src/core/MonoDevelop.Core/Makefile.am
++++ b/src/core/MonoDevelop.Core/Makefile.am
+@@ -394,7 +394,7 @@
+ all: $(ASSEMBLY) $(ASSEMBLY).mdb
+ 
+ $(ASSEMBLY): $(build_sources) $(build_resources)
+-	$(CSC) $(CSC_FLAGS) -warnaserror -unsafe -debug -out:$@ -target:library $(REFS) $(build_resources:%=/resource:%) $(build_sources) \
++	$(CSC) $(CSC_FLAGS) -unsafe -debug -out:$@ -target:library $(REFS) $(build_resources:%=/resource:%) $(build_sources) \
+ 	&& cp $(srcdir)/$(CONFIG) $(top_builddir)/build/bin
+ 
+ $(ASSEMBLY).mdb: $(ASSEMBLY)
+--- a/src/core/MonoDevelop.Core/Makefile.in
++++ b/src/core/MonoDevelop.Core/Makefile.in
+@@ -809,7 +809,7 @@
+ all: $(ASSEMBLY) $(ASSEMBLY).mdb
+ 
+ $(ASSEMBLY): $(build_sources) $(build_resources)
+-	$(CSC) $(CSC_FLAGS) -warnaserror -unsafe -debug -out:$@ -target:library $(REFS) $(build_resources:%=/resource:%) $(build_sources) \
++	$(CSC) $(CSC_FLAGS) -unsafe -debug -out:$@ -target:library $(REFS) $(build_resources:%=/resource:%) $(build_sources) \
+ 	&& cp $(srcdir)/$(CONFIG) $(top_builddir)/build/bin
+ 
+ $(ASSEMBLY).mdb: $(ASSEMBLY)
diff --git a/dev-util/monodevelop/files/monodevelop-3.0.2-pc-fix.patch b/dev-util/monodevelop/files/monodevelop-3.0.2-pc-fix.patch
new file mode 100644
index 000000000000..6d55329d880b
--- /dev/null
+++ b/dev-util/monodevelop/files/monodevelop-3.0.2-pc-fix.patch
@@ -0,0 +1,8 @@
+--- monodevelop-3.0.2/monodevelop-core-addins.pc.in	2012-05-23 23:31:15.000000000 +0200
++++ monodevelop-core-addins.pc.in	2012-06-16 13:34:17.252945870 +0200
+@@ -6,4 +6,4 @@
+ Name: MonoDevelop Core Add-ins
+ Description: MonoDevelop Core Add-ins
+ Version: @VERSION@
+-Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
++Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
diff --git a/dev-util/monodevelop/metadata.xml b/dev-util/monodevelop/metadata.xml
new file mode 100644
index 000000000000..d35e9300c540
--- /dev/null
+++ b/dev-util/monodevelop/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>dotnet</herd>
+</pkgmetadata>
diff --git a/dev-util/monodevelop/monodevelop-3.0.2-r1.ebuild b/dev-util/monodevelop/monodevelop-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..83165237af0d
--- /dev/null
+++ b/dev-util/monodevelop/monodevelop-3.0.2-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit fdo-mime gnome2-utils mono versionator eutils
+
+DESCRIPTION="Integrated Development Environment for .NET"
+HOMEPAGE="http://www.monodevelop.com/"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+subversion +git"
+
+RDEPEND=">=dev-lang/mono-2.10.9
+	>=dev-dotnet/gconf-sharp-2.24.0
+	>=dev-dotnet/glade-sharp-2.12.9
+	>=dev-dotnet/gnome-sharp-2.24.0
+	>=dev-dotnet/gnomevfs-sharp-2.24.0
+	>=dev-dotnet/gtk-sharp-2.12.9
+	>=dev-dotnet/mono-addins-0.6[gtk]
+	>=dev-dotnet/xsp-2
+	dev-util/ctags
+	sys-apps/dbus[X]
+	|| (
+		www-client/firefox
+		www-client/firefox-bin
+		www-client/seamonkey
+		)
+	subversion? ( dev-vcs/subversion )
+	!<dev-util/monodevelop-boo-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-java-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-database-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-debugger-gdb-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-debugger-mdb-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-vala-$(get_version_component_range 1-2)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	x11-misc/shared-mime-info"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pc-fix.patch
+	epatch "${FILESDIR}"/${P}-nowarningerrors.patch
+}
+
+src_configure() {
+	econf \
+		--disable-update-mimedb \
+		--disable-update-desktopdb \
+		--enable-monoextensions \
+		--enable-gnomeplatform \
+		$(use_enable subversion) \
+		$(use_enable git)
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-util/mpatch/Manifest b/dev-util/mpatch/Manifest
new file mode 100644
index 000000000000..f45669484759
--- /dev/null
+++ b/dev-util/mpatch/Manifest
@@ -0,0 +1 @@
+DIST mpatch-0.8.tar.bz2 115774 SHA256 b886843319a107f914f765617959989560fecf3f59b9e09ca0ad2d10643546d9 SHA512 1a05d23c923e29cc87dcc0994affd87b9b0b9257f2d410fb28ed2fe5337676274e9c8548df286a81479afa231a80805ac09f3e0e9b6c8942ebef443fbc4f96f1 WHIRLPOOL f135137ac6994a3f8b3945653f6b0fcb29d42dc638ee306781c70a81b211356d96e45abf9d8dac73c81704cfd72220d865df732278ec20807e241146612e5fc7
diff --git a/dev-util/mpatch/metadata.xml b/dev-util/mpatch/metadata.xml
new file mode 100644
index 000000000000..a732fd8b2f03
--- /dev/null
+++ b/dev-util/mpatch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer>
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-util/mpatch/mpatch-0.8-r1.ebuild b/dev-util/mpatch/mpatch-0.8-r1.ebuild
new file mode 100644
index 000000000000..f7e61ef67b45
--- /dev/null
+++ b/dev-util/mpatch/mpatch-0.8-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Patch-like tool for applying diffs which can resolve common causes of patch rejects"
+HOMEPAGE="http://oss.oracle.com/~mason/mpatch/"
+SRC_URI="http://oss.oracle.com/~mason/mpatch/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+	dobin cmd/qp cmd/mp
+}
diff --git a/dev-util/mutrace/Manifest b/dev-util/mutrace/Manifest
new file mode 100644
index 000000000000..5e3608cc8a9b
--- /dev/null
+++ b/dev-util/mutrace/Manifest
@@ -0,0 +1 @@
+DIST mutrace-0.2.tar.gz 358710 SHA256 38eb62b9c86443361b8222d7088a9dc1e8c1db6b2b01b47c4155234d230dbd23 SHA512 237ef478417a19d5967c80d285dcde68ee8ffce40af4967a3b055347272c66a6bbdfb55ed9bf36633fbaccc7c4fd9c2de09b705ab92b74eefc5e7a7170c0c545 WHIRLPOOL df7320740b0716956c1b2efda81c6a236ae4e54a219ff1f7a07ac456f9c7cc646ea678c01ef4f7b40a439d80cc0ee461dfa88da7400312d50a7f22cba5bbb5e5
diff --git a/dev-util/mutrace/files/mutrace-0.2-missing-header.patch b/dev-util/mutrace/files/mutrace-0.2-missing-header.patch
new file mode 100644
index 000000000000..aa2c32e79d5e
--- /dev/null
+++ b/dev-util/mutrace/files/mutrace-0.2-missing-header.patch
@@ -0,0 +1,10 @@
+--- backtrace-symbols.c	2009-09-30 00:30:08.000000000 +0300
++++ backtrace-symbols.c	2013-10-20 19:54:47.273470222 +0300
+@@ -49,6 +49,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <execinfo.h>
++#include "config.h"
+ #include <bfd.h>
+ #include <libiberty.h>
+ #include <dlfcn.h>
diff --git a/dev-util/mutrace/metadata.xml b/dev-util/mutrace/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/mutrace/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/mutrace/mutrace-0.2.ebuild b/dev-util/mutrace/mutrace-0.2.ebuild
new file mode 100644
index 000000000000..4755465bb5c8
--- /dev/null
+++ b/dev-util/mutrace/mutrace-0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A mutex tracer/profiler"
+HOMEPAGE="http://0pointer.de/blog/projects/mutrace.html"
+SRC_URI="http://0pointer.de/public/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+IUSE=""
+
+DEPEND="sys-devel/binutils:*"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Fails to build due to missing header, bug #430706
+	epatch "${FILESDIR}"/${PN}-0.2-missing-header.patch
+}
diff --git a/dev-util/nemiver/Manifest b/dev-util/nemiver/Manifest
new file mode 100644
index 000000000000..a752215102ef
--- /dev/null
+++ b/dev-util/nemiver/Manifest
@@ -0,0 +1 @@
+DIST nemiver-0.9.5.tar.xz 1396468 SHA256 33590e3964092cabb629a6ba8415786b054702063a944eca5fe4156048baf8d9 SHA512 c8aac934749320caab163d15520cb3eb9a981ca0311c0c9a8b29f31f6e57a7d50d0cdae663d635155f9ed3617462175949ddf2d776058880c0a243b419280b98 WHIRLPOOL 37a1e6077f8b784cfd982bf4df7cd0c9b02081f4dcfeefab15bca89fedbb1df9f8799d1c3336a5eb06b132d745a5d00700b33e8bec89e06bfd024692f1624680
diff --git a/dev-util/nemiver/metadata.xml b/dev-util/nemiver/metadata.xml
new file mode 100644
index 000000000000..aaf2445bc9e4
--- /dev/null
+++ b/dev-util/nemiver/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+  <longdescription>
+    Nemiver is an on going effort to write an easy to use standalone C/C++
+	debugger that integrates well in the GNOME environment.
+  </longdescription>
+  <use>
+	<flag name='memoryview'>Enable the optional hexadecimal memory inspection
+	with <pkg>app-editors/ghex</pkg>.</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/nemiver/nemiver-0.9.5.ebuild b/dev-util/nemiver/nemiver-0.9.5.ebuild
new file mode 100644
index 000000000000..4a5831a21c7a
--- /dev/null
+++ b/dev-util/nemiver/nemiver-0.9.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="A gtkmm front end to the GNU Debugger (gdb)"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nemiver"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="memoryview"
+
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	>=dev-cpp/glibmm-2.30:2
+	>=dev-cpp/gtkmm-3:3.0
+	>=dev-cpp/gtksourceviewmm-3:3.0
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+	>=gnome-base/libgtop-2.19
+	>=x11-libs/vte-0.28:2.90
+	>=dev-db/sqlite-3:3
+	sys-devel/gdb
+	dev-libs/boost
+	memoryview? ( >=app-editors/ghex-2.90:2 )
+"
+# FIXME: dynamiclayout needs unreleased stable gdlmm:3
+# dynamiclayout? ( >=dev-cpp/gdlmm-3.0:3 )
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-dynamiclayout \
+		--disable-static \
+		--disable-symsvis \
+		--enable-gsettings \
+		$(use_enable memoryview) \
+		ITSTOOL=$(type -P true)
+}
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
new file mode 100644
index 000000000000..a8b3cdda8e74
--- /dev/null
+++ b/dev-util/netbeans/Manifest
@@ -0,0 +1,3 @@
+DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
+DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
+DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
diff --git a/dev-util/netbeans/metadata.xml b/dev-util/netbeans/metadata.xml
new file mode 100644
index 000000000000..f8a80571336f
--- /dev/null
+++ b/dev-util/netbeans/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<email>fordfrog@gentoo.org</email>
+		<name>Miroslav Šulc</name>
+	</maintainer>
+	<longdescription>
+NetBeans is dedicated to providing rock solid software development products (NetBeans IDE, NetBeans Platform) that address the needs
+of developers, users and the businesses who rely on NetBeans as a basis for their products. NetBeans is also a vibrant community
+where people from just about any country you can think of, have the ability ask questions, give advice, make a wide variety of
+contributions and ultimately share in the success of our products. You will find students on our mailing list, developers from top
+companies and individuals looking to sharpen their skills.
+
+In June of 2000 NetBeans was made Open Source by Sun Microsystems who remains the project sponsor. Today two products exist: the
+NetBeans IDE and NetBeans Platform. Both products are free for commercial and noncommercial use. The source code to both are available
+to anyone, to reuse as they see fit, under the terms of use.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/netbeans/netbeans-8.0.2.ebuild b/dev-util/netbeans/netbeans-8.0.2.ebuild
new file mode 100644
index 000000000000..d3312948c045
--- /dev/null
+++ b/dev-util/netbeans/netbeans-8.0.2.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="linguas_af? ( ${ALL_URLS} )
+	linguas_ar? ( ${ALL_URLS} )
+	linguas_bg? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_nl? ( ${ALL_URLS} )
+	linguas_pl? ( ${ALL_URLS} )
+	linguas_pt_BR? ( ${ALL_URLS} )
+	linguas_pt_PT? ( ${ALL_URLS} )
+	linguas_ro? ( ${ALL_URLS} )
+	linguas_ru? ( ${ALL_URLS} )
+	linguas_si? ( ${ALL_URLS} )
+	linguas_sq? ( ${ALL_URLS} )
+	linguas_sr? ( ${ALL_URLS} )
+	linguas_sv? ( ${ALL_URLS} )
+	linguas_ta_IN? ( ${ALL_URLS} )
+	linguas_tl? ( ${ALL_URLS} )
+	linguas_tr? ( ${ALL_URLS} )
+	linguas_vi? ( ${ALL_URLS} )
+	linguas_zh_CN? ( ${ALL_URLS} )
+	linguas_zh_TW? ( ${ALL_URLS} )
+"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="amd64 x86"
+IUSE_NETBEANS_MODULES="
+	+netbeans_modules_apisupport
+	netbeans_modules_cnd
+	netbeans_modules_dlight
+	netbeans_modules_enterprise
+	netbeans_modules_ergonomics
+	netbeans_modules_extide
+	netbeans_modules_groovy
+	+netbeans_modules_java
+	netbeans_modules_javacard
+	+netbeans_modules_javafx
+	netbeans_modules_mobility
+	netbeans_modules_php
+	+netbeans_modules_profiler
+	netbeans_modules_webcommon
+	+netbeans_modules_websvccommon"
+IUSE_LINGUAS="
+	linguas_af
+	linguas_ar
+	linguas_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_nl
+	linguas_pl
+	linguas_pt_BR
+	linguas_pt_PT
+	linguas_ro
+	linguas_ru
+	linguas_si
+	linguas_sq
+	linguas_sr
+	linguas_sv
+	linguas_ta_IN
+	linguas_tl
+	linguas_tr
+	linguas_vi
+	linguas_zh_CN
+	linguas_zh_TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
+S="${WORKDIR}"
+
+DEPEND="virtual/jdk:1.7
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}
+	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
+	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
+	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
+	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
+	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
+	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
+	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
+	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
+	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
+	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
+	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
+	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
+	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
+	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
+	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
+	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
+JAVA_PKG_BSFIX="off"
+NBLOCALES=""
+
+pkg_setup() {
+	for lingua in ${IUSE_LINGUAS} ; do
+		local lang=${lingua/linguas_/}
+
+		if [[ "${lang}" = "ar" ]] ; then
+			lang="ar_EG,ar_SA"
+		elif [[ "${lang}" = "es" ]] ; then
+			lang="es,es_CO"
+		elif [[ "${lang}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id" ]] ; then
+			lang="in_ID"
+		elif [[ "${lang}" = "nl" ]] ; then
+			lang="nl_BE,nl_NL"
+		elif [[ "${lang}" = "tl" ]] ; then
+			lang="fil_PH"
+		fi
+
+		if use ${lingua} ; then
+			if [ -z "${NBLOCALES}" ] ; then
+				NBLOCALES="${lang}"
+			else
+				NBLOCALES="${NBLOCALES},${lang}"
+			fi
+		fi
+	done
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	if [ -n "${NBLOCALES}" ] ; then
+		unpack $(basename ${SOURCE_URL})
+		unpack $(basename ${L10N_URL})
+
+		einfo "Deleting bundled jars..."
+		find -name "*.jar" -type f -delete
+
+		unpack netbeans-8.0.2-build.xml.patch.bz2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Deleting bundled class files..."
+		find -name "*.class" -type f | xargs rm -vf
+
+		epatch netbeans-8.0.2-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
+		einfo "the locale is built for Netbeans."
+		einfo "If you want to force specific locale, use --locale argument, for example:"
+		einfo "${PN}-${SLOT} --locale de"
+		einfo "${PN}-${SLOT} --locale pt:BR"
+	fi
+
+	if use linguas_ar ; then
+		einfo
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_gl ; then
+		einfo
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans."
+	fi
+}
diff --git a/dev-util/ninja-ide/Manifest b/dev-util/ninja-ide/Manifest
new file mode 100644
index 000000000000..256a7610c50d
--- /dev/null
+++ b/dev-util/ninja-ide/Manifest
@@ -0,0 +1,3 @@
+DIST ninja-ide-2.1.1.tar.gz 737456 SHA256 534a891dfdaa262fd6465d2d72672eb29e494401968ba31c483f9eab31f3d5a8 SHA512 4ecc9e09ce9e68fa3a883f326a59d6c5fc2c52e2b8e936da0d3c57974b76ce11d1c171bcbce29ab676818efedab10bf282d28e2d43eed4c00d1b9d1d1807e48c WHIRLPOOL 7b42097df4725b3747e6c774c1ff206dae0344f860ffea1ac8bc2212a2042cfb66b8f33a799c395ed58bbbd8348f5045e09720f549b0974b65ba80509980d1af
+DIST ninja-ide-2.2.tar.gz 763910 SHA256 2f2a46f33a81229ebc63b34cc52e76625ce62a9be0f107c4c3b91ba3c159a409 SHA512 311fd94a2595ff962cd41bc7e84dd1d9d9b8feb2ea0ffdbbbd52735661f48d0a3e97eaca50a83100f66e37043b9554ca67fdd64853111c85b3a54c085b953bcb WHIRLPOOL 735cbedae901a1ce298cde67f26288f03df621fb698660eb9e7431e314a064473f12fe3a6ac89e7bc2352e2ca2b77d5e3ac4f6b4d00fc250183cf0d552d8f559
+DIST ninja-ide-2.3.tar.gz 650762 SHA256 79012ba8e526e126d54ba7b70fa6fcf61dfadb478624a74c299a0740c170d9ac SHA512 c449620c603060cb9dcc64ffa8c5a778a3993501c906b89a8ece1691ec85504521c893b03b8536c16d9a3e20c10fbc29b0fbfdf57250eb68a7284dca54dbaca9 WHIRLPOOL 79182e28bbef2592ef9ffeae301d0a48a87765121169e505fbe1364961e3286425d2a44b1d4e637bf3ccdea22f4cce3333a55ab8a855a80f1b167e3220ea84ca
diff --git a/dev-util/ninja-ide/files/ninja-ide-2.1.1-lang.patch b/dev-util/ninja-ide/files/ninja-ide-2.1.1-lang.patch
new file mode 100644
index 000000000000..a374dedde1f3
--- /dev/null
+++ b/dev-util/ninja-ide/files/ninja-ide-2.1.1-lang.patch
@@ -0,0 +1,26 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Oct  9 20:22:45 UTC 2012
+Subject: build system
+
+add install rules for translations
+
+--- setup.py
++++ setup.py
+@@ -95,14 +95,15 @@
+ 
+     # include all resources
+     "include_package_data": True,
+-    "package_data": {'': ['*.png', '*.json', '*.qss',
+-        '*.js', '*.html', '*.css']},
++    "package_data": {'': ['*.png', '*.gif', '*.jpg', '*.json', '*.qss',
++        '*.js', '*.html', '*.css', '*.qm']},
+ 
+     # include ninja pkg and setup the run script
+     "packages": find_packages() + [
+         'ninja_ide/addins',
+         'ninja_ide/addins/syntax',
+         'ninja_ide/addins/theme',
++        'ninja_ide/addins/lang',
+         'ninja_ide/doc',
+         'ninja_ide/doc/css',
+         'ninja_ide/doc/img',
diff --git a/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch b/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch
new file mode 100644
index 000000000000..f3eb64bf315a
--- /dev/null
+++ b/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch
@@ -0,0 +1,43 @@
+https://github.com/ninja-ide/ninja-ide/commit/f19cffa29646f1f9bc015597080b8ebc0ed83530.patch
+https://github.com/ninja-ide/ninja-ide/commit/c722e86c4e497efac56de674c47d5e094ea4c5c5.patch
+
+backported by hasufell@gentoo.org for 2.1.1
+
+--- ninja_ide/gui/editor/highlighter.py
++++ ninja_ide/gui/editor/highlighter.py
+@@ -276,7 +276,7 @@
+         hls = []
+         block = self.currentBlock()
+         user_data = block.userData()
+-        if user_data is None:
++        if user_data is None or not isinstance(user_data, SyntaxUserData):
+             user_data = SyntaxUserData(False)
+         user_data.clear_data()
+         block_number = block.blockNumber()
+@@ -321,7 +321,7 @@
+         hls = []
+         block = self.currentBlock()
+         user_data = block.userData()
+-        if user_data is None:
++        if user_data is None or not isinstance(user_data, SyntaxUserData):
+             user_data = SyntaxUserData(False)
+         user_data.clear_data()
+         block_number = block.blockNumber()
+@@ -409,7 +409,7 @@
+         block = self.document().begin()
+         while block.isValid():
+             user_data = block.userData()
+-            if (user_data is not None) and (user_data.error == True):
++            if (user_data is not None) and isinstance(user_data, SyntaxUserData) and (user_data.error == True):
+                 errors_lines.append(block.blockNumber())
+             block = block.next()
+         return errors_lines
+@@ -462,7 +462,7 @@
+                ((st_fmt == STYLES['comment']) and
+                (self.previousBlockState() != 0))) and \
+                 (len(start_collides) == 0):
+-                if user_data is not None:
++                if user_data is not None and isinstance(user_data, SyntaxUserData):
+                     style = highlight_errors(style, user_data)
+                 self.setFormat(start, length, style)
+             else:
diff --git a/dev-util/ninja-ide/files/ninja-ide-2.2-python2_6.patch b/dev-util/ninja-ide/files/ninja-ide-2.2-python2_6.patch
new file mode 100644
index 000000000000..c01465dd9140
--- /dev/null
+++ b/dev-util/ninja-ide/files/ninja-ide-2.2-python2_6.patch
@@ -0,0 +1,27 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Apr 24 21:05:44 UTC 2013
+Subject: fix compatibility with python:2.6
+
+--- ninja_ide/core/file_manager.py
++++ ninja_ide/core/file_manager.py
+@@ -26,7 +26,7 @@
+ 
+ from ninja_ide.core import settings
+ 
+-if sys.version_info.major == 3:
++if sys.version_info[0] == 3:
+     python3 = True
+ else:
+     python3 = False
+
+--- ninja_ide/gui/editor/editor.py
++++ ninja_ide/gui/editor/editor.py
+@@ -68,7 +68,7 @@
+ logger = NinjaLogger('ninja_ide.gui.editor.editor')
+ 
+ 
+-if sys.version_info.major == 3:
++if sys.version_info[0] == 3:
+     python3 = True
+ else:
+     python3 = False
diff --git a/dev-util/ninja-ide/files/ninja-ide-2.2-syntax.patch b/dev-util/ninja-ide/files/ninja-ide-2.2-syntax.patch
new file mode 100644
index 000000000000..0430b6448983
--- /dev/null
+++ b/dev-util/ninja-ide/files/ninja-ide-2.2-syntax.patch
@@ -0,0 +1,9 @@
+--- ninja_tests/core/examples/file_for_tests.py
++++ ninja_tests/core/examples/file_for_tests.py
+@@ -1,4 +1,4 @@
+ # -*- coding: utf-8 -*-
+ 
+-print 'testing'
+-print 'ñandú testing'
++print('testing')
++print('ñandú testing')
diff --git a/dev-util/ninja-ide/files/ninja-ide-2.2-version.patch b/dev-util/ninja-ide/files/ninja-ide-2.2-version.patch
new file mode 100644
index 000000000000..a060b2bf48d6
--- /dev/null
+++ b/dev-util/ninja-ide/files/ninja-ide-2.2-version.patch
@@ -0,0 +1,9 @@
+Correct package version.
+
+Patch by Aaron Burnett <awol.lordofthepants@gmail.com>
+
+--- ninja_ide/__init__.py
++++ ninja_ide/__init__.py
+@@ -29,1 +29,1 @@
+-__version__ = "2.2-dev"
++__version__ = "2.2"
diff --git a/dev-util/ninja-ide/files/ninja-ide-2.3-python2_6.patch b/dev-util/ninja-ide/files/ninja-ide-2.3-python2_6.patch
new file mode 100644
index 000000000000..c01465dd9140
--- /dev/null
+++ b/dev-util/ninja-ide/files/ninja-ide-2.3-python2_6.patch
@@ -0,0 +1,27 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Apr 24 21:05:44 UTC 2013
+Subject: fix compatibility with python:2.6
+
+--- ninja_ide/core/file_manager.py
++++ ninja_ide/core/file_manager.py
+@@ -26,7 +26,7 @@
+ 
+ from ninja_ide.core import settings
+ 
+-if sys.version_info.major == 3:
++if sys.version_info[0] == 3:
+     python3 = True
+ else:
+     python3 = False
+
+--- ninja_ide/gui/editor/editor.py
++++ ninja_ide/gui/editor/editor.py
+@@ -68,7 +68,7 @@
+ logger = NinjaLogger('ninja_ide.gui.editor.editor')
+ 
+ 
+-if sys.version_info.major == 3:
++if sys.version_info[0] == 3:
+     python3 = True
+ else:
+     python3 = False
diff --git a/dev-util/ninja-ide/files/ninja-ide-2.3-syntax.patch b/dev-util/ninja-ide/files/ninja-ide-2.3-syntax.patch
new file mode 100644
index 000000000000..0430b6448983
--- /dev/null
+++ b/dev-util/ninja-ide/files/ninja-ide-2.3-syntax.patch
@@ -0,0 +1,9 @@
+--- ninja_tests/core/examples/file_for_tests.py
++++ ninja_tests/core/examples/file_for_tests.py
+@@ -1,4 +1,4 @@
+ # -*- coding: utf-8 -*-
+ 
+-print 'testing'
+-print 'ñandú testing'
++print('testing')
++print('ñandú testing')
diff --git a/dev-util/ninja-ide/metadata.xml b/dev-util/ninja-ide/metadata.xml
new file mode 100644
index 000000000000..021c8cade6ca
--- /dev/null
+++ b/dev-util/ninja-ide/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+		<description>Maintainer, assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>awol.lordofthepants@gmail.com</email>
+		<name>Aaron Burnett</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<upstream>
+		<changelog>https://github.com/ninja-ide/ninja-ide/commits/master</changelog>
+		<doc lang="en">https://github.com/ninja-ide/ninja-ide/wiki</doc>
+		<bugs-to>https://github.com/ninja-ide/ninja-ide/issues</bugs-to>
+		<remote-id type="github">ninja-ide/ninja-ide</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		NINJA-IDE (from the recursive acronym: "Ninja-IDE Is Not Just
+		Another IDE"), is a cross-platform integrated development
+		environment (IDE). NINJA-IDE runs on Linux/X11, Mac OS X and
+		Windows desktop operating systems, and allows developers to create
+		applications for several purposes using all the tools and utilities
+		of NINJA-IDE, making the task of writing software easier and more
+		enjoyable.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/ninja-ide/ninja-ide-2.1.1-r3.ebuild b/dev-util/ninja-ide/ninja-ide-2.1.1-r3.ebuild
new file mode 100644
index 000000000000..667359ebbddf
--- /dev/null
+++ b/dev-util/ninja-ide/ninja-ide-2.1.1-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: tests
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils distutils-r1 vcs-snapshot
+
+DESCRIPTION="Ninja-IDE Is Not Just Another IDE"
+HOMEPAGE="http://www.ninja-ide.org"
+SRC_URI="https://github.com/ninja-ide/ninja-ide/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/PyQt4[webkit]
+	dev-python/pyinotify"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-lang.patch )
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon -s 256 icon.png ${PN}.png
+	make_desktop_entry ${PN} "NINJA-IDE"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/ninja-ide/ninja-ide-2.1.1-r5.ebuild b/dev-util/ninja-ide/ninja-ide-2.1.1-r5.ebuild
new file mode 100644
index 000000000000..30d75fe1b573
--- /dev/null
+++ b/dev-util/ninja-ide/ninja-ide-2.1.1-r5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: tests
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils distutils-r1 vcs-snapshot
+
+DESCRIPTION="Ninja-IDE Is Not Just Another IDE"
+HOMEPAGE="http://www.ninja-ide.org"
+SRC_URI="https://github.com/ninja-ide/ninja-ide/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-lang.patch
+	"${FILESDIR}"/${P}-syntaxhighlighting.patch
+	)
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon -s 256 icon.png ${PN}.png
+	make_desktop_entry ${PN} "NINJA-IDE"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/ninja-ide/ninja-ide-2.2.ebuild b/dev-util/ninja-ide/ninja-ide-2.2.ebuild
new file mode 100644
index 000000000000..da92a49b29de
--- /dev/null
+++ b/dev-util/ninja-ide/ninja-ide-2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: tests
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils distutils-r1 vcs-snapshot
+
+DESCRIPTION="Ninja-IDE Is Not Just Another IDE"
+HOMEPAGE="http://www.ninja-ide.org"
+SRC_URI="https://github.com/ninja-ide/ninja-ide/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-syntax.patch
+	"${FILESDIR}"/${P}-python2_6.patch
+	"${FILESDIR}"/${P}-version.patch
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon -s 256 icon.png ${PN}.png
+	make_desktop_entry ${PN} "NINJA-IDE"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/ninja-ide/ninja-ide-2.3.ebuild b/dev-util/ninja-ide/ninja-ide-2.3.ebuild
new file mode 100644
index 000000000000..32468e2e1beb
--- /dev/null
+++ b/dev-util/ninja-ide/ninja-ide-2.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# XXX: tests
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils distutils-r1 vcs-snapshot
+
+DESCRIPTION="Ninja-IDE Is Not Just Another IDE"
+HOMEPAGE="http://www.ninja-ide.org"
+SRC_URI="https://github.com/ninja-ide/ninja-ide/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/PyQt4[X,declarative,webkit,${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-syntax.patch
+	"${FILESDIR}"/${P}-python2_6.patch
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon -s 256 icon.png ${PN}.png
+	make_desktop_entry ${PN} "NINJA-IDE"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
new file mode 100644
index 000000000000..25b5d30313dc
--- /dev/null
+++ b/dev-util/ninja/Manifest
@@ -0,0 +1,3 @@
+DIST ninja-1.5.1.tar.gz 163437 SHA256 fba77b9ed4b4dd0e86c4513776938dc64bd4508dc2055b04c0c6df68bcfa397d SHA512 ab82389ee88bd68ec57e720dabb47494371990dca581cf9bb35650177164f04bf41c81ab3e5019a370eeacc7f5f49ae81d41d8b21e1b07cc8abedce37e00da61 WHIRLPOOL 3fdd76505aa39a3960c8d47fc04e7fb12f613561ecf8f29d88329c06b78a0ef47fda02226d6ebb12718676c2ea9dc6bf7352564150de8b92f1b0c189bcf21e3a
+DIST ninja-1.5.3.tar.gz 168829 SHA256 7c953b5a7c26cfcd082882e3f3e2cd08fee8848ad228bb47223b18ea18777ec0 SHA512 6d8cba5838d796bf50a17ca760498309477342422d1ad971e8fd030d4dd06aa9095ce27c2a02f89504cdf3aa5a8ba5af395a2c805b5c45e266a8250985212eea WHIRLPOOL 6b6116e4bf8a2c622559cee7f2f9c48f4f896e878eacb880d9bad483eaa2f18fe9b6a11210ca396679177850b0df5377de52110c47ac22e6fd8641cbd7ccabe3
+DIST ninja-1.6.0.tar.gz 174501 SHA256 b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7 SHA512 551a9e14b95c2d2ddad6bee0f939a45614cce86719748dc580192dd122f3671e3d95fd6a6fb3facb2d314ba100d61a004af4df77f59df119b1b95c6fe8c38875 WHIRLPOOL 74d10df3d112c6cbd524f802978f1a56d2643767d947cff33a276a29f89485576f7d6b40597f9eac1db1446ae22c7f2c73c9d1f7795132e0254fa970df37063b
diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml
new file mode 100644
index 000000000000..d0d2e6d9f0f4
--- /dev/null
+++ b/dev-util/ninja/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>chromium</herd>
+	<upstream>
+		<remote-id type="github">martine/ninja</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/ninja/ninja-1.5.1.ebuild b/dev-util/ninja/ninja-1.5.1.ebuild
new file mode 100644
index 000000000000..008fa7a01fa4
--- /dev/null
+++ b/dev-util/ninja/ninja-1.5.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [ "${PV}" = "999999" ]; then
+	EGIT_REPO_URI="git://github.com/martine/ninja.git http://github.com/martine/ninja.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm ~arm64 ~m68k ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="http://github.com/martine/ninja"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax zsh-completion"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	zsh-completion? ( app-shells/zsh )
+	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py uses CFLAGS instead of CXXFLAGS
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build "${PYTHON}" bootstrap.py --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		"${PYTHON}" configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja-build -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		dohtml -r doc/doxygen/html/*
+		dohtml doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/"${PN}".vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/${PN}.vim"
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins misc/zsh-completion _ninja
+	fi
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ${PN} ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-1.5.3.ebuild b/dev-util/ninja/ninja-1.5.3.ebuild
new file mode 100644
index 000000000000..dc1a2dd02031
--- /dev/null
+++ b/dev-util/ninja/ninja-1.5.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="alpha amd64 arm arm64 ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="http://github.com/martine/ninja"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax zsh-completion"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	zsh-completion? ( app-shells/zsh )
+	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py uses CFLAGS instead of CXXFLAGS
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build "${PYTHON}" bootstrap.py --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		"${PYTHON}" configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja-build -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		dohtml -r doc/doxygen/html/*
+		dohtml doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/"${PN}".vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/${PN}.vim"
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins misc/zsh-completion _ninja
+	fi
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ${PN} ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-1.6.0.ebuild b/dev-util/ninja/ninja-1.6.0.ebuild
new file mode 100644
index 000000000000..1df91aa7c83c
--- /dev/null
+++ b/dev-util/ninja/ninja-1.6.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="http://github.com/martine/ninja"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax zsh-completion"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	zsh-completion? ( app-shells/zsh )
+	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py uses CFLAGS instead of CXXFLAGS
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build "${PYTHON}" bootstrap.py --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		"${PYTHON}" configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja-build -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		dohtml -r doc/doxygen/html/*
+		dohtml doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/"${PN}".vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/${PN}.vim"
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins misc/zsh-completion _ninja
+	fi
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ${PN} ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
new file mode 100644
index 000000000000..fa0d563643dc
--- /dev/null
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/martine/ninja.git"
+else
+	SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="http://github.com/martine/ninja"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax zsh-completion"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	zsh-completion? ( app-shells/zsh )
+	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py uses CFLAGS instead of CXXFLAGS
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		"${PYTHON}" configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja-build -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		dohtml -r doc/doxygen/html/*
+		dohtml doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/"${PN}".vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/${PN}.vim"
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins misc/zsh-completion _ninja
+	fi
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ${PN} ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
new file mode 100644
index 000000000000..57990bd10ce4
--- /dev/null
+++ b/dev-util/nsis/Manifest
@@ -0,0 +1,3 @@
+DIST makensis_64bit.patch 18743 SHA256 df6377f0e21ef585064c3dd999550e1aef9df8c2224833167716a7166d93d22a SHA512 e04e0f6255708490e4fc2929bbfca442b7e59b5f05ea9b10145e556e59317e81452e77f9214df011bc7d6b45c79ce13396e2aeb85ce2d7d48e95721e53340c2b WHIRLPOOL c0b1ab7c12e43f8ff8d4fd543ac0600d76b1d2f870c89b25fd22aaba9215f45893acadbed075a50e9428ae1d29dde971f9772846f2223163e7836c1d952036f3
+DIST nsis-2.46-src.tar.bz2 1499014 SHA256 f5f9e5e22505e44b25aea14fe17871c1ed324c1f3cc7a753ef591f76c9e8a1ae SHA512 8716cf6dc086d8b9eb3c707b3a65790bf2e2b41116243d86243514ec6b2db7c508dedef027863bbd6650b21ca5f94ef7dd6706fe14ddc151c4548ecb15858ee6 WHIRLPOOL d716a7b78b20517dff420f57ff820a5aac4654d77a3a0760ee7512aff12d9abbb8be20da888968b151571363ddc1b8c3b02cc7e51784c95ab5169b8a1ab424e3
+DIST nsis_w64-mingw.patch 10378 SHA256 e3fe5f5675ac3562ae67283914f5ecf83f313e9127a406477f04c2aeafd945d5 SHA512 b8f0f7151a53335a5b3bf49ef2a16d805642c43a238afd424541be7d64a1a543ded28479ff503da84591b358f5f71728a815b704a083b94997cfbd5246b6f2b6 WHIRLPOOL a14e5168550974947d4da50747b7dd9893117c0b6dc981bdcd8c0fa053ead8d5a61c8317e18bf9f81a10c2b2efa398c3d40a3da011cc3c3dacef241f5aaa622c
diff --git a/dev-util/nsis/files/nsis-2.46-gcc47.patch b/dev-util/nsis/files/nsis-2.46-gcc47.patch
new file mode 100644
index 000000000000..e64a8b6ba43f
--- /dev/null
+++ b/dev-util/nsis/files/nsis-2.46-gcc47.patch
@@ -0,0 +1,15 @@
+Fix building with gcc-4.7
+
+https://bugs.gentoo.org/show_bug.cgi?id=421871
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/Source/util.h
++++ b/Source/util.h
+@@ -18,6 +18,7 @@
+ #define _UTIL_H_
+ 
+ #include <string> // for std::string
++#include <unistd.h>
+ 
+ #include "boost/scoped_ptr.hpp" // for boost::scoped_ptr
+ #include "ResourceEditor.h"
diff --git a/dev-util/nsis/metadata.xml b/dev-util/nsis/metadata.xml
new file mode 100644
index 000000000000..b0b6adab8407
--- /dev/null
+++ b/dev-util/nsis/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+NSIS (Nullsoft Scriptable Install System) is a professional open source
+system to create Windows installers. It is designed to be as small and
+flexible as possible and is therefore very suitable for Internet distribution.
+
+NSIS is script-based and allows you to create the logic to handle even the
+most complex installation tasks. Many plug-ins and scripts are already
+available: you can create web installers, communicate with Windows and other
+software components, install or update shared components and more.
+</longdescription>
+  <use>
+    <flag name="config-log">Enable the logging facility (useful in debugging installers)</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">nsis</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/nsis/nsis-2.46-r1.ebuild b/dev-util/nsis/nsis-2.46-r1.ebuild
new file mode 100644
index 000000000000..0276d6a664e7
--- /dev/null
+++ b/dev-util/nsis/nsis-2.46-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+mingw32_variants=$(echo {,i{6,5,4,3}86-{,pc-,w32-,w64-}}mingw32)
+
+inherit eutils
+
+DESCRIPTION="Nullsoft Scriptable Install System"
+HOMEPAGE="http://nsis.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
+	http://f0rt.users.sourceforge.net/makensis_64bit.patch
+	http://f0rt.users.sourceforge.net/nsis_w64-mingw.patch"
+
+LICENSE="ZLIB BZIP2 CPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="bzip2 config-log doc zlib"
+RESTRICT="strip"
+
+# NSIS Menu uses wxwindows but it's all broken, so disable for now
+#	wxwindows? ( x11-libs/wxGTK )
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-0.98"
+
+S="${WORKDIR}"/${P}-src
+
+mingw_CTARGET() {
+	local i
+	for i in ${mingw32_variants} ; do
+		type -P ${i}-g++ > /dev/null && echo ${i} && return
+	done
+}
+
+pkg_pretend() {
+	[[ -n $(mingw_CTARGET) ]] && return 0
+
+	eerror "Before you could emerge nsis, you need to install mingw with C++ support"
+	eerror "Run the following commands:"
+	eerror "  emerge crossdev"
+	eerror "  USE='cxx' crossdev --stable --libc '[latest]' -t i686-w64-mingw32"
+	die "mingw is needed"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+	epatch "${DISTDIR}/makensis_64bit.patch"
+	epatch "${DISTDIR}/nsis_w64-mingw.patch"
+
+	sed -i 's/SetDefault/Append/' "${S}/Source/exehead/SConscript" || die #505996
+
+	# a dirty but effective way of killing generated docs
+	use doc || echo > Docs/src/SConscript
+}
+
+get_additional_options() {
+	echo \
+		PREFIX=/usr \
+		PREFIX_CONF=/etc \
+		PREFIX_DOC=/usr/share/doc/${PF} \
+		PREFIX_DEST=\"${D}\" \
+		VERSION=${PV} \
+		DEBUG=no \
+		STRIP=no
+	echo \
+		SKIPSTUBS=\"$(use zlib || echo zlib) $(use bzip2 || echo bzip2)\" \
+		SKIPUTILS=\"NSIS Menu\"
+	use config-log && echo NSIS_CONFIG_LOG=yes
+
+	local tcpfx=$($(mingw_CTARGET)-gcc -print-file-name=libshell32.a)
+	tcpfx=${tcpfx%/lib/libshell32.a}
+	echo \
+		PREFIX_PLUGINAPI_INC=${tcpfx}/include \
+		PREFIX_PLUGINAPI_LIB=${tcpfx}/lib
+	echo CROSS_W32=$(mingw_CTARGET)-
+}
+
+do_scons() {
+	local cmd=$1
+	eval set -- $(get_additional_options)
+	echo scons $(get_additional_options) ${cmd}
+	scons "$@" ${cmd}
+}
+
+src_compile() {
+	do_scons || die "scons failed"
+}
+
+src_install() {
+	do_scons install || die "scons failed"
+	use doc || rm -rf "${D}"/usr/share/doc/${PF}/{Docs,Examples}
+
+	fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${PF}/ /etc/nsisconf.nsh
+
+	env -uRESTRICT prepstrip "${D}/usr/bin"
+	src_strip_win32
+}
+
+src_strip_win32() {
+	# need to strip win32 binaries ourselves ... should fold this
+	# back in to prepstrip at some point
+	local STRIP_PROG=$(mingw_CTARGET)-strip
+	local STRIP_FLAGS="--strip-unneeded"
+
+	echo
+	echo "strip: ${STRIP_PROG} ${STRIP_FLAGS}"
+	local FILE
+	for FILE in $(find "${D}" -iregex '.*\.\(dll\|exe\|a\)$') ; do
+		echo "   /${FILE#${D}}"
+		${STRIP_PROG} ${STRIP_FLAGS} "${FILE}"
+	done
+}
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
new file mode 100644
index 000000000000..bac01742e600
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -0,0 +1,7 @@
+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
diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.02.0807.1535-make_cpp_fix.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.02.0807.1535-make_cpp_fix.patch
new file mode 100644
index 000000000000..53ce974024ae
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.02.0807.1535-make_cpp_fix.patch
@@ -0,0 +1,111 @@
+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>
diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch
new file mode 100644
index 000000000000..8029abc240d0
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch
@@ -0,0 +1,21 @@
+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
diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch
new file mode 100644
index 000000000000..f639b967bda0
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch
@@ -0,0 +1,89 @@
+--- 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
diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-asneeded.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-asneeded.patch
new file mode 100644
index 000000000000..c414578a73fb
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-asneeded.patch
@@ -0,0 +1,22 @@
+--- 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 -----------------------------------------------------------------------------------------------)
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
new file mode 100644
index 000000000000..288e4957a1dd
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+  <use>
+    <flag name="opencl">
+			Build OpenCL binaries.
+		</flag>
+    <flag name="cuda">
+			Build CUDA binaries.
+		</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.5.22.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.5.22.ebuild
new file mode 100644
index 000000000000..93c729bb17f7
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.5.22.ebuild
@@ -0,0 +1,146 @@
+# 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
+}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild
new file mode 100644
index 000000000000..2a29cd0fd9a4
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild
@@ -0,0 +1,155 @@
+# 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 "http://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
+}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
new file mode 100644
index 000000000000..cf13949355f0
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
@@ -0,0 +1,155 @@
+# 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 "http://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
+}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.28.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.28.ebuild
new file mode 100644
index 000000000000..ad6891a9e7ab
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.28.ebuild
@@ -0,0 +1,144 @@
+# 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
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
new file mode 100644
index 000000000000..bac01742e600
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -0,0 +1,7 @@
+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
diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
new file mode 100644
index 000000000000..ca0d1d77e107
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
+
+_print_help() {
+	cat <<- EOF
+	Usage:
+		$(basename $0) [options]
+	
+		-s | --supported   Returns by current CUDA supported gcc versions
+		-h | --help        Shows this help
+	EOF
+}
+
+case ${1} in
+	-s|--supported)
+		echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
+		exit 0
+		;;
+	-h|--help)
+		_print_help
+		exit -1
+		;;
+	*)
+		_print_help
+		exit 1
+		;;
+esac
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
new file mode 100644
index 000000000000..5e09419f5bfa
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+  <use>
+    <flag name="profiler">
+			Installs the NVIDIA CUDA visual profiler.
+		</flag>
+    <flag name="debugger">
+			Installs the CUDA debugger.
+		</flag>
+    <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
new file mode 100644
index 000000000000..ccf206b487d6
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
@@ -0,0 +1,144 @@
+# 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
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
new file mode 100644
index 000000000000..06b5fa17a7a6
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
@@ -0,0 +1,155 @@
+# 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-340.32[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 "http://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
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
new file mode 100644
index 000000000000..19a32b802640
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
@@ -0,0 +1,157 @@
+# 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 "http://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
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild
new file mode 100644
index 000000000000..67164958592b
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild
@@ -0,0 +1,155 @@
+# 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 "http://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
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild
new file mode 100644
index 000000000000..f1d65831e0d2
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild
@@ -0,0 +1,143 @@
+# 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
+}
diff --git a/dev-util/objconv/Manifest b/dev-util/objconv/Manifest
new file mode 100644
index 000000000000..4c349aa93ede
--- /dev/null
+++ b/dev-util/objconv/Manifest
@@ -0,0 +1 @@
+DIST objconv-2.32_pre20131127.zip 814334 SHA256 e0ed4a795ce46eadbf724b072e7f1e2b4c37a8a85f94a44ee9da94ed85ac12f2 SHA512 9be8f6e7f33794ade3340604508a996139c3f7a3a620efc634919e20ad29c5510b25a88df469769862d969375eefaed39c4e200b1ef25d9eff8abb1936027f7b WHIRLPOOL 6abe704f9f8f9864f7321d5abe5d3caabda364c744d6918d9f0c84fbc4dc7d0294262fef350cc9f4463a827d88bd76e8fababecda9a414d9252a15732c6a040e
diff --git a/dev-util/objconv/metadata.xml b/dev-util/objconv/metadata.xml
new file mode 100644
index 000000000000..49bf44dac71e
--- /dev/null
+++ b/dev-util/objconv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/objconv/objconv-2.32_pre20131127.ebuild b/dev-util/objconv/objconv-2.32_pre20131127.ebuild
new file mode 100644
index 000000000000..25dd51c035e8
--- /dev/null
+++ b/dev-util/objconv/objconv-2.32_pre20131127.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs unpacker
+
+DESCRIPTION="object code file converted (COFF, ELF, OMF, MACHO)"
+HOMEPAGE="http://agner.org/optimize/#objconv"
+# original URL is "http://agner.org/optimize/objconv.zip", but it's unversioned.
+# I copy those to distfiles time to time
+SRC_URI="http://dev.gentoo.org/~slyfox/distfiles/${P}.zip"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpacker_src_unpack
+	mkdir "${S}" || die
+	pushd "${S}" || die
+	unpack_zip ../source.zip
+}
+
+src_prepare() {
+	# project has extremenly poor build system (see build.sh)
+	local sources=$(echo *.cpp)
+
+	{
+		echo "objconv: ${sources//.cpp/.o}"
+		echo "	\$(CXX) -o \$@ \$^ \$(LDFLAGS)"
+	} > Makefile || die
+
+	tc-export CXX
+}
+
+src_install() {
+	dobin objconv
+	dodoc ../objconv-instructions.pdf
+}
diff --git a/dev-util/obs-service-cpanspec/Manifest b/dev-util/obs-service-cpanspec/Manifest
new file mode 100644
index 000000000000..161ae2c48cc3
--- /dev/null
+++ b/dev-util/obs-service-cpanspec/Manifest
@@ -0,0 +1,2 @@
+DIST cpanspec-20130318 2228 SHA256 5949a2604fc51cbb3e87814018e00bc3d13358d0c06722d74109312872170489 SHA512 a3150811f12af16d62f4635833a92827de8bd2260ae5e43cecf65b066d7beb2aeb1323c428e379e4a53168d3c99dd9ce988b4f41ad58026a267ab9e809df7eef WHIRLPOOL 6f3a3a1d25dd2fa6db0f0627044986397d2c9c50b38c38eaeb6b807bf6a8b9d38edb9d6cf1fb466e989a7ffdf3915a94613ee791f4af72a551b8283278e78c70
+DIST cpanspec-20130318.service 986 SHA256 4aa68921a95cc3b1ef28ad44219df8775eb337e6cdf621422dd9a90e3e2804a4 SHA512 c4191060a576cb63986dc9a115e397d4f8870a6bb10ddaf642310eb6acaf0b0c3b8d803c239e401ff85058f8ca1455058c246757ab4b53a26b884cb7f4525c3c WHIRLPOOL e2ce05c836932b84ce6c89bc396d72fe4fd5f6ebdb200dfd0517587af9d8532954ab5ac0f20917596c9af4cce767a716d6986838c84fd738d60179610fed41cc
diff --git a/dev-util/obs-service-cpanspec/metadata.xml b/dev-util/obs-service-cpanspec/metadata.xml
new file mode 100644
index 000000000000..d4b914b8debe
--- /dev/null
+++ b/dev-util/obs-service-cpanspec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. It's a wrapper around cpanspec script.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild b/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild
new file mode 100644
index 000000000000..9d0cb99bbfeb
--- /dev/null
+++ b/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-util/obs-service-download_files/Manifest b/dev-util/obs-service-download_files/Manifest
new file mode 100644
index 000000000000..8548cd2981cc
--- /dev/null
+++ b/dev-util/obs-service-download_files/Manifest
@@ -0,0 +1,2 @@
+DIST download_files-20130716 6333 SHA256 2e625a9287fd56b85e76890dde579aca4e5501f33932e183dbec342edfa54484 SHA512 2df185d535043c4652c09f8404a67d6b6e27436d01187378c21b2309bd4ea4928162dbe93a980ffc5aa212f83195facf90c602adf7984b0af7b3c14875a904e5 WHIRLPOOL 0f576c95a90794b5c4de680691990954dc6934601d232eeb316ea30eb34aec7c2a8cd97022b40ba111472789beb1cdaa0821d4ecac4e6954a2e194472e701dd9
+DIST download_files-20130716.service 1070 SHA256 6a900f6d610cdbd27aafc469fde42c4c2a20ae488b3dde6fb38b7adb1e171fd5 SHA512 3c19bc317bf4d9559d61ea388bdbb9a04fd8f3749102a52579737af9809f9dcfe045ce39feefbf08c42b52f7ca5a3d598b85609a0fb8fcefc55a7f846f13dbb2 WHIRLPOOL 397deb0f2e9a74afe62fa3d7b05062456630a97fb2dd295a4c7ef8a584cc132ccfab958fff86a67fc22e9a6936ee1d4049345f03fcca82464ed9fe58c9389f24
diff --git a/dev-util/obs-service-download_files/metadata.xml b/dev-util/obs-service-download_files/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-download_files/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-download_files/obs-service-download_files-20130716.ebuild b/dev-util/obs-service-download_files/obs-service-download_files-20130716.ebuild
new file mode 100644
index 000000000000..81ca749033ba
--- /dev/null
+++ b/dev-util/obs-service-download_files/obs-service-download_files-20130716.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	net-misc/wget
+"
diff --git a/dev-util/obs-service-download_src_package/Manifest b/dev-util/obs-service-download_src_package/Manifest
new file mode 100644
index 000000000000..babd8458dd7a
--- /dev/null
+++ b/dev-util/obs-service-download_src_package/Manifest
@@ -0,0 +1,2 @@
+DIST download_src_package-20130318 1454 SHA256 2e2f9fec6d09f27b72e270ce007bd82c7005f0dfc2e79380cdbf0174b369e39e SHA512 47c83be8f97bebd9920e7ad115c5f1ef52281c2f0b11f62b31426349d9139b8a236530a7617473535dd160326de15d1f4a629017c8e47f5e8ec09e111b179500 WHIRLPOOL 6f67b6d1081383c69d6b9785b1160056547b9f68904afd84ad829bf3bc35a47fb1fb8a61d5f3c3c27e5938b115d1610cc4defb1539e009cdfadd44778c5728c8
+DIST download_src_package-20130318.service 1054 SHA256 a4e8c4c263dfaf0920b41f9935c8c2677f951d53b420950ed22345a9f49d9d06 SHA512 b2f97f32ccd28e148f7317c4213523cc87adfc19ebb85ab5277ec62fa75ef603b6b4d65bd69e44f168c374ad890e28e69250735b1c9476f09a8dac89b3682f5f WHIRLPOOL 4d2435fe62781101fa45c53d449a0fc5ddf6dd7494e267fb313f4bc2eb487347f58756cea570b690789f2a49bed21daa2090826a98de87ee6bc2523f2d287f61
diff --git a/dev-util/obs-service-download_src_package/metadata.xml b/dev-util/obs-service-download_src_package/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-download_src_package/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild b/dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild
new file mode 100644
index 000000000000..81ca749033ba
--- /dev/null
+++ b/dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	net-misc/wget
+"
diff --git a/dev-util/obs-service-download_url/Manifest b/dev-util/obs-service-download_url/Manifest
new file mode 100644
index 000000000000..8d1f6a97da8e
--- /dev/null
+++ b/dev-util/obs-service-download_url/Manifest
@@ -0,0 +1,2 @@
+DIST download_url-20130318 2225 SHA256 e74cdb81c446e0144a6535f010fca744c73696dbfe0fa15c0d2d77de7e4bd361 SHA512 70aa703d36d7e43a8533a8b6ea15fa92e01653759a86d187184a9bae272ea10fdbf25e4a6c6a70ad59d39be88e30293fb8d8b65720b80b4e2e8f739839259cb0 WHIRLPOOL 3fa707735900fefbe8b7574b14563b7cf0d8573a8a9eba0020ca2932911b07bd884aaa6a8a0b4dd7e3b858b3d18eac4b6b84231c6ea5ae3ac9797a2b3b244320
+DIST download_url-20130318.service 849 SHA256 e889bec6a3720b15897097479c1a78c0005fe90450e08a43bd8a527de1767a02 SHA512 b32d87e490e04e561013d9d0981674be8fc63c07575bf7a2fd7282c423fe755615547e5ef19ba7fa058b2a3803714a32cbee618aa4bedcad2fe4b9c54a7172e4 WHIRLPOOL 7c6f4bcf5b029fad40a0bb83c3345fecd325447e1e7e02ff0c84707ffce8cea180206f06f4e4c2e9ecd5adabc1771810fbc34ceca1b59082b1a938d62d3fc237
diff --git a/dev-util/obs-service-download_url/metadata.xml b/dev-util/obs-service-download_url/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-download_url/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild b/dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild
new file mode 100644
index 000000000000..81ca749033ba
--- /dev/null
+++ b/dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	net-misc/wget
+"
diff --git a/dev-util/obs-service-extract_file/Manifest b/dev-util/obs-service-extract_file/Manifest
new file mode 100644
index 000000000000..f3c771637c5c
--- /dev/null
+++ b/dev-util/obs-service-extract_file/Manifest
@@ -0,0 +1,2 @@
+DIST extract_file-20130318 1828 SHA256 f73b24c762a58c77814ec298b09a8c587287e43449ab3d79cb93b26ec6a53cbf SHA512 ceb09d0c7f86a04ddc7389e97ba94105249488be267c998ab601add03cd6ec6e7fd26baf463b18d9422f3360b69ea73000ccbb331807b19ae7df95e468d8aba1 WHIRLPOOL c83e4c9a889f191c2dc1b19578b8d49be81586afb66fc0b64a64104f92a4d25a0d0422b3c79cfdb13d3405f83493fb9fea43cec0b4d05b8f6af99b2f69acea1a
+DIST extract_file-20130318.service 615 SHA256 a87a9e2241f5342fcc4e29bed7ebf75e8ec0a5dffc98a05a1a42c022a610774d SHA512 e647787b83bc1f45e9104bb210d3807481f2ab7ddcc7dd4eb3c522a9dc6f94580b60a92ad5ff73a634c025438d2ccaa655ea005c26e1f214532e69f67510d7c6 WHIRLPOOL 384802508be5d9f23b8f783dd1067491dc799edf7d065c95a3edcf5b32373b7512b58ac8c518061f6ad87784d4afc82c79b0b8af8ff8117fb0fbf006870597a5
diff --git a/dev-util/obs-service-extract_file/metadata.xml b/dev-util/obs-service-extract_file/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-extract_file/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild b/dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild
new file mode 100644
index 000000000000..853d4f69e4e5
--- /dev/null
+++ b/dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/bzip2
+	app-arch/gzip
+	app-arch/tar
+	app-arch/unzip
+	app-arch/xz-utils
+"
diff --git a/dev-util/obs-service-format_spec_file/Manifest b/dev-util/obs-service-format_spec_file/Manifest
new file mode 100644
index 000000000000..9376ac4ebb6c
--- /dev/null
+++ b/dev-util/obs-service-format_spec_file/Manifest
@@ -0,0 +1,5 @@
+DIST format_spec_file-20130618 957 SHA256 7338b7cea0ccd89ab1ba86f0a3ae525860a4f5816d7adab06ba252f1598c104e SHA512 52dfb06f6d7ab71570090a940f69d631fdf027b48797354911e5aca9d8aeab53026251f4da1c0e8fc58044344762d01633f02253fcdb096e8d9e9edae0cd0ebe WHIRLPOOL dcf6e822364c45c0382f0e18a1ee302db7095645d1e45fedbfd0bb90d0037ee7e387f5234ff7253a74e6535fd1f93687a3fb39cbca092410f14ca69addce8dca
+DIST format_spec_file-20130618.service 274 SHA256 2f8c5639f893e20f99a70fb11ed525517be6a094f73f10d8da4cc90454f4ce7b SHA512 a97789f41f9493aab3cb2dc15da3de69d3e9dd025ae3660afb6dec436f050112460611db969f0c9f2ba8ec786f210714c51088a7089bdbaed3353635e7e8e6b1 WHIRLPOOL 1bedd6130fd91732d6ead78b1e9dbba4a143969a35222198295a9dc4793f35a78f59a17739e4e7a2c5ca67fdb20200840863ba7014625d6c4c2efa9f088f8eb4
+DIST licenses_changes.txt-20130618 24641 SHA256 6ff17a2b366b75547635f5e51e41e97039f2a53f363ea5683f743e19ef3d45e4 SHA512 ca5a3a56892331b8c7377ffdd0010ac8174871aa710ff60e58bc3aaa9def8b25676ac377aef8cc27035e648e7b60e315a5ec39c1ace05a76d26c41f46d647d9f WHIRLPOOL 346729f875d618f4403baa221620660ceafef9d1c8eaba62a7a1808ccb60d939ea5fc30f626ff2c2b815cdd7400a4952aab1e21466c46397566907007e493b51
+DIST patch_license-20130618 14873 SHA256 e5085e9aa3101d130eb8c286c295cbafc2abca75715b29416a7c46268a6033b8 SHA512 b3eaa1a99d3035ce1fc36da702f563896a16328ad0bd01da62a36e7973558749724203fcd5d24a7e3dc2118ab1f9099daa71b3c33fa46f2926f072d4227c81bf WHIRLPOOL 954b3542c620c5c81c2c4194ddc25fb666a6b471d63ed3ba637ec3c77a7c967276efd9d3490a750df3e9e7d945482cbf30563f9ad4097ca576b10a692d0b0550
+DIST prepare_spec-20130618 19929 SHA256 25121dfa44d7186742450befb19256319665418d0d3ada75fe004fce43ad0f36 SHA512 51826979c2ca8f5c9adf5d51c3d2c0a6422785cf690d044798a439e532a90eb399f776d0d7fdbc8673779a988a71629ba6dcbd3a572198a4cd4aef4dd1fedc7f WHIRLPOOL fcaed7d8f0bbe20c102e2798024452732d4fd1a1db9021b129a77986456b067398e10f16f141caa81e38a347e6cefc9c141449b91f5e119c2865de721984feef
diff --git a/dev-util/obs-service-format_spec_file/metadata.xml b/dev-util/obs-service-format_spec_file/metadata.xml
new file mode 100644
index 000000000000..c1febdafc499
--- /dev/null
+++ b/dev-util/obs-service-format_spec_file/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for openSUSE Build Service.
+
+This source service is formating the spec file to SUSE standard. The rational
+behind is to make it easier to review spec files from unknown packagers.
+
+This should be used in "trylocal" mode, so that osc is adapting the existing
+spec file instead of creating a new one.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild b/dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild
new file mode 100644
index 000000000000..fcaff17616d1
--- /dev/null
+++ b/dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ADDITIONAL_FILES="
+	licenses_changes.txt
+	patch_license
+	prepare_spec
+"
+inherit obs-service
+
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-util/obs-service-source_validator
+"
diff --git a/dev-util/obs-service-generator_driver_update_disk/Manifest b/dev-util/obs-service-generator_driver_update_disk/Manifest
new file mode 100644
index 000000000000..ad2926dbd4c2
--- /dev/null
+++ b/dev-util/obs-service-generator_driver_update_disk/Manifest
@@ -0,0 +1,3 @@
+DIST BSKiwiXML-20130318.pm 7295 SHA256 9ca0eb48f8d1f93d05757622894866a9b03f6782329822983e6c2e082acca289 SHA512 1e6df1903b0ac8447a26385df4a83ccea62d2a9f698a1d46745216bb7b8f44563c8502791b4da42f702aaaad5f0e3597636de437194af457b366d7b42f492782 WHIRLPOOL ee2be557f75dac0871819e5786930a1000db41a9e72ce66a0642461c658b3cba5b21d2c695c099d48a297892f03983b49ed40c58ddfda1423a7a0faff3a5c282
+DIST generator_driver_update_disk-20130318 11776 SHA256 21397673ebf480654f078d5828e857176ad1b2278afe5735801ce5d695fda218 SHA512 155924d561e7256cd9ea0c862a538310c96014527f461c9256c2b6e11c8a820e8df38c111c3f7662c3f2ff73845450189970364f28904afebe2abc6366328213 WHIRLPOOL a12c81fec31d75d92297a44cd967fea14bf9fdc158d50f0fc0b229e2202639ba93d5e739da2c5db1f12805719b8993e82ebe979f0af9a34844de8ac2f7d821b3
+DIST generator_driver_update_disk-20130318.service 838 SHA256 8a39eaeb8d0492919948a03fc7c48de16942271a9cc8df2375c55f349db4e0fb SHA512 85ebeef1d79a37e81c5e8558a078f9b929e5f9b5b8960b7930bab7812846eda911210f9cdacff82686298c9b58f62560f99ed76a33d346f3c65be0738f9ff374 WHIRLPOOL 21a8c2d4e1c207deadafe9988849e51168d3e66bd3033d9275b138672890ce232ff1b4490ab3e2eeacc0cdfa5f32ebcb55d684fdc2c27504079994802a82a123
diff --git a/dev-util/obs-service-generator_driver_update_disk/metadata.xml b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild b/dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild
new file mode 100644
index 000000000000..96f46d002cdd
--- /dev/null
+++ b/dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+SRC_URI+=" ${OBS_URI}/BSKiwiXML.pm -> BSKiwiXML-${PV}.pm"
+
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-lang/perl
+"
+
+src_install() {
+	obs-service_src_install
+
+	insinto /usr/libexec/obs/service
+	newins BSKiwiXML-${PV}.pm BSKiwiXML.pm
+}
diff --git a/dev-util/obs-service-git_tarballs/Manifest b/dev-util/obs-service-git_tarballs/Manifest
new file mode 100644
index 000000000000..fbc550853e95
--- /dev/null
+++ b/dev-util/obs-service-git_tarballs/Manifest
@@ -0,0 +1 @@
+DIST obs-service-git_tarballs-0.1.7+git.1375261502.72b5224.tar.gz 11006 SHA256 b82cf6c1c7533e881a2feaad6393dabfcd37c067167f2a1b4a351c697be3b180 SHA512 4c8557aa0139a6b65a7993b5ebd5b3cbf3a9f9bbd7da50d56619ed6dc54bdba6e098af92163cf4819acc42e5d4106b6056f120c6f4d0cc38e67daf5c92cc0e6a WHIRLPOOL bd13f9085213c542da852b0a7f751511bc354d908c391cb8b034a24aeb6e6b50cdc776388faf56697a8084f3c1742e0767cfff977a7823164e157b95cae1deb3
diff --git a/dev-util/obs-service-git_tarballs/metadata.xml b/dev-util/obs-service-git_tarballs/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-git_tarballs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild b/dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild
new file mode 100644
index 000000000000..a7a9bc43650b
--- /dev/null
+++ b/dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+HASH="git.1375261502.72b5224"
+SRC_URI="${OBS_URI}/${P}+${HASH}.tar.gz"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-vcs/git
+"
+
+S="${WORKDIR}/${P}+${HASH}"
+
+src_unpack() {
+	default
+}
+
+src_install() {
+	# different folder and files in this module
+	exeinto /usr/libexec/obs/service
+	doexe ${OBS_SERVICE_NAME}
+
+	insinto /usr/libexec/obs/service
+	doins ${OBS_SERVICE_NAME}.service
+}
diff --git a/dev-util/obs-service-github_tarballs/Manifest b/dev-util/obs-service-github_tarballs/Manifest
new file mode 100644
index 000000000000..e273a17c4163
--- /dev/null
+++ b/dev-util/obs-service-github_tarballs/Manifest
@@ -0,0 +1 @@
+DIST obs-service-github_tarballs-0.2.1.tar.gz 8837 SHA256 d39518f4ec0c1343bb56c496842323e0ae2d556f2c789e288ee1a23eaa22bebd SHA512 7e4d2b9bc5f27448d7c6f11e05307fdb5860ccfff285fc486a4b17ce475716db73fe026c5019674a7dea02dd3e892045eae735c8060735fd1384e2b672995599 WHIRLPOOL f211c9b11e2455edac4248ffd8e4db0e2e9b3dd993f85a7cf143202da69cac7a9803512aca4522911ebd195331ca9bf68f467d3306a9cca6897fe10bdc64ca15
diff --git a/dev-util/obs-service-github_tarballs/metadata.xml b/dev-util/obs-service-github_tarballs/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-github_tarballs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild b/dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild
new file mode 100644
index 000000000000..92b73e2bc1d1
--- /dev/null
+++ b/dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+[[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/}
+OBS_PROJECT="openSUSE:Tools"
+
+inherit obs-download
+
+DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service"
+HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
+LICENSE="GPL-2"
+SLOT="0"
+
+SRC_URI="${OBS_URI}/${P}.tar.gz"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-util/osc
+	dev-util/suse-build
+	dev-vcs/git
+"
+
+src_install() {
+	exeinto /usr/libexec/obs/service
+	doexe ${OBS_SERVICE_NAME}
+	insinto /usr/libexec/obs/service
+	doins *.service
+}
diff --git a/dev-util/obs-service-meta/metadata.xml b/dev-util/obs-service-meta/metadata.xml
new file mode 100644
index 000000000000..bf2692f5562e
--- /dev/null
+++ b/dev-util/obs-service-meta/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-meta/obs-service-meta-1.ebuild b/dev-util/obs-service-meta/obs-service-meta-1.ebuild
new file mode 100644
index 000000000000..28caab8f8a9b
--- /dev/null
+++ b/dev-util/obs-service-meta/obs-service-meta-1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Metapackage to pull all open build service services"
+HOMEPAGE="http://openbuildservice.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-util/obs-service-cpanspec
+	dev-util/obs-service-download_files
+	dev-util/obs-service-download_src_package
+	dev-util/obs-service-download_url
+	dev-util/obs-service-extract_file
+	dev-util/obs-service-format_spec_file
+	dev-util/obs-service-generator_driver_update_disk
+	dev-util/obs-service-recompress
+	dev-util/obs-service-set_version
+	dev-util/obs-service-source_validator
+	dev-util/obs-service-verify_file
+"
+
+pkg_postinst() {
+	if ! has_version dev-util/obs-service-tar_scm ; then
+		elog "You should consider installing also following package"
+		elog "if you plan to work with SCM packages:"
+		elog "    dev-util/obs-service-tar_scm"
+	fi
+}
diff --git a/dev-util/obs-service-meta/obs-service-meta-2.ebuild b/dev-util/obs-service-meta/obs-service-meta-2.ebuild
new file mode 100644
index 000000000000..bc4374a7ac53
--- /dev/null
+++ b/dev-util/obs-service-meta/obs-service-meta-2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Metapackage to pull all open build service services"
+HOMEPAGE="http://openbuildservice.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-util/obs-service-cpanspec
+	dev-util/obs-service-download_files
+	dev-util/obs-service-download_src_package
+	dev-util/obs-service-download_url
+	dev-util/obs-service-extract_file
+	dev-util/obs-service-format_spec_file
+	dev-util/obs-service-generator_driver_update_disk
+	dev-util/obs-service-git_tarballs
+	dev-util/obs-service-github_tarballs
+	dev-util/obs-service-rearchive
+	dev-util/obs-service-recompress
+	dev-util/obs-service-set_version
+	dev-util/obs-service-source_validator
+	dev-util/obs-service-update_source
+	dev-util/obs-service-verify_file
+"
+
+pkg_postinst() {
+	if ! has_version dev-util/obs-service-tar_scm ; then
+		elog "You should consider installing also following package"
+		elog "if you plan to work with SCM packages:"
+		elog "    dev-util/obs-service-tar_scm"
+	fi
+}
diff --git a/dev-util/obs-service-rearchive/Manifest b/dev-util/obs-service-rearchive/Manifest
new file mode 100644
index 000000000000..c40c5e0fc332
--- /dev/null
+++ b/dev-util/obs-service-rearchive/Manifest
@@ -0,0 +1,2 @@
+DIST rearchive-20130802 2182 SHA256 dd72dd52f7453ebb01633c2c01f712c6fb891d74142db8ca4727f9e0edc2a51c SHA512 7266f142cdfcbcf9b96b36ed70d80e3640ec8897b98619abd885b892ffd6b86980bb337957879871b7b268bf72cc12e2b4bf8c1e0ecb9a45cf95a6f535ca0279 WHIRLPOOL 0ca606b91486c97df0192b20db6021004805cf29e96e2b9e7339d9af60f6808b444ee719405d2b7c5f89192f3d90a038f7a5d6b3254bd6be39b56ee29811bb58
+DIST rearchive-20130802.service 544 SHA256 5aceaa120cffcd59ff069eba9f01139463970b56842c1cd7478452139e585d1e SHA512 a228f780b5494d19565c190f4e97389a9e2fb6926ee939220df8862082f0cc881e5bdbaeac2db9085fcb57f47e4e43eb504c49929fc55a7954786e57d2a9925f WHIRLPOOL fe6da8b295c64a4e10ff7a26a1b344d37c342edc173ef4a59fdcbcaed68c20f1d145f39273c2f9a166b81f1a0219bf23df233e770383c280d387b878dd1a0503
diff --git a/dev-util/obs-service-rearchive/metadata.xml b/dev-util/obs-service-rearchive/metadata.xml
new file mode 100644
index 000000000000..d4b914b8debe
--- /dev/null
+++ b/dev-util/obs-service-rearchive/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. It's a wrapper around cpanspec script.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild b/dev-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild
new file mode 100644
index 000000000000..0d4299223981
--- /dev/null
+++ b/dev-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/gzip
+	app-arch/unrar
+	app-arch/unzip
+"
diff --git a/dev-util/obs-service-recompress/Manifest b/dev-util/obs-service-recompress/Manifest
new file mode 100644
index 000000000000..65c160ac9e32
--- /dev/null
+++ b/dev-util/obs-service-recompress/Manifest
@@ -0,0 +1 @@
+DIST obs-service-recompress-0.2.tar.gz 1593 SHA256 7b458102204cbdae74bd72d4da6e0c77d3a6bc4e22880ad2e5278e89d7bf81af SHA512 085a6b47ca2a2930a41a6edcdbec85960c0d3c092e5d4e643c90c5bbc97f01ddbf35c73edad9293ffc0ff3254270a3f7ae2d6c500708bd4f41e355b5549a2585 WHIRLPOOL 24adce8a8b3ffc3bacc404a44ab27f46aaba827a40d079fb642296fa6e8c6af22ad94ee28aa5d4ff7e27be37533ff61062c22bd386ab133cc2ee4d3f9e9cf5c3
diff --git a/dev-util/obs-service-recompress/metadata.xml b/dev-util/obs-service-recompress/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-recompress/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild b/dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild
new file mode 100644
index 000000000000..b6e377507e4a
--- /dev/null
+++ b/dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+[[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/}
+OBS_PROJECT="openSUSE:Tools"
+
+inherit obs-download
+
+DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service"
+HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
+LICENSE="GPL-2"
+SLOT="0"
+
+SRC_URI="${OBS_URI}/${P}.tar.gz"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/bzip2
+	app-arch/gzip
+	app-arch/xz-utils
+	dev-util/osc
+	dev-util/suse-build
+"
+
+src_install() {
+	exeinto /usr/libexec/obs/service
+	doexe ${OBS_SERVICE_NAME}
+	insinto /usr/libexec/obs/service
+	doins *.service
+}
diff --git a/dev-util/obs-service-set_version/Manifest b/dev-util/obs-service-set_version/Manifest
new file mode 100644
index 000000000000..dbbe6b2e8abc
--- /dev/null
+++ b/dev-util/obs-service-set_version/Manifest
@@ -0,0 +1 @@
+DIST obs-service-set_version-0.3.tar.gz 1993 SHA256 31514b9d30d33df4e171ca9e9f299a562f4734b6fde7b135e38c986e6dae936b SHA512 a053c869199441aec54af3e170258297584c018a2d7b6a0f48119762ac2386f74b0a15132280d3428c948454cd4d0c8dadc65eb68d9439df40d55ba4f9e5da7a WHIRLPOOL 91156c82f9724b2bba428fbe7ea6ebe7a0b35411ab8a87abcb3322936f2fce6e870c52797dcd9bf9d51813ab5b8cf24d9c67f909a563b2ff40bdfeb0c4c70e5a
diff --git a/dev-util/obs-service-set_version/metadata.xml b/dev-util/obs-service-set_version/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-set_version/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-set_version/obs-service-set_version-0.3.ebuild b/dev-util/obs-service-set_version/obs-service-set_version-0.3.ebuild
new file mode 100644
index 000000000000..d81c2c863c02
--- /dev/null
+++ b/dev-util/obs-service-set_version/obs-service-set_version-0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+[[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/}
+OBS_PROJECT="openSUSE:Tools"
+
+inherit obs-download
+
+DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service"
+HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
+LICENSE="GPL-2"
+SLOT="0"
+
+SRC_URI="${OBS_URI}/${P}.tar.gz"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-util/osc
+	dev-util/suse-build
+"
+
+src_install() {
+	exeinto /usr/libexec/obs/service
+	doexe ${OBS_SERVICE_NAME}
+	insinto /usr/libexec/obs/service
+	doins *.service
+}
diff --git a/dev-util/obs-service-source_validator/Manifest b/dev-util/obs-service-source_validator/Manifest
new file mode 100644
index 000000000000..cdc10cebc842
--- /dev/null
+++ b/dev-util/obs-service-source_validator/Manifest
@@ -0,0 +1 @@
+DIST obs-service-source_validator-0.3.tar.bz2 18472 SHA256 7c2131cb5edda57c7f187c55f425c021167b36e2b0c246fd4a703d9b32baf8fe SHA512 129d69a896bbd157b781f6d9014420fa7a9717f6a48b677bbe99d5d92a242ff25be470108d6f6da00a170b3133b9fceaf8d7447f356e9ddc1090ba7f7d79c164 WHIRLPOOL b86727b0d67d5359ff098af02a5f36c5d61f964905801fcc84548e781ec765ccbe82562b728315532bfa9a2f49566501267193baca531b2d5e133cbe2fbf316b
diff --git a/dev-util/obs-service-source_validator/metadata.xml b/dev-util/obs-service-source_validator/metadata.xml
new file mode 100644
index 000000000000..bf2692f5562e
--- /dev/null
+++ b/dev-util/obs-service-source_validator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild b/dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild
new file mode 100644
index 000000000000..a6b258ed79eb
--- /dev/null
+++ b/dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+# only one sanely packed service
+SRC_URI="${OBS_URI}/${P}.tar.bz2"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-perl/TimeDate"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+}
+
+src_install() {
+	# different folder and files in this module
+	exeinto /usr/libexec/obs/service
+	doexe ${OBS_SERVICE_NAME}
+
+	insinto /usr/libexec/obs/service
+	doins ${OBS_SERVICE_NAME}.service
+
+	exeinto /usr/libexec/obs/service/${OBS_SERVICE_NAME}s
+	doexe [0-9]*
+	exeinto /usr/libexec/obs/service/${OBS_SERVICE_NAME}s/helpers/
+	doexe helpers/*
+}
diff --git a/dev-util/obs-service-tar_scm/Manifest b/dev-util/obs-service-tar_scm/Manifest
new file mode 100644
index 000000000000..7a79f363695c
--- /dev/null
+++ b/dev-util/obs-service-tar_scm/Manifest
@@ -0,0 +1 @@
+DIST obs-service-tar_scm-0.3.1.1383144507.58d1af8.tar.gz 18252 SHA256 fab9fc62f38964973a7570692b488e85a4ba8e1b53629f1324b98b0749cfdb90 SHA512 c150e6a0867befacfbd029726e997b3e64307646e2887d00e6ad7493ac2bd9200afd7bfb9057255549ff87cc5280161edc7c96f31c7fcfa572ab4b96ba74cfbe WHIRLPOOL d2c521a14e1461889e774fbebf04984c35115533714f62f21f62b0fea6830a5b0e70bc09b62c98c89b0630e0741c21204137b7df39e845f8e1087dfa94805b01
diff --git a/dev-util/obs-service-tar_scm/metadata.xml b/dev-util/obs-service-tar_scm/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-tar_scm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild b/dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild
new file mode 100644
index 000000000000..089980b9d24c
--- /dev/null
+++ b/dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+HASH="1383144507.58d1af8"
+SRC_URI="${OBS_URI}/${P}.${HASH}.tar.gz"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-vcs/bzr
+	dev-vcs/git
+	dev-vcs/mercurial
+	dev-vcs/subversion
+"
+
+S="${WORKDIR}/${P}.${HASH}"
+
+src_unpack() {
+	default
+}
+
+src_install() {
+	# different folder and files in this module
+	exeinto /usr/libexec/obs/service
+	doexe ${OBS_SERVICE_NAME}
+
+	insinto /usr/libexec/obs/service
+	doins ${OBS_SERVICE_NAME}.service
+
+	insinto /etc/obs/services
+	newins ${OBS_SERVICE_NAME}.rc ${OBS_SERVICE_NAME}
+}
diff --git a/dev-util/obs-service-update_source/Manifest b/dev-util/obs-service-update_source/Manifest
new file mode 100644
index 000000000000..aaa5e396bdb5
--- /dev/null
+++ b/dev-util/obs-service-update_source/Manifest
@@ -0,0 +1,2 @@
+DIST update_source-20130802 4081 SHA256 1c3dea734bf0826a9e3dcff97dc53c9e9acaed080eaa7bed51aeac5cc611a2fe SHA512 24a28c9f487b9ecc247988dcffc3ab612fa11b33824f9b3f1537548722186143dfeefe5208444383a918baa599fc57994dc6a7ae7049aea8108c087fd49f6e17 WHIRLPOOL 51574e12ba70a9cc5b8fe071fc88651439d52acd5648e3b949b01227003099ce269766c1aa533bd8d71a16b49a562a4da98ef6ed4fb67727b57efdd119e32519
+DIST update_source-20130802.service 486 SHA256 86f4703f355891aa55f1ed2b064f18171d705c1e704811f2aedd3b5354c6d9ea SHA512 3cfb25566f2806c145bca0817976e7129436334706c2f0022fe7e94be62ce11b8e2420c2e97c24999bcda1de88850a589e5b6a0de633a27cdce52b4253965818 WHIRLPOOL 104c1f9242c2dfa268d027c1d865f71ec5850a29668ca5a25c5b8dab678ebfe918a155c821ac4d154997161b72763fd992c9b695ad709c4ee370e93206d2709e
diff --git a/dev-util/obs-service-update_source/metadata.xml b/dev-util/obs-service-update_source/metadata.xml
new file mode 100644
index 000000000000..d4b914b8debe
--- /dev/null
+++ b/dev-util/obs-service-update_source/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. It's a wrapper around cpanspec script.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild b/dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild
new file mode 100644
index 000000000000..1749f92e2e1a
--- /dev/null
+++ b/dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	net-misc/wget
+	sys-apps/diffutils
+"
diff --git a/dev-util/obs-service-verify_file/Manifest b/dev-util/obs-service-verify_file/Manifest
new file mode 100644
index 000000000000..a75e3a9abd07
--- /dev/null
+++ b/dev-util/obs-service-verify_file/Manifest
@@ -0,0 +1,2 @@
+DIST verify_file-20130403 1279 SHA256 34a8aad8ae563e150a72805749aca54275183ec9012d6bfb950922c862e14bf2 SHA512 8fd6771c6c93766429d58620750132a6139df34041009f890792458c2f6de4efd8548c1f9f96aba051563d32a60294bae7e14d6c5523db345787c609e1a0a5dc WHIRLPOOL 5949e94a6b11b5816076a753f0f6c48ac2db96a64a177f78197e696c00a6e43f4d16fb2b3fe2187673e2b88d14f83acdb10cd5b3a82b6de5ffbc4e05694cd194
+DIST verify_file-20130403.service 513 SHA256 210c28bceaf3c8bb9db8b53f0fd6115d209005458ce58066ba5b541ebd3cc1c0 SHA512 3ad6b31fc5599ebf3389f32b909c8859b78a2134079692e2891aa03cca1b9fea420f6796d762fbceb431c6216610427fb33fb2d58859a521ff34639cab38a63c WHIRLPOOL 94785b9324b185ff0515ab0ff7fc2bb74abd634286299fa7bbaed6b5748c77ab9aa3541401e1a31ebacf21487d9faaf0447266bcf542d15780f00e79381319c6
diff --git a/dev-util/obs-service-verify_file/metadata.xml b/dev-util/obs-service-verify_file/metadata.xml
new file mode 100644
index 000000000000..efc0b67b56e3
--- /dev/null
+++ b/dev-util/obs-service-verify_file/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild b/dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild
new file mode 100644
index 000000000000..8d026087a52c
--- /dev/null
+++ b/dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit obs-service
+
+LICENSE="MIT"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	net-misc/wget
+"
diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
new file mode 100644
index 000000000000..270635e27ad5
--- /dev/null
+++ b/dev-util/omake/Manifest
@@ -0,0 +1 @@
+DIST omake-0.9.8.6-0.rc1.tar.gz 3254283 SHA256 23c498f071723621dd5e1e29c1abefd6937c73c67bb85d223fd514b9ae005ae9 SHA512 10a7ef6746c656d25852d408fafdd67a95acc59b73c892f0dbc316f2a01949b5349d5203c9fe2400cc7c05e14a7b1bc075603bd462ab74b60427d944f8e177d0 WHIRLPOOL d7da243aff8b6ff12f943db997bb644cfb88117b4deadb8ebea698537d864ede4084acc4afe7314a93eb24fa3a4092dbb24ecfb28cabff85c0214a03d89b44c6
diff --git a/dev-util/omake/files/omake-0.9.8.6.0_rc1-cflags.patch b/dev-util/omake/files/omake-0.9.8.6.0_rc1-cflags.patch
new file mode 100644
index 000000000000..a6eaf707c971
--- /dev/null
+++ b/dev-util/omake/files/omake-0.9.8.6.0_rc1-cflags.patch
@@ -0,0 +1,11 @@
+--- a/OMakefile
++++ b/OMakefile
+@@ -33,7 +33,7 @@
+     #
+     # Extra options for the C compiler
+     #
+-    CFLAGS += -g -O2 -Wall -Werror -Wno-unused
++    CFLAGS += -Wall -Wno-unused
+ 
+     #
+     # We never need threads on Unix
diff --git a/dev-util/omake/files/omake-0.9.8.6.0_rc1-warnerror.patch b/dev-util/omake/files/omake-0.9.8.6.0_rc1-warnerror.patch
new file mode 100644
index 000000000000..cf8a7972027d
--- /dev/null
+++ b/dev-util/omake/files/omake-0.9.8.6.0_rc1-warnerror.patch
@@ -0,0 +1,11 @@
+--- a/lib/build/OCaml.om
++++ b/lib/build/OCaml.om
+@@ -176,7 +176,7 @@ public.PREFIXED_OCAMLPACKS =\
+ #
+ declare OCAMLDEPFLAGS
+ public.OCAMLPPFLAGS  =
+-public.OCAMLFLAGS    = -warn-error A
++public.OCAMLFLAGS    =
+ public.OCAMLCFLAGS   = -g
+ public.OCAMLOPTFLAGS =
+ public.OCAMLCPPFLAGS =
diff --git a/dev-util/omake/metadata.xml b/dev-util/omake/metadata.xml
new file mode 100644
index 000000000000..2193d772e351
--- /dev/null
+++ b/dev-util/omake/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>ml</herd>
+</pkgmetadata>
diff --git a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
new file mode 100644
index 000000000000..b39cf8b8b7bd
--- /dev/null
+++ b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs multilib versionator eutils
+
+MY_PV=$(replace_version_separator 5 '.' "$(replace_version_separator 4 '-' )")
+RESTRICT="installsources"
+DESCRIPTION="Make replacement"
+HOMEPAGE="http://omake.metaprl.org/"
+SRC_URI="http://omake.metaprl.org/downloads/${PN}-${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE="doc fam ncurses +ocamlopt readline"
+DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	ncurses? ( >=sys-libs/ncurses-5.3 )
+	fam? ( virtual/fam )
+	readline? ( >=sys-libs/readline-4.3 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${MY_PV%-*}
+
+use_boolean() {
+	if use $1; then
+		echo "true"
+	else
+		echo "false"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-cflags.patch" \
+		"${FILESDIR}/${P}-warnerror.patch"
+}
+
+src_configure() {
+	# Configuration steps...
+	echo "PREFIX = \$(dir \$\"/usr\")" > .config
+	echo "BINDIR = \$(dir \$\"\$(PREFIX)/bin\")" >> .config
+	echo "LIBDIR = \$(dir \$\"\$(PREFIX)/$(get_libdir)\")" >> .config
+	echo "MANDIR = \$(dir \$\"\$(PREFIX)/man\")" >> .config
+
+	echo "CC = $(tc-getCC)" >> .config
+	echo "CFLAGS = ${CFLAGS}" >> .config
+
+	if use ocamlopt; then
+		echo "NATIVE_ENABLED = true" >> .config
+		echo "BYTE_ENABLED = false" >> .config
+	else
+		echo "NATIVE_ENABLED = false" >> .config
+		echo "BYTE_ENABLED = true" >> .config
+	fi
+
+	echo "NATIVE_PROFILE = false" >> .config
+
+	echo "READLINE_ENABLED = $(use_boolean readline)" >> .config
+	echo "FAM_ENABLED = $(use_boolean fam)" >> .config
+	echo "NCURSES_ENABLED = $(use_boolean ncurses)" >> .config
+
+	echo "DEFAULT_SAVE_INTERVAL = 60" >> .config
+
+	echo "OCAMLDEP_MODULES_ENABLED = false" >> .config
+}
+
+src_compile() {
+	emake all
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc CHANGELOG.txt
+	if use doc; then
+		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
+		dohtml -r doc/html/*
+	fi
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}
diff --git a/dev-util/open-vcdiff/Manifest b/dev-util/open-vcdiff/Manifest
new file mode 100644
index 000000000000..96a09e42cb7c
--- /dev/null
+++ b/dev-util/open-vcdiff/Manifest
@@ -0,0 +1,2 @@
+DIST open-vcdiff-0.8.3.tar.gz 757271 SHA256 b7e47db78866082e9e8b5782f5491092c8414f0acc0440aea03b14c7d1d3c371 SHA512 7f0712aa9f08b19658fbc77f28e6dde9f4a45a4be8f97fb00db1ca78f5ee4e7b9f333dc3208e9ba85b5696a24fa30865397c096be1687d73048809cd30e12a55 WHIRLPOOL 90d75d62c7eceae74639c2105cae98bd148b02c7c83d169a71f094d8f30829ed736b8d8fb43ecef06657ce8b10b8dfaf0f98b439dd170a4a0259e9dd4f035977
+DIST open-vcdiff-0.8.4.tar.gz 780923 SHA256 2b142b1027fb0a62c41347600e01a53fa274dad15445a7da48083c830c3138b3 SHA512 fb9062d6a854c999d04eb68672596583e958c3d1705d58429280cb53dcf381c880b23d7fc9d5277545b4a5f9023435648d7bc87bad10cb30385fb950e5d499bd WHIRLPOOL fbbb26f6aa3773bb06c33085bc1d2f1e2bd74776466864713b06567806eca815f80d72d8872487359ffa99102f8914948d20b37a2b4e3bf502a03ca7de029a8a
diff --git a/dev-util/open-vcdiff/files/0.8.3-system-libs.patch b/dev-util/open-vcdiff/files/0.8.3-system-libs.patch
new file mode 100644
index 000000000000..508f30379b2c
--- /dev/null
+++ b/dev-util/open-vcdiff/files/0.8.3-system-libs.patch
@@ -0,0 +1,215 @@
+Unbundle the following libraries:
+gflags
+gtest
+zlib
+
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 42)
++++ configure.ac	(working copy)
+@@ -111,7 +111,5 @@
+ fi
+ AC_SUBST(LIBSTDCXX_LA_LINKER_FLAG)
+ 
+-AC_CONFIG_FILES([Makefile
+-                 gflags/src/gflags/gflags.h
+-                 gflags/src/gflags/gflags_completions.h])
++AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 42)
++++ Makefile.am	(working copy)
+@@ -5,11 +5,7 @@
+                   -I gflags/m4
+ 
+ # This is so we can #include <google/vcencoder.h> or <gtest/gtest.h>
+-AM_CPPFLAGS = -I$(top_srcdir)/src \
+-              -I$(top_srcdir)/src/zlib \
+-              -I$(top_srcdir)/gflags/src \
+-              -I$(top_srcdir)/gtest \
+-              -I$(top_srcdir)/gtest/include
++AM_CPPFLAGS = -I$(top_srcdir)/src
+ 
+ # For a non-optimized (debug) build, change "-DNDEBUG" to "-DDEBUG".
+ AM_CXXFLAGS = -DNDEBUG -DNO_THREADS
+@@ -46,6 +42,7 @@
+ ## Tests are added one by one to these lists in the RULES sections.
+ check_PROGRAMS =
+ check_SCRIPTS =
++check_LTLIBRARIES =
+ 
+ ## Other binaries, scripts, and libraries that are built but not automatically
+ ## installed.
+@@ -55,52 +52,11 @@
+ 
+ ## vvvv RULES TO MAKE THE LIBRARIES, BINARIES, AND UNITTESTS
+ 
+-# google-gflags: Used for command-line client
+-#     Please refer to http://code.google.com/p/google-gflags/ for details
+-noinst_LTLIBRARIES += libgflags.la
+-libgflags_la_SOURCES = gflags/src/gflags/gflags.h \
+-                       gflags/src/gflags/gflags_completions.h \
+-                       gflags/src/mutex.h \
+-                       gflags/src/gflags.cc \
+-                       gflags/src/gflags_completions.cc \
+-                       gflags/src/gflags_reporting.cc
+-
+-# gtest (Google Test): Used for unit tests only
+-#     Please refer to http://code.google.com/p/googletest/ for details
+-noinst_LTLIBRARIES += libgtest_main.la
+-libgtest_main_la_SOURCES = gtest/include/gtest/gtest.h \
+-                           gtest/include/gtest/gtest-death-test.h \
+-                           gtest/include/gtest/gtest-message.h \
+-                           gtest/include/gtest/gtest-param-test.h \
+-                           gtest/include/gtest/gtest_pred_impl.h \
+-                           gtest/include/gtest/gtest_prod.h \
+-                           gtest/include/gtest/gtest-spi.h \
+-                           gtest/include/gtest/gtest-test-part.h \
+-                           gtest/include/gtest/gtest-typed-test.h \
+-                           gtest/include/gtest/internal/gtest-death-test-internal.h \
+-                           gtest/include/gtest/internal/gtest-filepath.h \
+-                           gtest/include/gtest/internal/gtest-internal.h \
+-                           gtest/include/gtest/internal/gtest-linked_ptr.h \
+-                           gtest/include/gtest/internal/gtest-param-util.h \
+-                           gtest/include/gtest/internal/gtest-param-util-generated.h \
+-                           gtest/include/gtest/internal/gtest-port.h \
+-                           gtest/include/gtest/internal/gtest-string.h \
+-                           gtest/include/gtest/internal/gtest-tuple.h \
+-                           gtest/include/gtest/internal/gtest-type-util.h \
+-                           gtest/src/gtest-internal-inl.h \
+-                           gtest/src/gtest.cc \
+-                           gtest/src/gtest-death-test.cc \
+-                           gtest/src/gtest-filepath.cc \
+-                           gtest/src/gtest-port.cc \
+-                           gtest/src/gtest-test-part.cc \
+-                           gtest/src/gtest-typed-test.cc \
+-                           gtest/src/gtest_main.cc \
+-                           src/testing.h
+-
+-noinst_LTLIBRARIES += libvcdecoder_test_common.la
++check_LTLIBRARIES += libvcdecoder_test_common.la
+ libvcdecoder_test_common_la_SOURCES = src/vcdecoder_test.h \
+ 				      src/vcdecoder_test.cc
+-libvcdecoder_test_common_la_LIBADD = libvcddec.la libgtest_main.la
++libvcdecoder_test_common_la_LIBADD = libvcddec.la -lgtest_main
++libvcdecoder_test_common_la_LDFLAGS = -pthread
+ 
+ # libvcdcom: The open-vcdiff *common* library
+ lib_LTLIBRARIES += libvcdcom.la
+@@ -112,9 +68,6 @@
+ 		       src/logging.h \
+ 		       src/varint_bigendian.h \
+ 		       src/vcdiff_defs.h \
+-		       src/zlib/zlib.h \
+-		       src/zlib/zconf.h \
+-		       src/zlib/adler32.c \
+ 		       src/addrcache.cc \
+ 		       src/codetable.cc \
+ 		       src/logging.cc \
+@@ -128,7 +81,7 @@
+ 		       src/decodetable.cc \
+ 		       src/headerparser.cc \
+ 		       src/vcdecoder.cc
+-libvcddec_la_LIBADD = libvcdcom.la
++libvcddec_la_LIBADD = libvcdcom.la -lz
+ 
+ # libvcdenc: The open-vcdiff *encoder* library
+ lib_LTLIBRARIES += libvcdenc.la
+@@ -147,52 +100,62 @@
+ 		       src/jsonwriter.cc \
+ 		       src/vcdiffengine.cc \
+                        src/vcencoder.cc
+-libvcdenc_la_LIBADD = libvcdcom.la
++libvcdenc_la_LIBADD = libvcdcom.la -lz
+ 
+ bin_PROGRAMS += vcdiff
+ vcdiff_SOURCES = src/vcdiff_main.cc
+-vcdiff_LDADD = libvcddec.la libvcdenc.la libgflags.la
++vcdiff_LDADD = libvcddec.la libvcdenc.la -lgflags
+ 
+ check_PROGRAMS += addrcache_test
+ addrcache_test_SOURCES = src/addrcache_test.cc
+-addrcache_test_LDADD = libvcdcom.la libgtest_main.la
++addrcache_test_LDADD = libvcdcom.la -lgtest_main
++addrcache_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += blockhash_test
+ blockhash_test_SOURCES = src/blockhash_test.cc
+-blockhash_test_LDADD = libvcdenc.la libgtest_main.la
++blockhash_test_LDADD = libvcdenc.la -lgtest_main
++blockhash_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += codetable_test
+ codetable_test_SOURCES = src/codetable_test.cc
+-codetable_test_LDADD = libvcdcom.la libgtest_main.la
++codetable_test_LDADD = libvcdcom.la -lgtest_main
++codetable_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += decodetable_test
+ decodetable_test_SOURCES = src/decodetable_test.cc
+-decodetable_test_LDADD = libvcddec.la libvcdcom.la libgtest_main.la
++decodetable_test_LDADD = libvcddec.la libvcdcom.la -lgtest_main
++decodetable_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += encodetable_test
+ encodetable_test_SOURCES = src/encodetable_test.cc
+-encodetable_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++encodetable_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++encodetable_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += headerparser_test
+ headerparser_test_SOURCES = src/headerparser_test.cc
+-headerparser_test_LDADD = libvcddec.la libvcdcom.la libgtest_main.la
++headerparser_test_LDADD = libvcddec.la libvcdcom.la -lgtest_main
++headerparser_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += instruction_map_test
+ instruction_map_test_SOURCES = src/instruction_map_test.cc
+-instruction_map_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++instruction_map_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++instruction_map_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += output_string_test
+ output_string_test_SOURCES = src/output_string_crope.h \
+ 			     src/output_string_test.cc
+-output_string_test_LDADD = libgtest_main.la
++output_string_test_LDADD = -lgtest_main
++output_string_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += rolling_hash_test
+ rolling_hash_test_SOURCES = src/rolling_hash_test.cc
+-rolling_hash_test_LDADD = libvcdcom.la libgtest_main.la
++rolling_hash_test_LDADD = libvcdcom.la -lgtest_main
++rolling_hash_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += varint_bigendian_test
+ varint_bigendian_test_SOURCES = src/varint_bigendian_test.cc
+-varint_bigendian_test_LDADD = libvcdcom.la libgtest_main.la
++varint_bigendian_test_LDADD = libvcdcom.la -lgtest_main
++varint_bigendian_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += vcdecoder1_test
+ vcdecoder1_test_SOURCES = src/vcdecoder1_test.cc
+@@ -216,15 +179,18 @@
+ 
+ check_PROGRAMS += vcdiffengine_test
+ vcdiffengine_test_SOURCES = src/vcdiffengine_test.cc
+-vcdiffengine_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++vcdiffengine_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++vcdiffengine_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += vcencoder_test
+ vcencoder_test_SOURCES = src/vcencoder_test.cc
+-vcencoder_test_LDADD = libvcddec.la libvcdenc.la libvcdcom.la libgtest_main.la
++vcencoder_test_LDADD = libvcddec.la libvcdenc.la libvcdcom.la -lgtest_main
++vcencoder_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += jsonwriter_test
+ jsonwriter_test_SOURCES = src/jsonwriter_test.cc
+-jsonwriter_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++jsonwriter_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++jsonwriter_test_LDFLAGS = -pthread
+ 
+ check_SCRIPTS += src/vcdiff_test.sh
+ dist_noinst_DATA = testdata/configure.ac.v0.1 \
diff --git a/dev-util/open-vcdiff/metadata.xml b/dev-util/open-vcdiff/metadata.xml
new file mode 100644
index 000000000000..af2678460755
--- /dev/null
+++ b/dev-util/open-vcdiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">open-vcdiff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild b/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild
new file mode 100644
index 000000000000..7a6d762fd2d2
--- /dev/null
+++ b/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils
+
+DESCRIPTION="An encoder/decoder for the VCDIFF (RFC3284) format"
+HOMEPAGE="http://code.google.com/p/open-vcdiff/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-cpp/gflags
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+	rm -r gflags/src gtest src/zlib || die
+	local PATCHES=( "${FILESDIR}/0.8.3-system-libs.patch" )
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+	)
+	autotools-utils_src_configure
+}
diff --git a/dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild b/dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild
new file mode 100644
index 000000000000..bc2c31c9af4c
--- /dev/null
+++ b/dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="An encoder/decoder for the VCDIFF (RFC3284) format"
+HOMEPAGE="http://code.google.com/p/open-vcdiff/"
+SRC_URI="http://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+}
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
new file mode 100644
index 000000000000..0dd98d4b5f82
--- /dev/null
+++ b/dev-util/oprofile/Manifest
@@ -0,0 +1,3 @@
+DIST oprofile-0.9.9.tar.gz 1502834 SHA256 1e523400daaba7b8d0d15269e977a08b40edfea53970774b69ae130e25117597 SHA512 98cc3d2c15744d02ed649833cf4797482aec73bd52653e916f80b490e17a8250d988c4c945e52dd8999a0d0603fec405e99c9570dfc54baa4992950fe4d8763f WHIRLPOOL 534d04449923da5008dbf044f9783a1d39ad8b749170edf04a503ca1a885455fc8aef4f5894060d14135f5e3b0a0d577897779eed30dc26deff9b0663fcbb7d1
+DIST oprofile-1.0.0.tar.gz 1397396 SHA256 847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a SHA512 35b0e9f23c1d8df0aebda3f9b550692a896424de901d529a0ad41da41000328f33d184dcbb8e6f8367008723c8b2177b621757a2282b4c881ac46a57e1b51010 WHIRLPOOL eaf7feefb6561851d2f8573ec60f2086245aa9fc034c8f4ab62679895ae80ca45e8dcb4bfdcb96ad477c5b446b7f0b11e339d9dc270e8b4b0366bc3a9e980143
+DIST oprofile-1.1.0.tar.gz 1468502 SHA256 cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758 WHIRLPOOL b268af1578c485165624e0152751b6c5053c745e6813d6f13ea554993f311e540312854a36011e10560e82c378ef1fc357220a69cd713f73824ae249cc150650
diff --git a/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-non-ppc.patch b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-non-ppc.patch
new file mode 100644
index 000000000000..423c703f7ffb
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-non-ppc.patch
@@ -0,0 +1,36 @@
+Backported from 1.0.0:
+======================================================================
+commit 008e470a9b8751de0a3745e511cbc05b68759688
+Author: Aaro Koskinen <aaro.koskinen@iki.fi>
+Date:   Mon May 12 08:28:46 2014 -0500
+
+    configure: fix test-for-synth check with GCC 4.9.0
+    
+    With GCC 4.9.0 oprofile 0.9.9 build fails on non-PPC platfroms because
+    the "test-for-synth" configure check result is incorrect: There is a NULL
+    pointer dereference in the test program, so the compiler seems to optimize
+    the rest of the code away, and the test will always succeed regardless
+    whether powerpc_elf64_vec/bfd_elf64_powerpc_vec are present or not.
+    Fix by allocating the referred struct statically.
+    
+    While at it, also include stdio.h to avoid a compiler warning.
+    
+    Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
+
+diff --git a/m4/binutils.m4 b/m4/binutils.m4
+index 25fb15a..d7948c1 100644
+--- a/m4/binutils.m4
++++ b/m4/binutils.m4
+@@ -27,8 +27,10 @@ if test "$OS" = "Linux"; then
+ 	AC_MSG_CHECKING([whether bfd_get_synthetic_symtab() exists in BFD library])
+ 	rm -f test-for-synth
+ 	AC_LANG_CONFTEST(
+-		[AC_LANG_PROGRAM([[#include <bfd.h>]],
+-			[[asymbol * synthsyms;	bfd * ibfd = 0; 
++		[AC_LANG_PROGRAM([[#include <bfd.h>]
++                        [#include <stdio.h>]
++                        [static bfd _ibfd;]],
++                        [[asymbol * synthsyms;	bfd * ibfd = &_ibfd;
+ 			long synth_count = bfd_get_synthetic_symtab(ibfd, 0, 0, 0, 0, &synthsyms);
+ 			extern const bfd_target bfd_elf64_powerpc_vec;
+ 			extern const bfd_target bfd_elf64_powerpcle_vec;
diff --git a/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-unused.patch b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-unused.patch
new file mode 100644
index 000000000000..5c541a053a72
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-unused.patch
@@ -0,0 +1,47 @@
+commit 98f57a6c0e32bc6080a50e1cdd769b9ff78108bc
+Author: William Cohen <wcohen@redhat.com>
+Date:   Tue Jun 10 09:56:55 2014 -0500
+
+    Remove unused functions causing errors in recent gcc
+    
+    The Fedora rawhide compiler is now stricter and will treat the
+    warnings for unused functions as errors and stop the compile. This patch
+    removes two unused functions in the code.
+    
+    Signed-off-by: William Cohen <wcohen@redhat.com>
+
+diff --git a/libpp/callgraph_container.cpp b/libpp/callgraph_container.cpp
+index 1d1c95f..c5bc272 100644
+--- a/libpp/callgraph_container.cpp
++++ b/libpp/callgraph_container.cpp
+@@ -36,13 +36,6 @@ using namespace std;
+ 
+ namespace {
+ 
+-bool operator==(cg_symbol const & lhs, cg_symbol const & rhs)
+-{
+-	less_symbol cmp_symb;
+-	return !cmp_symb(lhs, rhs) && !cmp_symb(rhs, lhs);
+-}
+-
+-
+ // we store {caller,callee} inside a single u64
+ odb_key_t caller_to_key(u32 value)
+ {
+diff --git a/libpp/xml_utils.cpp b/libpp/xml_utils.cpp
+index 5f1a3a1..3de41e5 100644
+--- a/libpp/xml_utils.cpp
++++ b/libpp/xml_utils.cpp
+@@ -101,12 +101,6 @@ bool has_separated_thread_info()
+ }
+ 
+ 
+-string get_cpu_num(size_t pclass)
+-{
+-	return classes.v[pclass].ptemplate.cpu;
+-}
+-
+-
+ };  // anonymous namespace
+ 
+ xml_utils::xml_utils(format_output::xml_formatter * xo,
diff --git a/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch b/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch
new file mode 100644
index 000000000000..5916271b3a00
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch
@@ -0,0 +1,20 @@
+Fix AMD Athlon CPU family recognition.
+See upstream bug 275 for details:
+https://sourceforge.net/p/oprofile/bugs/275/
+--- oprofile-1.0.0/libop/op_cpu_type.c.orig	2014-09-12 18:39:47.000000000 +0400
++++ oprofile-1.0.0/libop/op_cpu_type.c	2014-11-30 18:29:00.328342552 +0300
+@@ -538,10 +538,13 @@
+ 	family = cpu_family(eax);
+ 
+ 	/* These family does not exist in the past.*/
+-	if (family < 0x0f || family == 0x13)
++	if ((family < 0x0f && family != 0x06) || family == 0x13)
+ 		return ret;
+ 
+ 	switch (family) {
++	case 0x6:
++		ret = op_get_cpu_number("i386/athlon");
++		break;
+ 	case 0x0f:
+ 		ret = op_get_cpu_number("x86-64/hammer");
+ 		break;
diff --git a/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch b/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch
new file mode 100644
index 000000000000..2943a074f5ef
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch
@@ -0,0 +1,11 @@
+--- a/opjitconv/opjitconv.c
++++ b/opjitconv/opjitconv.c
+@@ -216,7 +216,7 @@
+ 	int file_locked = 0;
+ 	unsigned int usecs_waited = 0;
+ 	int rc = OP_JIT_CONV_OK;
+-	int fd = open(dumpfile, S_IRUSR);
++	int fd = open(dumpfile, O_RDONLY);
+ 	if (fd < 0) {
+ 		perror("opjitconv failed to open JIT dumpfile");
+ 		return OP_JIT_CONV_FAIL;
diff --git a/dev-util/oprofile/metadata.xml b/dev-util/oprofile/metadata.xml
new file mode 100644
index 000000000000..33b97ddedc15
--- /dev/null
+++ b/dev-util/oprofile/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <longdescription>A transparent low-overhead system-wide profiler</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">oprofile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/oprofile/oprofile-0.9.9-r1.ebuild b/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..ee1c01837679
--- /dev/null
+++ b/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit autotools eutils linux-info multilib user java-pkg-opt-2
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="A transparent low-overhead system-wide profiler"
+HOMEPAGE="http://${PN}.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
+IUSE="java pch qt4"
+
+DEPEND=">=dev-libs/popt-1.7-r1
+	>=sys-devel/binutils-2.14.90.0.6-r3:*
+	>=sys-libs/glibc-2.3.2-r1
+	qt4? ( dev-qt/qtgui:4[qt3support] )
+	java? ( >=virtual/jdk-1.5:= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if ! linux_config_exists || ! linux_chkconfig_present OPROFILE ; then
+		echo
+		elog "In order for ${PN} to work, you need to configure your kernel"
+		elog "with CONFIG_OPROFILE set to 'm' or 'y'."
+		echo
+	fi
+
+	if ! kernel_is -ge 2 6 ; then
+		echo
+		elog "Support for kernels before 2.6 has been dropped in ${PN}-0.9.8."
+		echo
+	fi
+
+	# Required for JIT support, see README_PACKAGERS
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+
+	use java && java-pkg_init
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc-4.9-non-ppc.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.9-unused.patch"
+	epatch "${FILESDIR}/${PN}-1.0.0-athlon.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with qt4 x) \
+		$(use_enable qt4 gui qt4) \
+		$(use_enable pch) \
+		$(use_with java java ${JAVA_HOME})
+}
+
+src_install() {
+	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
+
+	dodoc ChangeLog* README TODO
+
+	dodir /etc/env.d
+	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${D}"/etc/env.d/10${PN} || die "env.d failed"
+}
+
+pkg_postinst() {
+	echo
+	elog "Now load the ${PN} module by running:"
+	elog "  # opcontrol --init"
+	elog "Then read manpages and this html doc:"
+	elog "  /usr/share/doc/${PF}/${PN}.html"
+	echo
+}
diff --git a/dev-util/oprofile/oprofile-1.0.0-r1.ebuild b/dev-util/oprofile/oprofile-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..4c7550125c8b
--- /dev/null
+++ b/dev-util/oprofile/oprofile-1.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils java-pkg-opt-2 linux-info multilib user
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="A transparent low-overhead system-wide profiler"
+HOMEPAGE="http://${PN}.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java pch"
+
+RDEPEND=">=dev-libs/popt-1.7-r1
+	>=sys-devel/binutils-2.14.90.0.6-r3:*
+	>=sys-libs/glibc-2.3.2-r1
+	java? ( >=virtual/jdk-1.5:= )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.31"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFIG_CHECK="PERF_EVENTS"
+ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work."
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if ! kernel_is -ge 2 6 31; then
+		echo
+		ewarn "Support for kernels before 2.6.31 has been dropped in ${PN}-1.0.0."
+		echo
+	fi
+
+	# Required for JIT support, see README_PACKAGERS
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+
+	use java && java-pkg_init
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-athlon.patch"
+	epatch "${FILESDIR}/${P}-opjitconv-open.patch"
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable pch) \
+		$(use_with java java ${JAVA_HOME})
+}
+
+src_install() {
+	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
+
+	dodoc ChangeLog* README TODO
+	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}"
+	doenvd "${T}/10${PN}"
+}
+
+pkg_postinst() {
+	echo
+	elog "Starting from ${PN}-1.0.0 opcontrol was removed, use operf instead."
+	elog "CONFIG_OPROFILE is no longer used, you may remove it from your kernels."
+	elog "Please read manpages and this html doc:"
+	elog "  /usr/share/doc/${PF}/${PN}.html"
+	echo
+}
diff --git a/dev-util/oprofile/oprofile-1.1.0.ebuild b/dev-util/oprofile/oprofile-1.1.0.ebuild
new file mode 100644
index 000000000000..fedcbb11635e
--- /dev/null
+++ b/dev-util/oprofile/oprofile-1.1.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit java-pkg-opt-2 linux-info multilib user
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="A transparent low-overhead system-wide profiler"
+HOMEPAGE="http://${PN}.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java pch"
+
+RDEPEND=">=dev-libs/popt-1.7-r1
+	>=sys-devel/binutils-2.14.90.0.6-r3:*
+	>=sys-libs/glibc-2.3.2-r1
+	java? ( >=virtual/jdk-1.5:= )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.31"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFIG_CHECK="PERF_EVENTS"
+ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work."
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if ! kernel_is -ge 2 6 31; then
+		echo
+		ewarn "Support for kernels before 2.6.31 has been dropped in ${PN}-1.0.0."
+		echo
+	fi
+
+	# Required for JIT support, see README_PACKAGERS
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+
+	use java && java-pkg_init
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable pch) \
+		$(use_with java java ${JAVA_HOME})
+}
+
+src_install() {
+	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
+
+	dodoc ChangeLog* README TODO
+	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}"
+	doenvd "${T}/10${PN}"
+}
+
+pkg_postinst() {
+	echo
+	elog "Starting from ${PN}-1.0.0 opcontrol was removed, use operf instead."
+	elog "CONFIG_OPROFILE is no longer used, you may remove it from your kernels."
+	elog "Please read manpages and this html doc:"
+	elog "  /usr/share/doc/${PF}/${PN}.html"
+	echo
+}
diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
new file mode 100644
index 000000000000..a0cf0690c2a5
--- /dev/null
+++ b/dev-util/osc/Manifest
@@ -0,0 +1,2 @@
+DIST osc-0.148.2.tar.gz 6818939 SHA256 573d23d84e47316bd2eaed16e37696a1b87b8bc8cb457be5403ecfcb4da44c4c SHA512 4e17c8fb8f78a3f9a279f27e3c52fa1a4d6ee62825e06a5943b144ff39a3c53650d31c1b8033ee78cf6f3d4e85c140b2fc0c7f86b3d134cea59fc8da24e3fd16 WHIRLPOOL 20160e3148f21ff78074f4858928fee20227defe1065c8971c9e1823ab7cb5195edab2ac9da4662667be49ad2dc772c1d260a83eae59166c362f3050b88fd19d
+DIST osc-0.150.1.tar.gz 329415 SHA256 a6ebb67cfe2b878f51dfa3a725cda176d28bef586bc23e4255d35fc830823386 SHA512 8d9d601b6e5ae89e5319e70465dfa7ad2550248107d7bfb1f5c31b991743f78e7fd53f7766773d76aa884da1f535edac50d82ae4505d80801354e323e7f8fa3c WHIRLPOOL 594f29e8998a27075a0b3f1c153bd42805ff8704256ee1c6e64a63e315b66c94b7e3db87c94ef723081a94fa5010e15900d3feece1048e23c5dea10a38498417
diff --git a/dev-util/osc/files/osc-0.139.2-out-of-tree-build.patch b/dev-util/osc/files/osc-0.139.2-out-of-tree-build.patch
new file mode 100644
index 000000000000..d0adfe53f615
--- /dev/null
+++ b/dev-util/osc/files/osc-0.139.2-out-of-tree-build.patch
@@ -0,0 +1,20 @@
+--- setup.py.orig	2013-05-27 13:51:06.143039789 +0000
++++ setup.py	2013-05-27 13:53:27.814034661 +0000
+@@ -25,7 +25,7 @@
+         """
+         """
+         import gzip
+-        man_path = os.path.join('build', 'osc.1.gz')
++        man_path = 'osc.1.gz'
+         distutils.log.info('generating %s' % man_path)
+         outfile = gzip.open(man_path, 'w')
+         osccli = commandline.Osc(stdout=outfile)
+@@ -48,7 +48,7 @@
+ 
+ data_files = []
+ if sys.platform[:3] != 'win':
+-    data_files.append((os.path.join('share', 'man', 'man1'), [os.path.join('build', 'osc.1.gz')]))
++    data_files.append((os.path.join('share', 'man', 'man1'), ['osc.1.gz']))
+ 
+ setup(name='osc',
+       version = osc.core.__version__,
diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
new file mode 100644
index 000000000000..4a239b9dbb0a
--- /dev/null
+++ b/dev-util/osc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>suse</herd>
+<longdescription lang="en">
+Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
+</longdescription>
+</pkgmetadata>
+
diff --git a/dev-util/osc/osc-0.148.2.ebuild b/dev-util/osc/osc-0.148.2.ebuild
new file mode 100644
index 000000000000..7f3ddc23e503
--- /dev/null
+++ b/dev-util/osc/osc-0.148.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	OBS_PROJECT="openSUSE:Tools"
+	EXTRA_ECLASS="obs-download"
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Command line tool for Open Build Service"
+HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	dev-python/urlgrabber[${PYTHON_USEDEP}]
+	app-arch/rpm[python,${PYTHON_USEDEP}]
+	dev-python/m2crypto[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+"
+PDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-util/obs-service-meta
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.139.2-out-of-tree-build.patch
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dosym osc-wrapper.py /usr/bin/osc
+	keepdir /usr/lib/osc/source_validators
+	cd "${ED}"/usr/
+	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'     {} +
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
+	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|g'          {} +
+	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
+}
diff --git a/dev-util/osc/osc-0.150.1.ebuild b/dev-util/osc/osc-0.150.1.ebuild
new file mode 100644
index 000000000000..e394d17376fc
--- /dev/null
+++ b/dev-util/osc/osc-0.150.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	OBS_PROJECT="openSUSE:Tools"
+	EXTRA_ECLASS="obs-download"
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Command line tool for Open Build Service"
+HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/urlgrabber[${PYTHON_USEDEP}]
+	app-arch/rpm[python,${PYTHON_USEDEP}]
+	dev-python/m2crypto[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+"
+PDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-util/obs-service-meta
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.139.2-out-of-tree-build.patch
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dosym osc-wrapper.py /usr/bin/osc
+	keepdir /usr/lib/osc/source_validators
+	cd "${ED}"/usr/
+	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'     {} +
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
+	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|g'          {} +
+	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
+}
diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
new file mode 100644
index 000000000000..e394d17376fc
--- /dev/null
+++ b/dev-util/osc/osc-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/openSUSE/osc.git"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	OBS_PROJECT="openSUSE:Tools"
+	EXTRA_ECLASS="obs-download"
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Command line tool for Open Build Service"
+HOMEPAGE="http://en.opensuse.org/openSUSE:OSC"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/urlgrabber[${PYTHON_USEDEP}]
+	app-arch/rpm[python,${PYTHON_USEDEP}]
+	dev-python/m2crypto[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+"
+PDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-util/obs-service-meta
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.139.2-out-of-tree-build.patch
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dosym osc-wrapper.py /usr/bin/osc
+	keepdir /usr/lib/osc/source_validators
+	cd "${ED}"/usr/
+	find . -type f -exec sed -i 's|/usr/bin/build|/usr/bin/suse-build|g'     {} +
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
+	find . -type f -exec sed -i 's|/usr/lib/obs|/usr/libexec/obs|g'          {} +
+	rm -f "${ED}"/usr/share/doc/${PN}*/TODO*
+}
diff --git a/dev-util/osdt/Manifest b/dev-util/osdt/Manifest
new file mode 100644
index 000000000000..8a3051e9eecf
--- /dev/null
+++ b/dev-util/osdt/Manifest
@@ -0,0 +1 @@
+DIST osdt-1.1.5.tbz2 314333 SHA256 f9c977a93ba4b9104f0e9d9f9cb33f80d26c3c6b2912cc3b251aa44c44250c61 SHA512 c4a1d702303f7e0aaff360b621adc97e6db7cff49b1d0f2b592f66a3ec0ea2a6864770a535656dfcf02b31b510da7215355bed73cd877662dd34122fea6adf1c WHIRLPOOL d236543aa75679ebb62ac0a47e4bcd91decb0fe95831239dc5de1953d0157adf075c1ede8f6c9d11ec829c900b865f5505996d8d392cca0525b2ebd8e1103df3
diff --git a/dev-util/osdt/metadata.xml b/dev-util/osdt/metadata.xml
new file mode 100644
index 000000000000..759dee1c3cd7
--- /dev/null
+++ b/dev-util/osdt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		OSDT (Open Source Development Toolkit), is a set of tools that help
+		lower the "friction cost" of Open Source software development.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">osdt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/osdt/osdt-1.1.5.ebuild b/dev-util/osdt/osdt-1.1.5.ebuild
new file mode 100644
index 000000000000..956fa3eee544
--- /dev/null
+++ b/dev-util/osdt/osdt-1.1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="tools for Open Source software distribution"
+HOMEPAGE="http://sourceforge.net/projects/osdt/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tbz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5
+	dev-perl/XML-Simple
+	sys-devel/m4"
+
+src_compile() { :; }
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr SYSCONFDIR=/etc \
+	  INFODIR=/usr/share/info MANDIR=/usr/share/man install || die
+
+	# Hack until the fix can be incorporated upstream: fix the permissions
+	# on /etc/osdt/project-skeletons/opensource/
+	chmod 755 "${D}"/etc/osdt/project-skeletons/opensource/
+}
diff --git a/dev-util/par/Manifest b/dev-util/par/Manifest
new file mode 100644
index 000000000000..4070c99db148
--- /dev/null
+++ b/dev-util/par/Manifest
@@ -0,0 +1 @@
+DIST prc.tgz 62143 SHA256 00fe6faf5e34e65ab6ee7b44e1948523e7bf4ef304652fb04b53b314ed2c3f49 SHA512 f971af42a1a6a60d7b05c375db9a0ecd463a7801543a9ab96413170a807e68e4f9524180899c73fb93224bdcf510eeaaadcf1028d3f0a625207086215c572cef WHIRLPOOL 3cc15580aa67d33ead4ab4d230bac3a7f629dee34601b00b35f295ce478e4b71c1fd1127ffecd3646fa5d68f654ac3a32b4c31cfb1fca5890fedde9440f1b50e
diff --git a/dev-util/par/metadata.xml b/dev-util/par/metadata.xml
new file mode 100644
index 000000000000..ff62877c67ae
--- /dev/null
+++ b/dev-util/par/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/par/par-00.05.01.ebuild b/dev-util/par/par-00.05.01.ebuild
new file mode 100644
index 000000000000..4fbedb5b1649
--- /dev/null
+++ b/dev-util/par/par-00.05.01.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="par manipulates PalmOS database files"
+HOMEPAGE="http://www.djw.org/product/palm/par/"
+SRC_URI="http://www.djw.org/product/palm/par/prc.tgz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+DEPEND="!app-text/par
+	!app-arch/par"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/prc"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die 'Failed to compile!'
+	emake par.man || die 'Failed to make man page!'
+}
+
+src_install () {
+	dobin par || die 'dobin failed'
+	dolib *.a || die 'dolib *.a failed'
+
+	newman par.man par.1 || die 'newman failed'
+}
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
new file mode 100644
index 000000000000..bf2ff6e432be
--- /dev/null
+++ b/dev-util/patchelf/Manifest
@@ -0,0 +1 @@
+DIST patchelf-0.8.tar.bz2 119369 SHA256 c99f84d124347340c36707089ec8f70530abd56e7827c54d506eb4cc097a17e7 SHA512 819ace0ee032612e8bef56f230ea470be9d44bc03ef561f98ffac84f2555e419f87309280df6d265a8ae56452e54d46fc90be13a449847e93e4e7b413dc8605a WHIRLPOOL 64c56eda439dc114e4450428d7bde754a894ecbd8d2e0d1a29c3a53965527f76723fef9a240cd3686532f9202c84b23dd25cfe8e4f664ac33e08ca4056ef6780
diff --git a/dev-util/patchelf/files/patchelf-0.8-dash.patch b/dev-util/patchelf/files/patchelf-0.8-dash.patch
new file mode 100644
index 000000000000..4210b1c054d0
--- /dev/null
+++ b/dev-util/patchelf/files/patchelf-0.8-dash.patch
@@ -0,0 +1,28 @@
+From 3b9e7913a6d14cb09ed91ce8a1110955bda200ef Mon Sep 17 00:00:00 2001
+From: Alexandre Pretyman <alexandre.pretyman@gmail.com>
+Date: Tue, 14 Jul 2015 09:12:38 -0400
+Subject: [PATCH] Change configure.ac from OpenWrt to support Mac OS
+
+This change is from the OpenWrt project, from the URL:
+https://dev.openwrt.org/ticket/18998
+It enables patchelf to sucessfully compile and run under Mac OS and
+keeps compatibility with Linux.
+
+Tested under Mac OS X 10.9.5 and Ubuntu 15.04 to patch a binary of type
+ELF 32-bit LSB executable - the patch fully worked
+
+This patch is credited to Felix Fietkau
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8ca9ad4..69e12de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)]))
++AC_INIT([patchelf], m4_esyscmd([printf $(cat ./version)]))
+ AC_CONFIG_SRCDIR([src/patchelf.cc])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign color-tests parallel-tests])
diff --git a/dev-util/patchelf/metadata.xml b/dev-util/patchelf/metadata.xml
new file mode 100644
index 000000000000..4a00a64b40ae
--- /dev/null
+++ b/dev-util/patchelf/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/patchelf/patchelf-0.8.ebuild b/dev-util/patchelf/patchelf-0.8.ebuild
new file mode 100644
index 000000000000..ef8f82a7d792
--- /dev/null
+++ b/dev-util/patchelf/patchelf-0.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
+HOMEPAGE="http://nixos.org/patchelf.html"
+SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
+IUSE=""
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}"/${P}-dash.patch )
+
+src_prepare() {
+	rm src/elf.h || die
+	sed -e 's:-Werror::g' -i configure.ac || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=( --docdir="${EPREFIX}"/usr/share/doc/${PF} )
+	autotools-utils_src_configure
+}
+
+src_test() {
+	autotools-utils_src_test -j1
+}
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
new file mode 100644
index 000000000000..90d9829a68a4
--- /dev/null
+++ b/dev-util/patchutils/Manifest
@@ -0,0 +1 @@
+DIST patchutils-0.3.3.tar.xz 156328 SHA256 91f4e8451b2efcac5d40c966e42c175803450f0de94c926bfecc12c90070ad3c SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268 WHIRLPOOL b4db67f2682e3bd4a37abacaa56477f7bfe79210469243c572ebd870e0e19cb54e51d6be79b737210e9de685d09470ce2d2db0452fe4b8f26f72f06a9cb6b3f8
diff --git a/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch b/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch
new file mode 100644
index 000000000000..be190b65a734
--- /dev/null
+++ b/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch
@@ -0,0 +1,25 @@
+ src/filterdiff.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/filterdiff.c b/src/filterdiff.c
+index eb08d49..0b2b301 100644
+--- a/src/filterdiff.c
++++ b/src/filterdiff.c
+@@ -1263,7 +1263,7 @@ read_regex_file (const char *file)
+ 			char errstr[300];
+ 			regerror (err, &regex[num_regex - 1], errstr,
+ 				  sizeof (errstr));
+-			error (EXIT_FAILURE, 0, errstr);
++			error (EXIT_FAILURE, 0, "%s", errstr);
+ 			exit (1);
+ 		}
+ 	}
+@@ -1509,7 +1509,7 @@ int main (int argc, char *argv[])
+ 			char errstr[300];
+ 			regerror (err, &regex[num_regex - 1], errstr,
+ 				  sizeof (errstr));
+-			error (EXIT_FAILURE, 0, errstr);
++			error (EXIT_FAILURE, 0, "%s", errstr);
+ 			exit (1);
+ 		}
+ 	}
diff --git a/dev-util/patchutils/metadata.xml b/dev-util/patchutils/metadata.xml
new file mode 100644
index 000000000000..934d5c44fc6f
--- /dev/null
+++ b/dev-util/patchutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>flameeyes@gentoo.org</email>
+	</maintainer>
+	<herd>shell-tools</herd>
+</pkgmetadata>
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
new file mode 100644
index 000000000000..36a18d6d968b
--- /dev/null
+++ b/dev-util/patchutils/patchutils-0.3.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A collection of tools that operate on patch files"
+HOMEPAGE="http://cyberelk.net/tim/patchutils/"
+SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+# The testsuite makes use of gendiff(1) that comes from rpm, thus if
+# the user wants to run tests, it should install that too.
+DEPEND="test? ( app-arch/rpm )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format-security.patch
+}
diff --git a/dev-util/peg/Manifest b/dev-util/peg/Manifest
new file mode 100644
index 000000000000..5c9c10952486
--- /dev/null
+++ b/dev-util/peg/Manifest
@@ -0,0 +1,3 @@
+DIST peg-0.1.13.tar.gz 55352 SHA256 1803b1427a55aae9d7a0db032669a86c4db372fdf775921e43b6308c7b69148c SHA512 fbec192daef2c72511cc17e6f7b301ac48d20746ac9843d61c05e8a069633c5fbc6d92155a94aad5094dc84a2f1bb92bc2b2aabaf6bc563d4401460f1047b3b0 WHIRLPOOL 9b2043aa14569fc45053563c5785297d4ea26fd350a18edd9791a3fb55445c3a31de91fcfd654fe4aed5abd78d47a8651b0c1c78a3218aa78dc5c4a4559505c5
+DIST peg-0.1.15.tar.gz 56522 SHA256 b6736ca15e5eb9154596e620ebad94a4705c7e597fc97b11219a90fc171faef2 SHA512 70b67d57c866c24cc9ceaf029e95bacba56def7ccb289233e3816c1f6f1f210dd8a729446df94d0424b5946959dbf9a33f81a5a95f7563a9dca460d6e2320018 WHIRLPOOL 2a8f4942c32d92998ba930707e59f49b3e957a9c8602d9160fe07143e7f7353d88ae597c694f42554f789d6ab35c4748f81ef5548fabe520ced623d3905b5168
+DIST peg-0.1.9.tar.gz 38485 SHA256 81d9299f3ee9e12b78c993529185645edd4475f5da271bff65b13c61d776708f SHA512 73d0776972243ca8cba348b63252dee837308df6d6b00d2a186396545b80cb798e3280a9af6a71d51d9ae8c381a518502f96cf3d0d651bcf0f2206276f29ed1e WHIRLPOOL 2b3ff19f6028ae15e5cd6e1794e97892ea791da0f7a906d3ba45d1a478d7c0eaa1aa5432572e2dcfe03106f3d108bb5e02d3fbd9ee1c59f45d5c56ca56efa5a9
diff --git a/dev-util/peg/metadata.xml b/dev-util/peg/metadata.xml
new file mode 100644
index 000000000000..6971c1e19018
--- /dev/null
+++ b/dev-util/peg/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+        	<maintainer>
+		<email>jauhien@gentoo.org</email>
+		<name>Jauhien Piatlicki</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/peg/peg-0.1.13.ebuild b/dev-util/peg/peg-0.1.13.ebuild
new file mode 100644
index 000000000000..646390c7c4bf
--- /dev/null
+++ b/dev-util/peg/peg-0.1.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Recursive-descent parser generators for C"
+HOMEPAGE="http://piumarta.com/software/peg/"
+SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e '/strip/d' \
+		-e '/^CFLAGS/d' \
+		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
+			Makefile || die "sed failed"
+}
+
+src_install() {
+	mkdir -p "${D}/usr/bin" || die "mkdir failed"
+	emake ROOT="${D}" PREFIX="/usr" install
+	rm -rf "${D}/usr/man" || die "rm failed"
+	doman src/${PN}.1
+}
+
+src_test() {
+	emake check
+	emake test
+}
diff --git a/dev-util/peg/peg-0.1.15-r1.ebuild b/dev-util/peg/peg-0.1.15-r1.ebuild
new file mode 100644
index 000000000000..0179513b7944
--- /dev/null
+++ b/dev-util/peg/peg-0.1.15-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Recursive-descent parser generators for C"
+HOMEPAGE="http://piumarta.com/software/peg/"
+SRC_URI="http://piumarta.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e '/strip/d' \
+		-e '/^CFLAGS/d' \
+		-e 's/$(CC) $(CFLAGS) -o/$(CC) $(CFLAGS) $(LDFLAGS) -o/g' \
+			Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dodir "/usr/bin"
+	emake -j1 \
+		ROOT="${D}" \
+		PREFIX="/usr" \
+		install
+	rm -rf "${D}/usr/man" || die "rm failed"
+	doman src/${PN}.1
+}
+
+src_test() {
+	emake check
+	emake test
+}
diff --git a/dev-util/peg/peg-0.1.15.ebuild b/dev-util/peg/peg-0.1.15.ebuild
new file mode 100644
index 000000000000..34c064feade1
--- /dev/null
+++ b/dev-util/peg/peg-0.1.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Recursive-descent parser generators for C"
+HOMEPAGE="http://piumarta.com/software/peg/"
+SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e '/strip/d' \
+		-e '/^CFLAGS/d' \
+		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
+			Makefile || die "sed failed"
+}
+
+src_install() {
+	dodir "/usr/bin"
+	emake ROOT="${D}" PREFIX="/usr" install
+	rm -rf "${D}/usr/man" || die "rm failed"
+	doman src/${PN}.1
+}
+
+src_test() {
+	emake check
+	emake test
+}
diff --git a/dev-util/peg/peg-0.1.9.ebuild b/dev-util/peg/peg-0.1.9.ebuild
new file mode 100644
index 000000000000..f64f511f9aa0
--- /dev/null
+++ b/dev-util/peg/peg-0.1.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Recursive-descent parser generators for C"
+HOMEPAGE="http://piumarta.com/software/peg/"
+SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e '/strip/d' \
+		-e '/^CFLAGS/d' \
+		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
+			Makefile || die "sed failed"
+}
+
+src_install() {
+	mkdir -p "${D}/usr/bin" || die "mkdir failed"
+	emake ROOT="${D}" PREFIX="/usr" install
+	doman ${PN}.1
+}
+
+src_test() {
+	emake check
+	emake test
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
new file mode 100644
index 000000000000..1b4f9567cee8
--- /dev/null
+++ b/dev-util/perf/Manifest
@@ -0,0 +1,6 @@
+DIST linux-3.12.tar.bz2 91111381 SHA256 43129defd9079c99cf5e57506d36b6b01614c734a5ed9e604d3a7c1510ab8b22 SHA512 bea14d044c8a0257d8312f45db6a39ca4f9dffe8ac32a11198e90762ee1735c8b6975bb81c635a4755d451793fa7c7e5b2d7d692c9e57133b15b4cdc941febf1 WHIRLPOOL 1889c3f689cf305856112f350e3901175b9f6c4f1e4143d62b40e502000685ade3e75b211a8a9fd948f6225e1c57a68cae10ceb649ff7976981089290d562926
+DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
+DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
+DIST linux-3.8.tar.bz2 84623657 SHA256 fce774b5313e73949cb35f128e91e7b2ccd7fa2438abc5cff69267e504395a45 SHA512 966a3b08aecc4b135a48ea73ba3326e1710c455e6da29693479e9d1a56663fc10f569e2342fa861486d39d4ea5c2af406d1bd40613c15555acffdba160ef7ba9 WHIRLPOOL a83baa904c78f71fed5e4cf2607b8e6d1db70a4137b5c00b3cc5f60f04042724faa3cfec36a781417d483548ba0c811f559e82146806edacd1c2fe90bd398e64
+DIST patch-3.13.1.xz 2884 SHA256 74a093b2cacddac0a105e0989b7bf0e9829b9923e2d71ca10382e90324a17e74 SHA512 164235a15e6a984e9aeaf9fe475a8b2975d5e4c4b28dd4ecf99064b0f0c72eea766d925340f1a7232cabcbd23d26773527c300b6d995bf5cde18a276208fdccc WHIRLPOOL 0ea0118960970b7d6465445252e7a21a6aeb494c0afefec5f52a68c0b7e0d63fd2ed59a3877fbe9ebd282ac03812235b021534866efa8f46d549b6f70228e4b6
+DIST patch-3.15.5.xz 122232 SHA256 9b0d000e0bdec7a25ee6303afdab8d2af77439995876eadd6ce248e5c954037d SHA512 6831200503334e839c3cccdad29058aecc0205171cc5b75205d0a2aada8636633889ebff35d9677d4567bbaeea249efc83571e016104cd67554fe72b3b405755 WHIRLPOOL 56e1e817c08b4557e18b34d148d8ffd0f73bf8dec92f2339ca9413ca2143b65ec35f6d48c87e37f140226e57d7df33f06d6c53a48dafa7ddf090a839fdabe024
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
new file mode 100644
index 000000000000..b4aba5127c82
--- /dev/null
+++ b/dev-util/perf/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>naota@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="audit">
+      Enable support for sys-process/audit.
+    </flag>
+    <flag name="demangle">
+      Enable C++ symbol name demangling, using libbfd from
+      <pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
+      package will have to be rebuilt after every version bump of
+      binutils.
+    </flag>
+    <flag name="doc">
+      Build documentation and man pages. With this USE flag disabled,
+      the --help parameter for perf and its sub-tools will not be
+      available. This is optional because it depends on a few
+      documentation handling tools that are not always welcome on user
+      systems.
+    </flag>
+    <flag name="perl">
+      Add support for Perl as a scripting language for perf tools.
+    </flag>
+    <flag name="unwind">
+      Use sys-libs/libunwind for frame unwinding support.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/perf/perf-3.12.ebuild b/dev-util/perf/perf-3.12.ebuild
new file mode 100644
index 000000000000..af262155bd1a
--- /dev/null
+++ b/dev-util/perf/perf-3.12.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit versionator eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="http://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV/_rc} != ${PV} ]] ; then
+	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+	PATCH_VERSION=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ $(get_version_component_count) == 4 ]] ; then
+	# stable-release series
+	LINUX_VER=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+	SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.bz2"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="audit +demangle +doc perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+	demangle? ( sys-devel/binutils )
+	perl? ( dev-lang/perl )
+	slang? ( dev-libs/newt )
+	unwind? ( sys-libs/libunwind )
+	dev-libs/elfutils"
+DEPEND="${RDEPEND}
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)
+	python? ( ${PYTHON_DEPS} )"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" )
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		cd "${S_K}"
+		epatch "${WORKDIR}"/${P}.patch
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e 's:-Werror::' \
+		-e 's:-ggdb3::' \
+		-e 's:-fstack-protector-all::' \
+		-e 's:^LDFLAGS =:EXTLIBS +=:' \
+		-e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
+		-e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
+		-e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
+		-e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
+		-e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
+		"${S}"/Makefile || die
+	sed -i -e 's:-Werror::' "${S_K}"/tools/lib/lk/Makefile || die
+	sed -i \
+		-e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
+		"${S}"/Makefile \
+		"${S}"/Documentation/Makefile || die
+
+	# Avoid the call to make kernelversion
+	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+	local arch=$(KV=2.6.23 tc-arch-kernel)
+	emake -j1 V=1 \
+		CC="$(tc-getCC)" AR="$(tc-getAR)" \
+		prefix="/usr" bindir_relative="sbin" \
+		CFLAGS_OPTIMIZE="${CFLAGS}" \
+		LDFLAGS_OPTIMIZE="${LDFLAGS}" \
+		ARCH="${arch}" \
+		NO_DEMANGLE=$(puse demangle) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_NEWT=$(puse slang) \
+		WERROR=0 \
+		"$@"
+}
+
+src_compile() {
+	perf_make
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	perf_make install DESTDIR="${D}"
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+	if use doc ; then
+		dohtml Documentation/*.html
+		doman Documentation/*.1
+	fi
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Without the doc USE flag you won't get any documentation nor man pages."
+		elog "And without man pages, you won't get any --help output for perf and its"
+		elog "sub-tools."
+	fi
+}
diff --git a/dev-util/perf/perf-3.13.1-r1.ebuild b/dev-util/perf/perf-3.13.1-r1.ebuild
new file mode 100644
index 000000000000..33e2f9e4cffb
--- /dev/null
+++ b/dev-util/perf/perf-3.13.1-r1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit versionator eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="http://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+	PATCH_VERSION=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.xz
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+else
+	VER_COUNT=$(get_version_component_count)
+	if [[ ${VER_COUNT} -gt 2 ]] ; then
+		# stable-release series
+		LINUX_VER=$(get_version_component_range 1-2)
+		LINUX_PATCH=patch-${PV}.xz
+		SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+	else
+		LINUX_VER=${PV}
+		SRC_URI=""
+	fi
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="audit +demangle +doc gtk perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+	demangle? ( sys-devel/binutils )
+	gtk? ( x11-libs/gtk+:2 )
+	perl? ( dev-lang/perl )
+	slang? ( dev-libs/newt )
+	unwind? ( sys-libs/libunwind )
+	dev-libs/elfutils"
+DEPEND="${RDEPEND}
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)
+	python? ( ${PYTHON_DEPS} )"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" )
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		cd "${S_K}"
+		epatch "${WORKDIR}"/${P}.patch
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e 's:-Werror::' \
+		-e 's:-ggdb3::' \
+		-e 's:-fstack-protector-all::' \
+		-e 's:^LDFLAGS =:EXTLIBS +=:' \
+		-e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
+		-e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
+		-e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
+		-e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
+		-e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
+		"${S}"/Makefile || die
+	sed -i -e 's:-Werror::' "${S_K}"/tools/lib/lk/Makefile || die
+	sed -i \
+		-e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
+		"${S}"/Makefile \
+		"${S}"/Documentation/Makefile || die
+
+	# Avoid the call to make kernelversion
+	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+	local arch=$(KV=2.6.23 tc-arch-kernel)
+	emake V=1 \
+		CC="$(tc-getCC)" AR="$(tc-getAR)" \
+		prefix="/usr" bindir_relative="bin" \
+		CFLAGS_OPTIMIZE="${CFLAGS}" \
+		LDFLAGS_OPTIMIZE="${LDFLAGS}" \
+		ARCH="${arch}" \
+		NO_DEMANGLE=$(puse demangle) \
+		NO_GTK2=$(puse gtk) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_NEWT=$(puse slang) \
+		WERROR=0 \
+		"$@"
+}
+
+src_compile() {
+	perf_make -f Makefile.perf
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	perf_make -f Makefile.perf install DESTDIR="${D}"
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+	if use doc ; then
+		dohtml Documentation/*.html
+		doman Documentation/*.1
+	fi
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Without the doc USE flag you won't get any documentation nor man pages."
+		elog "And without man pages, you won't get any --help output for perf and its"
+		elog "sub-tools."
+	fi
+}
diff --git a/dev-util/perf/perf-3.15.5.ebuild b/dev-util/perf/perf-3.15.5.ebuild
new file mode 100644
index 000000000000..dc9dac7a843e
--- /dev/null
+++ b/dev-util/perf/perf-3.15.5.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit versionator eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="http://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+	PATCH_VERSION=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.xz
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+else
+	VER_COUNT=$(get_version_component_count)
+	if [[ ${VER_COUNT} -gt 2 ]] ; then
+		# stable-release series
+		LINUX_VER=$(get_version_component_range 1-2)
+		LINUX_PATCH=patch-${PV}.xz
+		SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+	else
+		LINUX_VER=${PV}
+		SRC_URI=""
+	fi
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="audit debug +demangle +doc gtk perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+	demangle? ( sys-devel/binutils )
+	gtk? ( x11-libs/gtk+:2 )
+	perl? ( dev-lang/perl )
+	slang? ( dev-libs/newt )
+	unwind? ( sys-libs/libunwind )
+	dev-libs/elfutils"
+DEPEND="${RDEPEND}
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)
+	python? ( ${PYTHON_DEPS} )"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	local paths=( tools/perf tools/scripts tools/include tools/lib include lib "arch/*/include" "arch/*/lib" )
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		cd "${S_K}"
+		epatch "${WORKDIR}"/${P}.patch
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e 's:-Werror::' \
+		-e 's:-ggdb3::' \
+		-e 's:-fstack-protector-all::' \
+		-e 's:^LDFLAGS =:EXTLIBS +=:' \
+		-e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
+		-e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
+		-e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
+		-e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
+		-e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
+		"${S}"/Makefile || die
+	sed -i -e 's:-Werror::' "${S_K}"/tools/lib/api/Makefile || die
+	sed -i \
+		-e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
+		"${S}"/Makefile \
+		"${S}"/Documentation/Makefile || die
+
+	# Avoid the call to make kernelversion
+	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+	local arch=$(KV=2.6.23 tc-arch-kernel)
+	emake V=1 \
+		CC="$(tc-getCC)" AR="$(tc-getAR)" \
+		prefix="/usr" bindir_relative="bin" \
+		CFLAGS_OPTIMIZE="${CFLAGS}" \
+		LDFLAGS_OPTIMIZE="${LDFLAGS}" \
+		ARCH="${arch}" \
+		NO_DEMANGLE=$(puse demangle) \
+		NO_GTK2=$(puse gtk) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_NEWT=$(puse slang) \
+		WERROR=0 \
+		"$@"
+}
+
+src_compile() {
+	perf_make -f Makefile.perf
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	perf_make -f Makefile.perf install DESTDIR="${D}"
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+	if use doc ; then
+		dohtml Documentation/*.html
+		doman Documentation/*.1
+	fi
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Without the doc USE flag you won't get any documentation nor man pages."
+		elog "And without man pages, you won't get any --help output for perf and its"
+		elog "sub-tools."
+	fi
+}
diff --git a/dev-util/perf/perf-3.8-r1.ebuild b/dev-util/perf/perf-3.8-r1.ebuild
new file mode 100644
index 000000000000..74afde049bd6
--- /dev/null
+++ b/dev-util/perf/perf-3.8-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2"
+inherit versionator eutils toolchain-funcs python linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="http://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV/_rc} != ${PV} ]] ; then
+	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+	PATCH_VERSION=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ $(get_version_component_count) == 4 ]] ; then
+	# stable-release series
+	LINUX_VER=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+	SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.bz2"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="audit +demangle +doc perl python slang unwind"
+
+RDEPEND="audit? ( sys-process/audit )
+	demangle? ( sys-devel/binutils )
+	perl? ( dev-lang/perl )
+	slang? ( dev-libs/newt )
+	unwind? ( sys-libs/libunwind )
+	dev-libs/elfutils"
+DEPEND="${RDEPEND}
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python_set_active_version 2
+}
+
+src_unpack() {
+	local paths=( tools/perf tools/scripts tools/lib include lib "arch/*/include" "arch/*/lib" )
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		cd "${S_K}"
+		epatch "${WORKDIR}"/${P}.patch
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e 's:-Werror::' \
+		-e 's:-ggdb3::' \
+		-e 's:-fstack-protector-all::' \
+		-e 's:^LDFLAGS =:EXTLIBS +=:' \
+		-e '/\(PERL\|PYTHON\)_EMBED_LDOPTS/s:ALL_LDFLAGS +=:EXTLIBS +=:' \
+		-e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
+		-e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
+		-e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
+		-e 's:$(sysconfdir_SQ)/bash_completion.d:/usr/share/bash-completion:' \
+		"${S}"/Makefile
+	sed -i \
+		-e '/.FORCE-PERF-VERSION-FILE/s,.FORCE-PERF-VERSION-FILE,,g' \
+		"${S}"/Makefile \
+		"${S}"/Documentation/Makefile
+
+	# Avoid the call to make kernelversion
+	echo "PERF_VERSION = ${MY_PV}" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	local arch=$(tc-arch)
+	[[ "${arch}" == "amd64" ]] && arch="x86_64"
+	emake -j1 V=1 \
+		CC="$(tc-getCC)" AR="$(tc-getAR)" \
+		prefix="/usr" bindir_relative="sbin" \
+		CFLAGS_OPTIMIZE="${CFLAGS}" \
+		LDFLAGS_OPTIMIZE="${LDFLAGS}" \
+		ARCH="${arch}" \
+		NO_DEMANGLE=$(puse demangle) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_NEWT=$(puse slang) \
+		"$@"
+}
+
+src_compile() {
+	perf_make
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	perf_make install DESTDIR="${D}"
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+	if use doc ; then
+		dohtml Documentation/*.html
+		doman Documentation/*.1
+	fi
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Without the doc USE flag you won't get any documentation nor man pages."
+		elog "And without man pages, you won't get any --help output for perf and its"
+		elog "sub-tools."
+	fi
+}
diff --git a/dev-util/pida/Manifest b/dev-util/pida/Manifest
new file mode 100644
index 000000000000..3bb88bcad1bb
--- /dev/null
+++ b/dev-util/pida/Manifest
@@ -0,0 +1 @@
+DIST pida-0.6.2.tar.gz 812069 SHA256 f8476c9a36399b525a18761b709c204ae3f3c4344a4334b726d4ddccfca17a34 SHA512 7793bda11f890d329e0748e789f41c8907fb47c6d4e40f9f2a6ae6d098e606cbf29aae0946786e47b5fac45a672f84c78925cdcf2b8fd7ad05d758630c3b8ea3 WHIRLPOOL 9a11770a0c09c58a17e163f4f4ef8924e9481a95de85f844586b759dbe8c50f4ed32f26beeabd2a53d1f10ac0b459fd715727f9c4b6d0c8f6046a9b9568ee91b
diff --git a/dev-util/pida/files/pida-0.6.1-fix_implicit_declaration.patch b/dev-util/pida/files/pida-0.6.1-fix_implicit_declaration.patch
new file mode 100644
index 000000000000..0636a0dd7279
--- /dev/null
+++ b/dev-util/pida/files/pida-0.6.1-fix_implicit_declaration.patch
@@ -0,0 +1,10 @@
+--- contrib/moo/moo.override
++++ contrib/moo/moo.override
+@@ -6,6 +6,7 @@
+ #include <pygobject.h>
+ #include <pygtk/pygtk.h>
+ #include "moobigpaned.h"
++#include "moopython-utils.h"
+ %%
+ modulename moo_stub
+ %%
diff --git a/dev-util/pida/metadata.xml b/dev-util/pida/metadata.xml
new file mode 100644
index 000000000000..42c241eb0463
--- /dev/null
+++ b/dev-util/pida/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">pida</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/pida/pida-0.6.2-r1.ebuild b/dev-util/pida/pida-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..4b440c3327b8
--- /dev/null
+++ b/dev-util/pida/pida-0.6.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+# json module required.
+
+DESCRIPTION="Gtk and/or Vim-based Python Integrated Development Application"
+HOMEPAGE="http://pida.co.uk/ http://pypi.python.org/pypi/pida"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=app-editors/gvim-6.3[gtk,${PYTHON_USEDEP}]
+	>=dev-python/anyvc-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/bpython-0.9.7[gtk,${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+	>dev-python/pygtkhelpers-0.4.1[${PYTHON_USEDEP}]
+	>=x11-libs/vte-0.11.11-r2:0[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Don't require argparse with Python 2.7.
+	sed -e "/argparse/d" -i setup.py || die "sed failed"
+
+	epatch "${FILESDIR}/${PN}-0.6.1-fix_implicit_declaration.patch"
+	emake -C contrib/moo moo-pygtk.c
+}
+
+src_install() {
+	distutils-r1_src_install
+	make_desktop_entry pida Pida Development
+}
diff --git a/dev-util/piklab/Manifest b/dev-util/piklab/Manifest
new file mode 100644
index 000000000000..9561c5a45f86
--- /dev/null
+++ b/dev-util/piklab/Manifest
@@ -0,0 +1 @@
+DIST piklab-0.16.2.tar.bz2 1036644 SHA256 51de9edda8edb9d2e9d07ed1c479b83b87eb6fb17c85717477f05fac03a5740e SHA512 8fdf8fdbcedbb0c7b840341575560e6bc3d02b5564cecd043fbe0e1bf6560aa28bd1e92ed2c80ea6d890bb5759dd0d4a72571f68ab7ee0858eb98649097e5f30 WHIRLPOOL be037be4fbf410cb9722d2a20a3b96222f57d63f0a4d7e744b65bd53937a73d3576aa6be80d16f8b478c3fdeb0663964a74be8344678b65adbe0af669eec42ab
diff --git a/dev-util/piklab/metadata.xml b/dev-util/piklab/metadata.xml
new file mode 100644
index 000000000000..b930de0e48fc
--- /dev/null
+++ b/dev-util/piklab/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">piklab</remote-id>
+		<bugs-to>http://sourceforge.net/tracker/?group_id=138852</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/piklab/piklab-0.16.2.ebuild b/dev-util/piklab/piklab-0.16.2.ebuild
new file mode 100644
index 000000000000..429f8296ae22
--- /dev/null
+++ b/dev-util/piklab/piklab-0.16.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+KDE_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="de cs es fr hu it"
+inherit kde4-base
+
+DESCRIPTION="IDE for applications based on PIC and dsPIC microcontrollers"
+HOMEPAGE="http://piklab.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qt3support:4
+	sys-libs/readline
+	virtual/libusb:0
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( Changelog README TODO )
+
+src_prepare() {
+	sed -e "/install(FILES README/d" \
+		-i CMakeLists.txt || die
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use !kde QT_ONLY)
+		-DLOCALE_INSTALL_DIR="/usr/share/locale"
+	)
+	kde4-base_src_configure
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
new file mode 100644
index 000000000000..26f681e13f89
--- /dev/null
+++ b/dev-util/pkgcheck/Manifest
@@ -0,0 +1 @@
+DIST pkgcheck-0.5.tar.gz 68669 SHA256 38de9d6ff6950852167f7d21b1aa50aab3b980150f9c31f2d0547e74165df7b9 SHA512 fb16450374b942533f83f76114c09e692ba000e91f79fb5e6a79afbfa791476864a591f1342e8b93fcbcc36422218a89b8e6753c65fdc644847ec1c08d369ace WHIRLPOOL 0fb7ac1b82fe58497cf41426d6ea11104e80900bc4f1378613c36022f93ea4f222c5324725475b3bdf5e91cb6048a17720bbaa7bba996407693a21f73cc34424
diff --git a/dev-util/pkgcheck/metadata.xml b/dev-util/pkgcheck/metadata.xml
new file mode 100644
index 000000000000..9f0490ad3043
--- /dev/null
+++ b/dev-util/pkgcheck/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pkgcheck</remote-id>
+    <remote-id type="github">pkgcore/pkgcheck</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.ebuild b/dev-util/pkgcheck/pkgcheck-0.5.ebuild
new file mode 100644
index 000000000000..17e720316fac
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+
+RDEPEND=">=sys-apps/pkgcore-0.9[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	# disable snakeoil 2to3 caching...
+	unset PY2TO3_CACHEDIR
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo "updating pkgcore plugin cache"
+	python_foreach_impl pplugincache pkgcheck.plugins
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
new file mode 100644
index 000000000000..c786406a6419
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+
+RDEPEND="=sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_setup() {
+	# disable snakeoil 2to3 caching...
+	unset PY2TO3_CACHEDIR
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo "updating pkgcore plugin cache"
+	python_foreach_impl pplugincache pkgcheck.plugins
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
new file mode 100644
index 000000000000..9838b748f725
--- /dev/null
+++ b/dev-util/pkgconf/Manifest
@@ -0,0 +1,4 @@
+DIST pkgconf-0.9.11.tar.bz2 86489 SHA256 3bdae1b2672133943dc0dda694ed57074f8b03c3fea10efb215d76d3cabe2c3b SHA512 21313ef29afcaa7c49a8cb512ecd3a821693945c22fb1a670ada74f41bca320e1b9ffb64e79adc2c33cb86822b74ddc850fadb16ddcde7eb805b81a50096992f WHIRLPOOL 7442a456af7e959c86f318ee74ec89883cc4e2ad16c9708f98d8ab30cdcf71ea7ef13f7e0f9bf945717b1dea8a317ffc5322878f88a5084c2dcbdc2aeafaf4d2
+DIST pkgconf-0.9.3.tar.bz2 82334 SHA256 00033a1080a81dfff7cd7ef98d2b054e4cf627376df92a67b98f2e0c243e7f11 SHA512 5b57dcb78f1e5d5bec2db9456b1e784057d6faeb24a5599c29c439672545dcea01b19b8388952c4259f4028a4e6e70b049c1736532d4d7b2239d450698cbc24a WHIRLPOOL 96a07c04a4785fe62bff16cda8aaf8025afe8c3db0e41863af34c42593fe39f0d42b67b60858d9536d5fcde8bb018f61949c364c1651ff50edf145ffef64918f
+DIST pkgconf-0.9.6.tar.bz2 84005 SHA256 c40a77543fe5c7259b813f70ddaf229c2760a250d1cf2ccef60b81fb1d3fc299 SHA512 3eb997637c85a2babf14e8dcc6ac401c9a12d927cbf29524d0b34246944ec3b3929d079b68c28b83b4cc9b277f49759c213c2458c0143c06963753f1f56b956c WHIRLPOOL 1a4cf46c9e52630869b2c4bfd2c5abf3aa6f5de1a67fb2988bdbd85a2e9f2f52e66207ee8f2e737a53fed3a1846cea7beb5d9d77f76be57b05feb65a4df90606
+DIST pkgconf-0.9.8.tar.bz2 85104 SHA256 29289fe5c775974c0403cfba8999d18591ca3deee56b455950eb1dc0b488805f SHA512 652b32c29a95cd889ed8a9f3a5a00aaa3df199e7c05e1701ac78fa7b04dfff7fb983b5d92763db2c1556b9722c8a48384887741b055985c458f1a97a2de1c0ee WHIRLPOOL 8ba3e61fd756bd07928d4ca4ad9e29b778e2afcb02d0bac955de359c319e47390251e29ebed4204e09a58c1bbb1220391dc1690313b96eddce676e100f04ab1a
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
new file mode 100644
index 000000000000..94288df8b186
--- /dev/null
+++ b/dev-util/pkgconf/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>jdhore@gentoo.org</email>
+    <name>Jeff Horelick</name>
+  </maintainer>
+  <use>
+    <flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
+    <flag name="strict">Adhere to POSIX pkg-config specification. Useful for finding uses of non-standard pkg-config invocations.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">pkgconf/pkgconf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/pkgconf/pkgconf-0.9.11.ebuild b/dev-util/pkgconf/pkgconf-0.9.11.ebuild
new file mode 100644
index 000000000000..1bced6969de4
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-0.9.11.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
+	inherit autotools git-2 multilib-minimal
+else
+	inherit eutils multilib-minimal
+	SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf $(use_enable strict)
+}
+
+multilib_src_install() {
+	default
+	use pkg-config \
+		&& dosym pkgconf /usr/bin/pkg-config \
+		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
+		|| die
+}
diff --git a/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild b/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..268038598cf7
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
+	inherit autotools git-2 multilib-minimal
+else
+	inherit eutils multilib-minimal
+	SRC_URI="http://tortois.es/~nenolod/distfiles/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf $(use_enable strict)
+}
+
+multilib_src_install() {
+	default
+	use pkg-config \
+		&& dosym pkgconf /usr/bin/pkg-config \
+		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
+		|| die
+}
diff --git a/dev-util/pkgconf/pkgconf-0.9.6.ebuild b/dev-util/pkgconf/pkgconf-0.9.6.ebuild
new file mode 100644
index 000000000000..40ca7a96854a
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-0.9.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
+	inherit autotools git-2 multilib-minimal
+else
+	inherit eutils multilib-minimal
+	SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf $(use_enable strict)
+}
+
+multilib_src_install() {
+	default
+	use pkg-config \
+		&& dosym pkgconf /usr/bin/pkg-config \
+		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
+		|| die
+}
diff --git a/dev-util/pkgconf/pkgconf-0.9.8.ebuild b/dev-util/pkgconf/pkgconf-0.9.8.ebuild
new file mode 100644
index 000000000000..1bced6969de4
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-0.9.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
+	inherit autotools git-2 multilib-minimal
+else
+	inherit eutils multilib-minimal
+	SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf $(use_enable strict)
+}
+
+multilib_src_install() {
+	default
+	use pkg-config \
+		&& dosym pkgconf /usr/bin/pkg-config \
+		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
+		|| die
+}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
new file mode 100644
index 000000000000..aed82b201943
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-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
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
+	inherit autotools git-2 multilib-minimal
+else
+	inherit autotools multilib-minimal vcs-snapshot
+	SRC_URI="https://github.com/pkgconf/pkgconf/tarball/${P} -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf $(use_enable strict)
+}
+
+multilib_src_install() {
+	default
+	use pkg-config \
+		&& dosym pkgconf /usr/bin/pkg-config \
+		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
+		|| die
+}
diff --git a/dev-util/pkgconfig-openbsd/Manifest b/dev-util/pkgconfig-openbsd/Manifest
new file mode 100644
index 000000000000..716354f133a5
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/Manifest
@@ -0,0 +1,2 @@
+DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
+DIST pkgconfig-openbsd-20130507.tar.xz 10876 SHA256 ed43eef85e6f2fcee3eb02944b59cdacf29305507d4f168dc63c022a452869b8 SHA512 39335c986be0f58fe22bfcda9b6196b34c7c8b7e889df2df0d9707fc699ba6e45df7aaa1d1f4bbe53098ea5fb1bb4aa3e5e33c22971978b40bba395642b41b69 WHIRLPOOL 607ab006bc262143ff4e87ccf72321f0217b7efba44f6b46efad34571d5324ba1fcb3a7142c75a002511fc6ba55ea2dbba16df383ca9fafbf52f38f308113f69
diff --git a/dev-util/pkgconfig-openbsd/metadata.xml b/dev-util/pkgconfig-openbsd/metadata.xml
new file mode 100644
index 000000000000..37d754051771
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <use>
+    <flag name='pkg-config'>Install as a replacement for <pkg>dev-util/pkgconfig</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
new file mode 100644
index 000000000000..dc8826a9307c
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils multilib perl-module multilib-minimal
+
+# cvs -d anoncvs@anoncvs.openbsd.org:/cvs get src/usr.bin/pkg-config
+
+PKG_M4_VERSION=0.28
+
+DESCRIPTION="A perl based version of pkg-config from OpenBSD"
+HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz
+	pkg-config? ( http://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pkg-config"
+
+RDEPEND="virtual/perl-Getopt-Long
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkgconf[pkg-config]
+	)"
+
+S=${WORKDIR}/src
+
+src_prepare() {
+	epatch_user
+	ecvs_clean
+
+	# Config.pm from dev-lang/perl doesn't set ARCH, only archname
+	sed -i -e '/Config/s:ARCH:archname:' usr.bin/pkg-config/pkg-config || die
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config )
+	else
+		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config-openbsd )
+	fi
+}
+
+multilib_src_install() {
+	local pc_bin=pkg-config
+	use pkg-config || pc_bin+=-openbsd
+
+	newbin "${S}"/usr.bin/pkg-config/pkg-config ${pc_bin}
+	newman "${S}"/usr.bin/pkg-config/pkg-config.1 ${pc_bin}.1
+
+	# insert proper paths
+	local pc_paths=(
+		/usr/$(get_libdir)/pkgconfig
+		/usr/share/pkgconfig
+	)
+	sed -i -e "/my @PKGPATH/,/;/{s@(.*@( ${pc_paths[*]} );@p;d}" \
+		"${ED%/}/usr/bin/${pc_bin}" || die
+}
+
+multilib_src_install_all() {
+	if use pkg-config; then
+		insinto /usr/share/aclocal
+		doins "${WORKDIR}"/pkg-config-*/pkg.m4
+	fi
+
+	perl_set_version
+	insinto "${VENDOR_LIB}"
+	doins -r "${S}"/usr.bin/pkg-config/OpenBSD
+}
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
new file mode 100644
index 000000000000..ad5531bd0f42
--- /dev/null
+++ b/dev-util/pkgconfig/Manifest
@@ -0,0 +1 @@
+DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch
new file mode 100644
index 000000000000..9515f4f650a0
--- /dev/null
+++ b/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch
@@ -0,0 +1,281 @@
+From 217ffa021257fc2313c9eeb3e94e2ee38d255634 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 15 Apr 2015 12:25:29 -0400
+Subject: [PATCH] Enable large file support
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90078
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: expand out configure,
+ config.h.in modifications.]
+---
+ configure.ac |   3 +
+ config.h.in  |  11 ++++
+ configure    | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 217 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 2b33371..1a321e1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,6 +17,9 @@ dnl by either passing --disable-silent-rules to configure or passing V=1
+ dnl to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
++dnl Enable large file support
++AC_SYS_LARGEFILE
++
+ dnl Check for programs
+ AC_PROG_CC
+ AC_CHECK_PROG([LN], [ln], [ln], [cp -Rp])
+diff --git a/config.h.in b/config.h.in
+index 0aac8f3..fdae454 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -72,3 +72,14 @@
+ 
+ /* Version number of package */
+ #undef VERSION
++
++/* Enable large inode numbers on Mac OS X 10.5.  */
++#ifndef _DARWIN_USE_64_BIT_INODE
++# define _DARWIN_USE_64_BIT_INODE 1
++#endif
++
++/* Number of bits in a file offset, on hosts where this is settable. */
++#undef _FILE_OFFSET_BITS
++
++/* Define for large files, on AIX-style hosts. */
++#undef _LARGE_FILES
+diff --git a/configure b/configure
+index 160ecab..f897e22 100755
+--- a/configure
++++ b/configure
+@@ -783,6 +783,7 @@ with_gnu_ld
+ with_sysroot
+ enable_libtool_lock
+ enable_silent_rules
++enable_largefile
+ with_pc_path
+ with_system_include_path
+ with_system_library_path
+@@ -1435,6 +1436,7 @@ Optional Features:
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --enable-silent-rules   less verbose build output (undo: "make V=1")
+   --disable-silent-rules  verbose build output (undo: "make V=0")
++  --disable-largefile     omit support for large files
+   --enable-indirect-deps  list both direct and indirect dependencies.
+        --disable-indirect-deps only list direct dependencies.
+     default=auto
+@@ -11389,6 +11391,207 @@ fi
+ AM_BACKSLASH='\'
+ 
+ 
++# Check whether --enable-largefile was given.
++if test "${enable_largefile+set}" = set; then :
++  enableval=$enable_largefile;
++fi
++
++if test "$enable_largefile" != no; then
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
++$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
++if ${ac_cv_sys_largefile_CC+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_sys_largefile_CC=no
++     if test "$GCC" != yes; then
++       ac_save_CC=$CC
++       while :; do
++	 # IRIX 6.2 and later do not support large files by default,
++	 # so use the C compiler's -n32 option if that helps.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++	 if ac_fn_c_try_compile "$LINENO"; then :
++  break
++fi
++rm -f core conftest.err conftest.$ac_objext
++	 CC="$CC -n32"
++	 if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_largefile_CC=' -n32'; break
++fi
++rm -f core conftest.err conftest.$ac_objext
++	 break
++       done
++       CC=$ac_save_CC
++       rm -f conftest.$ac_ext
++    fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
++$as_echo "$ac_cv_sys_largefile_CC" >&6; }
++  if test "$ac_cv_sys_largefile_CC" != no; then
++    CC=$CC$ac_cv_sys_largefile_CC
++  fi
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
++if ${ac_cv_sys_file_offset_bits+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  while :; do
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_file_offset_bits=no; break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#define _FILE_OFFSET_BITS 64
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_file_offset_bits=64; break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_sys_file_offset_bits=unknown
++  break
++done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
++$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
++case $ac_cv_sys_file_offset_bits in #(
++  no | unknown) ;;
++  *)
++cat >>confdefs.h <<_ACEOF
++#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
++_ACEOF
++;;
++esac
++rm -rf conftest*
++  if test $ac_cv_sys_file_offset_bits = unknown; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
++$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
++if ${ac_cv_sys_large_files+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  while :; do
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_large_files=no; break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#define _LARGE_FILES 1
++#include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_sys_large_files=1; break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_sys_large_files=unknown
++  break
++done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
++$as_echo "$ac_cv_sys_large_files" >&6; }
++case $ac_cv_sys_large_files in #(
++  no | unknown) ;;
++  *)
++cat >>confdefs.h <<_ACEOF
++#define _LARGE_FILES $ac_cv_sys_large_files
++_ACEOF
++;;
++esac
++rm -rf conftest*
++  fi
++
++
++fi
++
++
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-- 
+2.4.2
+
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch
new file mode 100644
index 000000000000..e1a2bb534a37
--- /dev/null
+++ b/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/512336
+http://bugs.freedesktop.org/show_bug.cgi?id=78077
+
+From 8691b580ab3f7ac36182060e2253307fbd0aba75 Mon Sep 17 00:00:00 2001
+From: Andrew Oakley <aoakley@espial.com>
+Date: Tue, 29 Apr 2014 13:14:35 +0100
+Subject: [PATCH 1/1] Strip system library directories reliably
+
+This loop was changed from a while loop to a for loop in commit
+9bf6277b, but the iterator is now advanced twice each time round the
+loop.
+---
+ pkg.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pkg.c b/pkg.c
+index 3697fec..c847c95 100644
+--- a/pkg.c
++++ b/pkg.c
+@@ -917,7 +917,6 @@ verify_package (Package *pkg)
+             }
+           system_dir_iter = system_dir_iter->next;
+         }
+-      iter = iter->next;
+     }
+   g_list_free (system_directories);
+ 
+-- 
+1.8.3.2
+
diff --git a/dev-util/pkgconfig/metadata.xml b/dev-util/pkgconfig/metadata.xml
new file mode 100644
index 000000000000..572c23e967c4
--- /dev/null
+++ b/dev-util/pkgconfig/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>freedesktop</herd>
+	<maintainer>
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='internal-glib'>Use internal copy of <pkg>dev-libs/glib</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
new file mode 100644
index 000000000000..730000c6a486
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic libtool multilib multilib-minimal
+
+MY_P=pkg-config-${PV}
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
+	inherit autotools git-2
+else
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="Package config system that manages compile/link flags"
+HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+	!dev-util/pkgconf[pkg-config]
+	!dev-util/pkg-config-lite
+	!dev-util/pkgconfig-openbsd[pkg-config]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch
+
+	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
+
+	epatch_user
+
+	if [[ ${PV} == *9999* ]]; then
+		eautoreconf
+	else
+		elibtoolize # Required for FreeMiNT wrt #333429
+	fi
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use internal-glib; then
+		myconf+=' --with-internal-glib'
+		# non-glibc platforms use GNU libiconv, but configure needs to
+		# know about that not to get confused when it finds something
+		# outside the prefix too
+		if use prefix && use !elibc_glibc ; then
+			myconf+=" --with-libiconv=gnu"
+			# add the libdir for libtool, otherwise it'll make love with system
+			# installed libiconv
+			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
+		fi
+	else
+		if ! has_version dev-util/pkgconfig; then
+			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+			export GLIB_LIBS="-lglib-2.0"
+		fi
+	fi
+
+	use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+	# Force using all the requirements when linking, so that needed -pthread
+	# lines are inherited between libraries
+	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
+
+	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-system-include-path="${EPREFIX}"/usr/include \
+		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use prefix; then
+		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
+		# simplify cross-prefix builds
+		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
+		doenvd "${T}"/99${PN}
+	fi
+}
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
new file mode 100644
index 000000000000..09f88545f704
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
+inherit eutils flag-o-matic libtool multilib multilib-minimal
+
+MY_P=pkg-config-${PV}
+
+if [[ ${PV} == *9999* ]]; then
+	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
+	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
+	WANT_AUTOMAKE=1.12
+	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
+	inherit autotools git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="Package config system that manages compile/link flags"
+HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+	!dev-util/pkgconf[pkg-config]
+	!dev-util/pkg-config-lite
+	!dev-util/pkgconfig-openbsd[pkg-config]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch
+
+	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
+
+	# Large file support, fixed in upstream git; bug #550508
+	epatch "${FILESDIR}"/${P}-lfs.patch
+	# lfs patch touches config.h.in; need this hack to prevent autoreconf and automake
+	touch aclocal.m4 config.h.in Makefile.in
+
+	epatch_user
+
+	if [[ ${PV} == *9999* ]]; then
+		eautoreconf
+	else
+		elibtoolize # Required for FreeMiNT wrt #333429
+	fi
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use internal-glib; then
+		myconf+=' --with-internal-glib'
+		# non-glibc platforms use GNU libiconv, but configure needs to
+		# know about that not to get confused when it finds something
+		# outside the prefix too
+		if use prefix && use !elibc_glibc ; then
+			myconf+=" --with-libiconv=gnu"
+			# add the libdir for libtool, otherwise it'll make love with system
+			# installed libiconv
+			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
+		fi
+	else
+		if ! has_version dev-util/pkgconfig; then
+			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+			export GLIB_LIBS="-lglib-2.0"
+		fi
+	fi
+
+	use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+	# Force using all the requirements when linking, so that needed -pthread
+	# lines are inherited between libraries
+	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
+
+	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-system-include-path="${EPREFIX}"/usr/include \
+		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use prefix; then
+		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
+		# simplify cross-prefix builds
+		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
+		doenvd "${T}"/99${PN}
+	fi
+}
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
new file mode 100644
index 000000000000..04c55012806c
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
+inherit eutils flag-o-matic libtool multilib multilib-minimal
+
+MY_P=pkg-config-${PV}
+
+if [[ ${PV} == *9999* ]]; then
+	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
+	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
+	WANT_AUTOMAKE=1.12
+	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
+	inherit autotools git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="Package config system that manages compile/link flags"
+HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+	!dev-util/pkgconf[pkg-config]
+	!dev-util/pkg-config-lite
+	!dev-util/pkgconfig-openbsd[pkg-config]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
+
+	epatch_user
+
+	if [[ ${PV} == *9999* ]]; then
+		eautoreconf
+	else
+		elibtoolize # Required for FreeMiNT wrt #333429
+	fi
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use internal-glib; then
+		myconf+=' --with-internal-glib'
+		# non-glibc platforms use GNU libiconv, but configure needs to
+		# know about that not to get confused when it finds something
+		# outside the prefix too
+		if use prefix && use !elibc_glibc ; then
+			myconf+=" --with-libiconv=gnu"
+			# add the libdir for libtool, otherwise it'll make love with system
+			# installed libiconv
+			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
+		fi
+	else
+		if ! has_version dev-util/pkgconfig; then
+			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+			export GLIB_LIBS="-lglib-2.0"
+		fi
+	fi
+
+	use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+	# Force using all the requirements when linking, so that needed -pthread
+	# lines are inherited between libraries
+	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
+
+	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-system-include-path="${EPREFIX}"/usr/include \
+		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use prefix; then
+		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
+		# simplify cross-prefix builds
+		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
+		doenvd "${T}"/99${PN}
+	fi
+}
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
new file mode 100644
index 000000000000..94a1c252ee7a
--- /dev/null
+++ b/dev-util/plan9port/Manifest
@@ -0,0 +1,3 @@
+DIST plan9port-20130320.tgz 54184719 SHA256 d08fd032edc9c27bc549ee9076963812f210476d0d1f21f5300e9d867699ff55 SHA512 fae40eae76a0f3121f47a3895809f2433beed91fc9e879c8cde25e493ec91dfdfc89fe59e3fe3a8aab7c33a2537a02b30857edb3af7f202df4a98e02cee8ecb7 WHIRLPOOL 5b707c8d18c8f1fa8e3d36e8f14a20213cad9ab3344f088f18942034dce3356ba88675c5817a7d50b66275d71d95e6d5fd3fdefbd18bcca9089790e258dbb60f
+DIST plan9port-20140304.tgz 54512040 SHA256 926f6531603ce5112108cdeec1fa808103c92045ba374b986672f28a40004817 SHA512 3727cb8d135005b0b4af1621c14a341904fdcaacd45df4e8c60c2998d372f57a7444ab296d35bc60dbc49b47e5f075e2c5d6a96f513395225eb996833ee87c83 WHIRLPOOL d2b76ea9be4e365a63bab2b24bfc3d5a6fdc402f44529ca8774c6f7c346de94b635c235d38707fee4c2fa7c6f522ad971036836f8bdb71890e61a4988cf2073f
+DIST plan9port-20140306.tgz 54512505 SHA256 cbb826cde693abdaa2051c49e7ebf75119bf2a4791fe3b3229f1ac36a408eaeb SHA512 a0671163940186fd3d8cf37f06824f0d5a4b9734c1e70eb3174cd7f6b9a1ae769cf78e067dcf4e963192a26a2420b4bb1ce79ed788314ed1783c3bd793fe2aef WHIRLPOOL c19977ef310ac34efcb294e9f7f73f6095e9db0ab52ef359956a05e5a5252a0f9d03f88dd29d21d01bfc82d2e0bdd8ac77bc6a8bb80ef81ce3c773b2dfee0677
diff --git a/dev-util/plan9port/files/plan9port-9660srv-errno.patch b/dev-util/plan9port/files/plan9port-9660srv-errno.patch
new file mode 100644
index 000000000000..a596321669a9
--- /dev/null
+++ b/dev-util/plan9port/files/plan9port-9660srv-errno.patch
@@ -0,0 +1,19 @@
+Defining int errno; resuls in the following error on amd64:
+
+  ld: errno: TLS definition in /lib64/libc.so.6 section .tbss mismatches
+  non-TLS reference in main.o
+
+Patch by Alex Efros:
+
+  http://code.swtch.com/plan9port/issue/39/
+--- plan9/src/cmd/9660srv/main.c
++++ plan9.new/src/cmd/9660srv/main.c
+@@ -38,7 +38,7 @@
+ uchar mdata[Maxiosize];
+ char fdata[Maxfdata];
+ uchar statbuf[STATMAX];
+-int errno;
++#include <errno.h>
+ 
+ 
+ extern Xfsub	*xsublist[];
diff --git a/dev-util/plan9port/files/plan9port-builderr.patch b/dev-util/plan9port/files/plan9port-builderr.patch
new file mode 100644
index 000000000000..266f10c4b9d5
--- /dev/null
+++ b/dev-util/plan9port/files/plan9port-builderr.patch
@@ -0,0 +1,29 @@
+Prevent mk from ignoring errors
+
+By default, the plan9port INSTALL script doesn't report build error,
+which can result in a mostly broken build begin installed.
+--- a/INSTALL
++++ b/INSTALL
+@@ -41,7 +41,6 @@ echo " "
+ echo "* Resetting $PLAN9/config"
+ rm -f config
+ 
+-(
+ echo "* Compiler version:"
+ 9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/	/'
+ 
+@@ -134,7 +133,7 @@ if $dobuild; then
+ 		echo "* Warning: not all binaries built successfully."
+ 	fi
+ 	echo "* Installing everything in $PLAN9/bin..."
+-	mk -k install || exit 1
++	mk install || exit 1
+ 	if [ ! -x $PLAN9/bin/cleanname -o ! -x $PLAN9/bin/acme -o ! -x $PLAN9/bin/sam ]; then
+ 		echo " "
+ 		echo "* Warning: not all binaries built successfully."
+@@ -182,5 +181,4 @@ if $doinstall; then
+ 	echo "	PLAN9=$PLAN9 export PLAN9"
+ 	echo '	PATH=$PATH:$PLAN9/bin export PATH'
+ fi
+-) 2>&1 | tee install.log | $awk -f $PLAN9/dist/isum.awk -v 'copy='install.sum
+ 
diff --git a/dev-util/plan9port/files/plan9port-cflags.patch b/dev-util/plan9port/files/plan9port-cflags.patch
new file mode 100644
index 000000000000..c2d2ed6defe5
--- /dev/null
+++ b/dev-util/plan9port/files/plan9port-cflags.patch
@@ -0,0 +1,16 @@
+Prevent resetting CFLAGS and LDFLAGS
+
+This allows the plan9port build to inherit cflags from the environment.
+
+(This patch must be applied after plan9port-noexecstack.patch)
+--- a/src/mkhdr
++++ b/src/mkhdr
+@@ -28,8 +28,6 @@ LD=9l
+ AS=9a
+ AR=9ar
+ INSTALL=install
+-CFLAGS=
+-LDFLAGS=
+ AFLAGS=--noexecstack
+ CLEANFILES=
+ NUKEFILES=
diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch b/dev-util/plan9port/files/plan9port-noexecstack.patch
new file mode 100644
index 000000000000..fb4f19f21fc5
--- /dev/null
+++ b/dev-util/plan9port/files/plan9port-noexecstack.patch
@@ -0,0 +1,54 @@
+Remove unneeded executable stack
+
+Assembly routines in libthread and libmp use an executable stack by
+default. This is not needed and can be removed using --noexecstack.
+
+The plan9port 9a wrapper wrapper needs to be modified to pass flags to the
+underlying assembler first though..
+
+Patch by Andy Spencer
+
+  http://code.swtch.com/plan9port/issue/76/
+--- a/bin/9a
++++ b/bin/9a
+@@ -1,10 +1,5 @@
+ #!/bin/sh
+ 
+-if [ $# != 1 ]; then
+-	echo 'usage: 9a file.s' 1>&2
+-	exit 1
+-fi
+-
+ test -f $PLAN9/config && . $PLAN9/config
+ 
+ aflags=""
+@@ -17,5 +12,16 @@ Darwin-*x86_64*)
+ 	;;
+ esac
+ 
+-out=`echo $1 | sed 's/\.s$//;s/$/.o/'`
+-exec as $aflags -o $out $1
++for arg; do
++	case $arg in
++	-*)
++		opts="$opts $arg"
++		;;
++	*.s)
++		src=$arg
++		dst=$(echo $arg | sed 's/\.s/\.o/')
++		;;
++	esac
++done
++
++exec as $aflags $opts -o $dst $src
+--- a/src/mkhdr
++++ b/src/mkhdr
+@@ -30,7 +30,7 @@ AR=9ar
+ INSTALL=install
+ CFLAGS=
+ LDFLAGS=
+-AFLAGS=
++AFLAGS=--noexecstack
+ CLEANFILES=
+ NUKEFILES=
+ YACC=9 yacc
diff --git a/dev-util/plan9port/metadata.xml b/dev-util/plan9port/metadata.xml
new file mode 100644
index 000000000000..0e42654984c7
--- /dev/null
+++ b/dev-util/plan9port/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>andy753421@gmail.com</email>
+	</maintainer>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<longdescription>
+		Plan9Port is a set of Plan 9 utilities ported to the POSIX
+		environment - also know as Plan 9 from User Space.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/plan9port/plan9port-20130320.ebuild b/dev-util/plan9port/plan9port-20130320.ebuild
new file mode 100644
index 000000000000..de2b2476608f
--- /dev/null
+++ b/dev-util/plan9port/plan9port-20130320.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multiprocessing
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="http://swtch.com/plan9port/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-apps/xauth"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PLAN9=/usr/lib/plan9
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack,cflags}".patch"
+
+	# Fix paths, done in place of ./INSTALL -c
+	einfo "Fixing hard-coded /usr/local/plan9 paths"
+	grep  --null -l -r '/usr/local/plan9' |
+	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
+}
+
+src_compile() {
+	export NPROC=$(makeopts_jobs)
+
+	# The INSTALL script builds mk then [re]builds everything using that
+	einfo "Compiling Plan 9 from User Space can take a very long time"
+	einfo "depending on the speed of your computer. Please be patient!"
+	./INSTALL -b
+}
+
+src_install() {
+	dodir "${PLAN9}"
+
+	# P9P's man does not handle compression
+	docompress -x $PLAN9/man
+
+	# do* plays with the executable bit, and we should not modify them
+	cp -a * "${D}/${PLAN9}"
+
+	# build the environment variables and install them in env.d
+	cat > "${T}/30plan9" <<-EOF
+		PLAN9="${PLAN9}"
+		PATH="${PLAN9}/bin"
+		ROOTPATH="${PLAN9}/bin"
+		MANPATH="${PLAN9}/man"
+	EOF
+	doenvd "${T}/30plan9"
+}
+
+pkg_postinst() {
+	elog "Plan 9 from User Space has been successfully installed into"
+	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
+	elog "also been appropriately set, please use env-update and"
+	elog "source /etc/profile to bring that into immediate effect."
+	elog
+	elog "Please note that ${PLAN9}/bin has been appended to the"
+	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
+	elog "versions of common UNIX tools, use the absolute path:"
+	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
+	elog
+	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+}
diff --git a/dev-util/plan9port/plan9port-20140304.ebuild b/dev-util/plan9port/plan9port-20140304.ebuild
new file mode 100644
index 000000000000..f4b1d0f694da
--- /dev/null
+++ b/dev-util/plan9port/plan9port-20140304.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multiprocessing
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="http://swtch.com/plan9port/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-apps/xauth )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PLAN9=/usr/lib/plan9
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
+
+	# Fix paths, done in place of ./INSTALL -c
+	einfo "Fixing hard-coded /usr/local/plan9 paths"
+	grep  --null -l -r '/usr/local/plan9' |
+	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
+}
+
+src_configure() {
+	if ! use X; then
+		echo "WSYSTYPE=nowsys" >> LOCAL.config
+	fi
+}
+
+src_compile() {
+	export NPROC=$(makeopts_jobs)
+
+	# The INSTALL script builds mk then [re]builds everything using that
+	einfo "Compiling Plan 9 from User Space can take a very long time"
+	einfo "depending on the speed of your computer. Please be patient!"
+	./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
+}
+
+src_install() {
+	dodir "${PLAN9}"
+
+	# P9P's man does not handle compression
+	docompress -x $PLAN9/man
+
+	# do* plays with the executable bit, and we should not modify them
+	cp -a * "${D}/${PLAN9}"
+
+	# build the environment variables and install them in env.d
+	cat > "${T}/30plan9" <<-EOF
+		PLAN9="${PLAN9}"
+		PATH="${PLAN9}/bin"
+		ROOTPATH="${PLAN9}/bin"
+		MANPATH="${PLAN9}/man"
+	EOF
+	doenvd "${T}/30plan9"
+}
+
+pkg_postinst() {
+	elog "Plan 9 from User Space has been successfully installed into"
+	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
+	elog "also been appropriately set, please use env-update and"
+	elog "source /etc/profile to bring that into immediate effect."
+	elog
+	elog "Please note that ${PLAN9}/bin has been appended to the"
+	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
+	elog "versions of common UNIX tools, use the absolute path:"
+	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
+	elog
+	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+}
diff --git a/dev-util/plan9port/plan9port-20140306.ebuild b/dev-util/plan9port/plan9port-20140306.ebuild
new file mode 100644
index 000000000000..f4b1d0f694da
--- /dev/null
+++ b/dev-util/plan9port/plan9port-20140306.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multiprocessing
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="http://swtch.com/plan9port/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-apps/xauth )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PLAN9=/usr/lib/plan9
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
+
+	# Fix paths, done in place of ./INSTALL -c
+	einfo "Fixing hard-coded /usr/local/plan9 paths"
+	grep  --null -l -r '/usr/local/plan9' |
+	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
+}
+
+src_configure() {
+	if ! use X; then
+		echo "WSYSTYPE=nowsys" >> LOCAL.config
+	fi
+}
+
+src_compile() {
+	export NPROC=$(makeopts_jobs)
+
+	# The INSTALL script builds mk then [re]builds everything using that
+	einfo "Compiling Plan 9 from User Space can take a very long time"
+	einfo "depending on the speed of your computer. Please be patient!"
+	./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
+}
+
+src_install() {
+	dodir "${PLAN9}"
+
+	# P9P's man does not handle compression
+	docompress -x $PLAN9/man
+
+	# do* plays with the executable bit, and we should not modify them
+	cp -a * "${D}/${PLAN9}"
+
+	# build the environment variables and install them in env.d
+	cat > "${T}/30plan9" <<-EOF
+		PLAN9="${PLAN9}"
+		PATH="${PLAN9}/bin"
+		ROOTPATH="${PLAN9}/bin"
+		MANPATH="${PLAN9}/man"
+	EOF
+	doenvd "${T}/30plan9"
+}
+
+pkg_postinst() {
+	elog "Plan 9 from User Space has been successfully installed into"
+	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
+	elog "also been appropriately set, please use env-update and"
+	elog "source /etc/profile to bring that into immediate effect."
+	elog
+	elog "Please note that ${PLAN9}/bin has been appended to the"
+	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
+	elog "versions of common UNIX tools, use the absolute path:"
+	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
+	elog
+	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+}
diff --git a/dev-util/plasmate/Manifest b/dev-util/plasmate/Manifest
new file mode 100644
index 000000000000..86a39644712f
--- /dev/null
+++ b/dev-util/plasmate/Manifest
@@ -0,0 +1 @@
+DIST plasmate-1.0.tar.gz 288285 SHA256 5e9486a76faf7fbf11ac0a9c8275eea7b037662508217928f052434d65611e28 SHA512 6e61e3274ee5cc74ea18e64484077e609d146f10ff0a82cdbd9776657487724fdfc0ace09dfa36ae8d46e7c03f67411eb92e38e065b6c750d5ca5f91a91901d2 WHIRLPOOL 3bc5edaf48e48c46c4aa4ba1a82c7ed9be3d301bfc9a6d433443d7953ed78600ece76fb778d47be2908260000aeb91dbc8a747a82a5af173873d20fcff9c2fd7
diff --git a/dev-util/plasmate/metadata.xml b/dev-util/plasmate/metadata.xml
new file mode 100644
index 000000000000..01b2427df4a5
--- /dev/null
+++ b/dev-util/plasmate/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
diff --git a/dev-util/plasmate/plasmate-1.0.ebuild b/dev-util/plasmate/plasmate-1.0.ebuild
new file mode 100644
index 000000000000..6945310fa1c3
--- /dev/null
+++ b/dev-util/plasmate/plasmate-1.0.ebuild
@@ -0,0 +1,30 @@
+# 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
+"
diff --git a/dev-util/pmd/Manifest b/dev-util/pmd/Manifest
new file mode 100644
index 000000000000..66b295c28a9b
--- /dev/null
+++ b/dev-util/pmd/Manifest
@@ -0,0 +1 @@
+DIST pmd-src-4.2.5.zip 10801078 SHA256 d3a8c181a59ea1cedb1896ba3c14e076bfe34ead602a2546a4028a857b881cb4 SHA512 f515445126d0b3ad11adac491df94d4e1e806764b2601b4ad9974a090d8542cfc4992d4aaf5ef61470459ecaf4c75db0865e257a1f7ea065b3d248b53387e93e WHIRLPOOL 39e04690df2d164d9aa6d6032ed71e3301d1fd5d8dd38a556f6a438cd2b1f58909da16ce058f9d5197cfbb6aa63b738ac1bb48ef5c5df0dedba5b4dd7b738feb
diff --git a/dev-util/pmd/files/pmd-4.2.5-build.xml.patch b/dev-util/pmd/files/pmd-4.2.5-build.xml.patch
new file mode 100644
index 000000000000..a0f043568625
--- /dev/null
+++ b/dev-util/pmd/files/pmd-4.2.5-build.xml.patch
@@ -0,0 +1,51 @@
+diff -Nur pmd-4.2.4/bin/build.xml pmd-4.2.4_patched/bin/build.xml
+--- pmd-4.2.4/bin/build.xml	2008-08-31 15:32:20.000000000 +0300
++++ pmd-4.2.4_patched/bin/build.xml	2008-11-23 08:15:09.000000000 +0200
+@@ -22,11 +22,7 @@
+ 
+ 	<path id="dependencies.path">
+ 		<pathelement location="${dir.build}" />
+-		<fileset dir="${dir.lib}">
+-			<include name="jaxen-${jaxen.version}.jar" />
+-			<include name="asm-${asm.version}.jar" />
+-			<include name="junit-${junit.version}.jar" />
+-		</fileset>
++		<fileset dir="${dir.lib}" includes="*.jar"/>
+ 	</path>
+ 
+ 	<target name="delete" description="Deletes the build directory and the pmd-x.x jar file.">
+@@ -76,7 +72,6 @@
+ 			<zipfileset dir="etc" includes="ruleset.dtd,ruleset_xml_schema.xsd" prefix="rulesets"/>
+ 			<manifest>
+ 				<attribute name="Main-Class" value="net.sourceforge.pmd.PMD" />
+-				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar asm-${asm.version}.jar" />
+ 			</manifest>
+ 		</jar>
+ 
+@@ -86,17 +81,6 @@
+ 			basedir="${dir.build}" />
+ 	</target>
+ 
+-	<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
+-		<classpath>
+-			<pathelement location="${dir.lib14}/retroweaver-${retroweaver.version}.jar"/>
+-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
+-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
+-			<pathelement location="${dir.lib14}/asm-commons-${asm.version}.jar"/>
+-			<pathelement location="${dir.lib14}/asm-util-${asm.version}.jar"/>
+-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
+-		</classpath>
+-	</taskdef>
+-
+ 	<target name="weavejunit" depends="jar">
+ 		<path id="retroweaverclasspath">
+ 			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
+@@ -211,7 +195,7 @@
+ 	<target name="test-execute" description="Runs the unit tests">
+ 		<delete dir="${test.outputdir}" />
+ 		<mkdir dir="${test.outputdir}/xml"/>
+-		<junit printsummary="${test.printsummary}" showoutput="no" filtertrace="yes" haltonfailure="no" jvm="${test.jvm}" forkmode="perBatch"
++		<junit printsummary="${test.printsummary}" showoutput="no" filtertrace="yes" haltonfailure="yes" jvm="${test.jvm}" forkmode="perBatch"
+ 			failureProperty="test.failure" 
+ 		>
+ 			<sysproperty key="pmd.regress" value="${test.regression}"/>
diff --git a/dev-util/pmd/files/pmd-4.2.5-launcher-pre-commands b/dev-util/pmd/files/pmd-4.2.5-launcher-pre-commands
new file mode 100644
index 000000000000..b2e48852597d
--- /dev/null
+++ b/dev-util/pmd/files/pmd-4.2.5-launcher-pre-commands
@@ -0,0 +1,6 @@
+if [ -z "$3" ]; then
+    script=`basename $0`
+    echo "Usage:"
+    echo "    $script <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
+    exit 1
+fi
diff --git a/dev-util/pmd/metadata.xml b/dev-util/pmd/metadata.xml
new file mode 100644
index 000000000000..56443875fae5
--- /dev/null
+++ b/dev-util/pmd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">pmd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/pmd/pmd-4.2.5.ebuild b/dev-util/pmd/pmd-4.2.5.ebuild
new file mode 100644
index 000000000000..b188b81f31db
--- /dev/null
+++ b/dev-util/pmd/pmd-4.2.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java source code analyzer"
+HOMEPAGE="http://pmd.sourceforge.net"
+SRC_URI="mirror://sourceforge/pmd/${PN}-src-${PV}.zip"
+
+LICENSE="pmd"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/ant-core
+	dev-java/asm:3
+	dev-java/jaxen:1.1
+	>=dev-java/junit-4.4:4"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit4
+		dev-java/ant-trax
+	)
+	${COMMON_DEPEND}"
+
+# tests fail
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+	find -name "*.jar" | xargs rm -v
+
+	cd "${S}/lib"
+	java-pkg_jar-from ant-core
+	java-pkg_jar-from asm-3 asm.jar
+	java-pkg_jar-from jaxen-1.1 jaxen.jar
+	java-pkg_jar-from junit-4
+}
+
+EANT_BUILD_XML="bin/build.xml"
+
+src_test() {
+	# junit does not like collisions
+	rm lib/ant.jar
+	ANT_TASKS="ant-junit4 ant-trax" eant -f bin/build.xml test -DoutputTestResultsToFile=true
+}
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar
+	java-pkg_register-ant-task
+
+	# Create launchers and copy rulesets
+	java-pkg_dolauncher ${PN} --main net.sourceforge.pmd.PMD --java_args "-Xmx512m" \
+		-pre "${FILESDIR}"/${P}-launcher-pre-commands
+	java-pkg_dolauncher ${PN}-designer --main net.sourceforge.pmd.util.designer.Designer
+	cp -r rulesets "${D}"/usr/share/${PN}
+	mkdir "${D}"/usr/share/${PN}/etc
+	cp -r etc/xslt "${D}"/usr/share/${PN}/etc/
+
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/net
+}
+
+pkg_postinst() {
+	elog "Example rulesets can be found under"
+	elog "/usr/share/pmd/rulesets/"
+}
diff --git a/dev-util/pmk/Manifest b/dev-util/pmk/Manifest
new file mode 100644
index 000000000000..b308be60711a
--- /dev/null
+++ b/dev-util/pmk/Manifest
@@ -0,0 +1 @@
+DIST pmk-0.10.4.tar.gz 208475 SHA256 bde39a1fb1f0612446838f4845f44f1a0a2adb9c62c2d0f9e3ca58c61888a569 SHA512 906ee690b6cae55d54b1e248847a61ddcb15d7404fb8914040047876eb906f868607b38b59dbbd9687a0f8b409d6c3852249d558119af1bea4c64775f34ea32d WHIRLPOOL 9f4c8295b53c3fe9cdbb56fa927ef05bdef7b36e8852af46ea362ba738283eaab69d5e486edcab654e0650f11339ad3ba25216b6e219531c678d6c166b8fe914
diff --git a/dev-util/pmk/metadata.xml b/dev-util/pmk/metadata.xml
new file mode 100644
index 000000000000..7ec158b4a32a
--- /dev/null
+++ b/dev-util/pmk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    The meaning of pmk is "Pre Make Kit", a dependency configuring tool. It
+    aims to be considered as an alternative to GNU autoconf, GNU libtool
+    and pkg-config.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">pmk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/pmk/pmk-0.10.4.ebuild b/dev-util/pmk/pmk-0.10.4.ebuild
new file mode 100644
index 000000000000..6dc47dc8c7f6
--- /dev/null
+++ b/dev-util/pmk/pmk-0.10.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit toolchain-funcs
+
+DESCRIPTION="Aims to be an alternative to GNU autoconf"
+HOMEPAGE="http://pmk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	# Make this respect LDFLAGS, bug #334987
+	sed -i -e "s:CLDFLAGS:LDFLAGS:" Makefile.pmk || die
+	sed -i -e "/@CLDFLAGS@/d" Makefile.pmk || die
+
+	# Remove executable stack
+	cp detect_cpu_asm.s detect_cpu_asm.S
+	cat >> detect_cpu_asm.S <<EOF
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
+EOF
+}
+
+src_configure() {
+	tc-export CC CPP AS
+	export SYSCONFDIR="${EPREFIX}"/etc
+	export PREFIX="${EPREFIX}"/usr
+	./pmkcfg.sh autodetected || die "Config failed"
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" MANDIR="${EPREFIX}/usr/share/man" install || die "make failed"
+
+	dodoc BUGS Changelog README STATUS TODO || die "dodoc failed"
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}etc/pmk/pmk.conf ]] ; then
+		einfo
+		einfo "${EROOT}etc/pmk/pmk.conf doesn't exist."
+		einfo "Running pmksetup to generate an initial pmk.conf."
+		einfo
+		# create one with initial values
+		"${EROOT}"usr/bin/pmksetup
+		# run it again to reset PREFIX from /usr/local to ${EPREFIX}/usr
+		"${EROOT}"usr/bin/pmksetup -u "PREFIX=\"${EPREFIX}/usr\""
+		# remove the automatically created backup from the extra run
+		rm -f "${EROOT}"etc/pmk/pmk.conf.bak
+	fi
+}
diff --git a/dev-util/premake/Manifest b/dev-util/premake/Manifest
new file mode 100644
index 000000000000..13ff884f7525
--- /dev/null
+++ b/dev-util/premake/Manifest
@@ -0,0 +1,2 @@
+DIST premake-4.3-src.zip 514366 SHA256 36536490f8928d8ecde135da80cd8b751ea5bebe50cabba5c0de49cd41cb2780 SHA512 df3a4f1e04afb6ae9acf06c063b084a4bcc7c48a98eebeb242eafef40de4097c6a6fe549369d9538b93efea35244222b9d26c15824f126a67b8f80abaecdf001 WHIRLPOOL f39bb097379206818989b5076b2310ea26252f694382eaec1ed5b3785318dbdb0fbd3669094f2756979fbf67c771f080f76dd9418da3d8326f3e93b8e15957e4
+DIST premake-src-3.7.zip 427727 SHA256 b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5 SHA512 351b26b9ee738e97b1828e7c26fe1538fb1509fbdc030da3d87fc28b1daa7966bc50ba8043062d35b37fa3929d909533b723241e1f98e438a039c6f9d61a46f4 WHIRLPOOL ddebaac25b0382620dba378ca8f3f3340cbe630cc081858cc94a6dc4d4a5a13c9e09706af5dc602e6886a0e3f720cc68515f38bc112fd82a389593a2b3514bf6
diff --git a/dev-util/premake/files/archless.patch b/dev-util/premake/files/archless.patch
new file mode 100644
index 000000000000..68719bc3669c
--- /dev/null
+++ b/dev-util/premake/files/archless.patch
@@ -0,0 +1,36 @@
+diff -Naur premake-4.3.orig/build/gmake.unix/Premake4.make premake-4.3/build/gmake.unix/Premake4.make
+--- premake-4.3.orig/build/gmake.unix/Premake4.make	2010-11-16 06:29:14.000000000 -0500
++++ premake-4.3/build/gmake.unix/Premake4.make	2011-04-18 07:24:59.374986001 -0400
+@@ -26,13 +26,12 @@
+   DEFINES   += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+   INCLUDES  += -I../../src/host/lua-5.1.4/src
+   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
+-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -Os
+-  CXXFLAGS  += $(CFLAGS) 
+-  LDFLAGS   += -s -rdynamic
++  CFLAGS    += $(CPPFLAGS) -Wall
++  LDFLAGS   += -rdynamic
+   LIBS      += -lm -ldl
+   RESFLAGS  += $(DEFINES) $(INCLUDES) 
+   LDDEPS    += 
+-  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
++  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LIBS)
+   define PREBUILDCMDS
+   endef
+   define PRELINKCMDS
+@@ -48,13 +47,12 @@
+   DEFINES   += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+   INCLUDES  += -I../../src/host/lua-5.1.4/src
+   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
+-  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g
+-  CXXFLAGS  += $(CFLAGS) 
++  CFLAGS    += $(CPPFLAGS) -Wall -g
+   LDFLAGS   += -rdynamic
+   LIBS      += -lm -ldl
+   RESFLAGS  += $(DEFINES) $(INCLUDES) 
+   LDDEPS    += 
+-  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
++  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LIBS)
+   define PREBUILDCMDS
+   endef
+   define PRELINKCMDS
diff --git a/dev-util/premake/metadata.xml b/dev-util/premake/metadata.xml
new file mode 100644
index 000000000000..f5d04b333f6c
--- /dev/null
+++ b/dev-util/premake/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>titanofold@gentoo.org</email>
+    <name>Aaron W. Swenson</name>
+  </maintainer>
+  <longdescription lang="en">
+	Describe your software project just once, using Premake's simple and
+	easy to read syntax, and build it everywhere. Generate project files
+	for Visual Studio, GNU Make, Xcode, Code::Blocks, and more across
+	Windows, Mac OS X, and Linux. Use the full featured Lua scripting
+	engine to make build configuration tasks a breeze.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">premake</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/premake/premake-3.7.ebuild b/dev-util/premake/premake-3.7.ebuild
new file mode 100644
index 000000000000..3fa26bbfadb9
--- /dev/null
+++ b/dev-util/premake/premake-3.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator
+
+DESCRIPTION="A makefile generation tool"
+HOMEPAGE="http://industriousone.com/premake"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT=$(get_major_version)
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}/${P/p/P}
+
+src_install() {
+	dobin bin/${PN}
+}
diff --git a/dev-util/premake/premake-4.3-r1.ebuild b/dev-util/premake/premake-4.3-r1.ebuild
new file mode 100644
index 000000000000..9d37258756ca
--- /dev/null
+++ b/dev-util/premake/premake-4.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator eutils
+
+DESCRIPTION="A makefile generation tool"
+HOMEPAGE="http://industriousone.com/premake"
+SRC_URI="mirror://sourceforge/premake/${P}-src.zip"
+
+LICENSE="BSD"
+SLOT=$(get_major_version)
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/archless.patch"
+}
+
+src_compile() {
+	emake -C build/gmake.unix/
+}
+
+src_install() {
+	dobin bin/release/premake4
+}
diff --git a/dev-util/pretrace/Manifest b/dev-util/pretrace/Manifest
new file mode 100644
index 000000000000..d1608019deb6
--- /dev/null
+++ b/dev-util/pretrace/Manifest
@@ -0,0 +1 @@
+DIST libpretrace-0.4.tar.gz 7370 SHA256 e215563c23c63ce23bbd544be7f0108bf862e2b24e9abeb27321720cc3b4c1a6 SHA512 64d1041ce398c73342ed371ebac4f656620c9ae4bc6da1b56b43bccd9898564a44dfe7bfaf3d4c865b89c5924b9d03aa21f393dcbafc185f84ac4b9ea2eb17d8 WHIRLPOOL 5dba777356049a4bc2621ad63f76e0ca9d5d8e55dc99392b5d7fdbedfbc79d931b8a88ca847b635267bb51b2c0ef5daa199116eee701592f2d04e51b3c123ded
diff --git a/dev-util/pretrace/files/pretrace-0.4--as-needed.diff b/dev-util/pretrace/files/pretrace-0.4--as-needed.diff
new file mode 100644
index 000000000000..19b66ed40c09
--- /dev/null
+++ b/dev-util/pretrace/files/pretrace-0.4--as-needed.diff
@@ -0,0 +1,12 @@
+diff -uNr libpretrace-0.4/Makefile libpretrace-0.4.new/Makefile
+--- libpretrace-0.4/Makefile	2005-12-15 12:50:06.000000000 +0000
++++ libpretrace-0.4.new/Makefile	2006-04-01 23:53:00.000000000 +0100
+@@ -14,7 +14,7 @@
+ 	@echo 'type `make install` to install to $(PREFIX)'
+ 
+ ptgenmap: libpretrace.so ptgenmap.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) -g -L. -lpretrace ptgenmap.o -o ptgenmap
++	$(CC) $(CFLAGS) $(LDFLAGS) -g -L. ptgenmap.o -lpretrace -o ptgenmap
+ 
+ ptgenmap.o:
+ 	$(CC) $(CFLAGS) -Wall -g -fPIC -c ptgenmap.c
diff --git a/dev-util/pretrace/files/pretrace-0.4-build.patch b/dev-util/pretrace/files/pretrace-0.4-build.patch
new file mode 100644
index 000000000000..4d7056fa83f7
--- /dev/null
+++ b/dev-util/pretrace/files/pretrace-0.4-build.patch
@@ -0,0 +1,15 @@
+fix building with newer glibc
+
+http://bugs.gentoo.org/227923
+
+--- pretrace.h
++++ pretrace.h
+@@ -20,3 +20,8 @@
+ #include <sys/time.h>
+ # define RANDOMIZE(x) { struct timeval tv; gettimeofday(&tv, NULL); x = tv.tv_usec; }
+ #endif
++
++#include <unistd.h>
++#ifndef ARG_MAX
++# define ARG_MAX sysconf(_SC_ARG_MAX)
++#endif
diff --git a/dev-util/pretrace/metadata.xml b/dev-util/pretrace/metadata.xml
new file mode 100644
index 000000000000..1470e032181b
--- /dev/null
+++ b/dev-util/pretrace/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/pretrace/pretrace-0.4.ebuild b/dev-util/pretrace/pretrace-0.4.ebuild
new file mode 100644
index 000000000000..bfda4821ff99
--- /dev/null
+++ b/dev-util/pretrace/pretrace-0.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib
+
+DESCRIPTION="start dynamically linked applications under debugging environment"
+HOMEPAGE="http://dev.inversepath.com/trac/pretrace"
+SRC_URI="http://dev.inversepath.com/pretrace/libpretrace-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S="${WORKDIR}/lib${P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}--as-needed.diff
+	epatch "${FILESDIR}"/${P}-build.patch #227923
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man{3,8}
+	einstall LIBDIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" || die
+	prepalldocs
+}
+
+pkg_postinst() {
+	elog "remember to execute ptgenmap after modifying pretrace.conf"
+}
diff --git a/dev-util/pscan/Manifest b/dev-util/pscan/Manifest
new file mode 100644
index 000000000000..ea6fa722ef90
--- /dev/null
+++ b/dev-util/pscan/Manifest
@@ -0,0 +1 @@
+DIST pscan.tar.gz 14555 SHA256 0f3a9f5b91ddba5363d77734a717f541260b2154c964b9ce63511b3ff50272ee SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78 WHIRLPOOL b5fe4022dd1234ab6b976ee3984114e50080ceec0f8b5cff539824c6b9f00ee83c5b7ebfb75e685d14efe655a0c4ac464fc80cfb485a10e7225c19c5bbdef52a
diff --git a/dev-util/pscan/metadata.xml b/dev-util/pscan/metadata.xml
new file mode 100644
index 000000000000..c6d862855eb5
--- /dev/null
+++ b/dev-util/pscan/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild
new file mode 100644
index 000000000000..e275b7f89fcd
--- /dev/null
+++ b/dev-util/pscan/pscan-20000721-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="A limited problem scanner for C source files"
+HOMEPAGE="http://www.striker.ottawa.on.ca/~aland/pscan/"
+# I wish upstream would version their files, even if it's only with a date
+SRC_URI="http://www.striker.ottawa.on.ca/~aland/pscan/pscan.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+# Does NOT contain a testsuite, but does contain a test.c that confuses src_test
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	emake CC="$(tc-getCC) ${CFLAGS}" || die
+}
+
+src_install() {
+	newbin pscan printf-scan || die
+	dodoc README find_formats.sh test.c wu-ftpd.pscan || die
+}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
new file mode 100644
index 000000000000..cda7ac88d47c
--- /dev/null
+++ b/dev-util/pycharm-community/Manifest
@@ -0,0 +1,4 @@
+DIST pycharm-community-3.4.1.tar.gz 112821686 SHA256 96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64 SHA512 3f5a4c8c598ed0fe1a28335b63864a5597fe6da3d6de225ada93bbe4342b81db8cc0a96f297b5f0ebe9608b8507f9293419790805b7e24e0151175e952ecd421 WHIRLPOOL efd62eb960902ab26983f51b2904209315b5a9535d6f0c0a45bc9d90df87cafc9d2d720d20e702b1846c0d2083af4e529f6de15184d73996da6164b4b8a38ac2
+DIST pycharm-community-4.0.6.tar.gz 121278114 SHA256 7aa0ed3d743ed6886329671d2e5ae10abdac35d0595cff8d6eeb39ada9168e9a SHA512 b9a20550fac93e9d247da702d8cf2e5c56eba9cb427024d85c76d21547f2e11f037ad12f465f4fdcbd3a8ee7e080bcaebf2b081af100b03953388f97921caba5 WHIRLPOOL cbb42c85a0835c323294f9b7648f8db51fd98b2b936dd92b228ee90e0ac78231d7fe8e16dd114c73380fd1bc6061a178e30483631fc16ee90c3b7a9f2c690d74
+DIST pycharm-community-4.5.2.tar.gz 121351880 SHA256 a951141777a6581dfe7df0344abcb07406f43577913e56daf1010d6840b46127 SHA512 f1b828fc432c3533aec74768435bf015d73eb29a22cca4c3b551a989c6980d5416ba4b41a67530599aaa93eb08050465839018e2f543c319f494f6f0e5a9d6ad WHIRLPOOL a260580d8427b17fbfa24356d85702df6db066a20406a1559e6f140015a6fb2c4cee5011bc26960f1ca9f7cd213a520c305fdd1bfa69cdcc97f07fe5e47318a8
+DIST pycharm-community-4.5.3.tar.gz 121605129 SHA256 205247b94965d9499e55d13ec701364475ff823d9353d967744750f6ceadc38d SHA512 0ae316890d6e348024f974a81cca9669c61f005a7af0cd0ef4d2f051fcb71cebbe372446f3a660f9c2a87837d7986809493499b34311a175542751d4f8597753 WHIRLPOOL e3895326751e6fd97a6ec60fc3933fc07b61337668dd18662ab22bb85f41fac1fca2511bf8eccfa0946dffa5f51f9cb24fda6019c88c88e07f281e390e6a37d9
diff --git a/dev-util/pycharm-community/files/README.gentoo b/dev-util/pycharm-community/files/README.gentoo
new file mode 100644
index 000000000000..2164d9e03ff7
--- /dev/null
+++ b/dev-util/pycharm-community/files/README.gentoo
@@ -0,0 +1,5 @@
+According to JetBrains, PyCharm has performance and
+graphics issues with OpenJDK Java.
+
+Please consider using Oracle JDK.
+Especially before reporting problems upstream.
diff --git a/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml
new file mode 100644
index 000000000000..5b80fb94c393
--- /dev/null
+++ b/dev-util/pycharm-community/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/pycharm-community/pycharm-community-3.4.1.ebuild b/dev-util/pycharm-community/pycharm-community-3.4.1.ebuild
new file mode 100644
index 000000000000..73913707a4b4
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-3.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=""
+
+RESTRICT="mirror strip"
+
+MY_PN=${PN/-community/}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_src_install
+}
diff --git a/dev-util/pycharm-community/pycharm-community-4.0.6.ebuild b/dev-util/pycharm-community/pycharm-community-4.0.6.ebuild
new file mode 100644
index 000000000000..2d6231557096
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-4.0.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=""
+
+RESTRICT="mirror strip"
+QA_PREBUILT="/opt/${PN}/bin/fsnotifier
+	/opt/${PN}/bin/fsnotifier64"
+
+MY_PN=${PN/-community/}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_src_install
+}
diff --git a/dev-util/pycharm-community/pycharm-community-4.5.2.ebuild b/dev-util/pycharm-community/pycharm-community-4.5.2.ebuild
new file mode 100644
index 000000000000..2d6231557096
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-4.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=""
+
+RESTRICT="mirror strip"
+QA_PREBUILT="/opt/${PN}/bin/fsnotifier
+	/opt/${PN}/bin/fsnotifier64"
+
+MY_PN=${PN/-community/}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_src_install
+}
diff --git a/dev-util/pycharm-community/pycharm-community-4.5.3.ebuild b/dev-util/pycharm-community/pycharm-community-4.5.3.ebuild
new file mode 100644
index 000000000000..2d6231557096
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-4.5.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=""
+
+RESTRICT="mirror strip"
+QA_PREBUILT="/opt/${PN}/bin/fsnotifier
+	/opt/${PN}/bin/fsnotifier64"
+
+MY_PN=${PN/-community/}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_src_install
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
new file mode 100644
index 000000000000..5f5d431f9260
--- /dev/null
+++ b/dev-util/pycharm-professional/Manifest
@@ -0,0 +1,4 @@
+DIST pycharm-professional-3.4.1.tar.gz 145673847 SHA256 e4f85f3248e8985ac9f8c326543f979b47ba1d7ac6b128a2cf2b3eb8ec545d2b SHA512 4f15484e3c0329bad8d89de44435f9d2cce3c3dfeb7bfdbdafe51649557b7f5059aeacd5aaf3e90307254195eefddcdf8c37dfbd67a12acb12d47af89ac6172e WHIRLPOOL b33b72b1eadd3b8ead2a7ec90f2fb121a14e06d632ce34a92105f36391d04d27da1ce8656bf37caccd5a9a7dcf0b13e0f0fe50da1fa4d6a0dea8d317e59b7b07
+DIST pycharm-professional-4.0.6.tar.gz 155933406 SHA256 b914f55dab1bff6e8707ca64b22092a99598009e858e397c39dde26f03e15b71 SHA512 538056c8aeb0eb2d996bfa3a76935866ed52b60e20de3b2f8f5c9a819005826537bac4b04b870d7e9a29a6f60f0d0aa532e0a5f9a348cfa95227afc9d289b1d6 WHIRLPOOL 21c4d811686fbbffa5276d89642cce6578575c543518b49378f2d58b4ed50f428007c622d574d25db6b909baa9f172bc9a772e39f5c21b875562af9b015d5c93
+DIST pycharm-professional-4.5.2.tar.gz 160339662 SHA256 a736a1d648ff7ae742b86ff278b2eeb53c61c875037d44f863b1abc78ffdf7b5 SHA512 3c79ee632554499b13b5d3096a3e60d3c578ef29ae985f7daef0555f217650686f6cd0d700a3a6f8fec809fc11a12c476365a594b167aa76f4720a9dabce66d7 WHIRLPOOL fb69b0cada495ba88872b2c0a38b4b272501a022338d600fc8ccb3cb7ea70c374bf898882e4e35eff2bd199da8ba15e721e765e156e3ee86edb9e3bf019d3c76
+DIST pycharm-professional-4.5.3.tar.gz 160688951 SHA256 5ac0ff2ad0e5a61d93182637ff308c30227f1c2f7e396149a9720782bc336601 SHA512 ea21e30d98bd5f83438fb3c51c366828dc1ab62540b7c22c3164afdd93f338ec677795dc43177e698efc86b72d2337fc3546abb1d78bc388697312afa4f7c018 WHIRLPOOL d89217d63086b5b0213b267eabb301900e0f4fb8b16a69260ba50a153fb7568f5dfbe6dec89f6c64083fd51d9fa089fced55a324a2837cfffd2c1abebffd8db6
diff --git a/dev-util/pycharm-professional/files/README.gentoo b/dev-util/pycharm-professional/files/README.gentoo
new file mode 100644
index 000000000000..2164d9e03ff7
--- /dev/null
+++ b/dev-util/pycharm-professional/files/README.gentoo
@@ -0,0 +1,5 @@
+According to JetBrains, PyCharm has performance and
+graphics issues with OpenJDK Java.
+
+Please consider using Oracle JDK.
+Especially before reporting problems upstream.
diff --git a/dev-util/pycharm-professional/metadata.xml b/dev-util/pycharm-professional/metadata.xml
new file mode 100644
index 000000000000..5b80fb94c393
--- /dev/null
+++ b/dev-util/pycharm-professional/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/pycharm-professional/pycharm-professional-3.4.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-3.4.1.ebuild
new file mode 100644
index 000000000000..d8316d0433c7
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-3.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=""
+
+RESTRICT="mirror strip"
+QA_FLAGS_IGNORED="opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_src_install
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-4.0.6.ebuild b/dev-util/pycharm-professional/pycharm-professional-4.0.6.ebuild
new file mode 100644
index 000000000000..d679699964cb
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-4.0.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=""
+
+RESTRICT="mirror strip"
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_src_install
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-4.5.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-4.5.2.ebuild
new file mode 100644
index 000000000000..d679699964cb
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-4.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=""
+
+RESTRICT="mirror strip"
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_src_install
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-4.5.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-4.5.3.ebuild
new file mode 100644
index 000000000000..d679699964cb
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-4.5.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=""
+
+RESTRICT="mirror strip"
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_src_install
+}
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
new file mode 100644
index 000000000000..a56c60baac7f
--- /dev/null
+++ b/dev-util/qbs/Manifest
@@ -0,0 +1 @@
+DIST qbs-src-1.4.1.tar.gz 802383 SHA256 eea8e0c1b2ef71f295fa5f1798a04a9f0509a701094fec11a691a4d7ae0155a9 SHA512 8fd48d27a2599c617ba19494e2716451c38253c964c24fc9685b5e31e75073f2606fb554400af57eab6b2e4e69e04e479dc8cfdf771eeeaf1068e3293ba691b2 WHIRLPOOL f4236866683e378827faae9c30e9fdf35d061804ee69069280cb4da220dd83c1a740186920ec108d708fdb63d08a511364a658fcd8a25d893478e9b5f08e0b7a
diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
new file mode 100644
index 000000000000..dc439f7e84f5
--- /dev/null
+++ b/dev-util/qbs/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>qt</herd>
+</pkgmetadata>
diff --git a/dev-util/qbs/qbs-1.4.1.ebuild b/dev-util/qbs/qbs-1.4.1.ebuild
new file mode 100644
index 000000000000..34b881941108
--- /dev/null
+++ b/dev-util/qbs/qbs-1.4.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib pax-utils qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Qt Build Suite"
+HOMEPAGE="http://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-qt/qdoc:5
+		dev-qt/qthelp:5
+	)
+	test? (
+		dev-qt/qtdeclarative:5
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# disable tests that require nodejs (bug 527652)
+	sed -i -e 's/!haveNodeJs()/true/' \
+		tests/auto/blackbox/tst_blackbox.cpp || die
+
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
+	if use test; then
+		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
+	else
+		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
+	fi
+}
+
+src_configure() {
+	local myqmakeargs=(
+		qbs.pro # bug 523218
+		-recursive
+		CONFIG+=qbs_disable_rpath
+		CONFIG+=qbs_enable_project_file_updates
+		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+		QBS_LIBRARY_DIRNAME="$(get_libdir)"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_compile() {
+	default
+
+	# disable mprotect wrt bug 526664
+	pax-mark m "${S}"/bin/qbs{,-config,-config-ui}
+}
+
+src_test() {
+	# disable mprotect wrt bug 526664
+	pax-mark m "${S}"/bin/tst_*
+
+	einfo "Setting up test environment in ${T}"
+
+	export HOME=${T}
+	export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+	"${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+
+	einfo "Running autotests"
+
+	# simply exporting LD_LIBRARY_PATH doesn't work
+	# we have to use a custom testrunner script
+	local testrunner=${S}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+	exec "\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# install documentation
+	if use doc; then
+		emake docs
+		dodoc -r doc/html
+		dodoc doc/qbs.qch
+		docompress -x /usr/share/doc/${PF}/qbs.qch
+	fi
+}
diff --git a/dev-util/qdevelop/Manifest b/dev-util/qdevelop/Manifest
new file mode 100644
index 000000000000..f74770a9226a
--- /dev/null
+++ b/dev-util/qdevelop/Manifest
@@ -0,0 +1 @@
+DIST qdevelop-v0.28.tar.gz 1660363 SHA256 d9772358078f62edb6591d3d7ca7515c52f256eb6becf82cc5fcde4228ac7d9e SHA512 daff4dc8b164eebcca1fce8ed32ef743ce0f34ac211a3cbaa292100da2179c8cbb8f44439f2130da79697de289a5a996ee0727908446299db3ad3d91e246ed5d WHIRLPOOL 89bc250389fbe8077c9c5748a43b2a6b052452830808dc114d85666c66968df15fcfa2bb43f83abdf8bb8e377815fc1e13cfe8033f7b260fe38b7a12fce5a976
diff --git a/dev-util/qdevelop/files/qdevelop-0.28-qt-4.7_fix.patch b/dev-util/qdevelop/files/qdevelop-0.28-qt-4.7_fix.patch
new file mode 100644
index 000000000000..a1607779bf54
--- /dev/null
+++ b/dev-util/qdevelop/files/qdevelop-0.28-qt-4.7_fix.patch
@@ -0,0 +1,24 @@
+Description: Fix FTBFS with Qt 4.7.
+
+--- qdevelop-0.28.orig/src/build.h
++++ qdevelop-0.28/src/build.h
+@@ -56,7 +56,7 @@ private:
+ 	int m_warnings;
+ 	QString m_forceMode;
+ signals:
+-	void message(QString, QString=0);
++	void message(QString, QString=QString());
+ protected slots:
+ 	void slotBuildMessages();
+ 	void slotStopBuild();
+--- qdevelop-0.28.orig/src/textEdit.h
++++ qdevelop-0.28/src/textEdit.h
+@@ -142,7 +142,7 @@ public:
+     void setMouseHidden( bool hidden );
+ public slots:
+     void gotoLine( int line, bool moveTop );
+-    void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=0,  QTextDocument::FindFlags options=0, bool fromButton=false);
++    void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=QString(),  QTextDocument::FindFlags options=0, bool fromButton=false);
+     void slotIndent(bool indent=true);
+     void slotUnindent();
+     void comment(ActionComment action);
diff --git a/dev-util/qdevelop/files/qdevelop.desktop b/dev-util/qdevelop/files/qdevelop.desktop
new file mode 100644
index 000000000000..60be0ac74904
--- /dev/null
+++ b/dev-util/qdevelop/files/qdevelop.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Categories=Qt;Development;
+Comment=
+Comment[en_US]=
+Exec=/usr/bin/qdevelop
+GenericName=QDevelop
+GenericName[en_US]=QDevelop
+Icon=/usr/share/pixmaps/qdevelop.png
+MimeType=
+Name=QDevelop
+Name[en_US]=QDevelop
+StartupNotify=true
+Terminal=false
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/dev-util/qdevelop/metadata.xml b/dev-util/qdevelop/metadata.xml
new file mode 100644
index 000000000000..e4dec25c0ac7
--- /dev/null
+++ b/dev-util/qdevelop/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="plugins">Build and install additional plugins</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-util/qdevelop/qdevelop-0.28.ebuild b/dev-util/qdevelop/qdevelop-0.28.ebuild
new file mode 100644
index 000000000000..4444970a70d5
--- /dev/null
+++ b/dev-util/qdevelop/qdevelop-0.28.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils cmake-utils
+
+MY_P=${PN}-v${PV}
+DESCRIPTION="A development environment entirely dedicated to Qt4"
+HOMEPAGE="http://biord-software.org/qdevelop/"
+SRC_URI="http://biord-software.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="debug plugins"
+
+DEPEND="|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
+	dev-qt/qtsql:4[sqlite]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-qt-4.7_fix.patch )
+
+src_configure() {
+	mycmakeargs=( "-DAUTOPLUGINS=$(use plugins && echo 1 || echo 0)" )
+
+	sed -e "s#/lib/pkgconfig#/$(get_libdir)/pkgconfig#" \
+		-e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
+	    -i CMakeLists.txt || die "sed fixing multilib failed"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc ChangeLog.txt README.txt
+	newicon "${S}"/resources/images/QDevelop.png qdevelop.png
+	make_desktop_entry ${PN}
+}
+
+pkg_postinst(){
+	elog "Additional functionality can be achieved by emerging other packages:"
+	elog "  dev-util/ctags - code completion"
+	elog "  sys-devel/gdb - debugging"
+}
diff --git a/dev-util/qfsm/Manifest b/dev-util/qfsm/Manifest
new file mode 100644
index 000000000000..114cccbdb195
--- /dev/null
+++ b/dev-util/qfsm/Manifest
@@ -0,0 +1,2 @@
+DIST qfsm-0.53.0-Source.tar.bz2 1498547 SHA256 a47f2f85fc15992a41ae06560fdc0ddbd663488821af6a34d2f0a3a87c4ba9bb SHA512 c9ad1784b1e5edd8f2ba1a24fa2555438de52294dbe39db84820f754bc170806fe999ba3cf14bc743c9753756202edf7581646e677f31e8fb16df1428284a537 WHIRLPOOL b7081dbc783fbc20dea8e1704815a4d118d0636722b67775605ba32a482d1859094ff9f7f03d53e4145802637328f904e6c8f0aa44b5fdfcc46f8c24d276f056
+DIST qfsm-0.54.0-Source.tar.bz2 2130183 SHA256 2b53b7e54e42d4c188f62220aaae3d3fb5e8239b8ac8e88f793689cc0a5b8766 SHA512 ab1f427c6d3421de924070a9fdca5aab2c2cf29dfad1b9f2cd35cbc35542238015a13bb91457de6872fe18f25e41720642bb58a22f33e4d0f56f9067ec8e9507 WHIRLPOOL 1a49150bd5bde7ac0f2d71b65e71523fbc3c5b40b7da593590f2bc78953f056ee410fc4d2c0372f7e33763a34a4252f8b0c890b06706dc2fcd03e3c65cf52c60
diff --git a/dev-util/qfsm/metadata.xml b/dev-util/qfsm/metadata.xml
new file mode 100644
index 000000000000..b125e2fd9521
--- /dev/null
+++ b/dev-util/qfsm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">qfsm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/qfsm/qfsm-0.53.0.ebuild b/dev-util/qfsm/qfsm-0.53.0.ebuild
new file mode 100644
index 000000000000..723fc702bb38
--- /dev/null
+++ b/dev-util/qfsm/qfsm-0.53.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P="${P}-Source"
+
+inherit cmake-utils
+
+DESCRIPTION="A graphical tool for designing finite state machines"
+HOMEPAGE="http://qfsm.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib
+	>=dev-qt/qtcore-4.7:4
+	>=dev-qt/qt3support-4.7:4
+	>=dev-qt/qtsvg-4.7:4
+	<media-gfx/graphviz-2.28.0"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ChangeLog README TODO )
+
+# TODO: fix doc building, probably some dependencies are missing
+src_prepare()
+{
+	# remove broken pre-generated Makefile
+	rm Makefile || die 'rm Makefile failed'
+	# fix desktop files
+	sed -i  -e '/Encoding/d' \
+		-e 's/\.png//' \
+		desktop/qfsm.desktop || die 'sed on qfsm.desktop failed'
+	# fix doc path installation, bug #130641
+	sed -i -e "s:share/doc/qfsm:share/doc/${P}/html:g" CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+}
diff --git a/dev-util/qfsm/qfsm-0.54.0.ebuild b/dev-util/qfsm/qfsm-0.54.0.ebuild
new file mode 100644
index 000000000000..de83220dad23
--- /dev/null
+++ b/dev-util/qfsm/qfsm-0.54.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${P}-Source"
+
+inherit cmake-utils
+
+DESCRIPTION="A graphical tool for designing finite state machines"
+HOMEPAGE="http://qfsm.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib
+	dev-qt/qtcore:4
+	dev-qt/qt3support:4
+	dev-qt/qtsvg:4
+	>=media-gfx/graphviz-2.36"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare()
+{
+	# remove broken pre-generated Makefile
+	rm Makefile || die 'rm Makefile failed'
+	# fix desktop files
+	sed -i  -e '/Encoding/d' \
+		-e 's/\.png//' \
+		desktop/qfsm.desktop || die 'sed on qfsm.desktop failed'
+	# fix doc path installation, bug #130641
+	sed -i -e "s:share/doc/qfsm:share/doc/${P}/html:g" CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/qmtest/Manifest b/dev-util/qmtest/Manifest
new file mode 100644
index 000000000000..3538da0cbd53
--- /dev/null
+++ b/dev-util/qmtest/Manifest
@@ -0,0 +1 @@
+DIST qmtest-2.4.1.tar.gz 2792290 SHA256 106b591ffae7c879afd147f21bfb37a2f5c3ea484988f54289d91063df567a04 SHA512 01a8b317fd5ae3d653b81d031005975d745829eda4b7d4d57c85cc13b71c142213dce053ba13999bf42a1b9b17118075e2c244c67e5c4c8a957d35d2850ae372 WHIRLPOOL 795d160ed71f2e5ab4453151a1d1d8bb9cc9d745a06823e9c4dd11a47e0c8c22cccce3688730016de9407dcab1d12b20abf0a44356d8f6bddbfba17139c115a8
diff --git a/dev-util/qmtest/metadata.xml b/dev-util/qmtest/metadata.xml
new file mode 100644
index 000000000000..effbbf33eac8
--- /dev/null
+++ b/dev-util/qmtest/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/dev-util/qmtest/qmtest-2.4.1-r1.ebuild b/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..faeac0eb7c88
--- /dev/null
+++ b/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="CodeSourcery's test harness system"
+HOMEPAGE="http://www.codesourcery.com/qmtest/"
+SRC_URI="http://www.codesourcery.com/public/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+	find "${D}" -name config.py -print0 | xargs -0 sed -i "s:${D}:/usr:"
+	rm -r "${D}"usr/share/doc/${PN}/{COPYING,LICENSE.OPL} || die
+	mv "${D}"usr/share/doc/${PN}/* "${D}"usr/share/doc/${PF} || die
+	rm -r "${D}"/usr/share/doc/${PN} || die
+}
diff --git a/dev-util/qmtest/qmtest-2.4.1.ebuild b/dev-util/qmtest/qmtest-2.4.1.ebuild
new file mode 100644
index 000000000000..fe18a236aab9
--- /dev/null
+++ b/dev-util/qmtest/qmtest-2.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils
+
+DESCRIPTION="CodeSourcery's test harness system"
+HOMEPAGE="http://www.codesourcery.com/qmtest/"
+SRC_URI="http://www.codesourcery.com/public/${PN}/${PF}/${PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PYTHON_MODNAME="qm"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_install() {
+	distutils_src_install
+	find "${D}" -name config.py -print0 | xargs -0 sed -i "s:${D}:/usr:"
+	dodir /usr/share/doc/${PF}
+	rm -r "${D}"/usr/share/doc/${PN}/{COPYING,LICENSE.OPL} || die
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF} || die
+	rm -r "${D}"/usr/share/doc/${PN} || die
+}
diff --git a/dev-util/qstlink2/Manifest b/dev-util/qstlink2/Manifest
new file mode 100644
index 000000000000..c10c0fbab9b8
--- /dev/null
+++ b/dev-util/qstlink2/Manifest
@@ -0,0 +1 @@
+DIST qstlink2-1.0.3.tar.gz 661197 SHA256 c6e39bd3cde87c932b42c0831bb243f7148e741bf788643e438cdb98b3fb3b04 SHA512 bd6d083623296cfcbc407e8c9c920de24efc91f508fb8bfe64d538ff776ed927cb89efba5c265c393b877cee995ed022b6ac51e081423b787cbcbb176215231b WHIRLPOOL 74243268a657fd8980a0aca3e64a0d7eccba2ae12f090aabe3170d8d82eb85a5909e2fb7118b8c7f46258f0618f9b30204fd6f2bf5b193f3cf50dd2b0faf8154
diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml
new file mode 100644
index 000000000000..72c026130307
--- /dev/null
+++ b/dev-util/qstlink2/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>no111u3@gmail.com</email>
+		<name>Boris Vinogradov</name>
+	</maintainer>
+	<maintainer>
+		<email>@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		This is a ST-Link V2 (Debugger/Programmer) client developped for Linux, OSX and Windows.
+
+		It is developped using QT and LibUsb/WinUsb. 
+	</longdescription>
+	<upstream>
+		<remote-id type="github">mobyfab/qstlink2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/qstlink2/qstlink2-1.0.3.ebuild b/dev-util/qstlink2/qstlink2-1.0.3.ebuild
new file mode 100644
index 000000000000..7b7f46c0b7cb
--- /dev/null
+++ b/dev-util/qstlink2/qstlink2-1.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="GUI and CLI ST-Link V2(Debugger/Programmer) client"
+HOMEPAGE="https://code.google.com/p/qstlink2/"
+SRC_URI="https://github.com/mobyfab/QStlink2/archive/v1.0.3.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="virtual/libusb:0
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/QStlink2-${PV}"
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
new file mode 100644
index 000000000000..abda92426a20
--- /dev/null
+++ b/dev-util/quilt/Manifest
@@ -0,0 +1,2 @@
+DIST quilt-0.50.tar.gz 452769 SHA256 fa4579628a98cf94472b36869e74f5cd0cb057d6fd13c1872a53f01c45aba8c3 SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365 WHIRLPOOL d4823f9c1507fc3b29f605df855c53343bc0e0b300617b8203d9422d3fede2e1930ba9390329b3ee484fbeb7dde5535f9938c84ceee63477eb8fc0c705556822
+DIST quilt-0.63.tar.gz 389593 SHA256 2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52 SHA512 e6d5c601805b664a5586a557799e7b321b6b28f7ccec708f52aa96371c987e5791aa54418c9b89d34154e4967ddfe7a261e37195fd29b6aa529e8fa6e5007c45 WHIRLPOOL 89b72f38d75e479fc8f030398757ab325ab46ff79baa7227fe122c4902d582374971c8c5f562611f0c024e8b56db01858669cd0427338f2368492ff118f31280
diff --git a/dev-util/quilt/files/quilt-0.48-no-graphviz.patch b/dev-util/quilt/files/quilt-0.48-no-graphviz.patch
new file mode 100644
index 000000000000..4ae5ba09624e
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.48-no-graphviz.patch
@@ -0,0 +1,34 @@
+--- Makefile.in.orig	2009-02-24 13:49:47.000000000 -0500
++++ Makefile.in	2009-02-24 13:50:21.000000000 -0500
+@@ -82,8 +82,7 @@ QUILT :=	$(QUILT_IN)
+ SRC +=		$(QUILT_SRC:%=quilt/%)
+ DIRT +=		$(QUILT_IN:%=quilt/%)
+ 
+-SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
+-		remove-trailing-ws
++SCRIPTS_IN :=	patchfns parse-patch inspect edmail	remove-trailing-ws
+ 
+ SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
+ SCRIPTS :=	$(SCRIPTS_IN)
+--- bash_completion.orig	2009-02-24 13:49:52.000000000 -0500
++++ bash_completion	2009-02-24 13:50:46.000000000 -0500
+@@ -189,19 +189,6 @@ _quilt_completion()
+ 	        ;;
+ 	   esac
+ 	   ;;
+-	graph)
+-	   case $prev in
+-	     -T)
+-	     	COMPREPLY=( $( compgen -W "ps" -- $cur ) )
+-		;;
+-	     --edge-labels)
+-	        COMPREPLY=( $( compgen -W "files" -- $cur ) )
+-		;;
+-	     *)
+-		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied)" -- $cur ) )
+-		;;
+-	   esac
+-	   ;;
+ 	grep)
+ 	   _longopt grep
+ 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
new file mode 100644
index 000000000000..04e0d7d3a9a1
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
@@ -0,0 +1,47 @@
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -82,8 +82,7 @@ QUILT :=	$(QUILT_IN)
+ SRC +=		$(QUILT_SRC:%=quilt/%)
+ DIRT +=		$(QUILT_IN:%=quilt/%)
+ 
+-SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
+-		remove-trailing-ws
++SCRIPTS_IN :=	patchfns parse-patch inspect edmail remove-trailing-ws
+ 
+ SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
+ SCRIPTS :=	$(SCRIPTS_IN)
+Index: b/bash_completion
+===================================================================
+--- a/bash_completion
++++ b/bash_completion
+@@ -95,7 +95,7 @@ _quilt_completion()
+     prev=${COMP_WORDS[COMP_CWORD-1]}
+ 
+     # quilt sub commands 
+-    cmds='add annotate applied delete diff edit files fold fork graph \
++    cmds='add annotate applied delete diff edit files fold fork \
+           grep header import mail new next patches pop previous push refresh \
+ 	  remove rename revert series setup snapshot top unapplied'
+ 
+@@ -189,19 +189,6 @@ _quilt_completion()
+ 	        ;;
+ 	   esac
+ 	   ;;
+-	graph)
+-	   case $prev in
+-	     -T)
+-	     	COMPREPLY=( $( compgen -W "ps" -- $cur ) )
+-		;;
+-	     --edge-labels)
+-	        COMPREPLY=( $( compgen -W "files" -- $cur ) )
+-		;;
+-	     *)
+-		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied 2>/dev/null)" -- $cur ) )
+-		;;
+-	   esac
+-	   ;;
+ 	grep)
+ 	   _longopt grep
+ 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/files/quilt-0.63-bash-completion.patch b/dev-util/quilt/files/quilt-0.63-bash-completion.patch
new file mode 100644
index 000000000000..c85caca5c9e1
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.63-bash-completion.patch
@@ -0,0 +1,17 @@
+--- bash_completion.orig	2014-10-21 18:15:29.549789267 -0400
++++ bash_completion	2014-10-21 18:15:38.489789221 -0400
+@@ -11,8 +11,6 @@
+ # completion to work then you must set QUILT_PC in your global environment
+ # (for example in ~/.profile) and not just in your quiltrc file.
+ 
+-if type quilt &> /dev/null ; then
+-
+ if ! type _expand &> /dev/null ; then
+     # This function expands tildes in pathnames
+     #
+@@ -310,5 +308,3 @@ _quilt_completion()
+ && _quilt_complete_opt="-o filenames"
+ complete -F _quilt_completion $_quilt_complete_opt quilt
+ unset -v _quilt_complete_opt
+-
+-fi
diff --git a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
new file mode 100644
index 000000000000..80458120f4f1
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
@@ -0,0 +1,43 @@
+--- Makefile.in.orig	2014-10-21 17:08:25.639810130 -0400
++++ Makefile.in	2014-10-21 17:09:03.269809935 -0400
+@@ -79,8 +79,7 @@ QUILT :=	$(QUILT_IN)
+ SRC +=		$(QUILT_SRC:%=quilt/%)
+ DIRT +=		$(QUILT_IN:%=quilt/%)
+ 
+-SCRIPTS_IN :=	patchfns inspect dependency-graph edmail	\
+-		remove-trailing-ws backup-files
++SCRIPTS_IN :=  patchfns inspect edmail remove-trailing-ws backup-files
+ 
+ SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
+ SCRIPTS :=	$(SCRIPTS_IN)
+--- bash_completion.orig	2014-10-21 17:09:08.789809906 -0400
++++ bash_completion	2014-10-21 17:09:53.189809676 -0400
+@@ -100,7 +100,7 @@ _quilt_completion()
+     prev=${COMP_WORDS[COMP_CWORD-1]}
+ 
+     # quilt sub commands
+-    cmds='add annotate applied delete diff edit files fold fork graph \
++    cmds='add annotate applied delete diff edit files fold fork \
+ 	  grep header import mail new next patches pop previous push refresh \
+ 	  remove rename revert series setup snapshot top unapplied'
+ 
+@@ -194,19 +194,6 @@ _quilt_completion()
+ 		;;
+ 	   esac
+ 	   ;;
+-	graph)
+-	   case $prev in
+-	     -T)
+-		COMPREPLY=( $( compgen -W "ps" -- $cur ) )
+-		;;
+-	     --edge-labels)
+-		COMPREPLY=( $( compgen -W "files" -- $cur ) )
+-		;;
+-	     *)
+-		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) )
+-		;;
+-	   esac
+-	   ;;
+ 	grep)
+ 	   _longopt grep
+ 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
new file mode 100644
index 000000000000..76c91f263895
--- /dev/null
+++ b/dev-util/quilt/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>dev-tools</herd>
+	<herd>suse</herd>
+	<maintainer>
+		  <email>mpagano@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/quilt/quilt-0.50.ebuild b/dev-util/quilt/quilt-0.50.ebuild
new file mode 100644
index 000000000000..d30af4988ccc
--- /dev/null
+++ b/dev-util/quilt/quilt-0.50.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
+SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86"
+IUSE="emacs graphviz"
+
+RDEPEND="sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )
+	>=sys-apps/coreutils-8.5"
+
+PDEPEND="emacs? ( app-emacs/quilt-el )"
+
+pkg_setup() {
+	use graphviz && return 0
+	echo
+	elog "If you intend to use the folding functionality (graphical illustration of the"
+	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
+	echo
+	epause 5
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Add support for USE=graphviz
+	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+
+	# Some tests are somewhat broken while being run from within portage, work
+	# fine if you run them manually
+	rm "${S}"/test/delete.test "${S}"/test/mail.test
+}
+
+src_install() {
+	emake BUILD_ROOT="${D}" install || die "make install failed"
+
+	rm -rf "${D}"/usr/share/doc/${P}
+	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
+		doc/quilt.pdf
+
+	rm -rf "${D}"/etc/bash_completion.d
+	newbashcomp bash_completion ${PN}
+
+	# Remove the compat symlinks
+	rm -rf "${D}"/usr/share/quilt/compat
+
+	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
+	rm -rf "${D}"/usr/share/emacs
+}
diff --git a/dev-util/quilt/quilt-0.63.ebuild b/dev-util/quilt/quilt-0.63.ebuild
new file mode 100644
index 000000000000..eff6dd45ddb9
--- /dev/null
+++ b/dev-util/quilt/quilt-0.63.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
+SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emacs graphviz"
+
+RDEPEND="sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )
+	>=sys-apps/coreutils-8.5"
+
+PDEPEND="emacs? ( app-emacs/quilt-el )"
+
+pkg_setup() {
+	use graphviz && return 0
+	echo
+	elog "If you intend to use the folding functionality (graphical illustration of the"
+	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
+	echo
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Some tests are somewhat broken while being run from within portage, work
+	# fine if you run them manually
+	rm "${S}"/test/delete.test "${S}"/test/mail.test
+}
+
+src_prepare() {
+
+	# Apply bash-competion patch see bug #526294
+	epatch "${FILESDIR}/${P}-bash-completion.patch"
+
+	# Add support for USE=graphviz
+	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+}
+
+src_install() {
+	emake BUILD_ROOT="${D}" install || die "make install failed"
+
+	rm -rf "${D}"/usr/share/doc/${P}
+	dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf
+
+	rm -rf "${D}"/etc/bash_completion.d
+	newbashcomp bash_completion ${PN}
+
+	# Remove the compat symlinks
+	rm -rf "${D}"/usr/share/quilt/compat
+
+	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
+	rm -rf "${D}"/usr/share/emacs
+}
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
new file mode 100644
index 000000000000..cb46e98d94a9
--- /dev/null
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.sv.gnu.org/quilt.git"
+
+[[ ${PV} == 9999 ]] && inherit git-2
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
+[[ ${PV} == 9999 ]] || SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+	dev-util/diffstat
+	mail-mta/sendmail
+	sys-apps/ed
+	>=sys-apps/coreutils-8.5
+	graphviz? ( media-gfx/graphviz )
+"
+
+src_prepare() {
+	# Add support for USE=graphviz
+	use graphviz || epatch "${FILESDIR}/${PN}-0.60-no-graphviz.patch"
+
+	# remove failing test, because it fails on root-build
+	rm -rf test/delete.test
+}
+
+src_install() {
+	emake BUILD_ROOT="${ED}" install
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
+		doc/quilt.pdf
+
+	rm -rf "${ED}"/etc/bash_completion.d
+	newbashcomp bash_completion ${PN}
+
+	# Remove the compat symlinks
+	rm -rf "${ED}"/usr/share/quilt/compat
+
+	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
+	rm -rf "${ED}"/usr/share/emacs
+}
+
+pkg_postinst() {
+	if ! has_version app-emacs/quilt-el ; then
+		elog "If you plan to use quilt with emacs consider installing \"app-emacs/quilt-el\""
+	fi
+}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
new file mode 100644
index 000000000000..bd661be73da2
--- /dev/null
+++ b/dev-util/radare2/Manifest
@@ -0,0 +1,2 @@
+DIST radare2-0.9.8.tar.xz 4614588 SHA256 8e72caaebdac10300fd7ec86a5d06b1cbecfc6914e5fea4007c6e06e667bfa5a SHA512 8a3b1811c994a520eb5758a11eceffdaa999bb69b5252e45148813a7c36d11e0afd8c83d6f03bc2282c526b630979edc20bed050cb119300dc353ee039a99355 WHIRLPOOL 09ec20978b18f16162100ef3277f01d0dd547779dfb350fac4ea0200cdec58b317aef8f976aa881d37db21a5c8aae0ca53577fc3a3420c20d835d40f4aaa92bb
+DIST radare2-0.9.9.tar.xz 4318304 SHA256 024adba5255f12e58c2c1a5e2263fada75aad6e71b082461dea4a2b94b29df32 SHA512 6ea9396f59a5f61d7d433bc2eceb093526112c58114e2c7d83127d52442e376fbb4277d44447c252c9ba99d1ad1d966a06a6a0d5049660ef330029e2facb4cc9 WHIRLPOOL a349edaf1fea30117a13cb07f59f0798ab4c11fa13bf068a22a574a87b42fef0e695db3d87d42dc32c2e6658688887398e1ad8de85a5558c4b2116c81eebad67
diff --git a/dev-util/radare2/files/radare2-0.9.9-nogit.patch b/dev-util/radare2/files/radare2-0.9.9-nogit.patch
new file mode 100644
index 000000000000..9a6979e348a4
--- /dev/null
+++ b/dev-util/radare2/files/radare2-0.9.9-nogit.patch
@@ -0,0 +1,13 @@
+capstone-sync does not work correctly for release tarballs.
+It tries to sync/revert from upstream git repo unconditionaly.
+diff --git a/shlr/Makefile b/shlr/Makefile
+index a1796ce..f8d179a 100644
+--- a/shlr/Makefile
++++ b/shlr/Makefile
+@@ -144,5 +144,5 @@ else
+ 
+ ifeq ($(CS_TAR),)
+-capstone: capstone-sync
++capstone: # capstone-sync
+ 
+ capstone-sync:
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
new file mode 100644
index 000000000000..9406077f08b4
--- /dev/null
+++ b/dev-util/radare2/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/radare2/radare2-0.9.8.ebuild b/dev-util/radare2/radare2-0.9.8.ebuild
new file mode 100644
index 000000000000..bf31827e4a17
--- /dev/null
+++ b/dev-util/radare2/radare2-0.9.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Advanced command line hexadecimal editor and more"
+HOMEPAGE="http://www.radare.org"
+SRC_URI="http://www.radare.org/get/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ssl"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl) \
+		$(use_enable debug)
+}
diff --git a/dev-util/radare2/radare2-0.9.9.ebuild b/dev-util/radare2/radare2-0.9.9.ebuild
new file mode 100644
index 000000000000..7998add0cbfb
--- /dev/null
+++ b/dev-util/radare2/radare2-0.9.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Advanced command line hexadecimal editor and more"
+HOMEPAGE="http://www.radare.org"
+SRC_URI="http://www.radare.org/get/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ssl"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.9-nogit.patch
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl) \
+		$(use_enable debug)
+}
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
new file mode 100644
index 000000000000..972f3c1a365f
--- /dev/null
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+is_live() { [[ ${PV} == 9999* ]]; }
+
+is_live && inherit git-r3
+
+DESCRIPTION="Advanced command line hexadecimal editor and more"
+HOMEPAGE="http://www.radare.org"
+is_live || SRC_URI="http://www.radare.org/get/${P}.tar.xz"
+EGIT_REPO_URI="https://github.com/radare/radare2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug ssl"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl) \
+		$(use_enable debug)
+}
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
new file mode 100644
index 000000000000..437d9d9311f8
--- /dev/null
+++ b/dev-util/ragel/Manifest
@@ -0,0 +1,3 @@
+DIST ragel-6.7.tar.gz 1182734 SHA256 46df8e3f117a730f8896061c95ea8e8f53e9789cb053c2eea047833724fd7a30 SHA512 a85c1d5d4fd7d903c823c2ddc8b5f1d5dd5f715f11bc04f10fb78ea5632b3aa33c5b4861f89179fa9d6b4944484216ee93bbd25dd0b5958d2419e434b781b78a WHIRLPOOL 52f1614e16390949fe070df46c9929b5871e35923b38e6c277f0d4688e45f610a16a6635240cea0622892c675aebf092e3f6a9c626684ed1a4af8191ff3c6d6f
+DIST ragel-6.8.tar.gz 1211146 SHA256 dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764 SHA512 3c7fa4ca0cfcd5d19e0ff8746ca427f5a1eefb0af09db5d2ee55ced9bcc35c588a5db146dcfdec46b83fb63d94ff9ace117b4cfcb07e2c57aec67a6cbe249458 WHIRLPOOL 540ba0c5a712ae0426982e08e7aa7b1fa1ff33e3d9c2095353939ed2c45e04048ebcdf93292ead8e70abbd8fa230dddbfeea8d485955142d0615ddb94c8a0b9a
+DIST ragel-6.9.tar.gz 1226871 SHA256 6e07be0fab5ca1d9c2d9e177718a018fc666141f594a5d6e7025658620cf660a SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd WHIRLPOOL c802e3020842b28ecfe604ca13c8f205ed98fb4c180c65a88be9001e7b73dc4facc6a716f55623da4f9c7cdc43c79d958c4c26fa89622bdabf9b3989e0c9682e
diff --git a/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch b/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
new file mode 100644
index 000000000000..80eb29a46f05
--- /dev/null
+++ b/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
@@ -0,0 +1,178 @@
+From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Tue, 22 May 2012 16:25:37 -0700
+Subject: [PATCH] aapl: fix building with gcc-4.7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with GCC 4.7, you have to explicit methods inherited from
+base templates, otherwise it will refuse to build.
+
+---
+
+The URL reported in the README is no longer registered, so I couldn't
+find a way to report this to an upstream project.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ aapl/avlcommon.h  |   12 ++++++------
+ aapl/bstcommon.h  |   16 ++++++++--------
+ aapl/bubblesort.h |    2 +-
+ aapl/mergesort.h  |    2 +-
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
+index 06983bc..2e3c190 100644
+--- a/aapl/avlcommon.h
++++ b/aapl/avlcommon.h
+@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 		}
+ 
+ #ifdef AVL_BASIC
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ #else
+-		keyRelation = compare( element->BASEKEY(getKey()), 
++		keyRelation = this->compare( element->BASEKEY(getKey()),
+ 				curEl->BASEKEY(getKey()) );
+ #endif
+ 
+@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare(key, curEl->getKey());
++		keyRelation = this->compare(key, curEl->getKey());
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h
+index 888717f..7c53ff3 100644
+--- a/aapl/bstcommon.h
++++ b/aapl/bstcommon.h
+@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
+ 
+ 			lower = mid - 1;
+ 			while ( lower != lowEnd && 
+-					compare(key, GET_KEY(*lower)) == 0 )
++					this->compare(key, GET_KEY(*lower)) == 0 )
+ 				lower--;
+ 
+ 			upper = mid + 1;
+ 			while ( upper != highEnd && 
+-					compare(key, GET_KEY(*upper)) == 0 )
++					this->compare(key, GET_KEY(*upper)) == 0 )
+ 				upper++;
+ 			
+ 			low = (Element*)lower + 1;
+@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h
+index bcc2fb6..f0f4ce5 100644
+--- a/aapl/bubblesort.h
++++ b/aapl/bubblesort.h
+@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>::
+ 		changed = false;
+ 		for ( long i = 0; i < len-pass; i++ ) {
+ 			/* Do we swap pos with the next one? */
+-			if ( compare( data[i], data[i+1] ) > 0 ) {
++			if ( this->compare( data[i], data[i+1] ) > 0 ) {
+ 				char tmp[sizeof(T)];
+ 
+ 				/* Swap the two items. */
+diff --git a/aapl/mergesort.h b/aapl/mergesort.h
+index 68b8426..8cefa73 100644
+--- a/aapl/mergesort.h
++++ b/aapl/mergesort.h
+@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>::
+ 		}
+ 		else {
+ 			/* Both upper and lower left. */
+-			if ( compare(*lower, *upper) <= 0 )
++			if ( this->compare(*lower, *upper) <= 0 )
+ 				memcpy( dest++, lower++, sizeof(T) );
+ 			else
+ 				memcpy( dest++, upper++, sizeof(T) );
+-- 
+1.7.8.6
+
diff --git a/dev-util/ragel/files/ragel-6.7-cross-compile.patch b/dev-util/ragel/files/ragel-6.7-cross-compile.patch
new file mode 100644
index 000000000000..e953a1aeeeef
--- /dev/null
+++ b/dev-util/ragel/files/ragel-6.7-cross-compile.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/473970
+
+already sent upstream
+
+patch by Jungshik Shin
+
+--- ragel-6.7/configure.in
++++ ragel-6.7/configure.in
+@@ -27,9 +27,9 @@
+ 
+ dnl Choose defaults for the build_parsers and build_manual vars. If the dist
+ dnl file is present in the root then default to no, otherwise go for it.
+-AC_CHECK_FILES( $srcdir/DIST, 
+-	[ . $srcdir/DIST; ], 
+-	[ build_parsers=yes; build_manual=yes; ] )
++
++AS_IF([test -r $srcdir/DIST], [. $srcdir/DIST], [build_parsers=yes;
++       build_manual=yes])
+ 
+ dnl
+ dnl Enable arg to explicitly control the building of the manual
diff --git a/dev-util/ragel/metadata.xml b/dev-util/ragel/metadata.xml
new file mode 100644
index 000000000000..2ba6e4da9d2c
--- /dev/null
+++ b/dev-util/ragel/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>lu_zero@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
new file mode 100644
index 000000000000..1ca0a9eff99a
--- /dev/null
+++ b/dev-util/ragel/ragel-6.7-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="Compiles finite state machines from regular languages into executable code"
+HOMEPAGE="http://www.complang.org/ragel/"
+SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="vim-syntax"
+
+DEPEND=""
+RDEPEND=""
+
+# We need to get the txl language in Portage to have the tests :(
+RESTRICT=test
+
+DOCS=( ChangeLog CREDITS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}+gcc-4.7.patch
+	epatch "${FILESDIR}"/${P}-cross-compile.patch #473970
+	sed -i -e '/CXXFLAGS/d' configure.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_test() {
+	cd "${S}"/test
+	./runtests.in || die
+}
+
+src_install() {
+	default
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins ragel.vim
+	fi
+}
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
new file mode 100644
index 000000000000..7b12d5241299
--- /dev/null
+++ b/dev-util/ragel/ragel-6.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools autotools-utils
+
+DESCRIPTION="Compiles finite state machines from regular languages into executable code"
+HOMEPAGE="http://www.complang.org/ragel/"
+SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="vim-syntax"
+
+DEPEND=""
+RDEPEND=""
+
+# We need to get the txl language in Portage to have the tests :(
+RESTRICT=test
+
+DOCS=( ChangeLog CREDITS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.7-cross-compile.patch #473970
+	sed -i -e '/CXXFLAGS/d' configure.in || die
+
+	eautoreconf
+}
+
+src_test() {
+	cd "${S}"/test
+	./runtests.in || die
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins ragel.vim
+	fi
+}
diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
new file mode 100644
index 000000000000..2f153c15a807
--- /dev/null
+++ b/dev-util/ragel/ragel-6.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools autotools-utils
+
+DESCRIPTION="Compiles finite state machines from regular languages into executable code"
+HOMEPAGE="http://www.colm.net/open-source/ragel/"
+SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="vim-syntax"
+
+DEPEND=""
+RDEPEND=""
+
+# We need to get the txl language in Portage to have the tests :(
+RESTRICT=test
+
+DOCS=( ChangeLog CREDITS README TODO )
+
+src_test() {
+	cd "${S}"/test
+	./runtests.in || die
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins ragel.vim
+	fi
+}
diff --git a/dev-util/rats/Manifest b/dev-util/rats/Manifest
new file mode 100644
index 000000000000..4c46c7bd9099
--- /dev/null
+++ b/dev-util/rats/Manifest
@@ -0,0 +1,2 @@
+DIST rats-2.1.tar.gz 326930 SHA256 ec9fac2765b655c03cede8c5920de3226581f1e626be314bce95f4d0ac9aadd9 SHA512 2fdb670dc9559c453a6c69ee2d411e2626c0ee4cca4b59ceda878142008e136dfd11f8265c0719383212b38b0358a9cab1a29f1cc92a986fc800dd0c46bdf0d3 WHIRLPOOL 376a79cf05aad274296a7a17944ad4f4523e82c0db4c09f201dbcdc306ba803a8e8824cadc2526a05cb448c91ea35020dcd0b3ef56fc71976216b38b50758822
+DIST rats-2.3.tar.gz 391573 SHA256 36872ab4ed55058821d49cd0d1f2c36f1505dae129a697083717a95924cd1478 SHA512 10ca0ca46515e6f9349f9325ab19a7e453a66e472036e22b602b77bd816fcddb8fa5c9fa936c6a8004f713af0eb11cd357a91668809b53666522d3aa08130ba1 WHIRLPOOL d1c8155b217bd8470b8f7ae38b9593a7a7c1f63b6877875444c5e3ed0bf11bb813151daa0a4dad59a3e9be0d87e1f05ab6dc3e10f4baca0062167dabf5229339
diff --git a/dev-util/rats/files/rats-2.1-add-getopt-trailing-null.patch b/dev-util/rats/files/rats-2.1-add-getopt-trailing-null.patch
new file mode 100644
index 000000000000..65ea6df1f456
--- /dev/null
+++ b/dev-util/rats/files/rats-2.1-add-getopt-trailing-null.patch
@@ -0,0 +1,11 @@
+diff -Nuar --exclude '*~' rats-2.1.orig/main.c rats-2.1/main.c
+--- rats-2.1.orig/main.c	2002-09-16 21:05:43.000000000 -0700
++++ rats-2.1/main.c	2006-05-21 21:56:29.578601459 -0700
+@@ -278,6 +278,7 @@
+       {"columns", 0,0,0},
+       {"context", 0,0,0},
+       {"all-static", 0,0,0},
++	  {NULL,0,0,0}
+     };
+     progname = argv[0];
+     flags|=RECURSIVE_FILE_SCAN;
diff --git a/dev-util/rats/files/rats-2.1-fix-null-pointers.patch b/dev-util/rats/files/rats-2.1-fix-null-pointers.patch
new file mode 100644
index 000000000000..0d4c701f0bfc
--- /dev/null
+++ b/dev-util/rats/files/rats-2.1-fix-null-pointers.patch
@@ -0,0 +1,128 @@
+diff -Nuar rats-2.1.orig/report.c rats-2.1/report.c
+--- rats-2.1.orig/report.c	2002-09-16 21:05:43.000000000 -0700
++++ rats-2.1/report.c	2006-05-21 23:16:16.323046789 -0700
+@@ -122,9 +122,15 @@
+   return result;
+ }
+        
+-   
+-
+-  
++/* Exclusively for debugging vulnerabilities.
++ * - robbat2@gentoo.org 21/05/2006 */
++static void debug_vuln_dump(vulnerability_t *ptr) {
++	fprintf(stderr,"vuln_dump: this=%x f=%s l=%d c=%d d=%x t=%d s=%d u=%x p=(%x,%x)\n",				
++			ptr,
++			ptr->filename,ptr->lineno,ptr->column,
++			ptr->data,ptr->type,ptr->severity,
++			ptr->uses,ptr->next,ptr->prev);
++}
+   
+ static void
+ replace_cfname(char *filename)
+@@ -317,6 +323,27 @@
+     insert_vulnerability(log);
+ }
+ 
++/* These are special static vulnerabilities because we don't
++ * want NULL data elements in the vulnerability_t->data
++ * field, because the HTML and XML output formats use that
++ * pointer without checking it for being null first.
++ * - robbat2@gentoo.org 21/05/2006 */
++static struct Vuln_t vuln_PerlBacktick = {
++	.Name = "Perl Backtick"
++};
++static struct Vuln_t vuln_PhpBacktick = {
++	.Name = "PHP Backtick"
++};
++static struct Vuln_t vuln_PythonBacktick = {
++	.Name = "Python Backtick"
++};
++static struct Vuln_t vuln_StaticLocalBuffer = {
++	.Name = "Static Local Buffer"
++};
++static struct Vuln_t vuln_StaticGlobalBuffer = {
++	.Name = "Static Global Buffer"
++};
++
+ void log_perlbacktick(int lineno, int column, Severity_t severity)
+ {
+     vulnerability_t *   log;
+@@ -325,7 +352,7 @@
+     log->filename = current_file;
+     log->column   = column;
+     log->lineno   = lineno;
+-    log->data     = (Vuln_t *)NULL;
++    log->data     = &vuln_PerlBacktick;
+     log->type     = PerlBacktick;
+     log->severity = severity;
+     log->uses     = (toctou_use_t *)NULL;
+@@ -342,7 +369,7 @@
+     log->filename = current_file;
+     log->column   = column;
+     log->lineno   = lineno;
+-    log->data     = (Vuln_t *)NULL;
++    log->data     = &vuln_PhpBacktick;
+     log->type     = PhpBacktick;
+     log->severity = severity;
+     log->uses     = (toctou_use_t *)NULL;
+@@ -358,7 +385,7 @@
+     log->filename = current_file;
+     log->column   = column;
+     log->lineno   = lineno;
+-    log->data     = (Vuln_t *)NULL;
++    log->data     = &vuln_PythonBacktick;
+     log->type     = PythonBacktick;
+     log->severity = severity;
+     log->uses     = (toctou_use_t *)NULL;
+@@ -374,7 +401,16 @@
+     log->filename = current_file;
+     log->column   = column;
+     log->lineno   = lineno;
+-    log->data     = (Vuln_t *)NULL;
++	switch(type) {
++		case StaticLocalBuffer: 
++			log->data     = &vuln_StaticLocalBuffer; 
++			break;
++		case StaticGlobalBuffer: 
++			log->data     = &vuln_StaticGlobalBuffer; 
++			break;
++		default:
++			log->data     = (Vuln_t *)NULL;
++	}
+     log->type     = type;
+     log->severity = severity;
+     log->uses     = (toctou_use_t *)NULL;
+@@ -432,6 +468,10 @@
+ static void build_xml_vulnerability(vulnerability_t *ptr) {
+     int i;
+     
++	/* Debugging - robbat2@gentoo.org 21/05/2006 */
++	if(ptr->data == NULL) 
++		debug_vuln_dump(ptr);
++    
+     printf("<vulnerability>\n");
+ 
+     /* Output the severity */
+@@ -593,6 +633,8 @@
+ void report_vulnerability(vulnerability_t *ptr)
+ {
+     int i;
++	if(ptr->data == NULL)
++		debug_vuln_dump(ptr);
+ 
+     switch (ptr->type)
+     {
+@@ -890,8 +932,10 @@
+      
+ static void build_html_vulnerability(vulnerability_t *ptr) {
+     int i;
+-    
+-
++ 
++	/* Debugging - robbat2@gentoo.org 21/05/2006 */
++	if(ptr->data == NULL) 
++		debug_vuln_dump(ptr);
+     
+     /* Output the severity */
+     printf("  <b>Severity: %s</b><br/>\n",
diff --git a/dev-util/rats/metadata.xml b/dev-util/rats/metadata.xml
new file mode 100644
index 000000000000..deb7defc3840
--- /dev/null
+++ b/dev-util/rats/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<longdescription>RATS - Rough Auditing Tool for Security - is an open source
+    tool developed and maintained by Secure Software security engineers. RATS
+    is a tool for scanning C, C++, Perl, PHP and Python source code and
+    flagging common security related programming errors such as buffer
+    overflows and TOCTOU (Time Of Check, Time Of Use) race conditions.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/rats/rats-2.1-r2.ebuild b/dev-util/rats/rats-2.1-r2.ebuild
new file mode 100644
index 000000000000..492229ddc7c2
--- /dev/null
+++ b/dev-util/rats/rats-2.1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit eutils
+
+DESCRIPTION="RATS - Rough Auditing Tool for Security"
+HOMEPAGE="http://www.fortifysoftware.com/security-resources/rats.jsp"
+SRC_URI="http://www.fortifysoftware.com/servlet/downloads/public/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-libs/expat"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-add-getopt-trailing-null.patch
+	epatch "${FILESDIR}"/${P}-fix-null-pointers.patch
+}
+
+src_configure() {
+	econf --datadir="${EPREFIX}/usr/share/${PN}/"
+}
+
+src_install () {
+	einstall SHAREDIR="${ED}/usr/share/${PN}" MANDIR="${ED}/usr/share/man"
+	dodoc README README.win32
+}
+
+pkg_postinst() {
+	ewarn "Please be careful when using this program with it's force language"
+	ewarn "option, '--language <LANG>' it may take huge amounts of memory when"
+	ewarn "it tries to treat binary files as some other type."
+}
diff --git a/dev-util/rats/rats-2.3.ebuild b/dev-util/rats/rats-2.3.ebuild
new file mode 100644
index 000000000000..a8b2c1fd6d2e
--- /dev/null
+++ b/dev-util/rats/rats-2.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit eutils
+
+DESCRIPTION="RATS - Rough Auditing Tool for Security"
+HOMEPAGE="https://code.google.com/p/rough-auditing-tool-for-security/"
+SRC_URI="https://rough-auditing-tool-for-security.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-libs/expat"
+
+src_prepare() {
+	edos2unix $(find "${S}" -name '*.[chl]' -o -name '*.in' -o -name '*.am')
+	epatch "${FILESDIR}"/${PN}-2.1-add-getopt-trailing-null.patch
+	epatch "${FILESDIR}"/${PN}-2.1-fix-null-pointers.patch
+}
+
+src_configure() {
+	econf --datadir="${EPREFIX}/usr/share/${PN}/"
+}
+
+src_install () {
+	einstall SHAREDIR="${ED}/usr/share/${PN}" MANDIR="${ED}/usr/share/man"
+	dodoc README README.win32
+}
+
+pkg_postinst() {
+	ewarn "Please be careful when using this program with it's force language"
+	ewarn "option, '--language <LANG>' it may take huge amounts of memory when"
+	ewarn "it tries to treat binary files as some other type."
+}
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
new file mode 100644
index 000000000000..f7c768d53b0b
--- /dev/null
+++ b/dev-util/rbtools/Manifest
@@ -0,0 +1,3 @@
+DIST RBTools-0.7.2.tar.gz 147069 SHA256 91288b1cc3ecd36b6405721288d55a1f6819c9e709bba3e9109f05d419a2e8d9 SHA512 08fe88b32629b6db019b5d7f79ac58c955706f673e85e1fe2e422b4b13ba88bd6cb533699662a5bf14a3b58cd1831048fdb788424f91149fc5b640c1e090faf8 WHIRLPOOL 07e976bd58c652434fba11a25a8d380ec281ce5105fd103c6b74467348b8c365a66b6bfc234f1c0ddb8ab91a37db0cf9c2cc783fa33d0619e72793949eec5b1c
+DIST RBTools-0.7.3.tar.gz 156877 SHA256 70cf4bdbd32a940826d983fe35876c6f9d93b5639ba7b2aaf8211d32d6c186f0 SHA512 e9e130abf66d57d8956926e88a475c5d89b8cdc09ba4bc41785defd1301cdd129f9246a667cd9c02a5f6311bf023b614e34b1fd15b029bcaacfff98dbacf6ae3 WHIRLPOOL 2acc8f3d64e66e1b4c9fc762b2ac87456dc66aae7196735c4afba5bc362a19ffe3e24f4e891cb56cccef459b5cfc59234f7ba3852771b8aec8f051ffa6c58739
+DIST RBTools-0.7.4.tar.gz 158594 SHA256 1626d449eae9d03a8e3e5c0125f77a86eefdc615b86ba7ee1368b238521de198 SHA512 c12d254f1eeb7a8d06a1ab7cbb952f45975da355b436a7514cf9fa0c3fe60b713daa79874c8cf7df05b13acb22441cf6ae06e442b238b5481a01cdaf15f6c5c9 WHIRLPOOL b6116eb6445994dadb3c6003e8fdecf60d9fa17257988c9822b69c5cf19ae369e31c9a07315c14e27cdce35697f0eef16207306f0e6a5ec8fa47a9d0aa66680b
diff --git a/dev-util/rbtools/metadata.xml b/dev-util/rbtools/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/dev-util/rbtools/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>kde</herd>
+</pkgmetadata>
diff --git a/dev-util/rbtools/rbtools-0.7.2.ebuild b/dev-util/rbtools/rbtools-0.7.2.ebuild
new file mode 100644
index 000000000000..d27244c23fd7
--- /dev/null
+++ b/dev-util/rbtools/rbtools-0.7.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="http://www.reviewboard.org/"
+SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README )
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rbtools/rbtools-0.7.3.ebuild b/dev-util/rbtools/rbtools-0.7.3.ebuild
new file mode 100644
index 000000000000..550781b45a0e
--- /dev/null
+++ b/dev-util/rbtools/rbtools-0.7.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="http://www.reviewboard.org/"
+SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README )
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rbtools/rbtools-0.7.4.ebuild b/dev-util/rbtools/rbtools-0.7.4.ebuild
new file mode 100644
index 000000000000..e67f185e4282
--- /dev/null
+++ b/dev-util/rbtools/rbtools-0.7.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="http://www.reviewboard.org/"
+SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
new file mode 100644
index 000000000000..51457f782925
--- /dev/null
+++ b/dev-util/re2c/Manifest
@@ -0,0 +1,5 @@
+DIST re2c-0.13.5.tar.gz 782725 SHA256 f3a995139af475e80a30207d02728b1e0065b0caade7375e974cb1b14861668c SHA512 56101bf01aea6f0c082b85382be34acada51d70036252581cd76ac4b2bdbc144633b97c63a94bfdba434ffb80884e11299a38853e2d805dc7ce6cf9d452c81c8 WHIRLPOOL 31e462704e3ab72fce92b62ce0bca73b256c98e48f302f6f90392c26a7235e86786f2bc5f43faedbaa60f9614098ac5d734a61abed394cd71135dd3639704210
+DIST re2c-0.13.6.tar.gz 844623 SHA256 8e463039aa8799a2957bfc00c9936232bb63b4fcb24d6ea6316170a67e5076c0 SHA512 dca2654de5f596fbaf519396b2f2c58690996c62dec32436599332b79107b5bf07c87b46630a224032ff44dc02d2c1861e16a920fbdc9251f4a538008709ceba WHIRLPOOL af810c4d8e41eb01cb4b06c86932fda6da86d1690a17cd626f3a864087a378cf685a9ae6ab170cb7581c696e08ca4474f128b51bff1d1284f2a9d2252d60f226
+DIST re2c-0.13.7.5.tar.gz 2347921 SHA256 d58afd50579e4564c9fc4218aec860d41b88583ace2ae0a23497b49108f1b461 SHA512 71abaec58ac02de6f13cfffec6965d3443c44a72425c4ce8873915daddf077f7f484c2dc702e6533bab2d2f0ca72b34e354771120a4788d9a456b3b3393b6e22 WHIRLPOOL 1d5f8b4822c04d7e84d79601194568810f4b4053ca55386fc7d216bdaf402ab0282994c823ba5001e558d40f78aa9f7b4ee704b43015046d4ccdb8d6118fde0e
+DIST re2c-0.14.2.tar.gz 2554944 SHA256 a702eb63977af4715555edb41eba3b47bbfdcdb44b566d146869a7db022f1c30 SHA512 25e682aafe434f838c41f01588f69b4979c73bab8562f56d1b1db656753c43a606b13eeb0e6542f793cdb73d001c304c61811630f7001131edd3eb76248a0a60 WHIRLPOOL 5f6864b800b7838177badf37b7ff5e7bcca73474da4f180319a9cf860694ab1191b14f913af919fa2fcce60f7bfdd85c3e6b87c91a5060260026520a8d059bd6
+DIST re2c-0.14.3.tar.gz 2576859 SHA256 1c6806df599f3aef0804b576cfdf64bdba5ad590626dfca2d44e473460917e84 SHA512 c1fa20c9c1e69d085415dde3177cb03688f8a9314dd4854241812f479a2b1e4306c3abbb8f9f31763918afbd1f7a821e7337551a898f6ae57f814c66e59e2382 WHIRLPOOL dd08d837c93737d9a4dd8fd9f01de721e26b569b2686a2d066636e130f6eb82a8b8b71e8b5d84fcf44993998250effc17c2c3dbc1fd6e1651c5b5ba18a36e8fe
diff --git a/dev-util/re2c/metadata.xml b/dev-util/re2c/metadata.xml
new file mode 100644
index 000000000000..6c6fa68f2a35
--- /dev/null
+++ b/dev-util/re2c/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>slyfox@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">re2c</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/re2c/re2c-0.13.5-r1.ebuild b/dev-util/re2c/re2c-0.13.5-r1.ebuild
new file mode 100644
index 000000000000..6c7804d2ca28
--- /dev/null
+++ b/dev-util/re2c/re2c-0.13.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.sourceforge.net/"
+MY_PV="${PV/_/.}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dobin re2c
+	doman re2c.1
+	dodoc README CHANGELOG doc/*
+	docinto examples
+	dodoc examples/*.c examples/*.re
+}
diff --git a/dev-util/re2c/re2c-0.13.6.ebuild b/dev-util/re2c/re2c-0.13.6.ebuild
new file mode 100644
index 000000000000..be872f1ccc27
--- /dev/null
+++ b/dev-util/re2c/re2c-0.13.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+src_install() {
+	dobin re2c
+	doman re2c.1
+	dodoc README CHANGELOG doc/*
+	docinto examples
+	dodoc examples/*.c examples/*.re
+}
diff --git a/dev-util/re2c/re2c-0.13.7.5.ebuild b/dev-util/re2c/re2c-0.13.7.5.ebuild
new file mode 100644
index 000000000000..8e06d4f9ab06
--- /dev/null
+++ b/dev-util/re2c/re2c-0.13.7.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+
+src_prepare() {
+	epatch_user
+}
+
+src_compile() {
+	touch re2c.1 # don't require asciidoc for mans
+	emake
+}
+
+src_install() {
+	default
+
+	dodoc README CHANGELOG doc/*
+	docinto examples
+	dodoc examples/*.c examples/*.re
+}
diff --git a/dev-util/re2c/re2c-0.14.2.ebuild b/dev-util/re2c/re2c-0.14.2.ebuild
new file mode 100644
index 000000000000..70387c5700fc
--- /dev/null
+++ b/dev-util/re2c/re2c-0.14.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	default
+
+	dodoc README CHANGELOG doc/*
+	docinto examples
+	dodoc examples/*.c examples/*.re
+}
diff --git a/dev-util/re2c/re2c-0.14.3.ebuild b/dev-util/re2c/re2c-0.14.3.ebuild
new file mode 100644
index 000000000000..70387c5700fc
--- /dev/null
+++ b/dev-util/re2c/re2c-0.14.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	default
+
+	dodoc README CHANGELOG doc/*
+	docinto examples
+	dodoc examples/*.c examples/*.re
+}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
new file mode 100644
index 000000000000..c96ce97028cd
--- /dev/null
+++ b/dev-util/rebar/Manifest
@@ -0,0 +1,3 @@
+DIST rebar-2.3.1.tar.gz 147014 SHA256 dddb3c13a3a875dd91c368e3294619ab377cfc88bcd53a3fb3d259eb27b7c102 SHA512 464dfc30d03bc40bfe2400a83c90339a85005d3e96f57970d2ce5e0c605d841c8a95e07528633aeae684212d5a1ebab54f01ef4385df135cd0926ad8aa95e564 WHIRLPOOL 3e421473c0775193a8413833bc88b0424aff9c5e16e2b416bd54b113d5290f886bf62b97c61e227bc34cc7df467c0cae7701c137a43515143309f924acce94ad
+DIST rebar-2.4.0.tar.gz 152328 SHA256 43ae0d9c1439d935086db349c5b6a8646707f5538720167b2bbcc1ad32516b6a SHA512 dda9915d8b8b2408d65156f5af8387858ad19ed4b29b99d3e5d8f9131ea6b76a218b99520d4f9501c0b698b11216076e779ccebba16b6c1ccdae13d333b4dae7 WHIRLPOOL b573a83b823ef451901fd334f54bf49f1ac6c87a647a012fc2540fc850324988427ed9f3dee0d7a7bc0927667d4f6928cd6c4feb6dfb82c9204a3c11fc42988e
+DIST rebar-2.5.0.tar.gz 152390 SHA256 d585fa4c7f59c66017d2552764bb423abeed3a3c99503be91b41fb931245ccbe SHA512 6fbb15d6c2bd3f4f7f83c35f4f8fa9d6dafc6bc9a739ac5e002a046d34d9da4216d64c5ea59b73a1b54cb11b9de32d0618f821912c26e63b8bbfdea9bd08f1fa WHIRLPOOL 712be4b52959230217a1a25e3f618db983626a0e06d0260afed3fe2ab319affc111a2beedc401d844663132f097b9a65591c217109e0fd777caf0d22d333a410
diff --git a/dev-util/rebar/metadata.xml b/dev-util/rebar/metadata.xml
new file mode 100644
index 000000000000..a07ab3cfb265
--- /dev/null
+++ b/dev-util/rebar/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>djc@gentoo.org</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
+  <maintainer>
+    <email>aranea@aixah.de</email>
+    <name>Luis Ressel</name>
+    <description>Proxy-maintainer, assign bugs</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rebar/rebar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/rebar/rebar-2.3.1.ebuild b/dev-util/rebar/rebar-2.3.1.ebuild
new file mode 100644
index 000000000000..1ce327273e86
--- /dev/null
+++ b/dev-util/rebar/rebar-2.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="http://github.com/rebar/rebar"
+SRC_URI="http://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	emake xref
+}
+
+src_install() {
+	dobin rebar
+	dodoc rebar.config.sample THANKS
+	dobashcomp priv/shell-completion/bash/${PN}
+}
diff --git a/dev-util/rebar/rebar-2.4.0.ebuild b/dev-util/rebar/rebar-2.4.0.ebuild
new file mode 100644
index 000000000000..9cd5c44cc02d
--- /dev/null
+++ b/dev-util/rebar/rebar-2.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="http://github.com/rebar/rebar"
+SRC_URI="http://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	emake xref
+}
+
+src_install() {
+	dobin rebar
+	dodoc rebar.config.sample THANKS
+	dobashcomp priv/shell-completion/bash/${PN}
+}
diff --git a/dev-util/rebar/rebar-2.5.0.ebuild b/dev-util/rebar/rebar-2.5.0.ebuild
new file mode 100644
index 000000000000..9cd5c44cc02d
--- /dev/null
+++ b/dev-util/rebar/rebar-2.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="http://github.com/rebar/rebar"
+SRC_URI="http://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	emake xref
+}
+
+src_install() {
+	dobin rebar
+	dodoc rebar.config.sample THANKS
+	dobashcomp priv/shell-completion/bash/${PN}
+}
diff --git a/dev-util/rec/Manifest b/dev-util/rec/Manifest
new file mode 100644
index 000000000000..72c54ac1b5b8
--- /dev/null
+++ b/dev-util/rec/Manifest
@@ -0,0 +1 @@
+DIST rec16lx.zip 311993 SHA256 3f8f4c802b33352fe0114bbf7758d4f5510b3e435824539cf8b5a73eb0162a87 SHA512 180f17cedb76ac3474b6d23da648eee9efba13c0c7288759c624032aafdb6d49832b4059a2b96421c88d8138c5aba28a3b352e479963eea1c031e6df3d159271 WHIRLPOOL 9fe3fbe68f0bc9e175eea338bd8b0db5fc54703c39adc36030437db6f61e9a4734101d67b94ac60e65d2c8c1e8c15160960df64b4bb88c70b774bd04151e68a5
diff --git a/dev-util/rec/metadata.xml b/dev-util/rec/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/rec/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/rec/rec-1.6.ebuild b/dev-util/rec/rec-1.6.ebuild
new file mode 100644
index 000000000000..1e251390cc0c
--- /dev/null
+++ b/dev-util/rec/rec-1.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Reverse Engineering Compiler"
+HOMEPAGE="http://www.backerstreet.com/rec/rec.htm"
+SRC_URI="http://www.backerstreet.com/rec/rec16lx.zip"
+
+LICENSE="BSD-2 free-noncomm HPND"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RESTRICT="strip"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	sys-libs/ncurses
+	sys-libs/gpm"
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/bin/rec"
+
+src_unpack() {
+	unzip -L -d "${S}" -q "${DISTDIR}/${A}" || die
+}
+
+src_prepare() {
+	sed -i 's#\(^.*$\)#/opt/rec/\1#g' proto.lst || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dodir /opt/rec
+	into /opt
+	dobin rec
+
+	insinto /opt/rec
+	doins proto.lst
+	doins string.o stdio.o stdlib.o fcntl.o winbase.o winuser.o wingdi.o
+	dodoc readme copyrite
+}
+
+pkg_postinst() {
+	elog "/opt/rec/proto.lst should be copied into the working"
+	elog "directory of new projects, this will make rec aware of common"
+	elog "prototypes."
+}
diff --git a/dev-util/redet/Manifest b/dev-util/redet/Manifest
new file mode 100644
index 000000000000..b874838a3fb2
--- /dev/null
+++ b/dev-util/redet/Manifest
@@ -0,0 +1 @@
+DIST redet-8.26.tar.gz 336661 SHA256 fa87d7b9fea0b380314cb9d62ce256128c75932822145bc8e6bef30703990746 SHA512 8400aaee58d5705cda6ce3ee1561f38d594adb18794fe4ecd9980278e2aa494ef559aa588cf7fb42937180ba1ddca1c6a69c124e71a5f44b2e21d2f44a6c9f0b WHIRLPOOL 2098361752c63b08edab7ede73aa072d0284a9e8cb375b8e7712a2ceac320473883a15ef38f281fa7da8df259c54521a21017bcaa32d56526302af94d2c690f8
diff --git a/dev-util/redet/metadata.xml b/dev-util/redet/metadata.xml
new file mode 100644
index 000000000000..f8ff719892e7
--- /dev/null
+++ b/dev-util/redet/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		A regular expression development and execution tool.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/redet/redet-8.26.ebuild b/dev-util/redet/redet-8.26.ebuild
new file mode 100644
index 000000000000..e9d65616f468
--- /dev/null
+++ b/dev-util/redet/redet-8.26.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A regular expression development and execution tool"
+HOMEPAGE="http://www.billposer.org/Software/redet.html"
+
+SRC_URI="http://www.billposer.org/Software/Downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/tk
+	dev-tcltk/itk
+	dev-tcltk/iwidgets"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	local MANUAL_PN=`echo ${PN} | cut -c 1 | tr [:lower:] [:upper:]``echo ${PN} | cut -c 2-`
+
+	newbin ${PN}.tcl ${PN}
+
+	sed \
+		-e "/Encoding/d" \
+		-i ${PN}.desktop || die
+	domenu ${PN}.desktop
+
+	doman ${PN}.1 || die
+	dodoc AUTHORS CREDITS README-General README-MacOSX \
+	 SampleClasses.utf8 \
+	 SampleCustomCharacterWidgetDefinition_Armenian \
+	 SampleCustomCharacterWidgetDefinition_Greek \
+	 SampleNewStyleDotRedetRC_Elaborate SampleNewStyleDotRedetRC_Simple
+	dosym doc/${P}/html /usr/share/${MANUAL_PN}
+}
diff --git a/dev-util/regexxer/Manifest b/dev-util/regexxer/Manifest
new file mode 100644
index 000000000000..20d33ea17a5e
--- /dev/null
+++ b/dev-util/regexxer/Manifest
@@ -0,0 +1 @@
+DIST regexxer-0.10.tar.xz 251544 SHA256 2a7832541a0306b3d4eb63a1cf8978d7bbfc7927e9304473fe801d71fd99736c SHA512 0b18c8f167595984a042403c7e91c8b65c1348870c47d664c6cfc825b74e047f657190f30830ce6e2098867bbd8e1b042e1adc2798aedb86a59299583340f920 WHIRLPOOL 4a8c408cf777a2bdaa6a9f6fde50a5ae6e09e1744680f040979a5cce7580f9a9f09c7e4a5027aafb48319f9ef7094ea25b377b91f71d0e44d8906e4c2af058de
diff --git a/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch b/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
new file mode 100644
index 000000000000..fbbb1cbf20f0
--- /dev/null
+++ b/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
@@ -0,0 +1,35 @@
+Downloaded from https://projects.archlinux.org/svntogit/community.git/plain/trunk/regexxer-glib2.32.patch?h=packages/regexxer
+for bug 417049
+
+--- a/src/fileshared.h
++++ b/src/fileshared.h
+@@ -23,6 +23,7 @@
+
+ #include "sharedptr.h"
+
++#include <glibmm/regex.h>
+ #include <gtkmm/textbuffer.h>
+ #include <functional>
+ #include <utility>
+--- a/src/globalstrings.h
++++ b/src/globalstrings.h
+@@ -21,7 +21,7 @@
+ #ifndef REGEXXER_GLOBALSTRINGS_H_INCLUDED
+ #define REGEXXER_GLOBALSTRINGS_H_INCLUDED
+
+-#include <glib/gutils.h>  /* for G_DIR_SEPARATOR_S */
++#include <glib.h>  /* for G_DIR_SEPARATOR_S */
+
+ namespace Regexxer
+ {
+--- a/src/translation.h
++++ b/src/translation.h
+@@ -21,7 +21,7 @@
+ #ifndef REGEXXER_TRANSLATION_H_INCLUDED
+ #define REGEXXER_TRANSLATION_H_INCLUDED
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glibmm/ustring.h>
+
+ #ifndef gettext_noop
diff --git a/dev-util/regexxer/files/regexxer-0.10-sandbox.patch b/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
new file mode 100644
index 000000000000..f460344b8ad7
--- /dev/null
+++ b/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -107,12 +107,6 @@
+ @INTLTOOL_DESKTOP_RULE@
+ @INTLTOOL_XML_NOMERGE_RULE@
+ 
+-install-data-hook: install-update-icon-cache
+-	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+-#$(gsettingsupdateschemacache) $(gsettingsschemadir)
+-
+-uninstall-hook: uninstall-update-icon-cache
+-
+ dist-hook: dist-changelog
+ 
+ # Note that this rule creates the ui/ build directory as a side effect.
diff --git a/dev-util/regexxer/metadata.xml b/dev-util/regexxer/metadata.xml
new file mode 100644
index 000000000000..bfb8e568fb12
--- /dev/null
+++ b/dev-util/regexxer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">regexxer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/regexxer/regexxer-0.10.ebuild b/dev-util/regexxer/regexxer-0.10.ebuild
new file mode 100644
index 000000000000..2e1539f0eb7a
--- /dev/null
+++ b/dev-util/regexxer/regexxer-0.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+inherit autotools eutils gnome2
+
+DESCRIPTION="An interactive tool for performing search and replace operations"
+HOMEPAGE="http://regexxer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND=">=dev-cpp/glibmm-2.28
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.32.patch
+	epatch "${FILESDIR}"/${P}-sandbox.patch
+	eautoreconf
+	gnome2_src_prepare
+}
diff --git a/dev-util/rej/Manifest b/dev-util/rej/Manifest
new file mode 100644
index 000000000000..cfdb3a5531b7
--- /dev/null
+++ b/dev-util/rej/Manifest
@@ -0,0 +1 @@
+DIST rej-0.16.tar.gz 422796 SHA256 a68c02b4833b60fc91b48f10e1f1fa67b185ec98d828a8132d936f1c3dcdcbb6 SHA512 e216edf5559141c571f56265a499dbb4273b47e3a05305a13233d3fc7d9d02aca4a2305317fb467fee1b08ecba147dbe72516d71ba189f1dfeedb45faa525d46 WHIRLPOOL c2fce597941d1c0ffcfc8534fe763e7d2d382a5ab1a6b5f3e840a9a64fdcd5d6a6018a67a263da05c0402133520e3bf24d80ca16eecc0689c100edab82437fb4
diff --git a/dev-util/rej/metadata.xml b/dev-util/rej/metadata.xml
new file mode 100644
index 000000000000..704d8f91190c
--- /dev/null
+++ b/dev-util/rej/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/rej/rej-0.16.ebuild b/dev-util/rej/rej-0.16.ebuild
new file mode 100644
index 000000000000..9900e5cfb3ac
--- /dev/null
+++ b/dev-util/rej/rej-0.16.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A utility for solving diff/patch rejects"
+HOMEPAGE="http://ftp.suse.com/pub/people/mason/rej/"
+SRC_URI="http://ftp.suse.com/pub/people/mason/rej/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-lang/perl
+	!<app-editors/mp-5
+	!dev-lang/qu-prolog
+	!dev-util/mpatch
+	"
+
+src_compile() {
+	echo
+}
+
+src_install() {
+	dobin rej qp mp
+	dodoc CHANGELOG README vimrc
+}
diff --git a/dev-util/reswrap/Manifest b/dev-util/reswrap/Manifest
new file mode 100644
index 000000000000..1762ee7adecf
--- /dev/null
+++ b/dev-util/reswrap/Manifest
@@ -0,0 +1,2 @@
+DIST fox-1.4.12.tar.gz 3922769 SHA256 a83966681aff8fa204504abe0e4654f8405597998ab8dcbf37b425fd7f59eb12 SHA512 aa2accc25fc740c4959dec5ebb87b86afb035e65636986a220e3d43582da3aabaa2ee8ce9acc2c043fb530c12fc0f0806c06ff75155afc47e7dc783bef44d8f7 WHIRLPOOL b4e1daff7cc3293f9085fbd93745817a46965a24bdb138426fcff0dfab24ad495b8e8611030f02e1d5a809effcb00c4a4aa453c760b23278bdd20569f7d5e666
+DIST fox-1.6.40.tar.gz 4353981 SHA256 19bcdb56f3985ef359adc1cf3a392d11cad0d097c646dd73c8ef1349faa1ba6f SHA512 63c46b3db2693c91dc6277b08395ab3a0748414471b7bff10062cac9ddc5e743ee7af5b85ea5f7b7dc96723baa1c9ff7ae18a0f503a210b6255ac956023ac17b WHIRLPOOL c4c946de1f40de5544f7c3a310bc8705315f0123d370240b7db812509f4640815e05c6d82adef4e9592520541f7cff4134fee53ce26be239fc9c5c6c4aac596b
diff --git a/dev-util/reswrap/metadata.xml b/dev-util/reswrap/metadata.xml
new file mode 100644
index 000000000000..550647655b44
--- /dev/null
+++ b/dev-util/reswrap/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mabi@gentoo.org</email>
+		<name>Matti Bickel</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/reswrap/reswrap-3.2.0.ebuild b/dev-util/reswrap/reswrap-3.2.0.ebuild
new file mode 100644
index 000000000000..a87c8b2bf984
--- /dev/null
+++ b/dev-util/reswrap/reswrap-3.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+FOX_COMPONENT="utils"
+FOX_PV="1.4.12"
+
+inherit fox
+
+DESCRIPTION="Utility to wrap icon resources into C++ code, from the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=""
+
+FOXCONF="--disable-bz2lib \
+	--disable-cups \
+	--disable-jpeg \
+	--without-opengl \
+	--disable-png \
+	--without-shape \
+	--disable-tiff \
+	--without-x \
+	--without-xcursor \
+	--without-xrandr \
+	--without-xshm \
+	--without-xft \
+	--disable-zlib"
diff --git a/dev-util/reswrap/reswrap-4.0.0.ebuild b/dev-util/reswrap/reswrap-4.0.0.ebuild
new file mode 100644
index 000000000000..5d46475007c5
--- /dev/null
+++ b/dev-util/reswrap/reswrap-4.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+FOX_COMPONENT="utils"
+FOX_PV="1.6.40"
+
+inherit fox
+
+DESCRIPTION="Utility to wrap icon resources into C++ code, from the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+
+FOXCONF="--disable-bz2lib \
+	--disable-jpeg \
+	--without-opengl \
+	--disable-png \
+	--without-shape \
+	--disable-tiff \
+	--without-x \
+	--without-xcursor \
+	--without-xrandr \
+	--without-xshm \
+	--without-xft \
+	--disable-zlib"
diff --git a/dev-util/reviewboard/Manifest b/dev-util/reviewboard/Manifest
new file mode 100644
index 000000000000..24ba9ecc6a2e
--- /dev/null
+++ b/dev-util/reviewboard/Manifest
@@ -0,0 +1 @@
+DIST ReviewBoard-1.7.28.tar.gz 2957387 SHA256 69a976e69c1e805b23aa78f43fc1954599b7513dff1d1cfd0bafa6112a946931 SHA512 9e97b56b68da6c06f713d98c70dda321ea3fdf6f26986b4272fbb392c1c633f1ce44170bb515e8b685813b69a0ae8ada9f392b5e776793222dd25c3b7d4fa704 WHIRLPOOL 51a731117b9a84b9f8e1cd785511da516bf4d7216f7f08a8ba83d200af94a235d994d53c630b26f430d28f1ce4a7ca8a47d83b87c241bc4b1f5469f7668cc03d
diff --git a/dev-util/reviewboard/files/1.7.28-docs.patch b/dev-util/reviewboard/files/1.7.28-docs.patch
new file mode 100644
index 000000000000..99741d2e40d0
--- /dev/null
+++ b/dev-util/reviewboard/files/1.7.28-docs.patch
@@ -0,0 +1,52 @@
+Avoid un-needed downloading od object.infv files, fix conf.py for docs/manual
+diff -ur ReviewBoard-1.7.7.1.orig/docs/codebase/conf.py ReviewBoard-1.7.7.1/docs/codebase/conf.py
+--- docs/codebase/conf.py	2013-04-22 04:40:29.000000000 +0800
++++ docs/codebase/conf.py	2013-06-16 15:35:59.639256650 +0800
+@@ -197,7 +197,3 @@
+ 
+ # If false, no module index is generated.
+ #latex_use_modindex = True
+-
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/dev': None}
+diff -ur ReviewBoard-1.7.7.1.orig/docs/manual/conf.py ReviewBoard-1.7.7.1/docs/manual/conf.py
+--- docs/manual/conf.py	2013-04-22 04:40:29.000000000 +0800
++++ docs/manual/conf.py	2013-06-16 15:36:30.592256658 +0800
+@@ -30,9 +30,14 @@
+ 
+ import reviewboard
+ from reviewboard import settings
++from reviewboard.settings import EXTENSIONS_STATIC_ROOT, ROOT_URLCONF
+ from django.core.management import setup_environ
++from django import conf
++from settings_local import DATABASES
++conf.EXTENSIONS_STATIC_ROOT=EXTENSIONS_STATIC_ROOT
++conf.settings.DATABASES=DATABASES
+ setup_environ(settings)
+-
++conf.settings.ROOT_URLCONF=ROOT_URLCONF
+ 
+ # If your extensions are in another directory, add it here. If the directory
+ # is relative to the documentation root, use os.path.abspath to make it
+@@ -223,7 +223,4 @@
+ latex_show_pagerefs = True
+
+
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/dev': None}
+-
+ todo_include_todos = True
+diff -ur 
+ReviewBoard-1.7.7.1.orig/docs/releasenotes/conf.py 
+ReviewBoard-1.7.7.1/docs/releasenotes/conf.py
+--- docs/releasenotes/conf.py	2013-04-22 04:40:29.000000000 +0800
++++ docs/releasenotes/conf.py	2013-06-16 15:36:53.119256665 +0800
+@@ -202,7 +202,3 @@
+ 
+ # If false, no module index is generated.
+ #latex_use_modindex = True
+-
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'https://www.reviewboard.org/docs/manual/dev': None}
diff --git a/dev-util/reviewboard/files/CVE-2013-2209-sec.patch b/dev-util/reviewboard/files/CVE-2013-2209-sec.patch
new file mode 100644
index 000000000000..1b41c3c6f0d2
--- /dev/null
+++ b/dev-util/reviewboard/files/CVE-2013-2209-sec.patch
@@ -0,0 +1,74 @@
+From 4aaacbb1e628a80803ba1a55703db38fccdf7dbf Mon Sep 17 00:00:00 2001
+From: Christian Hammond <chipx86@chipx86.com>
+Date: Fri, 21 Jun 2013 23:33:16 -0700
+Subject: [PATCH] Fix an XSS vulnerability in the reviews dropdown.
+
+The reviews dropdown had a bad vulnerability where it would assume the
+user's full name is valid HTML. This allowed the user to craft a script
+tag that would be executed every time the name appeared in the dropdown.
+
+This vulnerability exists in 1.6.x, 1.7.x, and the in-development 1.8.
+There are no known attacks in the wild.
+
+This was reported by Craig Young at Tripwire.
+#---
+# reviewboard/htdocs/media/rb/js/reviews.js | 6 ++++--
+# 1 file changed, 4 insertions(+), 2 deletions(-)
+ 
+#diff --git a/reviewboard/htdocs/media/rb/js/reviews.js b/reviewboard/htdocs/media/rb/js/reviews.js
+#index 6340744..035872f 100644
+#--- a/reviewboard/htdocs/media/rb/js/reviews.js
+#+++ b/reviewboard/htdocs/media/rb/js/reviews.js
+#@@ -352,10 +352,12 @@ $.fn.reviewsAutoComplete = function(options) {
+#         $(this)
+#             .autocomplete({
+#                 formatItem: function(data) {
+#-                    var s = data[options.nameKey];
+#+                    var s = data[options.nameKey],
+#+                        desc;
+#
+#                     if (options.descKey) {
+#-                        s += " <span>(" + data[options.descKey] + ")</span>";
+#+                        desc = $('<div/>').text(data[options.descKey]).html();
+#+                        s += " <span>(" + desc + ")</span>";
+#                     }
+# 
+ #                    return s;
+#-- 
+#1.8.1.6
+diff -ur ReviewBoard-1.7.7.1.orig/reviewboard/htdocs/static/rb/js/reviews.js ReviewBoard-1.7.7.1/reviewboard/htdocs/static/rb/js/reviews.js
+--- reviewboard/htdocs/static/rb/js/reviews.js	2013-04-22 04:40:30.000000000 +0800
++++ reviewboard/htdocs/static/rb/js/reviews.js	2013-06-28 10:38:29.514298074 +0800
+@@ -257,10 +257,12 @@
+         $(this)
+             .rbautocomplete({
+                 formatItem: function(data) {
+-                    var s = data[options.nameKey];
++                    var s = data[options.nameKey],
++                        desc;
+ 
+                     if (options.descKey && data[options.descKey]) {
+-                        s += " <span>(" + data[options.descKey] + ")</span>";
++                        desc = $('<div/>').text(data[options.descKey]).html();
++                        s += " <span>(" + desc + ")</span>";
+                     }
+ 
+                     return s;
+diff -ur ReviewBoard-1.7.7.1.orig/reviewboard/static/rb/js/reviews.js ReviewBoard-1.7.7.1/reviewboard/static/rb/js/reviews.js
+--- reviewboard/static/rb/js/reviews.js	2013-04-22 04:40:29.000000000 +0800
++++ reviewboard/static/rb/js/reviews.js	2013-06-28 10:40:09.922290974 +0800
+@@ -257,10 +257,12 @@
+         $(this)
+             .rbautocomplete({
+                 formatItem: function(data) {
+-                    var s = data[options.nameKey];
++                    var s = data[options.nameKey],
++                       desc;
+ 
+                     if (options.descKey && data[options.descKey]) {
+-                        s += " <span>(" + data[options.descKey] + ")</span>";
++                        desc = $('<div/>').text(data[options.descKey]).html();
++                        s += " <span>(" + desc + ")</span>";
+                     }
+ 
+                     return s;
diff --git a/dev-util/reviewboard/metadata.xml b/dev-util/reviewboard/metadata.xml
new file mode 100644
index 000000000000..d43f04946811
--- /dev/null
+++ b/dev-util/reviewboard/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>idella4@gentoo.org</email>
+		<name>Ian Delaney</name>
+	</maintainer>
+	<use>
+		<flag name='codebase'>Enables a build of the docs/codebase folder</flag>
+		<flag name='manual'>Enables a build of the docs/manual folder</flag>
+		<flag name='rnotes'>Enables a doc build of the release notes</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/reviewboard/reviewboard-1.7.28.ebuild b/dev-util/reviewboard/reviewboard-1.7.28.ebuild
new file mode 100644
index 000000000000..46de4a34d629
--- /dev/null
+++ b/dev-util/reviewboard/reviewboard-1.7.28.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_PN="ReviewBoard"
+DESCRIPTION="A web-based code review tool that offers developers an easy way to handle code reviews"
+HOMEPAGE="http://www.reviewboard.org/"
+SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/1.7/${MY_PN}-${PV}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+IUSE="codebase doc manual rnotes test"
+
+LICENSE="MIT"
+SLOT="0"
+S=${WORKDIR}/${MY_PN}-${PV}
+
+RDEPEND=">=dev-python/django-1.4.14[${PYTHON_USEDEP},sqlite]
+	<dev-python/django-1.5[${PYTHON_USEDEP},sqlite]
+	>=dev-python/django-evolution-0.6.9[${PYTHON_USEDEP}]
+	<dev-python/django-evolution-0.7[${PYTHON_USEDEP}]
+	>=dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}]
+	>=dev-python/Djblets-0.7.31[${PYTHON_USEDEP}]
+	<dev-python/Djblets-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-memcached[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2012h[${PYTHON_USEDEP}]
+	dev-python/recaptcha-client[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="doc? ( || ( codebase manual rnotes ) )"
+# Tests mostly access the inet and when run mostly fail
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}"/${PV}-docs.patch )
+
+python_prepare_all() {
+	# Running uglify is a problem right now, so skip this step. Rather
+	# have newer versions that compacted javascript.
+	sed -e "s/'pipeline.compressors.uglifyjs.UglifyJSCompressor'/None/" -i reviewboard/settings.py || die
+
+	# https://github.com/reviewboard/reviewboard/commit/b1b8867deb7cd857003d8abbf16e85897b0cb4bf
+	# # The version bordering of python-dateutil is long out of date and wrong since end of March 2012!
+	sed -e 's:==1.5:>=1.5:' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# See http://code.google.com/p/reviewboard/issues/ #3009
+	# until build of manual can find and use ROOT_URLCONF, only possible build path for manual
+	# requires sacrificing the resources section, all of which call on ROOT_URLCONF
+	local msg="Generating docs for"
+	if use doc; then
+		if use manual; then
+			rm -rf docs/manual/webapi//2.0/resources/ || die
+			einfo;einfo "$msg manual"
+			DJANGO_SETTINGS_MODULE="django.conf" emake -C docs/manual html
+		fi
+
+		if use codebase; then
+			pushd docs/codebase &> /dev/null
+			ln -sf ../../contrib/internal/conf/settings_local.py .
+			popd &> /dev/null
+			einfo;einfo "$msg codebase"
+			emake -C docs/codebase html
+		fi
+
+		if use rnotes; then
+			einfo;einfo "$msg release notes"
+			emake -C docs/releasenotes html
+		fi
+	fi
+}
+
+python_test() {
+	pushd ${PN} > /dev/null
+	ln -sf contrib/internal/conf/settings_local.py .
+	"${PYTHON}" manage.py test || die
+}
+
+python_install_all() {
+	if use doc; then
+		if use manual; then
+			insinto /usr/share/doc/${PF}/manual
+			doins -r docs/manual/_build/html/
+		fi
+		if use codebase; then
+			insinto /usr/share/doc/${PF}/codebase
+			doins -r docs/codebase/_build/html/
+		fi
+		if use rnotes; then
+			insinto /usr/share/doc/${PF}/release_notes
+			doins -r docs/releasenotes/_build/html/
+		fi
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "You must install any VCS tool you wish ${PN} to support."
+	elog "dev-util/cvs, dev-vcs/git, dev-vcs/mercurial or dev-util/subversion."
+	elog
+	elog "Enable the mysql, postgres or sqlite USEflag on dev-python/django"
+	elog "to use the corresponding database backend."
+	elog
+	elog "For speed and responsiveness, consider installing net-misc/memcached"
+	elog "and dev-python/python-memcached"
+}
diff --git a/dev-util/rootstrap/Manifest b/dev-util/rootstrap/Manifest
new file mode 100644
index 000000000000..e41b0f696405
--- /dev/null
+++ b/dev-util/rootstrap/Manifest
@@ -0,0 +1,3 @@
+DIST rootstrap_0.3.24-3.diff.gz 6618 SHA256 9c9fd6f854082369c7ca585529da4974173c46c414ba0e561a81eb1f4aa38b8d SHA512 7470c849fcea2e144c48c9de3522df95e3c8fd3f176b61840301687c086ba2c8774c8f5fc23572aaabc1cdcc406f8f236ed999375696a09ced2a5719647b5ab4 WHIRLPOOL 9c2bcea59b3ee6b30b9f8bd678f2e57c7fe0db710a2a7fedbd97b01a159d17e379b2b88aac148d1174a867eb1cdf9af8765773e31642179473c41a25983f154b
+DIST rootstrap_0.3.24-5.diff.gz 7114 SHA256 d8a5d7aeb30feb58e01bbc21bc3e73fd0b68e9d016b4c3e600c28f6cdfa7e36c SHA512 2f53c98e77914cd72f3d6bd1121889804d340f84646af368bc4fe414e8ed889f52719e25884fbf1ae825ce5793500cb74c8d12b7ebb9fba8a99d864a8b1f3c0d WHIRLPOOL 9539aede2341ca17e85930701e465e0c8db2136e58882dc682e05b3dea8c36db80bad5178df47db1048a07e19ba0d2db51fb7fd13ed1fb1f09f174004e02b894
+DIST rootstrap_0.3.24.orig.tar.gz 19730 SHA256 404cce2567c1545805a746a447a0792a4ba377705591bf0c96e319a8e57c7453 SHA512 04b42d1f999d9c9a3298a78b4b8abbdce6ac1f1192a97c36ff37ad694bcc94b6ca25e16134fea06099e6a92dd099dbc5cbff5e97565521d86fa8a4246d5d9d38 WHIRLPOOL 4bc248b4c9ff069e074ed9d0767425975404725d2996604230afd119e748f70679ed605354f91070a36116886b01bdbaf6e77f241fc56d8f715e3ddfc7274e24
diff --git a/dev-util/rootstrap/metadata.xml b/dev-util/rootstrap/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/dev-util/rootstrap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/rootstrap/rootstrap-0.3.24.ebuild b/dev-util/rootstrap/rootstrap-0.3.24.ebuild
new file mode 100644
index 000000000000..8ddfb5cd752f
--- /dev/null
+++ b/dev-util/rootstrap/rootstrap-0.3.24.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+PATCH_LEVEL=3
+
+DESCRIPTION="A tool for building complete Linux filesystem images"
+HOMEPAGE="http://packages.qa.debian.org/rootstrap"
+SRC_URI="mirror://debian/pool/main/r/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-util/debootstrap
+	dev-lang/python
+	app-arch/dpkg"
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-utils"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+	sed -i -e 's:docbook-to-man:docbook2man:' Makefile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	newdoc debian/changelog ChangeLog
+}
diff --git a/dev-util/rootstrap/rootstrap-0.3.24_p5-r1.ebuild b/dev-util/rootstrap/rootstrap-0.3.24_p5-r1.ebuild
new file mode 100644
index 000000000000..462bd2285bf6
--- /dev/null
+++ b/dev-util/rootstrap/rootstrap-0.3.24_p5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+PYTHON_DEPEND="2"
+inherit eutils python
+
+DESCRIPTION="A tool for building complete Linux filesystem images"
+HOMEPAGE="http://packages.qa.debian.org/rootstrap"
+SRC_URI="mirror://debian/pool/main/r/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/r/${PN}/${PN}_${PV/_p/-}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-util/debootstrap
+	app-arch/dpkg"
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-utils"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${PN}_${PV/_p/-}.diff
+	sed -i -e 's:docbook-to-man:docbook2man:' Makefile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	newdoc debian/changelog ChangeLog
+	python_convert_shebangs -r 2 "${D}"
+}
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
new file mode 100644
index 000000000000..ebab92c5890d
--- /dev/null
+++ b/dev-util/rpmdevtools/Manifest
@@ -0,0 +1 @@
+DIST rpmdevtools-8.3.tar.xz 102040 SHA256 5f03dc5414e485ba8eb6c13480826fe80cc55d04df064a2117e63b4667fc42cf SHA512 9d3d79d30abf5f579a11068aa2788967dfdcaf87bcd6ec127baede1cbfd38295671ae24700cf4a5c5433ae8bf0c7b3ba2466078aa491067d35db7c56a6efd0f5 WHIRLPOOL f4a4345a646072162b9ac2dd2f05997483e10b0ff3c6ea40fa4ac260a9ae99745d03c1245cd8b7e49bf015a4df841b276d7cc0772c200b5e4e73c299edb257bc
diff --git a/dev-util/rpmdevtools/metadata.xml b/dev-util/rpmdevtools/metadata.xml
new file mode 100644
index 000000000000..b5a20d8cf520
--- /dev/null
+++ b/dev-util/rpmdevtools/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>sochotnicky@gentoo.org</email>
+		<name>Stanislav Ochotnicky</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.3-r1.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.3-r1.ebuild
new file mode 100644
index 000000000000..e132c9969279
--- /dev/null
+++ b/dev-util/rpmdevtools/rpmdevtools-8.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Collection of rpm packaging related utilities"
+HOMEPAGE="https://fedorahosted.org/rpmdevtools/"
+SRC_URI="https://fedorahosted.org/releases/r/p/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+CDEPEND="
+	app-arch/rpm[python]
+	net-misc/curl
+	emacs? ( app-emacs/rpm-spec-mode )
+	dev-util/checkbashisms
+"
+
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	sys-apps/help2man
+"
+
+RDEPEND="${CDEPEND}"
+
+src_install() {
+	default
+
+	rm "${ED}/usr/bin/checkbashisms" || die "Failed to remove checkbashisms script"
+}
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.3.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.3.ebuild
new file mode 100644
index 000000000000..c7c761061db4
--- /dev/null
+++ b/dev-util/rpmdevtools/rpmdevtools-8.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Collection of rpm packaging related utilities"
+HOMEPAGE="https://fedorahosted.org/rpmdevtools/"
+SRC_URI="https://fedorahosted.org/releases/r/p/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+CDEPEND="
+	app-arch/rpm[python]
+	net-misc/curl
+	emacs? ( app-emacs/rpm-spec-mode )
+"
+
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	sys-apps/help2man
+"
+
+RDEPEND="${CDEPEND}"
diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest
new file mode 100644
index 000000000000..454678c387a0
--- /dev/null
+++ b/dev-util/sasm/Manifest
@@ -0,0 +1 @@
+DIST sasm-2.2.tar.gz 9117410 SHA256 4441726f7f081304bdddc4be2d139d96140655ed19df6b9ed33da666989d93eb SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513 WHIRLPOOL 683c783e2d9e2482e52c3925aa023ae1dcd62b211d7a24d1acf665fd3f3d238ff6325480e1a11216b265478bb4cbfb475664281e3798cc52198745fa71807713
diff --git a/dev-util/sasm/metadata.xml b/dev-util/sasm/metadata.xml
new file mode 100644
index 000000000000..84daad147631
--- /dev/null
+++ b/dev-util/sasm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Dman95/SASM</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/sasm/sasm-2.2.ebuild b/dev-util/sasm/sasm-2.2.ebuild
new file mode 100644
index 000000000000..84d291de9ea7
--- /dev/null
+++ b/dev-util/sasm/sasm-2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/SASM-${PV}"
+fi
+
+DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
+HOMEPAGE="http://dman95.github.io/SASM/"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+REPEND="${DEPEND}
+	dev-lang/nasm
+	sys-devel/gdb
+"
diff --git a/dev-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-9999.ebuild
new file mode 100644
index 000000000000..84d291de9ea7
--- /dev/null
+++ b/dev-util/sasm/sasm-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/SASM-${PV}"
+fi
+
+DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
+HOMEPAGE="http://dman95.github.io/SASM/"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+REPEND="${DEPEND}
+	dev-lang/nasm
+	sys-devel/gdb
+"
diff --git a/dev-util/scala-ide/Manifest b/dev-util/scala-ide/Manifest
new file mode 100644
index 000000000000..f5a6019d6734
--- /dev/null
+++ b/dev-util/scala-ide/Manifest
@@ -0,0 +1,2 @@
+DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86.tar.gz 232347349 SHA256 1d7054b49195b598d469a2d56971f67aa219c6043cb8209f8c8608160c4df7ad SHA512 f3d8bff300ee772e07f9c9287c37428d5ddf50bd750dcc86b6a28d9ad5a0b891fa8ce810599e754ac06bf48786a9c58b981055c29976c37b2c530466591d171a WHIRLPOOL f584d8d6e129f5464f9eb44ab7137e230dc0b701e07d3569a7975e35a5ecc2a4f6b81e085486f36867b00a9715e1e25b5cd29294c638abe195f4a60677aa61f9
+DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 232491001 SHA256 d3e9efe1176d979dc0fe2a9457f70068b5a3fd23635a07bcd5639e2345897aca SHA512 d5b8fe3cb3d6623e2f29e0ad5d279b363143c9b392ea5d91092ecb9de765828ac0c50c74ff879f7c825099b22a833ad3acbb0c2cfcd51c769ee19082905b63eb WHIRLPOOL 8007d41e9695c6ae5c3094906ebc6fba263d8d005f6763ce70eb4398db266ea1aff64bc4bc24bc216d0e869e839a92298bb3f85f8149608dd2986d36a3863def
diff --git a/dev-util/scala-ide/metadata.xml b/dev-util/scala-ide/metadata.xml
new file mode 100644
index 000000000000..68b30527c024
--- /dev/null
+++ b/dev-util/scala-ide/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+	  <email>monsieurp@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/scala-ide/scala-ide-4.1.0.ebuild b/dev-util/scala-ide/scala-ide-4.1.0.ebuild
new file mode 100644
index 000000000000..e5cbe8d3bae6
--- /dev/null
+++ b/dev-util/scala-ide/scala-ide-4.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+inherit java-pkg-opt-2
+
+SRC_URI_AMD64="http://downloads.typesafe.com/scalaide-pack/${PV}-vfinal-luna-211-20150525/scala-SDK-${PV}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
+SRC_URI_X86="http://downloads.typesafe.com/scalaide-pack/${PV}-vfinal-luna-211-20150525/scala-SDK-${PV}-vfinal-2.11-linux.gtk.x86.tar.gz"
+
+DESCRIPTION="The Scala IDE"
+HOMEPAGE="http://www.scala-ide.org"
+KEYWORDS="amd64 x86"
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+SLOT="0"
+LICENSE="BSD"
+
+DEPEND=">=virtual/jdk-1.6
+	|| (
+		dev-lang/scala
+		dev-lang/scala-bin
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+MY_D="/opt"
+
+src_unpack() {
+	unpack ${A}
+	mv "${WORKDIR}"/eclipse "${WORKDIR}"/"${P}"
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/"${P}"/eclipse "${WORKDIR}"/"${P}"/"${PN}"
+}
+
+src_install() {
+	cd "${D}" || die
+	dodir "${MY_D}" || die
+	insinto "${MY_D}"
+	doins -r "${WORKDIR}"/"${P}" || die
+	insopts -m 0755
+	insinto "${MY_D}"/"${P}"
+	doins "${WORKDIR}"/"${P}"/"${PN}" || die
+	dosym ${MY_D}/${P}/${PN} /usr/bin/${PN} || die
+}
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
new file mode 100644
index 000000000000..ef7987ac4746
--- /dev/null
+++ b/dev-util/scanmem/Manifest
@@ -0,0 +1 @@
+DIST scanmem-0.15.2.tar.gz 243439 SHA256 37abf8f4e4992d2c0816670f0c9f2bf68f0e261e04604df67a52acdcc721dca5 SHA512 9d1211b10b30962e35821895d7dd7d5a179e64b3f539b6dd2585a3f6b0ade7cd092fe377454b2582ec66e2c7a7676f8c7f04e8aff5c9e6e449a9eb6fb0498501 WHIRLPOOL efefba182a891b792c32370d99de1e9f0d76dbfa5c3050eb96d66ecc64460a7960a861ec0ad0b41671d83c6dd1ba4a1202cea6dedd498806a7f6721a35003401
diff --git a/dev-util/scanmem/files/scanmem-0.13-configure.patch b/dev-util/scanmem/files/scanmem-0.13-configure.patch
new file mode 100644
index 000000000000..cedc96a07098
--- /dev/null
+++ b/dev-util/scanmem/files/scanmem-0.13-configure.patch
@@ -0,0 +1,31 @@
+--- scanmem-0.13/configure.ac
++++ scanmem-0.13/configure.ac
+@@ -108,16 +108,17 @@
+                 test/Makefile
+                 ])
+ 
+-AC_ARG_ENABLE(gui, [AS_HELP_STRING([--enable-gui],
+-                            [enable gameconqueror, the gui front-end of scanmem])],
+-                 [enable_gui=true
+-                  AC_CONFIG_FILES([
+-                 gui/Makefile
+-                 gui/consts.py
+-                 gui/gameconqueror
+-                 ])],
+-                 [enable_gui=false]
+-                 )
++AC_ARG_ENABLE([gui],
++	AS_HELP_STRING([--enable-gui],
++		[enable gameconqueror, the gui front-end of scanmem]))
+ 
+-AM_CONDITIONAL([ENABLE_GUI], [test x$enable_gui = xtrue])
++AS_IF([test "x$enable_gui" = "xyes"], [
++	AC_CONFIG_FILES([
++		gui/Makefile
++		gui/consts.py
++		gui/gameconqueror
++	])
++])
++
++AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" = "xyes"])
+ AC_OUTPUT
diff --git a/dev-util/scanmem/files/scanmem-0.13-desktop.patch b/dev-util/scanmem/files/scanmem-0.13-desktop.patch
new file mode 100644
index 000000000000..7fabcb3f2860
--- /dev/null
+++ b/dev-util/scanmem/files/scanmem-0.13-desktop.patch
@@ -0,0 +1,11 @@
+--- scanmem-0.13/gui/GameConqueror.desktop
++++ scanmem-0.13/gui/GameConqueror.desktop
+@@ -4,6 +4,6 @@
+ Exec=gameconqueror
+ Terminal=false
+ Type=Application
+-Icon=GameConqueror_128x128.png
+-Categories=GNOME;Application;Game;
++Icon=GameConqueror_128x128
++Categories=GNOME;GTK;Game;
+ StartupNotify=true
diff --git a/dev-util/scanmem/files/scanmem-0.13-docs.patch b/dev-util/scanmem/files/scanmem-0.13-docs.patch
new file mode 100644
index 000000000000..7969de3ec0e8
--- /dev/null
+++ b/dev-util/scanmem/files/scanmem-0.13-docs.patch
@@ -0,0 +1,19 @@
+--- scanmem-0.13/gui/Makefile.am
++++ scanmem-0.13/gui/Makefile.am
+@@ -4,7 +4,6 @@
+ dist_icons_DATA = GameConqueror_128x128.png GameConqueror_72x72.png 
+ dist_desktop_DATA = GameConqueror.desktop
+ dist_man_MANS = gameconqueror.1
+-dist_doc_DATA = README TODO COPYING
+ EXTRA_DIST = gameconqueror.in consts.py.in
+ 
+ gameconquerordir=$(datadir)/gameconqueror
+--- scanmem-0.13/Makefile.am
++++ scanmem-0.13/Makefile.am
+@@ -12,6 +12,5 @@
+ scanmem_SOURCES += scanroutines.h scanroutines.c show_message.h show_message.c
+ scanmem_CFLAGS = -O2 -g -Wall
+ dist_man_MANS = scanmem.1
+-dist_doc_DATA = README
+ 
+ EXTRA_DIST = gpl-2.0.txt gpl-3.0.txt
diff --git a/dev-util/scanmem/metadata.xml b/dev-util/scanmem/metadata.xml
new file mode 100644
index 000000000000..04f8eccd65d3
--- /dev/null
+++ b/dev-util/scanmem/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gui">Enable the GameConqueror GUI</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">scanmem/scanmem</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/scanmem/scanmem-0.15.2.ebuild b/dev-util/scanmem/scanmem-0.15.2.ebuild
new file mode 100644
index 000000000000..904512ded5fc
--- /dev/null
+++ b/dev-util/scanmem/scanmem-0.15.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Locate and modify variables in executing processes"
+HOMEPAGE="https://github.com/scanmem/scanmem"
+SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+DEPEND="sys-libs/readline:="
+RDEPEND="${DEPEND}
+	gui? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3
+		sys-auth/polkit
+	)"
+
+REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use gui && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i "/CFLAGS/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable gui)
+}
+
+src_install() {
+	default
+
+	if use gui ; then
+		docinto gui
+		dodoc gui/{README,TODO}
+		python_fix_shebang "${D}"
+	fi
+}
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
new file mode 100644
index 000000000000..7c7db5f25c3b
--- /dev/null
+++ b/dev-util/schroot/Manifest
@@ -0,0 +1,5 @@
+DIST schroot_1.6.10-1.debian.tar.xz 27108 SHA256 d93a7acc4b6c06a024b6bb0bfc1867a144193aadbb09cab454373c2983120cd9 SHA512 2b989054485f397c7de4f9d5e625f2bb2d4738ecb087ff83903a247696a2c98dea611e9743d4ae6bee401b122c21aac4f5e220b5e544f9968f94d6f326fadfa6 WHIRLPOOL 7f9a1b782093321b0dc236098688dacd93f608725bd551ef848262049da3f08b12b2ec34188413ec5b16070753acdc0a07af8d723599581340ecd9cfc6493b67
+DIST schroot_1.6.10.orig.tar.xz 797328 SHA256 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe WHIRLPOOL 91c4682101c6eeb1f56d3e5c583a55af1164abd6853a822ac5c5f1c6820140fb1049765877e97985a90264f4e9d898886487fac794a794904f98210494974090
+DIST schroot_1.6.3.orig.tar.xz 730756 SHA256 0b914a0ae1eef0288e5bf016c14031d3433d1b3f18820bebc5480647594ebc82 SHA512 e435715091eed17e1f073218b2cc2355ad529bb702b9f8cfeb58ed3be38b78fa61280713801ce29e5b21c93939f5898e6f6e4f493d3f7d2550a873289a6c22be WHIRLPOOL 065142aa34a225d0cda44ca3d3703131fe2a0ab46ad914bf386a58dd0480650ca03a5b6d00216eca41edff5a534083874d121623002aec57e933a95a4d2cc60f
+DIST schroot_1.6.5-1.debian.tar.gz 30518 SHA256 acf7cdbbb486a5724e61d10ba682df24dc66ec9274c6897f64b7dbd5f9632aed SHA512 3f5753a877cf8226f9eb085620c91f3e6179855adb7faf1f60e78d12b30ac545f6f6d124a239bd6a8d6b3ac28b417ee1d3ccc7ea4978cad77f3bba1d6e2c043d WHIRLPOOL 13b8afc0575fc1d4e27e35ba0cf277ffb04353b2dc0ebcfb8596d6ada064402f2004bd0b9fd658daad8cef69c1a3c5d615be0569335f6b243ed2f09134d63543
+DIST schroot_1.6.5.orig.tar.xz 737656 SHA256 290d1af4eb06db7678277a5aa8104a69bc33b4e0f9b502aed166061d2717343e SHA512 2f7285f9e76fff8db2a9a7cd66f4d06c2c19662f812c3b3108be45bbc6a67bee63b39b56235e257ab226c35efdba6b50a2e2511a618c32d76da10a0d7843fe90 WHIRLPOOL bf9dcdd61862719492bde8e67ca5cd3b42e368cb69e57382b88a85aa1b34825ab40bd2e9f82f4296a0d9721a38fe03e8161f49931a95721be835d52a3a9108fa
diff --git a/dev-util/schroot/files/schroot-1.4.7-tests.patch b/dev-util/schroot/files/schroot-1.4.7-tests.patch
new file mode 100644
index 000000000000..4a492e7feb97
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.4.7-tests.patch
@@ -0,0 +1,81 @@
+--- schroot-1.4.7.orig/configure.ac
++++ schroot-1.4.7/configure.ac
+@@ -265,6 +265,19 @@ AC_ARG_WITH([bash-completion-dir], [AS_H
+ AC_MSG_RESULT([$bashcompletiondir])
+ AC_SUBST([bashcompletiondir])
+ 
++AC_MSG_CHECKING([whether to enable root-only unit tests])
++AC_ARG_ENABLE([root-tests], [AS_HELP_STRING([--with-root-tests], [Enable root-only tests])],
++              [ case "${enableval}" in
++                yes) enable_root_tests="yes" ;;
++                no)  enable_root_tests="no" ;;
++                *) AC_MSG_RESULT([unknown])
++                   AC_MSG_ERROR([bad value ${enableval} for --enable-root-tests]) ;;
++                esac],
++              [ enable_root_tests="yes" ])
++AC_MSG_RESULT([$enable_root_tests])
++AM_CONDITIONAL([USE_ROOT_TESTS], [test "$enable_root_tests" = "yes"])
++AC_SUBST([enable_root_tests])
++
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_LANG([C++])
+--- schroot-1.4.7.orig/test/Makefile.am
++++ schroot-1.4.7/test/Makefile.am
+@@ -24,10 +24,12 @@ include $(top_srcdir)/scripts/global.mk
+ LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) $(CPPUNIT_CFLAGS) -DTESTDATADIR='"./testdata"' -I$(top_srcdir)/bin
+ 
+ if USE_UNIT_TESTS
+-noinst_LTLIBRARIES = libtest.la
++check_LTLIBRARIES = libtest.la
+ 
+-noinst_PROGRAMS = 			\
+-	sbuild-chroot			\
++ROOT_TESTS =
++
++if USE_ROOT_TESTS
++ROOT_TESTS += \
+ 	sbuild-chroot-plain		\
+ 	sbuild-chroot-file		\
+ 	sbuild-chroot-directory		\
+@@ -35,7 +37,12 @@ noinst_PROGRAMS = 			\
+ 	sbuild-chroot-loopback		\
+ 	sbuild-chroot-lvm-snapshot	\
+ 	sbuild-chroot-btrfs-snapshot	\
+-	sbuild-chroot-config		\
++	sbuild-chroot-config
++endif
++
++check_PROGRAMS = \
++	sbuild-chroot			\
++	$(ROOT_TESTS)			\
+ 	sbuild-environment		\
+ 	sbuild-keyfile			\
+ 	sbuild-lock			\
+@@ -52,14 +59,7 @@ noinst_PROGRAMS = 			\
+ # randomly on slow or heavily-loaded systems.
+ TESTS = setup-test-data			\
+ 	sbuild-chroot			\
+-	sbuild-chroot-plain		\
+-	sbuild-chroot-file		\
+-	sbuild-chroot-directory		\
+-	sbuild-chroot-block-device	\
+-	sbuild-chroot-loopback		\
+-	sbuild-chroot-lvm-snapshot	\
+-	sbuild-chroot-btrfs-snapshot	\
+-	sbuild-chroot-config		\
++	$(ROOT_TESTS)			\
+ 	sbuild-environment		\
+ 	sbuild-keyfile			\
+ 	sbuild-log			\
+--- schroot-1.4.7.orig/test/setup-test-data
++++ schroot-1.4.7/test/setup-test-data
+@@ -4,4 +4,8 @@
+ rm -rf testdata
+ mkdir testdata
+ cp -r ${srcdir}/*.ex* testdata
++if test `id -u` -ne 0; then
++echo "You are not root, only doing partial setup"
++else
+ chown -R root:root testdata
++fi
diff --git a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch b/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
new file mode 100644
index 000000000000..1660f18ae4b8
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
@@ -0,0 +1,70 @@
+From 8c9139249689570ff2f4d058ed1031f0cbb6c084 Mon Sep 17 00:00:00 2001
+From: Roger Leigh <rleigh@codelibre.net>
+Date: Sun, 26 Jul 2015 14:00:13 +0100
+Subject: [PATCH] cmake: Add additional regex tests and corresponding unit
+ tests
+
+---
+ cmake/regex-checks.cmake | 10 ++++++++++
+ test/sbuild-regex.cc     | 20 ++++++++++++++++++++
+ 2 files changed, 30 insertions(+)
+
+diff --git a/cmake/regex-checks.cmake b/cmake/regex-checks.cmake
+index d0bb211..60507ec 100644
+--- a/cmake/regex-checks.cmake
++++ b/cmake/regex-checks.cmake
+@@ -30,6 +30,16 @@ int main() {
+   if (${namespace}_match(fail, bar)) return 11;
+   if (${namespace}_match(fail, chk)) return 12;
+ 
++  // Checks for broken support in GCC 4.9 and 5.1
++  ${namespace} range1(\"^[a-z0-9][a-z0-9-]*\$\", ${namespace}::extended);
++  ${namespace} range2(\"^[a-z0-9][-a-z0-9]*\$\", ${namespace}::extended);
++  if (!${namespace}_match(test, range1)) return 13;
++  if (!${namespace}_match(test, range2)) return 14;
++  if (!${namespace}_match(\"a-\", range1)) return 15;
++  if (!${namespace}_match(\"a-\", range2)) return 16;
++  if (${namespace}_match(\"-a\", range1)) return 17;
++  if (${namespace}_match(\"-a\", range2)) return 18;
++
+   return 0;
+ }"
+ ${outvar})
+diff --git a/test/sbuild-regex.cc b/test/sbuild-regex.cc
+index 915e915..a8520c5 100644
+--- a/test/sbuild-regex.cc
++++ b/test/sbuild-regex.cc
+@@ -33,6 +33,8 @@ class test_regex : public TestCase
+   CPPUNIT_TEST(test_output);
+   CPPUNIT_TEST(test_input);
+   CPPUNIT_TEST(test_match);
++  CPPUNIT_TEST(test_match_bracket1);
++  CPPUNIT_TEST(test_match_bracket2);
+   CPPUNIT_TEST_EXCEPTION(test_input_fail, std::regex_error);
+   CPPUNIT_TEST_SUITE_END();
+ 
+@@ -88,6 +90,24 @@ class test_regex : public TestCase
+   }
+ 
+   void
++  test_match_bracket1()
++  {
++    sbuild::regex r("^[a-z0-9][a-z0-9-]*$");
++    CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
++    CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
++    CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
++  }
++
++  void
++  test_match_bracket2()
++  {
++    sbuild::regex r("^[a-z0-9][-a-z0-9]*$");
++    CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
++    CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
++    CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
++  }
++
++  void
+   test_input_fail()
+   {
+     sbuild::regex r;
diff --git a/dev-util/schroot/files/schroot-1.6.3-tests.patch b/dev-util/schroot/files/schroot-1.6.3-tests.patch
new file mode 100644
index 000000000000..e58b6bae32ba
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.6.3-tests.patch
@@ -0,0 +1,86 @@
+diff -purN schroot-1.6.3.orig/configure.ac schroot-1.6.3/configure.ac
+--- schroot-1.6.3.orig/configure.ac	2012-07-23 17:54:07.000000000 -0400
++++ schroot-1.6.3/configure.ac	2012-09-20 03:43:20.451738906 -0400
+@@ -264,6 +264,19 @@ AC_ARG_WITH([bash-completion-dir], [AS_H
+ AC_MSG_RESULT([$bashcompletiondir])
+ AC_SUBST([bashcompletiondir])
+ 
++AC_MSG_CHECKING([whether to enable root-only unit tests])
++AC_ARG_ENABLE([root-tests], [AS_HELP_STRING([--with-root-tests], [Enable root-only tests])],
++              [ case "${enableval}" in
++                yes) enable_root_tests="yes" ;;
++                no)  enable_root_tests="no" ;;
++                *) AC_MSG_RESULT([unknown])
++                   AC_MSG_ERROR([bad value ${enableval} for --enable-root-tests]) ;;
++                esac],
++              [ enable_root_tests="yes" ])
++AC_MSG_RESULT([$enable_root_tests])
++AM_CONDITIONAL([USE_ROOT_TESTS], [test "$enable_root_tests" = "yes"])
++AC_SUBST([enable_root_tests])
++
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_LANG([C++])
+diff -purN schroot-1.6.3.orig/test/Makefile.am schroot-1.6.3/test/Makefile.am
+--- schroot-1.6.3.orig/test/Makefile.am	2012-07-23 17:54:07.000000000 -0400
++++ schroot-1.6.3/test/Makefile.am	2012-09-20 03:45:31.400235841 -0400
+@@ -24,10 +24,12 @@ include $(top_srcdir)/scripts/global.mk
+ LOCAL_CXXFLAGS = $(SCHROOT_CFLAGS) $(CPPUNIT_CFLAGS) -DTESTDATADIR='"./testdata"' -I$(top_srcdir)/bin
+ 
+ if USE_UNIT_TESTS
+-noinst_LTLIBRARIES = libtest.la
++check_LTLIBRARIES = libtest.la
+ 
+-noinst_PROGRAMS = 			\
+-	sbuild-chroot			\
++ROOT_TESTS =
++
++if USE_ROOT_TESTS
++ROOT_TESTS += \
+ 	sbuild-chroot-plain		\
+ 	sbuild-chroot-custom		\
+ 	sbuild-chroot-file		\
+@@ -37,7 +39,12 @@ noinst_PROGRAMS = 			\
+ 	sbuild-chroot-lvm-snapshot	\
+ 	sbuild-chroot-btrfs-snapshot	\
+ 	sbuild-chroot-config		\
+-	sbuild-chroot-facet-userdata	\
++	sbuild-chroot-facet-userdata
++endif
++
++check_PROGRAMS = \
++	sbuild-chroot 			\
++	$(ROOT_TESTS)			\
+ 	sbuild-environment		\
+ 	sbuild-keyfile			\
+ 	sbuild-lock			\
+@@ -54,16 +61,7 @@ noinst_PROGRAMS = 			\
+ # randomly on slow or heavily-loaded systems.
+ TESTS = setup-test-data			\
+ 	sbuild-chroot			\
+-	sbuild-chroot-plain		\
+-	sbuild-chroot-custom		\
+-	sbuild-chroot-file		\
+-	sbuild-chroot-directory		\
+-	sbuild-chroot-block-device	\
+-	sbuild-chroot-loopback		\
+-	sbuild-chroot-lvm-snapshot	\
+-	sbuild-chroot-btrfs-snapshot	\
+-	sbuild-chroot-config		\
+-	sbuild-chroot-facet-userdata	\
++	$(ROOT_TESTS)			\
+ 	sbuild-environment		\
+ 	sbuild-keyfile			\
+ 	sbuild-log			\
+diff -purN schroot-1.6.3.orig/test/setup-test-data schroot-1.6.3/test/setup-test-data
+--- schroot-1.6.3.orig/test/setup-test-data	2012-07-23 17:54:07.000000000 -0400
++++ schroot-1.6.3/test/setup-test-data	2012-09-20 03:43:20.451738906 -0400
+@@ -4,4 +4,8 @@
+ rm -rf testdata
+ mkdir testdata
+ cp -r ${srcdir}/*.ex* testdata
++if test `id -u` -ne 0; then
++echo "You are not root, only doing partial setup"
++else
+ chown -R root:root testdata
++fi
diff --git a/dev-util/schroot/files/schroot.confd b/dev-util/schroot/files/schroot.confd
new file mode 100644
index 000000000000..b62263175721
--- /dev/null
+++ b/dev-util/schroot/files/schroot.confd
@@ -0,0 +1,9 @@
+# This is a configuration file for /etc/init.d/schroot; it allows you
+# to perform common modifications to the behavior of schroot
+# initialization without editing the init script.
+
+# What do we want to do with "orphan" sessions when starting or
+# restarting?  Recover them (leave empty or set to "recover") or just
+# end them (set to "end")?
+SESSIONS_RECOVER="recover"
+
diff --git a/dev-util/schroot/files/schroot.initd b/dev-util/schroot/files/schroot.initd
new file mode 100644
index 000000000000..76ca9944532d
--- /dev/null
+++ b/dev-util/schroot/files/schroot.initd
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+
+depend() {
+	need localmount
+	after net netmount
+}
+
+start() {
+	local msg param
+	case "${SESSIONS_RECOVER}" in
+		end)
+			msg="Ending"
+			param="--end-session"
+			;;
+		recover|"")
+			msg="Recovering"
+			param="--recover-session"
+			;;
+		*)
+			ewarn "Invalid value \"$SESSIONS_RECOVER\" for \$SESSIONS_RECOVER, using \"recover\""
+			msg="Recovering"
+			param="--recover-session"
+			;;
+	esac
+
+	einfo "$msg schroot sessions"
+	eindent
+	local chroot
+	local chroots="$(schroot --all-sessions --list --quiet)"
+	if [ -n "$chroots" ]; then
+		for chroot in $chroots; do
+			ebegin "$chroot"
+			schroot --chroot=$chroot $param
+			eend $?
+		done
+	else
+		einfo "(none)"
+	fi
+	eoutdent
+	einfo "...done"
+}
diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
new file mode 100644
index 000000000000..7cd4c44b3546
--- /dev/null
+++ b/dev-util/schroot/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>jcallen@gentoo.org</email>
+  <name>Jonathan Callen</name>
+</maintainer>
+<use>
+  <flag name="btrfs">Enable support for chroots using btrfs snapshots.</flag>
+  <flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg>.</flag>
+  <flag name="lvm">Enable support for chroots using LVM snapshots.</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild b/dev-util/schroot/schroot-1.6.10-r3.ebuild
new file mode 100644
index 000000000000..c926dbd21a70
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10-r3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils eutils pam versionator bash-completion-r1
+
+MY_P=${PN}_${PV}
+DEB_REL=1
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="http://packages.debian.org/source/sid/schroot"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
+	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.42.0
+	>=sys-apps/util-linux-2.16
+	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-apps/groff
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? (
+		>=app-text/po4a-0.40
+		sys-devel/gettext
+	)
+	test? ( >=dev-util/cppunit-1.10.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/debianutils
+	dchroot? ( !sys-apps/dchroot )
+	nls? ( virtual/libintl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.10-cmake-add-additional-regex-tests.patch"
+)
+
+src_unpack() {
+	unpack ${MY_P}.orig.tar.xz
+	cd "${S}"
+	unpack ${MY_P}-${DEB_REL}.debian.tar.xz
+}
+
+src_prepare() {
+	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
+	sed -i -e '/^have schroot/d' etc/bash_completion/schroot || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use btrfs btrfs-snapshot)
+		$(cmake-utils_use dchroot dchroot)
+		$(cmake-utils_use dchroot dchroot-dsa)
+		$(cmake-utils_use debug debug)
+		$(cmake-utils_use doc doxygen)
+		$(cmake-utils_use lvm lvm-snapshot)
+		$(cmake-utils_use nls nls)
+		$(cmake-utils_use pam pam)
+		$(cmake-utils_use test test)
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+	)
+	if ! use nls; then
+		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all $(usev doc)
+}
+
+src_test() {
+	if [[ $EUID -ne 0 ]]; then
+		ewarn "Disabling tests because you are not root"
+		return 0
+	fi
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/doc/${PF}/contrib/setup.d
+	doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	newdoc debian/schroot.NEWS NEWS.debian
+
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
+
+	if use doc; then
+		docinto html/sbuild
+		dohtml "${BUILD_DIR}"/doc/sbuild/html/*
+		docinto html/schroot
+		dohtml "${BUILD_DIR}"/doc/schroot/html/*
+	fi
+
+	if use pam; then
+		rm -f "${ED}"etc/pam.d/schroot
+		pamd_mimic_system schroot auth account session
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
+		elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
+		elog "upgrade information."
+	fi
+}
diff --git a/dev-util/schroot/schroot-1.6.3.ebuild b/dev-util/schroot/schroot-1.6.3.ebuild
new file mode 100644
index 000000000000..4aa93f1ba3a6
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools base pam versionator
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="http://packages.debian.org/source/sid/schroot"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.42.0
+	dev-libs/lockdev
+	>=sys-apps/util-linux-2.16
+	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-apps/groff
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? (
+		>=app-text/po4a-0.40
+		sys-devel/gettext
+	)
+	test? ( >=dev-util/cppunit-1.10.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/debianutils
+	dchroot? ( !sys-apps/dchroot )
+	nls? ( virtual/libintl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.3-tests.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+
+	# Don't depend on cppunit unless we are testing
+	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
+
+	eautoreconf
+}
+
+src_configure() {
+	root_tests=no
+	use test && (( EUID == 0 )) && root_tests=yes
+	use nls || export ac_cv_path_PO4A=
+	econf \
+		$(use_enable btrfs btrfs-snapshot) \
+		$(use_enable doc doxygen) \
+		$(use_enable dchroot) \
+		$(use_enable dchroot dchroot-dsa) \
+		$(use_enable debug) \
+		$(use_enable lvm lvm-snapshot) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		--enable-block-device \
+		--enable-loopback \
+		--enable-uuid \
+		--enable-root-tests=$root_tests \
+		--enable-shared \
+		--disable-static \
+		--localstatedir="${EPREFIX}"/var \
+		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
+}
+
+src_compile() {
+	emake all $(usev doc)
+}
+
+src_test() {
+	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
+		ewarn "Disabling tests because you are no longer root"
+		return 0
+	fi
+
+	# Fix a bug in the tarball -- an empty directory was omitted
+	mkdir test/run-parts.ex2
+	default
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}/contrib/setup.d
+	doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	newdoc debian/schroot.NEWS NEWS.debian
+
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
+
+	if use doc; then
+		docinto html/sbuild
+		dohtml doc/sbuild/html/*
+		docinto html/schroot
+		dohtml doc/schroot/html/*
+	fi
+
+	if use pam; then
+		rm -f "${ED}"etc/pam.d/schroot
+		pamd_mimic_system schroot auth account session
+	fi
+
+	# Remove *.la files
+	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
+		elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
+		elog "upgrade information."
+	fi
+}
diff --git a/dev-util/schroot/schroot-1.6.5-r1.ebuild b/dev-util/schroot/schroot-1.6.5-r1.ebuild
new file mode 100644
index 000000000000..77b8ea7853d1
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.5-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools base eutils pam versionator bash-completion-r1
+
+MY_P=${PN}_${PV}
+DEB_REL=1
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="http://packages.debian.org/source/sid/schroot"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
+	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.42.0
+	dev-libs/lockdev
+	>=sys-apps/util-linux-2.16
+	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-apps/groff
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? (
+		>=app-text/po4a-0.40
+		sys-devel/gettext
+	)
+	test? ( >=dev-util/cppunit-1.10.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/debianutils
+	dchroot? ( !sys-apps/dchroot )
+	nls? ( virtual/libintl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.3-tests.patch"
+)
+
+src_unpack() {
+	unpack ${MY_P}.orig.tar.xz
+	cd "${S}"
+	unpack ${MY_P}-${DEB_REL}.debian.tar.gz
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# Don't depend on cppunit unless we are testing
+	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
+
+	eautoreconf
+}
+
+src_configure() {
+	root_tests=no
+	use test && (( EUID == 0 )) && root_tests=yes
+	use nls || export ac_cv_path_PO4A=
+	econf \
+		$(use_enable btrfs btrfs-snapshot) \
+		$(use_enable doc doxygen) \
+		$(use_enable dchroot) \
+		$(use_enable dchroot dchroot-dsa) \
+		$(use_enable debug) \
+		$(use_enable lvm lvm-snapshot) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		--enable-block-device \
+		--enable-loopback \
+		--enable-uuid \
+		--enable-root-tests=$root_tests \
+		--enable-shared \
+		--disable-static \
+		--localstatedir="${EPREFIX}"/var \
+		--with-bash-completion-dir="$(get_bashcompdir)"
+}
+
+src_compile() {
+	emake all $(usev doc)
+}
+
+src_test() {
+	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
+		ewarn "Disabling tests because you are no longer root"
+		return 0
+	fi
+
+	# Fix a bug in the tarball -- an empty directory was omitted
+	mkdir test/run-parts.ex2
+	default
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}/contrib/setup.d
+	doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	newdoc debian/schroot.NEWS NEWS.debian
+
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
+
+	if use doc; then
+		docinto html/sbuild
+		dohtml doc/sbuild/html/*
+		docinto html/schroot
+		dohtml doc/schroot/html/*
+	fi
+
+	if use pam; then
+		rm -f "${ED}"etc/pam.d/schroot
+		pamd_mimic_system schroot auth account session
+	fi
+
+	# Remove *.la files
+	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
+		elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
+		elog "upgrade information."
+	fi
+}
diff --git a/dev-util/schroot/schroot-1.6.5.ebuild b/dev-util/schroot/schroot-1.6.5.ebuild
new file mode 100644
index 000000000000..ef9f45f36c12
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.5.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools base eutils pam versionator
+
+MY_P=${PN}_${PV}
+DEB_REL=1
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="http://packages.debian.org/source/sid/schroot"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
+	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.42.0
+	dev-libs/lockdev
+	>=sys-apps/util-linux-2.16
+	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-apps/groff
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? (
+		>=app-text/po4a-0.40
+		sys-devel/gettext
+	)
+	test? ( >=dev-util/cppunit-1.10.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/debianutils
+	dchroot? ( !sys-apps/dchroot )
+	nls? ( virtual/libintl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.3-tests.patch"
+)
+
+src_unpack() {
+	unpack ${MY_P}.orig.tar.xz
+	cd "${S}"
+	unpack ${MY_P}-${DEB_REL}.debian.tar.gz
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# Don't depend on cppunit unless we are testing
+	use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
+
+	eautoreconf
+}
+
+src_configure() {
+	root_tests=no
+	use test && (( EUID == 0 )) && root_tests=yes
+	use nls || export ac_cv_path_PO4A=
+	econf \
+		$(use_enable btrfs btrfs-snapshot) \
+		$(use_enable doc doxygen) \
+		$(use_enable dchroot) \
+		$(use_enable dchroot dchroot-dsa) \
+		$(use_enable debug) \
+		$(use_enable lvm lvm-snapshot) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		--enable-block-device \
+		--enable-loopback \
+		--enable-uuid \
+		--enable-root-tests=$root_tests \
+		--enable-shared \
+		--disable-static \
+		--localstatedir="${EPREFIX}"/var \
+		--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
+}
+
+src_compile() {
+	emake all $(usev doc)
+}
+
+src_test() {
+	if [[ $root_tests == yes && $EUID -ne 0 ]]; then
+		ewarn "Disabling tests because you are no longer root"
+		return 0
+	fi
+
+	# Fix a bug in the tarball -- an empty directory was omitted
+	mkdir test/run-parts.ex2
+	default
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}/contrib/setup.d
+	doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	newdoc debian/schroot.NEWS NEWS.debian
+
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
+
+	if use doc; then
+		docinto html/sbuild
+		dohtml doc/sbuild/html/*
+		docinto html/schroot
+		dohtml doc/schroot/html/*
+	fi
+
+	if use pam; then
+		rm -f "${ED}"etc/pam.d/schroot
+		pamd_mimic_system schroot auth account session
+	fi
+
+	# Remove *.la files
+	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
+		elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
+		elog "upgrade information."
+	fi
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
new file mode 100644
index 000000000000..43f02d096ec4
--- /dev/null
+++ b/dev-util/scons/Manifest
@@ -0,0 +1,15 @@
+DIST scons-2.3.0-user.html 1006588 SHA256 64b52ed0ccad52ee7d57188934ee4326ddd8dd387d8283445367265084be8db4 SHA512 42dd7604548aa2f859c8fad8ea802e69a2e139b5a53804a0d855868d056194497653a7124d46a25eba6cdb6339dc16288311faefe8f5240dfa1c210260f27e6c WHIRLPOOL 6f5a164621e5a46f1ab256f6a4db192a9b1bda0de292859b7fc22f1feb31e1c47ca0281ee558b49d807b1224cd89028b4b6799a5abcd125cd440a1e9e00c817f
+DIST scons-2.3.0-user.pdf 2268686 SHA256 9b8eb3ed9ad40b375628417d39823042939c8f52f32d0f76c796107870a98c11 SHA512 ae94950bec28d88f83d01590db18ce776146d20dcfa756b0ce2f582f4c729c75eb4f7c57584f624bb653fb43dbf34c972f6a0dcc36aa1b338403885e2d177798 WHIRLPOOL 41dd9909f0b110f2dfd9369ac3f44b5b6a3ff5ae99d3caabb3aa0a92084b92d4b03c45923a8e52cfe18a4ca4f0184e4ddaa57545a6cac6a9ade42f748bc1d8f3
+DIST scons-2.3.0.tar.gz 599514 SHA256 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b SHA512 a7e88bb70b8b269337689fb4afd9563359f6ace37857bbd9824c9e40e43cac8b1e00468d8652bb9b46e410f6b161cb8c9006dd1fd9265756be153846a5e0fd65 WHIRLPOOL 948cc117fe40ab36f3862fab8322268dcb95ecbcde0397d684f31f5deedbbcff3f880d7af336710f237031df350eddcde81a044133b7b61bf5088c4c62ec70cf
+DIST scons-2.3.1-user.html 1234565 SHA256 17e617d5b5f7e43e70966c78148976f7e81bd2b5eb1530f447e3e8bc0cdaf86f SHA512 4b74a5099e23ec5d1e2714e6a0957697b703bbea3d7d0229d8925a5061c24ee1ae7bc2476e5e66fe4cacee5819c03e313d40b80b76e4ee6b7ccb65d4a461e5de WHIRLPOOL 39d7b70b743f410aac95880c533470bf967f534ef79cadc0ab925f3e9126200eaf8f4390729e3638d3a27ba133346f61e8ff510207eef6eef25355fa06a54cd1
+DIST scons-2.3.1-user.pdf 2408501 SHA256 3e2023f8dd1551963815c80f09a45658874174fc6373bb4918f8291f1b622478 SHA512 07ff05308e202541ae1c6538b94641fb0401da15c419854d51f855b177d71021938856307fc12e84db02bee720e2589a9ed2a2c725fd4e0c88fd111ea0862ed2 WHIRLPOOL b4b42e83b2f1ba7c584bdb06eeb3d868ce878c3295d490b4d60b9250c20b7eb55e63c8bde42eaa4c57a432b74a845de034ccbfb0d5fb51f7af72de8137acb7f9
+DIST scons-2.3.1.tar.gz 499037 SHA256 091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba120201 SHA512 207fd0df949d1130afecc168a3b643fee2a17c53c3f9704260bbd2e462fdf24fd6606d7269ceaa664d5b5989cac34d6b9a5a460dfd0d6b69e651cfd85a0d45d2 WHIRLPOOL 8c828ca32bd03fe4cdd768a22ec97740b7fe165692f2c101c73e4fc96884642f80a7ba5531402638b415b8b9250dc12cad3337d0d087a391314aa2b6a564077a
+DIST scons-2.3.2-user.html 1078088 SHA256 ea552cd4b966ceed46fefea6e297f13bcc6b35ce4a80b54d7bb5fabf7a1276fd SHA512 43ddb9f405bc09f08eedf2e321a2e4e4b36fcbcf30dab35f64a4e81e2b29f336a934251e72d0a8eefdc4e220396a1ac48d7a8178664ab4fe90b11343fc93331f WHIRLPOOL 83e049feca4e03ea3e6e1c96c6029696e03480309df5bf745589129b0582f1f55d12f6b3e0b090cecd25886c8451fe9ed7cf0ccde1b315e8942ac3a47b1aaa55
+DIST scons-2.3.2-user.pdf 2455822 SHA256 8d6320f22a38f7171d9ba69b92c643c6fb47d82768926c18328df221da4ec482 SHA512 a0120ad74b9f9b70f763c1cb8c5bede2086c478f8d3fe665332c3624e19b77a17b826731b23d5cf46c6b55e0b0f54fc8727c8d8b74de40aa92f8f1e493788082 WHIRLPOOL 85555bae9ab59cfb7c95e0e555a35d56146eac1011988aa2905fc070cf9adf0440bba52c2b0ce9fe4a37ef16f825721d3c838e1460239b712d78df7c4c26ff19
+DIST scons-2.3.2.tar.gz 621932 SHA256 f993320c5e9515e6567fcce73df0a7a8808414bf1223c69123d3dcf339a449d4 SHA512 90e6fb38cb39e030f0b77cf46f76a4ffef141d991087bd22a9bd0d012d568375b32084437e408c22bda54fa5517f294522ddd718838fef2598d892576cc2ae38 WHIRLPOOL 1d62de977b18bbe5f821c1b3b90e20d57772760a0e69d261be4bdec9ab5e9869debae779bfa686424bd839e35737f9f2feb82ddfaf639532c3152971c925b83e
+DIST scons-2.3.4-user.html 1078749 SHA256 d2cab40df012d1fcf5f7e79d0fc097d5acd2c9ae1659db787a4b5786980f7355 SHA512 75d93d93831bde615cb028dac31184394d4a2478ade5730e0f82ad0ded0a4e868f7981d047ec4b7037e97ea6cfb4fa52d51cb161e64938b21bb96fd3fa373038 WHIRLPOOL 835f2492c0ae6cfec058b0556a79c2f15c6c09cf46faae1e2678dabf30247d6b9d6b9b525105f5abd7ce77d03b473cdb2ba149cdc2114944722ef25d7464dce2
+DIST scons-2.3.4-user.pdf 2456751 SHA256 ecd1a17b01d00768fef580274bb51fc7bbd2400460d5c0112850d068bd7be381 SHA512 f1a2e329c54f415605f6de1661dcea390789a10844cd36a26c56eab754cfddb0da3617f3552fb9b3a9d19f404870821a68a6f167630af08ebf1f7fac417cdee6 WHIRLPOOL 287a9db662b8a877369883aa110115cb0f2416da9404b3f2ca46a5fdebddbd67c1004b6490f1fb2894de2b22202aa396181a313ac12c7a2ef7a383a4145d204b
+DIST scons-2.3.4.tar.gz 621953 SHA256 4b57d72066fed3b6ff65a7dd9f73633c9b1c09f87520e9b3aae84b3e4864b441 SHA512 a7d6d5e175d119f6a247e69ddbd0a18c4f10752e20eaedb6bb1d67c6d5f0a79cdb9efdf2a573045f3dbc33519b8267951afff55f587c39639db1fe704cf5e0d2 WHIRLPOOL fe285a8a82f1360c1a1a1b6eda1bb001f88c2c723ddaeaab03d54a0b17d4571d96327be9fba6c92e9d98c48ca0bb88793c65625b79abe75a23d834058c84c410
+DIST scons-2.3.5-user.html 1280097 SHA256 2724fe17e3901f6c70dc190e7a215a86e3c103f90393588480f0adb7c2c9a9bb SHA512 e2c80beacd03f4071e33f8084e499e54c8529e68ec02b972d0d0944b6e096437fd70f59339ebba652cc5539475e1b4eb8b80e4a3d188413ca5181af9ae5b70d3 WHIRLPOOL d73ef9a5f1cbf9a0cf70124b224a50b7d4ca5d7a35bddb6b88f3fa14ba5fbee1e2721ad9179698b5cd45f24bf91815bc15e4c0d40d21b34a761ec68243a1fc74
+DIST scons-2.3.5-user.pdf 2505997 SHA256 4e157b75b49b6e15f339811102b8e3e8af761ed197a6fe0df01c535ecb16f758 SHA512 137ab2d3b1cab6821f2d8a8fde33406e2a7d46a4c26eec9de1073d3c03f49e1d485ae7884ed3cd2e41a0e3d2ef457e103d782dc1deb01a280c48e4f5e7e68f1e WHIRLPOOL f5394cc86930ec60259af01232948cd10aa7c240bf75262d622a94f0b2311bdc70835921b8ff7a5e2091adc035ce56ad1c0b69c22def1305082af3f6a3aaf802
+DIST scons-2.3.5.tar.gz 508684 SHA256 5b72f959cafbef81f408b503bc8e8d5cfc39f41fb5b629e9ff13bdf20a3eefe2 SHA512 b838271a95680d53524a7cf7770cdad7151ba95b5ccf36104a37679cae14d470fa977dcabbe90b2cf0432da570cae80eeaccefb38df1e9a6a1325b4b159b2f99 WHIRLPOOL 54bbbb630c364db93115a1c675ba815328666b6d10648b6742503310fe1fecb6bdff96803bdc6f0aae365e3ed264fa34f6477f300a0733aa1f1289ceee20ad41
diff --git a/dev-util/scons/files/scons-1.2.0-popen.patch b/dev-util/scons/files/scons-1.2.0-popen.patch
new file mode 100644
index 000000000000..23063cffd0c5
--- /dev/null
+++ b/dev-util/scons/files/scons-1.2.0-popen.patch
@@ -0,0 +1,58 @@
+--- engine/SCons/compat/__init__.py (revision 2695)
++++ engine/SCons/compat/__init__.py (working copy)
+@@ -167,11 +167,17 @@
+     del shlex
+     import_as('_scons_shlex', 'shlex')
+ 
+-try:
+-    import subprocess
+-except ImportError:
+-    # Pre-2.4 Python has no subprocess module.
+-    import_as('_scons_subprocess', 'subprocess')
++#try:
++#    import subprocess
++#except ImportError:
++#    # Pre-2.4 Python has no subprocess module.
++#    import_as('_scons_subprocess', 'subprocess')
++
++# Import subprocess unconditionally to avoid possible race conditions in
++# the official subprocess API. If there are API versions without known
++# problems, we can version-check and use the original subprocess module
++# in these cases.
++import_as('_scons_subprocess', 'subprocess')
+ 
+ import sys
+ try:
+
+
+--- engine/SCons/compat/_scons_subprocess.py (revision 2695)
++++ engine/SCons/compat/_scons_subprocess.py (working copy)
+@@ -581,13 +581,19 @@
+     class object:
+         pass
+ 
++import thread
++lock = thread.allocate_lock()
++
+ class Popen(object):
+     def __init__(self, args, bufsize=0, executable=None,
+                  stdin=None, stdout=None, stderr=None,
+                  preexec_fn=None, close_fds=False, shell=False,
+                  cwd=None, env=None, universal_newlines=False,
+                  startupinfo=None, creationflags=0):
+-        """Create new Popen instance."""
++        """Create new Popen instance.
++        Popen is not thread-safe and is therefore protected with a lock.
++        """
++        lock.acquire()
+         _cleanup()
+ 
+         self._child_created = False
+@@ -655,6 +661,7 @@
+                 self.stderr = os.fdopen(errread, 'rU', bufsize)
+             else:
+                 self.stderr = os.fdopen(errread, 'rb', bufsize)
++        lock.release()
+ 
+ 
+     def _translate_newlines(self, data):
diff --git a/dev-util/scons/files/scons-2.1.0-jython.patch b/dev-util/scons/files/scons-2.1.0-jython.patch
new file mode 100644
index 000000000000..ca04e12031e1
--- /dev/null
+++ b/dev-util/scons/files/scons-2.1.0-jython.patch
@@ -0,0 +1,13 @@
+http://scons.tigris.org/issues/show_bug.cgi?id=2791
+
+--- setup.py
++++ setup.py
+@@ -325,7 +325,7 @@
+                 self.copy_scons(src, scons_version_bat)
+ 
+         # --- distutils copy/paste ---
+-        if os.name == 'posix':
++        if hasattr(os, 'chmod'):
+             # Set the executable bits (owner, group, and world) on
+             # all the scripts we just installed.
+             for file in self.get_outputs():
diff --git a/dev-util/scons/files/scons-install-scripts.patch b/dev-util/scons/files/scons-install-scripts.patch
new file mode 100644
index 000000000000..1e28ca72e599
--- /dev/null
+++ b/dev-util/scons/files/scons-install-scripts.patch
@@ -0,0 +1,20 @@
+diff --git a/src/setup.py b/src/setup.py
+--- a/src/setup.py
++++ b/src/setup.py
+@@ -81,6 +81,7 @@
+ import distutils.command.install_lib
+ import distutils.command.install_scripts
+ import distutils.command.build_scripts
++from distutils.util import convert_path
+ 
+ _install = distutils.command.install.install
+ _install_data = distutils.command.install_data.install_data
+@@ -303,7 +304,7 @@
+         else:
+             create_version_script = self.do_nothing
+ 
+-        inputs = self.get_inputs()
++        inputs = [os.path.join(self.build_dir, os.path.basename(convert_path(script))) for script in self.get_inputs()]
+         bat_scripts = [x for x in inputs if x[-4:] == '.bat']
+         non_bat_scripts = [x for x in inputs if x[-4:] != '.bat']
+ 
diff --git a/dev-util/scons/metadata.xml b/dev-util/scons/metadata.xml
new file mode 100644
index 000000000000..1181e65fb7d3
--- /dev/null
+++ b/dev-util/scons/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <longdescription lang="en">
+    SCons is a make replacement providing a range of enhanced
+    features such as automated dependency generation and built in
+    compilation cache support. SCons rule sets are Python scripts so
+    as well as the features it provides itself SCons allows you to use
+    the full power of Python to control compilation.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">scons</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/scons/scons-2.3.0.ebuild b/dev-util/scons/scons-2.3.0.ebuild
new file mode 100644
index 000000000000..9ab42d306b29
--- /dev/null
+++ b/dev-util/scons/scons-2.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/scons-1.2.0-popen.patch"
+		"${FILESDIR}/${PN}-2.1.0-jython.patch"
+	)
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=361061
+	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
+	# and make sure the build system doesn't "force" /usr/local/ :(
+	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--standard-lib \
+		--no-version-script \
+		--install-data "${EPREFIX}"/usr/share
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Build system does not use build_scripts properly.
+	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
+	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
+}
diff --git a/dev-util/scons/scons-2.3.1-r1.ebuild b/dev-util/scons/scons-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..9db2720763c1
--- /dev/null
+++ b/dev-util/scons/scons-2.3.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.1.0-jython.patch"
+	)
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=361061
+	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
+	# and make sure the build system doesn't "force" /usr/local/ :(
+	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--standard-lib \
+		--no-version-script \
+		--install-data "${EPREFIX}"/usr/share
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Build system does not use build_scripts properly.
+	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
+	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
+}
diff --git a/dev-util/scons/scons-2.3.1.ebuild b/dev-util/scons/scons-2.3.1.ebuild
new file mode 100644
index 000000000000..e74cb10b5523
--- /dev/null
+++ b/dev-util/scons/scons-2.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/scons-1.2.0-popen.patch"
+		"${FILESDIR}/${PN}-2.1.0-jython.patch"
+	)
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=361061
+	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
+	# and make sure the build system doesn't "force" /usr/local/ :(
+	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--standard-lib \
+		--no-version-script \
+		--install-data "${EPREFIX}"/usr/share
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Build system does not use build_scripts properly.
+	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
+	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
+}
diff --git a/dev-util/scons/scons-2.3.2.ebuild b/dev-util/scons/scons-2.3.2.ebuild
new file mode 100644
index 000000000000..4b40a90f0d5a
--- /dev/null
+++ b/dev-util/scons/scons-2.3.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" )
+
+python_prepare_all() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=361061
+	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
+	# and make sure the build system doesn't "force" /usr/local/ :(
+	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--standard-lib \
+		--no-version-script \
+		--install-data "${EPREFIX}"/usr/share
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Build system does not use build_scripts properly.
+	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
+	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
+}
diff --git a/dev-util/scons/scons-2.3.4.ebuild b/dev-util/scons/scons-2.3.4.ebuild
new file mode 100644
index 000000000000..c0a47a14efb1
--- /dev/null
+++ b/dev-util/scons/scons-2.3.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" )
+
+python_prepare_all() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=361061
+	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
+	# and make sure the build system doesn't "force" /usr/local/ :(
+	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--standard-lib \
+		--no-version-script \
+		--install-data "${EPREFIX}"/usr/share
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Build system does not use build_scripts properly.
+	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
+	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
+}
diff --git a/dev-util/scons/scons-2.3.5.ebuild b/dev-util/scons/scons-2.3.5.ebuild
new file mode 100644
index 000000000000..c0a47a14efb1
--- /dev/null
+++ b/dev-util/scons/scons-2.3.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" )
+
+python_prepare_all() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=361061
+	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
+	# and make sure the build system doesn't "force" /usr/local/ :(
+	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--standard-lib \
+		--no-version-script \
+		--install-data "${EPREFIX}"/usr/share
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Build system does not use build_scripts properly.
+	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
+	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
+}
diff --git a/dev-util/sel/Manifest b/dev-util/sel/Manifest
new file mode 100644
index 000000000000..4c9cc95303db
--- /dev/null
+++ b/dev-util/sel/Manifest
@@ -0,0 +1 @@
+DIST sel-0.08.4.tar.gz 22188 SHA256 051279e3432415497d02c53e2fe9691b4039bfa6398fb1a60bb2603e1c94a66a SHA512 5550f1b78fef10c2ac7c132f752db4e0f7a3318419bf5751a4f812c1da04b07b3fcac341076d32f6ea436a0216ad6746e9cf29c4bcef630b76e307ded6237e52 WHIRLPOOL 76d92e6d99260f40d633d975204cdcf17999566e268b202d5dce1e2ed809a195ecfbd965f2e90c9a416b1bb3f31d0246e4d394fca7dd824528a1d77f57cc97f6
diff --git a/dev-util/sel/metadata.xml b/dev-util/sel/metadata.xml
new file mode 100644
index 000000000000..b85f8c3dbf42
--- /dev/null
+++ b/dev-util/sel/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>wschlich@gentoo.org</email>
+	<name>Wolfram Schlich</name>
+	<description>Primary maintainer</description>
+</maintainer>
+<longdescription>
+sel is a file selection utility for use on the shell and in shell scripts
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/sel/sel-0.08.4-r1.ebuild b/dev-util/sel/sel-0.08.4-r1.ebuild
new file mode 100644
index 000000000000..81da6fc2c26a
--- /dev/null
+++ b/dev-util/sel/sel-0.08.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="A filemanager for shell scripts"
+SRC_URI="http://www.rninet.de/darkstar/files/${P}.tar.gz"
+HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc s390 sparc x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5.1"
+DEPEND="${RDEPEND}"
+
+src_prepare () {
+	sed -i -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
+		sel.c || die 'sed failed'
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDLIBS="-lncurses"
+}
+
+src_install () {
+	dobin sel
+	doman sel.1
+	insinto /usr/share/sel
+	doins help.txt
+	dodoc README.GER
+}
diff --git a/dev-util/sel/sel-0.08.4.ebuild b/dev-util/sel/sel-0.08.4.ebuild
new file mode 100644
index 000000000000..41dd52876162
--- /dev/null
+++ b/dev-util/sel/sel-0.08.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="A filemanager for shell scripts"
+SRC_URI="http://www.rninet.de/darkstar/files/${P}.tar.gz"
+HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc s390 sparc x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5.1"
+DEPEND="${RDEPEND}"
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
+		sel.c || die 'sed failed'
+}
+
+doecho() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	doecho $(tc-getCC) -o ${PN} \
+		${CFLAGS} ${LDFLAGS} \
+		${PN}.c -lncurses \
+		|| die "build failed"
+}
+
+src_install () {
+	dobin sel || die
+	doman sel.1 || die
+	insinto /usr/share/sel
+	doins help.txt || die
+	dodoc README.GER || die
+}
diff --git a/dev-util/setconf/Manifest b/dev-util/setconf/Manifest
new file mode 100644
index 000000000000..224e94af4d84
--- /dev/null
+++ b/dev-util/setconf/Manifest
@@ -0,0 +1,2 @@
+DIST setconf-0.6.6.tar.xz 12620 SHA256 1554877f771fd3e509df5fd75c452460fd4ed78d2b23a4cd97710d5cb9831e4f SHA512 28f62b4dbc5883763cd11480ca059dd8ba120d6dfd964bbf1746ec5cb23fb0f0fd949249f77673d150cb6abd0039ff6f34d79ad744f8abcc765e0af37fbb85ff WHIRLPOOL 95fcf26aba2e11c7b5d3a25adb7e813930ac3409b6dc51afdf189ae22025cc6bb5fdc47907c8705d09db34c1cc92036eb59572ffe5baf5955efebac6fbc74e31
+DIST setconf-0.6.7.tar.xz 12700 SHA256 dcc38c2864c4a6d76d161a7aa34eb425f45ee4e7e76ad95050988b437750bb4f SHA512 8b247de9f7ac06f77e6251e95c045886cde5b6ca21b0152cb6fdc1456381aacd9051d5221c9fc8149608555e14f85ee2b51acbe65f78d129b1c8b732e093236d WHIRLPOOL de34abb2cbf49827f4b2a9845c85fdaec76afaeb9858458358e2f82adfcea0f24c4025147707ebfe8be23e2b433334078ad6a7a9de40c60c7ebeb84eb08f2bb2
diff --git a/dev-util/setconf/metadata.xml b/dev-util/setconf/metadata.xml
new file mode 100644
index 000000000000..67dfac8ca4f4
--- /dev/null
+++ b/dev-util/setconf/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<herd>shell-tools</herd>
+	<maintainer>
+		<email>ssuominen@gentoo.org</email>
+		<name>Samuli Suominen</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/setconf/setconf-0.6.6.ebuild b/dev-util/setconf/setconf-0.6.6.ebuild
new file mode 100644
index 000000000000..878b1af8cdd5
--- /dev/null
+++ b/dev-util/setconf/setconf-0.6.6.ebuild
@@ -0,0 +1,41 @@
+# 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,4}} )
+inherit python-single-r1
+
+DESCRIPTION="A small python based utility that can be used to change configuration files"
+HOMEPAGE="http://setconf.roboticoverlords.org/"
+SRC_URI="http://${PN}.roboticoverlords.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=${PYTHON_DEPS}
+
+# "REQUIRED_USE is needed to have a (un-)nice error when someone disabled all of python3" -mgorny
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unpack ./${PN}.1.gz
+}
+
+src_prepare() {
+	python_fix_shebang ${PN}.py #462326
+}
+
+src_install() {
+	dobin ${PN}.py
+	ln -s ${PN}.py "${ED}"/usr/bin/${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/setconf/setconf-0.6.7.ebuild b/dev-util/setconf/setconf-0.6.7.ebuild
new file mode 100644
index 000000000000..350e359c928c
--- /dev/null
+++ b/dev-util/setconf/setconf-0.6.7.ebuild
@@ -0,0 +1,41 @@
+# 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,4}} )
+inherit python-single-r1
+
+DESCRIPTION="A small python based utility used to change configuration files"
+HOMEPAGE="http://setconf.roboticoverlords.org/"
+SRC_URI="http://${PN}.roboticoverlords.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=${PYTHON_DEPS}
+
+# "REQUIRED_USE is needed to have a (un-)nice error when someone disabled all of python3" -mgorny
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unpack ./${PN}.1.gz
+}
+
+src_prepare() {
+	python_fix_shebang ${PN}.py #462326
+}
+
+src_install() {
+	python_doscript ${PN}.py
+	dosym ${PN}.py /usr/bin/${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/sgb/Manifest b/dev-util/sgb/Manifest
new file mode 100644
index 000000000000..3f7ced50189b
--- /dev/null
+++ b/dev-util/sgb/Manifest
@@ -0,0 +1 @@
+DIST sgb-2003-06-23.tar.gz 493974 SHA256 dc911a3abd0bad1a528e89fc7f06135e05845ca7996ddf44559d3cc73d5eb7b5 SHA512 f486317dd85dc11761c970ab2bc0c9193f8dd3fa0d114528e1b55fd935fa9cce9266dc595b2ebe3526214ce3e6a1b3dc747382b32cbfd518ffb6179d3463e874 WHIRLPOOL 341ac4e0121675c2eb321d596ae7f52f7eeaeed802b7c330361f8621f72083ff0b26c1667ae6fb8af413868b9143bf20d7250e01f780aa34d6d9302b460df34b
diff --git a/dev-util/sgb/files/sgb-20030623-destdir.patch b/dev-util/sgb/files/sgb-20030623-destdir.patch
new file mode 100644
index 000000000000..0517d0ce46a3
--- /dev/null
+++ b/dev-util/sgb/files/sgb-20030623-destdir.patch
@@ -0,0 +1,76 @@
+diff -Nuar -Nuar work.orig/Makefile work/Makefile
+--- work.orig/Makefile	2009-09-22 01:59:32.521217030 +0000
++++ work/Makefile	2009-09-22 01:58:42.494972535 +0000
+@@ -93,50 +93,48 @@
+ 	$(CC) $(CFLAGS) -DDATA_DIRECTORY=\"$(DATADIR)/\" -c gb_io.c
+ 
+ test_io: gb_io.o
+-	$(CC) $(CFLAGS) test_io.c gb_io.o -o test_io
++	$(CC) $(CFLAGS) $(LDFLAGS) test_io.c gb_io.o -o test_io
+ 
+ test_graph: gb_graph.o
+-	$(CC) $(CFLAGS) test_graph.c gb_graph.o -o test_graph
++	$(CC) $(CFLAGS) $(LDFLAGS) test_graph.c gb_graph.o -o test_graph
+ 
+ test_flip: gb_flip.o
+-	$(CC) $(CFLAGS) test_flip.c gb_flip.o -o test_flip
++	$(CC) $(CFLAGS) $(LDFLAGS) test_flip.c gb_flip.o -o test_flip
+ 
+-tests: test_io test_graph test_flip
++tests: certified
++
++tests_phase1: test_io test_graph test_flip
+ 	./test_io
+ 	./test_graph
+ 	./test_flip
+-	make gb_sort.o
+-	make lib
+-	make test_sample
++
++certified tests_phase2: tests_phase1 gb_sort.o lib test_sample
+ 	- ./test_sample > sample.out
+ 	diff test.gb test.correct
+ 	diff sample.out sample.correct
+-	rm test.gb sample.out test_io test_graph test_flip test_sample
++	echo rm test.gb sample.out test_io test_graph test_flip test_sample
+ 	echo "Congratulations --- the tests have all been passed."
+ 	touch certified
+ 
+-install: lib
+-	if test ! -r certified; then echo "Please run 'make tests' first!"; fi
+-	test -r certified
+-	make installdata
+-	- mkdir $(LIBDIR)
+-	- cp libgb.a $(LIBDIR)
+-	- mkdir $(CWEBINPUTS)
+-	- cp -p boilerplate.w gb_types.w $(CWEBINPUTS)
+-	- mkdir $(INCLUDEDIR)
+-	- cp -p $(HEADERS) Makefile $(INCLUDEDIR)
++install: lib certified installdata
++	- mkdir -p $(DESTDIR)$(LIBDIR)
++	- cp libgb.a $(DESTDIR)$(LIBDIR)
++	- mkdir -p $(DESTDIR)$(CWEBINPUTS)
++	- cp -p boilerplate.w gb_types.w $(DESTDIR)$(CWEBINPUTS)
++	- mkdir -p $(DESTDIR)$(INCLUDEDIR)
++	- cp -p $(HEADERS) Makefile $(DESTDIR)$(INCLUDEDIR)
+ 
+ installdata: $(DATAFILES)
+-	- mkdir $(SGBDIR)
+-	- mkdir $(DATADIR)
+-	- cp -p $(DATAFILES) $(DATADIR)
++	- mkdir -p $(DESTDIR)$(SGBDIR)
++	- mkdir -p $(DESTDIR)$(DATADIR)
++	- cp -p $(DATAFILES) $(DESTDIR)$(DATADIR)
+ 
+ installdemos: lib $(DEMOS)
+-	- mkdir $(BINDIR)
+-	- mv $(DEMOS) $(BINDIR)
++	- mkdir -p $(DESTDIR)$(BINDIR)
++	- mv $(DEMOS) $(DESTDIR)$(BINDIR)
+ 
+ uninstalldemos:
+-	- cd $(BINDIR); rm -f $(DEMOS)
++	- cd $(DESTDIR)$(BINDIR); rm -f $(DEMOS)
+ 
+ doc:
+ 	tex abstract.plaintex
diff --git a/dev-util/sgb/files/sgb-20030623-parallel-make-fix.patch b/dev-util/sgb/files/sgb-20030623-parallel-make-fix.patch
new file mode 100644
index 000000000000..4a96742f24eb
--- /dev/null
+++ b/dev-util/sgb/files/sgb-20030623-parallel-make-fix.patch
@@ -0,0 +1,47 @@
+diff -Nuar b/Makefile a/Makefile
+--- b/Makefile	1999-12-27 22:27:24.000000000 +0000
++++ a/Makefile	2009-09-21 11:49:40.000000000 +0000
+@@ -46,26 +46,14 @@
+ 
+ .SUFFIXES: .dvi .tex .w
+ 
+-.tex.dvi:
+-	tex $*.tex
++all: libgb.a test_io test_graph test_flip demos
+ 
+-.w.c:
+-	if test -r $*.ch; then ctangle $*.w $*.ch; else ctangle $*.w; fi
+-
+-.w.tex:
+-	if test -r $*.ch; then cweave $*.w $*.ch; else cweave $*.w; fi
+-
+-.w.o:
+-	make $*.c
+-	make $*.o
+-
+-.w:
+-	make $*.c
+-	make $*
+-
+-.w.dvi:
+-	make $*.tex
+-	make $*.dvi
++%.dvi: %.tex
++	tex $^
++%.c: %.w
++	ctangle $^
++%.tex: %.w
++	cweave $^
+ 
+ DATAFILES = anna.dat david.dat econ.dat games.dat homer.dat huck.dat \
+         jean.dat lisa.dat miles.dat roget.dat words.dat
+@@ -175,3 +163,9 @@
+ 
+ fulltar: $(ALL) ERRATA ANSI AMIGA PROTOTYPES MSVC
+ 	tar cvf sgb.tar $(ALL) ERRATA ANSI AMIGA PROTOTYPES MSVC
++
++$(DEMOS) lib tests test_io test_graph test_flip: libgb.a
++
++demos: $(DEMOS)
++
++.PRECIOUS: .o .c .tex
diff --git a/dev-util/sgb/metadata.xml b/dev-util/sgb/metadata.xml
new file mode 100644
index 000000000000..c6d862855eb5
--- /dev/null
+++ b/dev-util/sgb/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/sgb/sgb-20030623.ebuild b/dev-util/sgb/sgb-20030623.ebuild
new file mode 100644
index 000000000000..a3bef58406f8
--- /dev/null
+++ b/dev-util/sgb/sgb-20030623.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib
+
+DESCRIPTION="Stanford GraphBase"
+HOMEPAGE="ftp://labrea.stanford.edu/pub/sgb/"
+SRC_URI="ftp://labrea.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+DEPEND="|| ( >=dev-util/cweb-3.00 virtual/tex-base )"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/sgb-20030623-parallel-make-fix.patch
+	epatch "${FILESDIR}"/sgb-20030623-destdir.patch
+}
+
+src_compile() {
+	# bug #299028
+	emake -j1 \
+	CFLAGS="${CFLAGS}" \
+	SGBDIR=/usr/share/${PN} \
+	INCLUDEDIR=/usr/include/sgb \
+	LIBDIR=/usr/$(get_libdir) \
+	BINDIR=/usr/bin \
+	CFLAGS="${CFLAGS}" \
+	lib demos tests || die "Failed to build"
+	#CWEBINPUTS=/usr/share/${PN}/cweb \
+	#LDFLAGS="${LDFLAGS}" \
+}
+
+src_install() {
+	dodir /usr/share/${PN} /usr/include/sgb /usr/lib /usr/bin /usr/share/${PN}/cweb
+	emake \
+	DESTDIR="${D}" \
+	SGBDIR=/usr/share/${PN} \
+	INCLUDEDIR=/usr/include/sgb \
+	LIBDIR=/usr/$(get_libdir) \
+	BINDIR=/usr/bin \
+	CFLAGS="${CFLAGS}" \
+	LDFLAGS="${LDFLAGS}" \
+	CWEBINPUTS=/usr/share/${PN}/cweb \
+	install \
+	|| die "Failed to install"
+
+	# we don't need no makefile
+	rm "${D}"/usr/include/sgb/Makefile
+
+	dodoc ERRATA README
+}
+
+src_test() {
+	emake tests
+}
diff --git a/dev-util/shc/Manifest b/dev-util/shc/Manifest
new file mode 100644
index 000000000000..e5e7fdb9a13f
--- /dev/null
+++ b/dev-util/shc/Manifest
@@ -0,0 +1 @@
+DIST shc-3.8.9.tgz 20536 SHA256 ef7bbf1252c9c791f711782870d00d6f19c42c08e0ee57e9a04d0e2b3d114d40 SHA512 e8a4f9b0ef6e90fc99ebeeb0af36b89d1020209429c9651a036ab1f51a293d9faa3b775b7f040e91997b6ff5a487cb45943fc3548fa6fa3e7282e0d6f74d2cd4 WHIRLPOOL 07e0144fb58deeb205ea108ee79b451b1456351970f7a1e90cbe52bb7463578161c18a1a6028298309fba454456703a1df97a29ca6e56074695831ff8dc6488d
diff --git a/dev-util/shc/metadata.xml b/dev-util/shc/metadata.xml
new file mode 100644
index 000000000000..5e6ea6acc16d
--- /dev/null
+++ b/dev-util/shc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>pinkbyte@gentoo.org</email>
+	<name>Sergey Popov</name>
+</maintainer>
+<upstream>
+	<changelog>http://www.datsi.fi.upm.es/~frosal/sources/CHANGES</changelog>
+</upstream>
+</pkgmetadata>
diff --git a/dev-util/shc/shc-3.8.9.ebuild b/dev-util/shc/shc-3.8.9.ebuild
new file mode 100644
index 000000000000..6b911aa3f4cd
--- /dev/null
+++ b/dev-util/shc/shc-3.8.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A (shell-) script compiler/scrambler"
+HOMEPAGE="http://www.datsi.fi.upm.es/~frosal"
+SRC_URI="http://www.datsi.fi.upm.es/~frosal/sources/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	# respect LDFLAGS
+	sed -i makefile -e 's:$(CC) $(CFLAGS):& $(LDFLAGS):' || die
+	# fix source file name wrt bug #433970
+	mv {${P},${PN}}.c || die
+}
+
+src_compile() {
+	## the "test"-target leads to an access-violation -> so we skip it
+	## as it's only for demonstration purposes anyway.
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" shc
+}
+
+src_install() {
+	dobin shc
+	doman shc.1
+	newdoc shc.README README
+	dodoc CHANGES
+}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
new file mode 100644
index 000000000000..20410cfba156
--- /dev/null
+++ b/dev-util/shellcheck/Manifest
@@ -0,0 +1,5 @@
+DIST ShellCheck-0.3.5.tar.gz 77173 SHA256 9289fda0b3683f4e7c2c003f875a9e308897368fe956ed924a76cafc2fdc9974 SHA512 b140d5907cec743fb31809fcf4e01481e2a6c6bf97394e521a191427d30358a995565d2fb9d99ed5b943ca33654cfe7014b042a41bf2da4fd20ea0227d6af06c WHIRLPOOL 6ee0c38a741b65d957f7ed422f879ddd3563dbf602d2477e301b4fb0404473b6082b7f4aba97e320c6f994063f6ccb789389a58116deb75519cccdc0935d73e1
+DIST ShellCheck-0.3.6.tar.gz 82760 SHA256 f19f950b39eba78334cfd044077ce3686fb6defe2c6e593c0def949aa089230c SHA512 53e36770eabb49f2e0e84a508b69805799451ecc3bc6b2013e68b5f701d021d552706dcc027089c92355e833059ce856ae193f320f9dad0d3c60c4c5d9516219 WHIRLPOOL 5e8e50c6fd2a0036c24994029ad2e3f5d08afee888606c5205b10bc93c6882308dbe14c3b050c3edeab6e6554f8f20d312b147f9a52575f0491a36e0e7a7411b
+DIST ShellCheck-0.3.7.tar.gz 84069 SHA256 417c90eb4e84da67b66f444ae56eab6c6674f80964a9172e4c494e7ad17b97d7 SHA512 a6835c96bbd81e5dbd84347a264b1492fbd8e4c18ca1c97a7f5d94f18d305abc45c8f994e431672d852db20054ac231511d76c0be451613629420bdc4fb9e286 WHIRLPOOL 75a67c8e388920717fa3567f65261c2242bb415e735181f16ad7068a71713fbef246ef2355887a4ef6f57b68326b269f724b97a874b26e018acd2ac3b52d5401
+DIST ShellCheck-0.3.8.tar.gz 86202 SHA256 c185b77166724c06531b3e07b7a8353c0451809a1f60e9f6756d29247853651a SHA512 d131225a9854e7a7d8de030a7267cd21c15a048c75c5fb14edca2aae957d019eb3cf0bbee0ed27ea2449928c0ee64b39e61924501a0243cfac3b20239b62d148 WHIRLPOOL 808718f336be4c16dad9112bba37fb658bb46f06a9af24bfe9e0b1888a24a2936684d7ebba8d0469cc14d8a64ae267bb7380e4ebae6fee0db2f784364a6c8acd
+DIST shellcheck-man-0.3.5.tar.xz 1876 SHA256 5b3f940fd8760676c40787b25b7c950a5ae7fa25e882dea6b11dfeabb1b712ee SHA512 974b7bae0a927151819a14eef2be40d76c2eb50fadfd966bef79908b7faab958ecd42a1584cbe1fb25e2e59f1593d89b8632684d655490c83e246502d9680d26 WHIRLPOOL 622968777ce5387abe6e5f068bff5eb9879d8a990d7680fe2acba1ee89114ec5aca3cf402e579222af2941b0d99b1df95415ad17e9ef973a7b7e74fcd6acbee5
diff --git a/dev-util/shellcheck/metadata.xml b/dev-util/shellcheck/metadata.xml
new file mode 100644
index 000000000000..7bc6ee8ea837
--- /dev/null
+++ b/dev-util/shellcheck/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/shellcheck/shellcheck-0.3.5-r1.ebuild b/dev-util/shellcheck/shellcheck-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..a40dbe17fc20
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.3.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="http://www.shellcheck.net/"
+SRC_URI="
+	mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz
+	http://dev.gentoo.org/~mjo/distfiles/${PN}-man-${PV}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-haskell/json:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
+	dev-haskell/regex-compat:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	# See bug #537500 for this beauty.
+	runghc Setup.hs test || die 'test suite failed'
+}
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/shellcheck/shellcheck-0.3.6.ebuild b/dev-util/shellcheck/shellcheck-0.3.6.ebuild
new file mode 100644
index 000000000000..b86243a8e5c1
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.3.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="http://www.shellcheck.net/"
+SRC_URI="
+	mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+#	http://dev.gentoo.org/~mjo/distfiles/${PN}-man-${PV}.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-haskell/json:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
+	dev-haskell/regex-compat:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.8.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	# See bug #537500 for this beauty.
+	runghc Setup.hs test || die 'test suite failed'
+}
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/shellcheck/shellcheck-0.3.7.ebuild b/dev-util/shellcheck/shellcheck-0.3.7.ebuild
new file mode 100644
index 000000000000..db6b1c372c46
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.3.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="http://www.shellcheck.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-haskell/json:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.8.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/cabal-1.20 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	# See bug #537500 for this beauty.
+	runghc Setup.hs test || die 'test suite failed'
+}
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/shellcheck/shellcheck-0.3.8.ebuild b/dev-util/shellcheck/shellcheck-0.3.8.ebuild
new file mode 100644
index 000000000000..75cfb2afc716
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.3.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="http://www.shellcheck.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-haskell/json:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.8.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/cabal-1.20 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	# See bug #537500 for this beauty.
+	runghc Setup.hs test || die 'test suite failed'
+}
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
new file mode 100644
index 000000000000..1c90ffe4c255
--- /dev/null
+++ b/dev-util/shelltestrunner/Manifest
@@ -0,0 +1,2 @@
+DIST shelltestrunner-1.3.4.tar.gz 21331 SHA256 1eeb0cb74e39c30289106af41bc4f7f88c9be6c241339aab32b1a49d1215ddbd SHA512 b46e5e2456573b06f6958076a001be3fd65471dc6c89b78700f1d77870bb3844e89e9cec98ad2a146554f19550891c2f3c6bd150b8ee8d0b20d9cd3b34f55753 WHIRLPOOL 38aaf46b929401ebc1f6a6c6c8888a8c734765e70eef66ebcf8ee09fdcc7ece942e760f18e1584305cb0e9ec0c8a632043b8e66eeabd8523ca4a01a8017ddabc
+DIST shelltestrunner-1.3.5.tar.gz 21428 SHA256 4265eb9cc87c352655099da26f49fb7829f5163edd03a20105b7a25609d3a829 SHA512 f0cc03c41fe176ddfd0e498121f5ebafda721b93e9a84f320b445bf797022545e1046ffb3814e2eaac72f0975a2a11fb1de5e0a007c5700de028e57ee66fa093 WHIRLPOOL af23b0af0c391843df2f83beb854caeded4ff043065690de9e0824a94f6b97fc2878a84d1140d5beb775d3184491428c11c0dfae4743a3a648bb1623b0e82287
diff --git a/dev-util/shelltestrunner/metadata.xml b/dev-util/shelltestrunner/metadata.xml
new file mode 100644
index 000000000000..dbb21d6b2945
--- /dev/null
+++ b/dev-util/shelltestrunner/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		shelltestrunner is a cross-platform tool for testing command-line
+		programs (or arbitrary shell commands.)  It reads simple declarative tests
+		specifying a command, some input, and the expected output, error output
+		and exit status.  Tests can be run selectively, in parallel, with a
+		timeout, in color, and/or with differences highlighted.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
new file mode 100644
index 000000000000..8df679d4e66f
--- /dev/null
+++ b/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A tool for testing command-line programs"
+HOMEPAGE="http://joyful.com/shelltestrunner"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cmdargs-0.7 <dev-haskell/cmdargs-0.11
+	>=dev-haskell/diff-0.2.0 <dev-haskell/diff-0.4
+	>=dev-haskell/filemanip-0.3 <dev-haskell/filemanip-0.4
+	<dev-haskell/hunit-1.3
+	<dev-haskell/parsec-3.2
+	>=dev-haskell/regex-tdfa-1.1 <dev-haskell/regex-tdfa-1.3
+	>=dev-haskell/test-framework-0.3.2 <dev-haskell/test-framework-0.9
+	>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+	>=dev-haskell/utf8-string-0.3.5 <dev-haskell/utf8-string-0.4
+	>=dev-lang/ghc-7.4.1
+"
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
new file mode 100644
index 000000000000..07e5b02740dc
--- /dev/null
+++ b/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A tool for testing command-line programs"
+HOMEPAGE="http://joyful.com/shelltestrunner"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
+	>=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:=
+	>=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:=
+	<dev-haskell/hunit-1.3:=
+	<dev-haskell/parsec-3.2:=
+	>=dev-haskell/pretty-show-1.6.5:=
+	>=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:=
+	dev-haskell/safe:=
+	>=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:=
+	>=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:=
+	>=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
new file mode 100644
index 000000000000..789290411114
--- /dev/null
+++ b/dev-util/shflags/Manifest
@@ -0,0 +1 @@
+DIST shflags-1.0.3.tgz 43549 SHA256 956a14771230760e24fa6ad5692bf858d1c9ee2d314320091fd045181cec8a22 SHA512 993f5b274855d5dea5d01d3a799cfd5ff6c5ff2bf153461983052a78d8a96f9b0ee44124b4c51977baa4905c86a3293778c5d7e154305ee051fcac03f6fe70cc WHIRLPOOL 90e7112e6087c50b502be35d6e665ccaa2e47e7619842a46c136dc4106fa9e7a0b986a0da7f316bf29ec00a1724c1dcc0dbc76a4194d5262eeabd93742d795c1
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
new file mode 100644
index 000000000000..b314e392fd19
--- /dev/null
+++ b/dev-util/shflags/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>shell-tools</herd>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">shflags</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/shflags/shflags-1.0.3.ebuild b/dev-util/shflags/shflags-1.0.3.ebuild
new file mode 100644
index 000000000000..6af28a4d8dcb
--- /dev/null
+++ b/dev-util/shflags/shflags-1.0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Command-line flags module for Unix shell scripts"
+HOMEPAGE="http://code.google.com/p/shflags/"
+SRC_URI="http://shflags.googlecode.com/files/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="examples"
+
+src_test() {
+	cd src
+	./shflags_test.sh || die
+}
+
+src_install() {
+	dohtml README.html
+	dodoc README.txt doc/*.txt
+	insinto /usr/share/misc
+	doins src/shflags
+	use examples && dodoc examples/*.sh
+}
diff --git a/dev-util/shtool/Manifest b/dev-util/shtool/Manifest
new file mode 100644
index 000000000000..c9956b38cae0
--- /dev/null
+++ b/dev-util/shtool/Manifest
@@ -0,0 +1 @@
+DIST shtool-2.0.8.tar.gz 97033 SHA256 1298a549416d12af239e9f4e787e6e6509210afb49d5cf28eb6ec4015046ae19 SHA512 f0c9292e8d980323d587b70e582574ba1cfe3c26296a01d51a2068a7886e5b1f501e8c5dc37b5d4b0f7a34217c7ad7f6f3011969d9c2d65776fe66e8287c1758 WHIRLPOOL d7c161a7b4492df79a0d1c20ee6bc25f920fd3bdf198dea46a0978121c8a128ce758af45c836f8e0b59b16dfa670ce03fc57ee073d2c69402abbc2a969ae38c9
diff --git a/dev-util/shtool/metadata.xml b/dev-util/shtool/metadata.xml
new file mode 100644
index 000000000000..028d1cef3af8
--- /dev/null
+++ b/dev-util/shtool/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>dev-tools</herd>
+</pkgmetadata>
diff --git a/dev-util/shtool/shtool-2.0.8.ebuild b/dev-util/shtool/shtool-2.0.8.ebuild
new file mode 100644
index 000000000000..fd7cb045203d
--- /dev/null
+++ b/dev-util/shtool/shtool-2.0.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A compilation of small but very stable and portable shell scripts into a single shell tool"
+HOMEPAGE="http://www.gnu.org/software/shtool/shtool.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+#SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6"
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README THANKS VERSION NEWS RATIONAL
+}
diff --git a/dev-util/shunit2/Manifest b/dev-util/shunit2/Manifest
new file mode 100644
index 000000000000..1d203f943326
--- /dev/null
+++ b/dev-util/shunit2/Manifest
@@ -0,0 +1 @@
+DIST shunit2-2.1.6.tgz 61558 SHA256 65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee SHA512 c78cf349d72a9048e4932108a62b2d1873019b9b1909c3fb1bd7e873e7bb62df58c1941d916508dc60ef6ba0261a2bc6ee9e25d654eefdcce997682f2bc748d7 WHIRLPOOL f20154214fa08db98ad6ffaef39b555079f1dd17cc04b3c15f206a4ae690b55a8dbff582c5440c232920dbb4013c0b292f9fe15aa7dcc64fb1a99e51189ddd92
diff --git a/dev-util/shunit2/metadata.xml b/dev-util/shunit2/metadata.xml
new file mode 100644
index 000000000000..800122e2b704
--- /dev/null
+++ b/dev-util/shunit2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dberkholz@gentoo.org</email>
+		<name>Donnie Berkholz</name>
+	</maintainer>
+	<longdescription>shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and
+  	it is designed to work in a similar manner to JUnit, PyUnit, etc. If you
+  	have ever had the desire to write a unit test for a shell script, shUnit2
+  	can do the job.</longdescription>
+	<upstream>
+		<remote-id type="google-code">shunit2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/shunit2/shunit2-2.1.6.ebuild b/dev-util/shunit2/shunit2-2.1.6.ebuild
new file mode 100644
index 000000000000..9b1eb16653fa
--- /dev/null
+++ b/dev-util/shunit2/shunit2-2.1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Unit-test framework for Bourne-based shell scripts"
+HOMEPAGE="http://code.google.com/p/shunit2/wiki/ProjectInfo"
+SRC_URI="http://shunit2.googlecode.com/files/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	net-misc/curl"
+
+src_install() {
+	dobin src/shunit2 || die
+
+	# For backwards compat to <=2.1.5
+	dosym /usr/bin/shunit2 /usr/share/shunit2/shunit2 || die
+
+	dodoc -r examples || die
+	dodoc doc/*.txt || die
+	dohtml doc/*.{html,css} || die
+}
diff --git a/dev-util/skelgen/Manifest b/dev-util/skelgen/Manifest
new file mode 100644
index 000000000000..0c067a207bc4
--- /dev/null
+++ b/dev-util/skelgen/Manifest
@@ -0,0 +1 @@
+DIST Fluid_Studios_Skeleton_Source_File_Generator-1.2.zip 218041 SHA256 6b502f4e9d171d00bc1f8f0147dd8adf75eb826a178c08bf5a5c8f7f839aff66 SHA512 7424f773cecefb9ce25712a22ba0a436f658125f2de4da55bba4717d23abea8c7ba7f7df48260dea96d40c98bb15ae6e07ffe3cb2aed4cb20603f0529cdca76b WHIRLPOOL 92851404a5487c536696e68b102dbb7f4e00f895d3300a4f7bdd76e72332f8ca75b1642ada257d807f5f0430bd2537f80fc354695c507beea4f1df06ee296419
diff --git a/dev-util/skelgen/files/skelgen-1.2-gcc43.patch b/dev-util/skelgen/files/skelgen-1.2-gcc43.patch
new file mode 100644
index 000000000000..3c65fda3a72a
--- /dev/null
+++ b/dev-util/skelgen/files/skelgen-1.2-gcc43.patch
@@ -0,0 +1,10 @@
+--- template.cpp.orig	2000-12-23 00:00:04.000000000 -0500
++++ template.cpp	2008-12-31 15:52:51.000000000 -0500
+@@ -31,6 +31,7 @@
+ // --------------------------------------------------------------------------------------------------------------------------------

+ 

+ #include "skelgen.h"

++#include "string.h"
+ 
+ // --------------------------------------------------------------------------------------------------------------------------------
+ 
diff --git a/dev-util/skelgen/metadata.xml b/dev-util/skelgen/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/skelgen/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/skelgen/skelgen-1.2.ebuild b/dev-util/skelgen/skelgen-1.2.ebuild
new file mode 100644
index 000000000000..845020460e64
--- /dev/null
+++ b/dev-util/skelgen/skelgen-1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A Skeleton Source File Generator"
+HOMEPAGE="http://www.fluidstudios.com/"
+SRC_URI="http://www.fluidstudios.com/pub/FluidStudios/Tools/Fluid_Studios_Skeleton_Source_File_Generator-${PV}.zip"
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=""
+S=${WORKDIR}/source
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_compile() {
+	# Makefile uses $STRIPPER to strip executable, so use true
+	# instead and let portage handle that.
+	emake \
+		COMPILER="$(tc-getCXX)" \
+		COMPILER_OPTIONS="-c ${CXXFLAGS}" \
+		LINKER="$(tc-getCXX) ${LDFLAGS}" \
+		STRIPPER="true"
+}
+
+src_install() {
+	dobin skelgen
+	dodoc readme.txt
+	dodoc macros/{common.macro,personal.macro,work.macro}
+	dodoc templates/{default.{cpp,h},fluid.{cpp,h},gpl.{c,h},skelgen.{cpp,h}}
+}
diff --git a/dev-util/skipfish/Manifest b/dev-util/skipfish/Manifest
new file mode 100644
index 000000000000..752fe06bd721
--- /dev/null
+++ b/dev-util/skipfish/Manifest
@@ -0,0 +1 @@
+DIST skipfish-2.10b.tgz 244528 SHA256 1a4fbc9d013f1f9b970946ea7228d943266127b7f4100c994ad26c82c5352a9e SHA512 ef961cbd6794083779a3e0d1a51dc68b6d0b580b840b213a16cf6dc4d2af858121db8527dcc590cf76efe6cdf0e2ee02dbb7a61956eb0017e9005a19f3537a74 WHIRLPOOL 7b22e892cd90a7ae616cf309849e5ec63b38224a670cbf726c2aeb1d66ea6a2aa7d69e5479d6c0b84f4fb48edf08bf4da7d76a727b0cc42b0f4e55bc8f0472c4
diff --git a/dev-util/skipfish/metadata.xml b/dev-util/skipfish/metadata.xml
new file mode 100644
index 000000000000..0d72971c67e1
--- /dev/null
+++ b/dev-util/skipfish/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>givi-zurabovich@mail.ru</email>
+		<name>Georgy Kovtunov</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">skipfish</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/skipfish/skipfish-2.10_beta.ebuild b/dev-util/skipfish/skipfish-2.10_beta.ebuild
new file mode 100644
index 000000000000..13a03f3cfc56
--- /dev/null
+++ b/dev-util/skipfish/skipfish-2.10_beta.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs versionator
+
+MY_P="$PN-$(get_version_component_range 1-2)b"
+
+DESCRIPTION="A fully automated, active web application security reconnaissance tool"
+HOMEPAGE="http://code.google.com/p/skipfish/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="Apache-2.0 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/openssl:0
+	dev-libs/libpcre
+	net-dns/libidn
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		-e '/CFLAGS_GEN/s:-g -ggdb::' \
+		-e '/CFLAGS_OPT/s:-O3::' \
+		Makefile || die
+
+	sed -i \
+		-e "/ASSETS_DIR/s:assets:/usr/share/doc/${PF}/html:" \
+		-e "/SIG_FILE/s:signatures/:/etc/skipfish/signatures/:" \
+		src/config.h || die
+
+	sed -i \
+		-e "s:signatures/:/etc/skipfish/signatures/:g" \
+		signatures/signatures.conf || die
+}
+
+src_compile() {
+	tc-export CC
+
+	local _debug
+	use debug && _debug=debug
+
+	emake ${_debug}
+}
+
+src_install() {
+	dobin ${PN}
+	doman doc/${PN}.1
+
+	insinto /etc/skipfish
+	doins -r signatures
+
+	insinto /usr/share/${PN}/dictionaries
+	doins dictionaries/*.wl
+
+	dohtml assets/*
+
+	dodoc ChangeLog README doc/*.txt
+}
diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
new file mode 100644
index 000000000000..567c255551f3
--- /dev/null
+++ b/dev-util/smem/Manifest
@@ -0,0 +1 @@
+DIST smem.pl.20071119_p1.bz2 794 SHA256 556300aaf70c1f2472cc36e93ac384f7b8c0bd56c0acfc5cef564cb0260e549f SHA512 452d10b2e3dda5d4167e62e3fd541f89f90cb07c431876e0fb671f30e224b8cd14a0268ab14243342c2188f3d3826e7a8303b3fd2eda393fdc8e31d0f1b1d575 WHIRLPOOL 90c241bcb0736261ad2d2c0b2f02c6c05707aa9940c7f478763d32b017cd583920f89a5e1317616cc7ec9d7b8c98eef2ed5f1e9307fe1352944261c5e1d855d5
diff --git a/dev-util/smem/metadata.xml b/dev-util/smem/metadata.xml
new file mode 100644
index 000000000000..9f002726a698
--- /dev/null
+++ b/dev-util/smem/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+    <name>Diego Pettenò</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/smem/smem-20071119_p1.ebuild b/dev-util/smem/smem-20071119_p1.ebuild
new file mode 100644
index 000000000000..335060bbdd1d
--- /dev/null
+++ b/dev-util/smem/smem-20071119_p1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A tool to parse smaps statistics"
+HOMEPAGE="http://bmaurer.blogspot.de/2006/03/memory-usage-with-smaps.html"
+SRC_URI="mirror://gentoo/smem.pl.${PV}.bz2
+	http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/smem.pl.${PV}.bz2"
+
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Linux-Smaps"
+
+src_compile() { :; }
+
+src_install() {
+	newbin smem.pl.${PV} smem || die
+}
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
new file mode 100644
index 000000000000..1442cf946c12
--- /dev/null
+++ b/dev-util/source-highlight/Manifest
@@ -0,0 +1 @@
+DIST source-highlight-3.1.7.tar.gz 1600692 SHA256 e1b2e007cdd94595393d42510e2a84763c36aad3409f0c3087f05fcb50a389e8 SHA512 4a1e733bd06468e6ebd023dfe4a62d7134c35aac311509a61e8d80de35ff3cea25fb79adb56bfe413ee214bbf4d578b4d4ebdcf1236481d9b83152aff6d7afb8 WHIRLPOOL 3d99a135abef73e865d2729bcbdf47fc7c143aeef91015b73a87d4a129323ca95aac153c3fa7d5207afb2a03ecba2f05db3e3ed8627b1e0477dcd9dfa830bbb7
diff --git a/dev-util/source-highlight/metadata.xml b/dev-util/source-highlight/metadata.xml
new file mode 100644
index 000000000000..5b2a5c55470b
--- /dev/null
+++ b/dev-util/source-highlight/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild b/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild
new file mode 100644
index 000000000000..ce23c9f7a9e3
--- /dev/null
+++ b/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit bash-completion-r1 versionator
+
+DESCRIPTION="Generate highlighted source code as an (x)html document"
+HOMEPAGE="http://www.gnu.org/software/src-highlite/source-highlight.html"
+SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+SLOT="0"
+IUSE="doc static-libs"
+
+DEPEND=">=dev-libs/boost-1.52.0-r1[threads]
+	dev-util/ctags"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--with-boost-regex="boost_regex" \
+		--without-bash-completion \
+		$(use_enable static-libs static)
+}
+
+src_install () {
+	DOCS="AUTHORS ChangeLog CREDITS NEWS README THANKS TODO.txt"
+	default
+
+	use static-libs || rm -rf "${D}"/usr/lib*/*.la
+
+	dobashcomp completion/source-highlight
+
+	# That's not how we want it
+	rm -fr "${ED}/usr/share"/{aclocal,doc}
+	use doc &&  dohtml -A java doc/*.{html,css,java}
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
+	default
+}
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
new file mode 100644
index 000000000000..11d7aee49d72
--- /dev/null
+++ b/dev-util/spec-cleaner/Manifest
@@ -0,0 +1 @@
+DIST spec-cleaner-0.7.1.tar.gz 80410 SHA256 880db846c443ef6bcc9b3f2ed871eeafc91987b3ee0deb6ae08fd601be7c9291 SHA512 1ec7c69e84ca8075e1580d64e090d871594af177fde7bbdc12ab721d62d1180d04fdc13cd771326cca47a504169ae0de62d5b46cb3f217bcd755e7ff67f0a32b WHIRLPOOL 84bf96b7ec5c110ba1e513811c9aa6a09af3c344da8cb7781025d8bd0eb679c316037f379c729dc45613e3215e1ab8fb70ed454c37a5b2d20a181cef9baa5def
diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml
new file mode 100644
index 000000000000..12ec8af3d77a
--- /dev/null
+++ b/dev-util/spec-cleaner/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>suse</herd>
+	<upstream>
+		<remote-id type="github">openSUSE/spec-cleaner</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/spec-cleaner/spec-cleaner-0.7.1.ebuild b/dev-util/spec-cleaner/spec-cleaner-0.7.1.ebuild
new file mode 100644
index 000000000000..20592dcd5458
--- /dev/null
+++ b/dev-util/spec-cleaner/spec-cleaner-0.7.1.ebuild
@@ -0,0 +1,44 @@
+# 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_4} )
+EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
+inherit distutils-r1
+[[ ${PV} == 9999 ]] && inherit git-r3
+
+DESCRIPTION="SUSE spec file cleaner and formatter"
+HOMEPAGE="https://github.com/openSUSE/spec-cleaner"
+[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+[[ ${PV} != 9999 ]] && \
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${PYTHON_DEPS}
+"
+
+[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	# we have libexec
+	sed -i \
+		-e 's:lib/obs:libexec/obs:g' \
+		setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	nosetests
+}
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
new file mode 100644
index 000000000000..20592dcd5458
--- /dev/null
+++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
@@ -0,0 +1,44 @@
+# 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_4} )
+EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
+inherit distutils-r1
+[[ ${PV} == 9999 ]] && inherit git-r3
+
+DESCRIPTION="SUSE spec file cleaner and formatter"
+HOMEPAGE="https://github.com/openSUSE/spec-cleaner"
+[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+[[ ${PV} != 9999 ]] && \
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${PYTHON_DEPS}
+"
+
+[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	# we have libexec
+	sed -i \
+		-e 's:lib/obs:libexec/obs:g' \
+		setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	nosetests
+}
diff --git a/dev-util/splint/Manifest b/dev-util/splint/Manifest
new file mode 100644
index 000000000000..0a7d3620d0d6
--- /dev/null
+++ b/dev-util/splint/Manifest
@@ -0,0 +1 @@
+DIST splint-3.1.2.src.tgz 2284033 SHA256 c78db643df663313e3fa9d565118391825dd937617819c6efc7966cdf444fb0a SHA512 9bbf3f6575763c022940efde947f845f52095a1bcf645f7f4a98feb335b62d2bd50d78420e7fe95f81eb139b110d8fe48112b025deace45f7994360b20d47e0b WHIRLPOOL 092afab6adee524b93a06c4674941bb5a21c838226fa8fa0d5536e97d1411ee43d472212f5aa3677431b59eef325837bf6521ba62163df54f302b6ac1c279313
diff --git a/dev-util/splint/files/splint-3.1.2-musl.patch b/dev-util/splint/files/splint-3.1.2-musl.patch
new file mode 100644
index 000000000000..bf8c770b2ef5
--- /dev/null
+++ b/dev-util/splint/files/splint-3.1.2-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/osd.c
++++ b/src/osd.c
+@@ -516,7 +516,7 @@
+ # if defined (WIN32) || defined (OS2) && defined (__IBMC__)
+   int pid = _getpid ();
+ # else
+-  __pid_t pid = getpid ();
++  pid_t pid = getpid ();
+ # endif
+ 
+   return (int) pid;
diff --git a/dev-util/splint/metadata.xml b/dev-util/splint/metadata.xml
new file mode 100644
index 000000000000..c3a21340a392
--- /dev/null
+++ b/dev-util/splint/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>jer@gentoo.org</email>
+	<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/splint/splint-3.1.2-r1.ebuild b/dev-util/splint/splint-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..abe3bdd6db0d
--- /dev/null
+++ b/dev-util/splint/splint-3.1.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="Check C programs for vulnerabilities and programming mistakes"
+HOMEPAGE="http://lclint.cs.virginia.edu/"
+SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+
+DEPEND="
+	sys-devel/flex
+"
+
+src_prepare() {
+	# verbose compiler calls
+	sed -i -e '/Compiling/d' src/Makefile.am || die
+	# automake complains about trailing \
+	sed -i -e '1600d' test/Makefile.am || die
+	# do not install these header files twice
+	sed -i -e '/\$(UnixHeaders)/s|stdio.h stdlib.h||g' lib/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# We do not need bison/yacc at all here
+	# We definitely need libfl
+	BISON=no LEXLIB=-lfl econf
+}
+
+src_compile() {
+	local subdir
+	# skip test/ subdir
+	for subdir in src lib imports doc; do
+		emake -j1 -C ${subdir}
+	done
+}
+
+src_test() {
+	emake -C test
+}
diff --git a/dev-util/splint/splint-3.1.2-r2.ebuild b/dev-util/splint/splint-3.1.2-r2.ebuild
new file mode 100644
index 000000000000..547f8f65e3f9
--- /dev/null
+++ b/dev-util/splint/splint-3.1.2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Check C programs for vulnerabilities and programming mistakes"
+HOMEPAGE="http://lclint.cs.virginia.edu/"
+SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	sys-devel/flex
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.2-musl.patch
+
+	# verbose compiler calls
+	sed -i -e '/Compiling/d' src/Makefile.am || die
+	# automake complains about trailing \
+	sed -i -e '1600d' test/Makefile.am || die
+	# do not install these header files twice
+	sed -i -e '/\$(UnixHeaders)/s|stdio.h stdlib.h||g' lib/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# We do not need bison/yacc at all here
+	# We definitely need libfl
+	BISON=no LEXLIB=-lfl econf
+}
+
+src_compile() {
+	local subdir
+	# skip test/ subdir
+	for subdir in src lib imports doc; do
+		emake -j1 -C ${subdir}
+	done
+}
+
+src_test() {
+	emake -C test
+}
diff --git a/dev-util/squashdelta/Manifest b/dev-util/squashdelta/Manifest
new file mode 100644
index 000000000000..d5d57673555b
--- /dev/null
+++ b/dev-util/squashdelta/Manifest
@@ -0,0 +1 @@
+DIST squashdelta-0.1.tar.bz2 77702 SHA256 732b0c05085d2d2f14329e0edd3a4b4f15ff315b8b47cac553e6be3c5f9f3f5a SHA512 1ce93b59b6c51be49aaaee9576049677c8ba146fa3a17c7d3552440a1c0ebe93fb4d8cbe1182db691e2c9552713ecfeef0e50d95f7e94218c341c51364bf724f WHIRLPOOL 1ff9fe6a653ca394e5fc1d32bf420880d2e2036d11560cf9ad9cf23535d4c8a60758a7da5e81121d8fa5fe053f1cac83d161057a84076327315b1c35a1d30e3a
diff --git a/dev-util/squashdelta/metadata.xml b/dev-util/squashdelta/metadata.xml
new file mode 100644
index 000000000000..9487ce936359
--- /dev/null
+++ b/dev-util/squashdelta/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
+	</use>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://bitbucket.org/mgorny/squashdelta/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/squashdelta</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/squashdelta/squashdelta-0.1.ebuild b/dev-util/squashdelta/squashdelta-0.1.ebuild
new file mode 100644
index 000000000000..93cd33b1bd39
--- /dev/null
+++ b/dev-util/squashdelta/squashdelta-0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
+HOMEPAGE="https://bitbucket.org/mgorny/squashdelta/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+# uses public-domain murmurhash3
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lz4 +lzo"
+
+COMMON_DEPEND="
+	lz4? ( app-arch/lz4:0= )
+	lzo? ( dev-libs/lzo:2= )"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/xdelta:3"
+DEPEND=${COMMON_DEPEND}
+
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable lz4)
+		$(use_enable lzo)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/squashdelta/squashdelta-9999.ebuild b/dev-util/squashdelta/squashdelta-9999.ebuild
new file mode 100644
index 000000000000..54ce642990dc
--- /dev/null
+++ b/dev-util/squashdelta/squashdelta-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
+HOMEPAGE="https://bitbucket.org/mgorny/squashdelta/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+# uses public-domain murmurhash3
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lz4 +lzo"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+#endif
+
+COMMON_DEPEND="
+	lz4? ( app-arch/lz4:0= )
+	lzo? ( dev-libs/lzo:2= )"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/xdelta:3"
+DEPEND=${COMMON_DEPEND}
+
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable lz4)
+		$(use_enable lzo)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/squashmerge/Manifest b/dev-util/squashmerge/Manifest
new file mode 100644
index 000000000000..85828b894243
--- /dev/null
+++ b/dev-util/squashmerge/Manifest
@@ -0,0 +1 @@
+DIST squashmerge-0.1.tar.bz2 76678 SHA256 f4c1c16ae91517191f64718f9e2e0d1f89efcbe56280b70d5c82e2b2f0447d3d SHA512 a12e78d79a3f212a65c0b979a1ca3de9532ebf33f891ae2fd216425cd044a6f3357496e9f37bebc53a067aa592f7a1eecdeee653929eb443426e48fe342c7683 WHIRLPOOL c559f79a8d43e9cf30a8850d62e6c9e374f32ea4bdb10f168b8ce7aef2a0b11b50c4c54e776a703628810cb8d9e7d6c323ab8378d1ac9f0c0b5c6f55d0589071
diff --git a/dev-util/squashmerge/metadata.xml b/dev-util/squashmerge/metadata.xml
new file mode 100644
index 000000000000..6973616f95ce
--- /dev/null
+++ b/dev-util/squashmerge/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
+	</use>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://bitbucket.org/mgorny/squashmerge/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/squashmerge</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/squashmerge/squashmerge-0.1.ebuild b/dev-util/squashmerge/squashmerge-0.1.ebuild
new file mode 100644
index 000000000000..cafb308e5c6a
--- /dev/null
+++ b/dev-util/squashmerge/squashmerge-0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="dev-util/squashdelta delta merge tool"
+HOMEPAGE="https://bitbucket.org/mgorny/squashmerge/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lz4 +lzo"
+
+COMMON_DEPEND="
+	lz4? ( app-arch/lz4:0= )
+	lzo? ( dev-libs/lzo:2= )"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/xdelta:3"
+DEPEND=${COMMON_DEPEND}
+
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
+
+DOCS=( FORMAT )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable lz4)
+		$(use_enable lzo)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/squashmerge/squashmerge-9999.ebuild b/dev-util/squashmerge/squashmerge-9999.ebuild
new file mode 100644
index 000000000000..bda7ce79054e
--- /dev/null
+++ b/dev-util/squashmerge/squashmerge-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+DESCRIPTION="dev-util/squashdelta delta merge tool"
+HOMEPAGE="https://bitbucket.org/mgorny/squashmerge/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lz4 +lzo"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+#endif
+
+COMMON_DEPEND="
+	lz4? ( app-arch/lz4:0= )
+	lzo? ( dev-libs/lzo:2= )"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/xdelta:3"
+DEPEND=${COMMON_DEPEND}
+
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
+
+DOCS=( FORMAT )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable lz4)
+		$(use_enable lzo)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
new file mode 100644
index 000000000000..9fe530a61ce4
--- /dev/null
+++ b/dev-util/strace/Manifest
@@ -0,0 +1,9 @@
+DIST strace-4.10.tar.xz 601856 SHA256 e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2 SHA512 53d55b749224927cfcc9783db57eb8a057fc1329b2f5da2f54299dab17d530f5d1359480f03bea307fb72f6f372e50a0dbf0bd25d36a57a77632d9c1f690fc1d WHIRLPOOL f177d980248892a99b2ed4c5d0275bc735200a597e9b6edf3bb68b8839b2bf090628f2760ffad1a4d1f862b83602cf587a63f3af288978ca2fa54cc221da4e6f
+DIST strace-4.5.19.tar.bz2 499565 SHA256 8997ce919e971b0ec45cd7006c6e1f9c7c0bce68ab59e3a629e1ddeda5013d08 SHA512 a7e500a7f47b5b22621efa723d5d522dd26bf2de908c7056531378661977c5671bff9892519db5870b8d448f943879b03beeb31a323a2f2305f2042d0f7c05c4 WHIRLPOOL 95162fb6adfe667da717897b7902f06642a6ea70a09fb4fd12156a2030341d73ea959061d366131b9d361e4de7fe672b7323fb484e63158ceae477eec6192ca7
+DIST strace-4.5.20-ioctls.patch.bz2 3497 SHA256 41235dbda6cc054b6f0c65a860be25e3d1723dff53f553e4a87e41ecb5bd8250 SHA512 f9dfcfca8fb58184f7a99548efcda22ac574b34ec46038a68f04fe70b3a9bbd99e9746dc3681945d4ad3c66cc678ec672d66dd2007eb19ea95faaa7f78440262 WHIRLPOOL 3228eeaf82749e520fff5143930b46ce6f3214f32d7c4b37e4ea6b9e5db770e0b5fd38ae0df44e00e3ac4b3dfda72edab3670cfd429961824d114c09ad852e4e
+DIST strace-4.5.20.tar.bz2 504078 SHA256 ea8c059369eaa5ad90b246f34eab247d0ee48bfdee2670c7196320a4669ccabd SHA512 b5adcbd00960580adf9441068d252216a40fcc4dca7888447f2de941b33e28bdd75058f3a7126eb487bc93f100b1f660d0fc5998885ca76929e5a0ce2069f2db WHIRLPOOL e75074d5fd04ed58da27ecb7d6c2ac2bd532ae52cfe2075fbdef965fe74e575acf07efb4d6bd0a57b3cba2d130f9e57cb93fa27efa95a2faebef0e96a9f831f9
+DIST strace-4.6-x32.patch.xz 142780 SHA256 78d196ea92d6d23a390ec8d00c7b4832f01204aa83b4ee52d1fadd32c993d72a SHA512 8ec318853964b7492e358f0513b1cd737ecb8bc526d76f0f89fe9d112259e48e2e4accf5f3059897fbe007bdf810f188504f702a40efd4d7d37c8c60b1b0e8cf WHIRLPOOL 2af1e353ffdcea032657322ea012a898e0de42bc7baae0c2f54ee86ef673c2fee910b5fadaf9d5c6eca3166e2b5df14babc8a8cc4c33a3bb5f1c0dc96bc29473
+DIST strace-4.6.tar.xz 403788 SHA256 9ef9aa41b6118578e33ef4833b8a04209d6cc062546c28efd715f283b172c28a SHA512 09246a2b104b66f407d35d25407def13a49aaab1fefdb5c3693503d066f18c20b68057fdf7954feaff7281b37b2e503b43eba89b7977108d84cb51e16b57cb43 WHIRLPOOL 603283ad88a421b2da9b785adb688edd25529947cdba9dfaa1beea7d095d613c6bfb5c6cb53590dd4779c40965a2fbdd87abee2e5a430a32d6d3f059f514ef77
+DIST strace-4.7.tar.xz 403280 SHA256 c49cd98873c119c5f201356200a9b9687da1ceea83a05047e2ae0a7ac1e41195 SHA512 52bcdd4b7a842b20233737197aeb5baf12533ea088568c9eeb644172420b98c79b86213c8068b49733da0a790031301b832489f87244bc65460971d1b0398d1e WHIRLPOOL 7f19233da30b0eb3d30aa79a881ad0bc6fed818557a55f9193511fb990e0af9ce7f8f792c395691bbedfb66b71427b0c743ea45819d039491cb02dccb29f4565
+DIST strace-4.8.tar.xz 441712 SHA256 f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8 SHA512 c3316382f60cd4d02eec1eef46a0ef2d000afbccf2c176a6fec652e1b3391685f0e33f184497cb3ccf54d72d460471a4945d3a864fb5bce1f45f32fdf132cfe3 WHIRLPOOL 0ca28920b73d3b70a87bffff77c9af6bb9179f0918589f90613e68a499f84cc399e306b4f1832e1dd9e825c94671fcb69a5f08f6c64e6000411553e0b911e6d2
+DIST strace-4.9.tar.xz 521728 SHA256 095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65 SHA512 70d03b74067ad03940cda72dc057a44a8a33fc55790a8a3bfffb1c4d7442c2de7f3e975a01dc7c7b0430342e492579b2f3a007242d13c8a0feba1a1989f42b7b WHIRLPOOL cbe2a859f6dfb82c3df652ed1fbe8982348f9c6ab61491153ce735e857275904639c003853a02188f8bc567d2eae7a710683b09d9cff67c3a4b8d7a0eb9a082e
diff --git a/dev-util/strace/files/strace-4.5.20-sparc.patch b/dev-util/strace/files/strace-4.5.20-sparc.patch
new file mode 100644
index 000000000000..daae6accdb42
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.20-sparc.patch
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/336939
+
+From b7915d15b813c56a36510e942fa4e5ec21307924 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= <fs@debian.org>
+Date: Thu, 29 Apr 2010 00:48:45 +0200
+Subject: [PATCH] linux/sparc: add missing syscall declarations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* linux/sparc/syscall.h: Sync with linux/syscall.h
+
+Signed-off-by: Frederik Schüler <fs@debian.org>
+---
+ linux/sparc/syscall.h |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/linux/sparc/syscall.h b/linux/sparc/syscall.h
+index 03e3a71..07bc777 100644
+--- a/linux/sparc/syscall.h
++++ b/linux/sparc/syscall.h
+@@ -208,12 +208,17 @@ int	sys_timer_create(), sys_timer_settime(), sys_timer_gettime();
+ int	sys_io_setup(), sys_io_destroy(), sys_io_submit(), sys_io_cancel(), sys_io_getevents();
+ int	sys_mq_open(), sys_mq_unlink(), sys_mq_timedsend(), sys_mq_timedreceive(), sys_mq_notify(), sys_mq_getsetattr();
+ int	sys_waitid();
++int	sys_mbind(), sys_get_mempolicy(), sys_set_mempolicy();
++int	sys_utimensat();
++int	sys_fallocate(), sys_timerfd_create(), sys_timerfd_settime(), sys_timerfd_gettime();
+ int	sys_openat(), sys_mkdirat(), sys_mknodat(), sys_fchownat(), sys_futimesat(), sys_newfstatat(), sys_unlinkat(), sys_renameat(), sys_linkat(), sys_symlinkat(), sys_readlinkat(), sys_fchmodat(),	sys_faccessat();
+ int	sys_pselect6(), sys_ppoll();
+ int	sys_unshare();
+ int	sys_move_pages(), sys_getcpu();
+ int	sys_epoll_pwait();
+ int	sys_signalfd(), sys_timerfd(), sys_eventfd();
++int	sys_signalfd4(), sys_eventfd2(), sys_epoll_create1(), sys_dup3(), sys_pipe2();
++int	sys_inotify_init1();
+ 
+ #  define SYS_socket_subcall	353
+ #define SYS_sub_socket		(SYS_socket_subcall + 1)
+-- 
+1.7.2
+
diff --git a/dev-util/strace/files/strace-4.7-glibc-2.15.patch b/dev-util/strace/files/strace-4.7-glibc-2.15.patch
new file mode 100644
index 000000000000..c23a86ff98a1
--- /dev/null
+++ b/dev-util/strace/files/strace-4.7-glibc-2.15.patch
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/414637
+
+From 302e8ec6cd62912a3cd6494ce6702f4ad8dae0e2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 4 May 2012 19:30:59 -0400
+Subject: [PATCH] util: fix building when glibc has a stub process_vm_readv
+
+If you have a newer glibc which provides process_vm_readv, but it is built
+against older kernel headers which lack __NR_process_vm_readv, the library
+will contain a stub implementation that just returns ENOSYS.  Autoconf
+checks for this case explicitly and will declare it as unavailable.  So we
+end up in a case where the headers provide the prototype, but autoconf has
+not defined HAVE_PROCESS_VM_READV, so we hit the same build failure again:
+
+util.c:738:16: error: static declaration of 'process_vm_readv' follows non-static declaration
+/usr/include/bits/uio.h:58:16: note: previous declaration of 'process_vm_readv' was here
+
+So rename our local function to something unique, and add a define so the
+callers all hit the right place.
+
+* util.c (strace_process_vm_readv): Rename from process_vm_readv.
+(process_vm_readv): Define to strace_process_vm_readv.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ util.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/util.c b/util.c
+index d347bd8..f27acdf 100644
+--- a/util.c
++++ b/util.c
+@@ -735,7 +735,8 @@ static bool process_vm_readv_not_supported = 0;
+ 
+ #if defined(__NR_process_vm_readv)
+ static bool process_vm_readv_not_supported = 0;
+-static ssize_t process_vm_readv(pid_t pid,
++/* Have to avoid duplicating with the C library headers. */
++static ssize_t strace_process_vm_readv(pid_t pid,
+ 		 const struct iovec *lvec,
+ 		 unsigned long liovcnt,
+ 		 const struct iovec *rvec,
+@@ -744,6 +745,7 @@ static ssize_t process_vm_readv(pid_t pid,
+ {
+ 	return syscall(__NR_process_vm_readv, (long)pid, lvec, liovcnt, rvec, riovcnt, flags);
+ }
++#define process_vm_readv strace_process_vm_readv
+ #else
+ static bool process_vm_readv_not_supported = 1;
+ # define process_vm_readv(...) (errno = ENOSYS, -1)
+-- 
+1.7.9.7
+
diff --git a/dev-util/strace/files/strace-4.7-x32.patch b/dev-util/strace/files/strace-4.7-x32.patch
new file mode 100644
index 000000000000..4a7a3db41682
--- /dev/null
+++ b/dev-util/strace/files/strace-4.7-x32.patch
@@ -0,0 +1,89 @@
+From 364ed4f14c5edb5ddbc79c72d22498219033b29d Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 4 Jun 2012 13:19:42 -0400
+Subject: [PATCH] x32: update syscall table
+
+This syncs with the syscall table as it is in linux 3.4.
+
+* linux/x32/syscallent.h (59): Fix comment typo.
+(78): Add missing getdents entry.
+(174): Delete create_module entry (not in the kernel).
+(181, 182, 183, 184, 185): Add missing entries.
+(524, 536, 539, 540): Fix spacing.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ linux/x32/syscallent.h |   24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/linux/x32/syscallent.h b/linux/x32/syscallent.h
+index fcb6a23..ee4c4ce 100644
+--- a/linux/x32/syscallent.h
++++ b/linux/x32/syscallent.h
+@@ -57,7 +57,7 @@
+ 	{ 5,	TP,	sys_clone,		"clone"		},  /* 56 */
+ 	{ 0,	TP,	sys_fork,		"fork"		},  /* 57 */
+ 	{ 0,	TP,	sys_vfork,		"vfork"		},  /* 58 */
+-	{ },							    /* 47 */
++	{ },							    /* 59 */
+ 	{ 1,	TP,	sys_exit,		"_exit"		},  /* 60 */
+ 	{ 4,	TP,	sys_wait4,		"wait4"		},  /* 61 */
+ 	{ 2,	TS,	sys_kill,		"kill"		},  /* 62 */
+@@ -76,7 +76,7 @@
+ 	{ 1,	TD,	sys_fdatasync,		"fdatasync"	},  /* 75 */
+ 	{ 2,	TF,	sys_truncate,		"truncate"	},  /* 76 */
+ 	{ 2,	TD,	sys_ftruncate,		"ftruncate"	},  /* 77 */
+-	{ },							    /* 78 */
++	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 78 */
+ 	{ 2,	TF,	sys_getcwd,		"getcwd"	},  /* 79 */
+ 	{ 1,	TF,	sys_chdir,		"chdir"		},  /* 80 */
+ 	{ 1,	TD,	sys_fchdir,		"fchdir"	},  /* 81 */
+@@ -172,18 +172,18 @@
+ 	{ 2,	0,	sys_setdomainname,	"setdomainname"	},  /* 171 */
+ 	{ 1,	0,	sys_iopl,		"iopl"		},  /* 172 */
+ 	{ 3,	0,	sys_ioperm,		"ioperm"	},  /* 173 */
+-	{ 2,	0,	sys_create_module,	"create_module"	},  /* 174 */
++	{ },  /* 174 */
+ 	{ 3,	0,	sys_init_module,	"init_module"	},  /* 175 */
+ 	{ 2,	0,	sys_delete_module,	"delete_module"	},  /* 176 */
+ 	{ },							    /* 177 */
+ 	{ },							    /* 178 */
+ 	{ 4,	0,	sys_quotactl,		"quotactl"	},  /* 179 */
+ 	{ },							    /* 180 */
+-	{ },							    /* 181 */
+-	{ },							    /* 182 */
+-	{ },							    /* 183 */
+-	{ },							    /* 184 */
+-	{ },							    /* 185 */
++	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 181 */
++	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 182 */
++	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	},  /* 183 */
++	{ 3,	0,	sys_tuxcall,		"tuxcall"	}, /* 184 */
++	{ 3,	0,	sys_security,		"security"	}, /* 185 */
+ 	{ 0,	0,	sys_gettid,		"gettid"	}, /* 186 */
+ 	{ 4,	TD,	sys_readahead,		"readahead"	}, /* 187 */
+ 	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 188 */
+@@ -325,7 +325,7 @@
+ 	{ 4,	0,	sys_ptrace,		"ptrace"	},  /* 521 */
+ 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	},  /* 522 */
+ 	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait" },  /* 523 */
+-	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo" },  /* 524 */
++	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo" },  /* 524 */
+ 	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	},  /* 525 */
+ 	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 526 */
+ 	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 527 */
+@@ -337,8 +337,8 @@
+ 	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 533 */
+ 	{ 5,	TD,	sys_preadv,		"preadv"	}, /* 534 */
+ 	{ 5,	TD,	sys_pwritev,		"pwritev"	}, /* 535 */
+-	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"}, /* 536 */
++	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo" }, /* 536 */
+ 	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 537 */
+ 	{ 4,	TN,	sys_sendmmsg,		"sendmmsg"	}, /* 538 */
+-	{ 6,	0,	sys_process_vm_readv,	"process_vm_readv"}, /* 539 */
+-	{ 6,	0,	sys_process_vm_writev,	"process_vm_writev"}, /* 540 */
++	{ 6,	0,	sys_process_vm_readv,	"process_vm_readv" }, /* 539 */
++	{ 6,	0,	sys_process_vm_writev,	"process_vm_writev" }, /* 540 */
+-- 
+1.7.9.7
+
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
new file mode 100644
index 000000000000..392a501dd31a
--- /dev/null
+++ b/dev-util/strace/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>base-system</herd>
+  <use>
+    <flag name="aio">
+      Enable <pkg>dev-libs/libaio</pkg> support for tracing Asynchronous I/O operations
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">strace</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/strace/strace-4.10.ebuild b/dev-util/strace/strace-4.10.ebuild
new file mode 100644
index 000000000000..289f2f73c3e9
--- /dev/null
+++ b/dev-util/strace/strace-4.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
+	inherit git-2 autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static"
+
+# strace only uses the header from libaio to decode structs
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers"
+RDEPEND="perl? ( dev-lang/perl )"
+
+src_prepare() {
+	if epatch_user || [[ ! -e configure ]] ; then
+		# git generation
+		./xlat/gen.sh
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	export ac_cv_header_libaio_h=$(usex aio)
+}
+
+src_install() {
+	default
+	use perl || rm "${ED}"/usr/bin/strace-graph
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-4.5.19.ebuild b/dev-util/strace/strace-4.5.19.ebuild
new file mode 100644
index 000000000000..af80b230960d
--- /dev/null
+++ b/dev-util/strace/strace-4.5.19.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit flag-o-matic
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="static aio"
+
+# strace only uses the header from libaio
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )"
+RDEPEND=""
+
+src_compile() {
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	use aio || export ac_cv_header_libaio_h=no #
+	econf || die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog CREDITS NEWS PORTING README* TODO
+}
diff --git a/dev-util/strace/strace-4.5.20-r2.ebuild b/dev-util/strace/strace-4.5.20-r2.ebuild
new file mode 100644
index 000000000000..aea62df0f733
--- /dev/null
+++ b/dev-util/strace/strace-4.5.20-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	http://dev.gentoo.org/~flameeyes/patches/${PN}/${P}-ioctls.patch.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="static aio"
+
+# strace only uses the header from libaio
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sparc.patch #336939
+	epatch "${WORKDIR}"/${P}-ioctls.patch
+}
+
+src_configure() {
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	use aio || export ac_cv_header_libaio_h=no
+
+	econf
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog CREDITS NEWS PORTING README* TODO
+}
diff --git a/dev-util/strace/strace-4.5.20.ebuild b/dev-util/strace/strace-4.5.20.ebuild
new file mode 100644
index 000000000000..fa429f4ea691
--- /dev/null
+++ b/dev-util/strace/strace-4.5.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="static aio"
+
+# strace only uses the header from libaio
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sparc.patch #336939
+
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	use aio || export ac_cv_header_libaio_h=no #
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog CREDITS NEWS PORTING README* TODO
+}
diff --git a/dev-util/strace/strace-4.6.ebuild b/dev-util/strace/strace-4.6.ebuild
new file mode 100644
index 000000000000..258f0ad58bde
--- /dev/null
+++ b/dev-util/strace/strace-4.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit flag-o-matic eutils autotools
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}-x32.patch.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="static aio"
+
+# strace only uses the header from libaio
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers"
+RDEPEND=""
+
+src_prepare() {
+	if has x32 $(get_all_abis) ; then
+		epatch "${WORKDIR}"/${P}-x32.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	use aio || export ac_cv_header_libaio_h=no
+
+	econf
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog CREDITS NEWS PORTING README* TODO
+}
diff --git a/dev-util/strace/strace-4.7.ebuild b/dev-util/strace/strace-4.7.ebuild
new file mode 100644
index 000000000000..197651b5108b
--- /dev/null
+++ b/dev-util/strace/strace-4.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
+	inherit git-2 autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="static aio"
+
+# strace only uses the header from libaio to decode structs
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc-2.15.patch #414637
+	epatch "${FILESDIR}"/${P}-x32.patch
+
+	if epatch_user || [[ ! -e configure ]] ; then
+		# git generation
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	export ac_cv_header_libaio_h=$(usex aio)
+}
+
+src_install() {
+	default
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-4.8.ebuild b/dev-util/strace/strace-4.8.ebuild
new file mode 100644
index 000000000000..021671ea7dba
--- /dev/null
+++ b/dev-util/strace/strace-4.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
+	inherit git-2 autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio +perl static"
+
+# strace only uses the header from libaio to decode structs
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers"
+RDEPEND=""
+
+src_prepare() {
+	if epatch_user || [[ ! -e configure ]] ; then
+		# git generation
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	export ac_cv_header_libaio_h=$(usex aio)
+}
+
+src_install() {
+	default
+	use perl || rm "${ED}"/usr/bin/strace-graph
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-4.9.ebuild b/dev-util/strace/strace-4.9.ebuild
new file mode 100644
index 000000000000..287aa8b3dfb3
--- /dev/null
+++ b/dev-util/strace/strace-4.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
+	inherit git-2 autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio +perl static"
+
+# strace only uses the header from libaio to decode structs
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers"
+RDEPEND=""
+
+src_prepare() {
+	if epatch_user || [[ ! -e configure ]] ; then
+		# git generation
+		./xlat/gen.sh
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	export ac_cv_header_libaio_h=$(usex aio)
+}
+
+src_install() {
+	default
+	use perl || rm "${ED}"/usr/bin/strace-graph
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
new file mode 100644
index 000000000000..289f2f73c3e9
--- /dev/null
+++ b/dev-util/strace/strace-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
+	inherit git-2 autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://sourceforge.net/projects/strace/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static"
+
+# strace only uses the header from libaio to decode structs
+DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers"
+RDEPEND="perl? ( dev-lang/perl )"
+
+src_prepare() {
+	if epatch_user || [[ ! -e configure ]] ; then
+		# git generation
+		./xlat/gen.sh
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	export ac_cv_header_libaio_h=$(usex aio)
+}
+
+src_install() {
+	default
+	use perl || rm "${ED}"/usr/bin/strace-graph
+	dodoc CREDITS
+}
diff --git a/dev-util/stressapptest/Manifest b/dev-util/stressapptest/Manifest
new file mode 100644
index 000000000000..be0b0ff14f72
--- /dev/null
+++ b/dev-util/stressapptest/Manifest
@@ -0,0 +1,3 @@
+DIST stressapptest-1.0.4_autoconf.tar.gz 200370 SHA256 c8c83419e800504682506e10800763759f3f339b2158bae1329bb145ff981b65 SHA512 bcc81057361c9ae09562106398f1a3d6b5a0a41e4bf4e7b61ca8f05144a4295e642136dd5441ad1950b5c2785476593ad30d03052e4fe9e9f4071aabd33b123f WHIRLPOOL fe8befb6f76c33c4b2d525064c47e3b9c69a1352b6a0eb502c06ca3b12143aa7a3127e9b944ab1c871937345978ddc6598f1dbe2f3fb7cd3dc6dd65b4563b537
+DIST stressapptest-1.0.6_autoconf.tar.gz 208918 SHA256 31b04bbd964431668977a89aee44b241cb54a5e84c3abf6132507545b286cdd9 SHA512 92a1258cc67f49de55f3cc1fa4e3fa627ed77aa033790f8af2b5d006799ff1aeef5b8e35dbeb52c777f9b4dad08ab6e4dfe445bc05e977c0f7c4a15c0cf46331 WHIRLPOOL 7e916e74e87ef935894c134ea867a077bc761b1959c3b2063b6b5ee5b2bae473d56a7e19423eb8d6c0be0a4f6dab29bad7c20eb5f2d68cee66210a6da2306921
+DIST stressapptest-1.0.7_p1.tar.xz 165876 SHA256 39183d4dd79ae37e7ad480a4b9254ff52bcc926e853e954df492b51db3ee3b04 SHA512 ac3c072eae6f13ba6608d2cee1ee33b5d27b078dbbcb9e7ae1e59507d4571e36a06dd0e19e4a1b705c916104e06be39aa93ebe607fe93d5669e8764c68904fc9 WHIRLPOOL 374a8c86dc2742187c001580ec335b72822f0ac44ba2694bdabf6991765126fedca8928862db56c827f24e9e11c5f7f8b6654d0e04a94ba5a4a284f608f28bf1
diff --git a/dev-util/stressapptest/files/stressapptest-1.0.4-cpuid-pic.patch b/dev-util/stressapptest/files/stressapptest-1.0.4-cpuid-pic.patch
new file mode 100644
index 000000000000..740349bc6f1f
--- /dev/null
+++ b/dev-util/stressapptest/files/stressapptest-1.0.4-cpuid-pic.patch
@@ -0,0 +1,43 @@
+http://code.google.com/p/stressapptest/issues/detail?id=26
+
+--- a/src/os.cc
++++ b/src/os.cc
+@@ -149,7 +149,16 @@ void OsLayer::GetFeatures() {
+   // http://www.sandpile.org/ia32/cpuid.htm
+   int ax, bx, cx, dx;
+   __asm__ __volatile__ (
+-      "cpuid": "=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) : "a" (1));
++# if defined(STRESSAPPTEST_CPU_I686) && defined(__PIC__)
++      "xchg %%ebx, %%esi;"
++      "cpuid;"
++      "xchg %%esi, %%ebx;"
++      : "=S" (bx),
++# else
++      "cpuid;"
++      : "=b" (bx),
++# endif
++        "=a" (ax), "=c" (cx), "=d" (dx) : "a" (1));
+   has_clflush_ = (dx >> 19) & 1;
+   has_sse2_ = (dx >> 26) & 1;
+ 
+--- a/src/worker.cc
++++ b/src/worker.cc
+@@ -85,7 +85,17 @@ namespace {
+   inline int apicid(void) {
+     int cpu;
+ #if defined(STRESSAPPTEST_CPU_X86_64) || defined(STRESSAPPTEST_CPU_I686)
+-    __asm __volatile("cpuid" : "=b" (cpu) : "a" (1) : "cx", "dx");
++    __asm__ __volatile__ (
++# if defined(STRESSAPPTEST_CPU_I686) && defined(__PIC__)
++        "xchg %%ebx, %%esi;"
++        "cpuid;"
++        "xchg %%esi, %%ebx;"
++        : "=S" (cpu)
++# else
++        "cpuid;"
++        : "=b" (cpu)
++# endif
++        : "a" (1) : "cx", "dx");
+ #elif defined(STRESSAPPTEST_CPU_ARMV7A)
+   #warning "Unsupported CPU type ARMV7A: unable to determine core ID."
+     cpu = 0;
diff --git a/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch b/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch
new file mode 100644
index 000000000000..db5103d34584
--- /dev/null
+++ b/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch
@@ -0,0 +1,145 @@
+From fdc52203836f7fd54e1bff84e11d26838a8f21bc Mon Sep 17 00:00:00 2001
+From: "nick.j.sanders@gmail.com"
+ <nick.j.sanders@gmail.com@93e54ea4-8218-11de-8aaf-8d8425684b44>
+Date: Tue, 11 Feb 2014 08:53:31 +0000
+Subject: [PATCH] Fix autoconf bugs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Correctly use autoconf host rather than target.
+* Use autoconf host_os.
+* Warn rather than error on unknown configs.
+* Add --disable-default-optimizations to avoid forced flags.
+* Fix manfile install
+
+
+git-svn-id: http://stressapptest.googlecode.com/svn/trunk@42 93e54ea4-8218-11de-8aaf-8d8425684b44
+---
+ Makefile.am     |   3 +-
+ Makefile.in     | 171 ++++++++-----
+ aclocal.m4      |  72 ++++--
+ configure       | 781 ++++++++++++++++++++++++++++----------------------------
+ configure.ac    |  63 +++--
+ src/Makefile.in |  36 ++-
+ 6 files changed, 602 insertions(+), 524 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c476e5f..5b1998f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,2 +1,3 @@
+ SUBDIRS = src
+-dist_doc_DATA = COPYING stressapptest.1
+\ No newline at end of file
++dist_man_MANS = stressapptest.1
++
+diff --git a/configure.ac b/configure.ac
+index 6f09eb9..1fbc460 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,60 +12,53 @@ else
+ fi
+ 
+ AC_CANONICAL_HOST
+-AC_CANONICAL_BUILD
+ # Checking for target cpu and setting custom configuration
+ # for the different platforms
+-AC_CANONICAL_TARGET
+-case x"$target_cpu" in
+-  "xx86_64")
++AS_CASE(["$host_cpu"],
++  [*x86_64*], [
+     AC_DEFINE([STRESSAPPTEST_CPU_X86_64],[],
+               [Defined if the target CPU is x86_64])
+-    ;;
+-  "xi686")
++    ], 
++  [*i686*], [
+     AC_DEFINE([STRESSAPPTEST_CPU_I686],[],
+               [Defined if the target CPU is i686])
+-    ;;
+-  "xpowerpc")
++    ], 
++  [*powerpc*], [
+     AC_DEFINE([STRESSAPPTEST_CPU_PPC],[],
+               [Defined if the target CPU is PowerPC])
+-    ;;
+-  "xarmv7a")
++    ], 
++  [*armv7a*], [
+     AC_DEFINE([STRESSAPPTEST_CPU_ARMV7A],[],
+               [Defined if the target CPU is armv7a])
+-    ;;
+-  *)
+-    AC_MSG_ERROR([$target_cpu is not supported! Try x86_64, i686, powerpc, or armv7a])
+-    ;;
+-esac
++    ], 
++  [AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i686, powerpc, or armv7a])]
++)
+ 
+-_os=`uname`
+ ## The following allows like systems to share settings. This is not meant to
+ ## imply that these OS are the same thing. From OpenOffice dmake configure.in
+-case "$_os" in
+-  "Linux")
++AS_CASE(["$host_os"],
++  [*linux*], [
+     OS_VERSION=linux
+     AC_DEFINE([STRESSAPPTEST_OS_LINUX],[],
+               [Defined if the target OS is Linux])
+-    ;;
+-  "Darwin")
++    ],
++  [*darwin*], [
+     OS_VERSION=macosx
+     AC_DEFINE([STRESSAPPTEST_OS_DARWIN],[],
+               [Defined if the target OS is OSX])
+-    ;;
+-  "FreeBSD")
++    ],
++  [*freebsd*], [
+     OS_VERSION=bsd
+     AC_DEFINE([STRESSAPPTEST_OS_BSD],[],
+               [Defined if the target OS is BSD based])
+-    ;;
+-  "NetBSD")
++    ],
++  [*netbsd*], [
+     OS_VERSION=bsd
+     AC_DEFINE([STRESSAPPTEST_OS_BSD],[],
+               [Defined if the target OS is BSD based])
+-    ;;
+-  *)
+-    AC_MSG_ERROR([$_os operating system is not suitable to build dmake!])
+-    ;;
+-esac
++    ],
++  [AC_MSG_WARN([unsupported system: $host_os])]
++)
+ 
+ AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+ AC_CONFIG_SRCDIR([src/])
+@@ -95,10 +88,14 @@ AC_DEFINE_UNQUOTED([STRESSAPPTEST_TIMESTAMP],
+                    "$username @ $hostname on $timestamp",
+                    [Timestamp when ./configure was executed])
+ 
+-#Default cxxflags
+-CXXFLAGS="$CXXFLAGS -DCHECKOPTS"
+-CXXFLAGS="$CXXFLAGS -Wreturn-type -Wunused -Wuninitialized -Wall -Wno-psabi"
+-CXXFLAGS="$CXXFLAGS -O3 -funroll-all-loops  -funroll-loops -DNDEBUG"
++AC_ARG_ENABLE([default-optimizations],
++    [AS_HELP_STRING([--disable-default-optimizations], [Disable default optimization flag overrides])])
++AS_IF([test x"$enable_default_optimizations" != xno], [
++    #Default cxxflags
++    CXXFLAGS="$CXXFLAGS -DCHECKOPTS"
++    CXXFLAGS="$CXXFLAGS -Wreturn-type -Wunused -Wuninitialized -Wall -Wno-psabi"
++    CXXFLAGS="$CXXFLAGS -O3 -funroll-all-loops  -funroll-loops -DNDEBUG"
++])
+ 
+ # Checks for header files.
+ AC_HEADER_DIRENT
+-- 
+2.0.0
+
diff --git a/dev-util/stressapptest/files/stressapptest-1.0.6-channel-hash.patch b/dev-util/stressapptest/files/stressapptest-1.0.6-channel-hash.patch
new file mode 100644
index 000000000000..468d2d3b5101
--- /dev/null
+++ b/dev-util/stressapptest/files/stressapptest-1.0.6-channel-hash.patch
@@ -0,0 +1,226 @@
+From 7d1eaee59d311523757fb93ec59d8985ea15b54d Mon Sep 17 00:00:00 2001
+From: "nick.j.sanders" <nick.j.sanders@93e54ea4-8218-11de-8aaf-8d8425684b44>
+Date: Thu, 10 Jan 2013 23:42:36 +0000
+Subject: [PATCH] Replace interleave_size with channel_hash
+
+This patch replaces the previously introduced interleave_size memory
+channel decoding mechanism with a more powerful channel_hash. Decoding
+can now be based upon an arbitrary mask of address bits, which will be
+XORed together to determine the target channel. Note that this drops
+support for more than two channels, but TripleChannel controllers will
+probably use much more complicated decoding mechanisms anyway.
+
+It also includes the findmask program, which offers a crude method to
+guess the decoding mask from an unknown memory controller for enterprising
+users. Use at your own risk.
+
+Signed-off-by: Julius Werner <jwerner@chromium.org>
+
+
+git-svn-id: http://stressapptest.googlecode.com/svn/trunk@37 93e54ea4-8218-11de-8aaf-8d8425684b44
+---
+ src/Makefile.am  |   2 +
+ src/Makefile.in  |  68 +++++++++++++++++++--------
+ src/findmask.c   | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/findmask.inc |   4 ++
+ src/os.cc        |  17 +++----
+ src/os.h         |  12 ++---
+ src/sat.cc       |  55 +++++++++++-----------
+ src/sat.h        |   5 +-
+ 8 files changed, 238 insertions(+), 63 deletions(-)
+ create mode 100644 src/findmask.c
+ create mode 100644 src/findmask.inc
+
+--- a/src/os.cc
++++ b/src/os.cc
+@@ -261,21 +261,22 @@ bool OsLayer::AdlerMemcpyWarm(uint64 *dstmem, uint64 *srcmem,
+ }
+ 
+ 
+-// Translate physical address to memory module name.
+-// Assumes simple round-robin interleaving between memory channels of
+-// 'interleave_size_' sized chunks, with repeated 'channel_width_'
++// Translate physical address to memory module/chip name.
++// Assumes interleaving between two memory channels based on the XOR of
++// all address bits in the 'channel_hash' mask, with repeated 'channel_width_'
+ // blocks with bits distributed from each chip in that channel.
+ int OsLayer::FindDimm(uint64 addr, char *buf, int len) {
+   static const string unknown = "DIMM Unknown";
+-  if (!modules_) {
++  if (!channels_) {
+     snprintf(buf, len, "%s", unknown.c_str());
+     return 0;
+   }
+ 
+-  // Find channel by counting interleave units (typically cachelines),
+-  // and mod by number of channels.
+-  vector<string>& channel = (*modules_)[
+-      (addr / interleave_size_) % modules_->size()];
++  // Find channel by XORing address bits in channel_hash mask.
++  uint32 low = (uint32)(addr & channel_hash_);
++  uint32 high = (uint32)((addr & channel_hash_) >> 32);
++  vector<string>& channel = (*channels_)[
++      __builtin_parity(high) ^ __builtin_parity(low)];
+ 
+   // Find dram chip by finding which byte within the channel
+   // by address mod channel width, then divide the channel
+--- a/src/os.h
++++ b/src/os.h
+@@ -58,11 +58,11 @@ class OsLayer {
+   }
+ 
+   // Set parameters needed to translate physical address to memory module.
+-  void SetDramMappingParams(int interleave_size, int channel_width,
+-                            vector< vector<string> > *modules) {
+-    interleave_size_ = interleave_size;
++  void SetDramMappingParams(uintptr_t channel_hash, int channel_width,
++                            vector< vector<string> > *channels) {
++    channel_hash_ = channel_hash;
+     channel_width_ = channel_width;
+-    modules_ = modules;
++    channels_ = channels;
+   }
+ 
+   // Initializes data strctures and open files.
+@@ -269,8 +269,8 @@ class OsLayer {
+   bool  use_posix_shm_;          // Use 4k page shmem?
+   bool  dynamic_mapped_shmem_;   // Conserve virtual address space.
+   int   shmid_;                  // Handle to shmem
+-  vector< vector<string> > *modules_;  // Memory module names per channel.
+-  int interleave_size_;          // Channel interleaving chunk size.
++  vector< vector<string> > *channels_;  // Memory module names per channel.
++  uint64 channel_hash_;          // Mask of address bits XORed for channel.
+   int channel_width_;            // Channel width in bits.
+ 
+   int64 regionsize_;             // Size of memory "regions"
+--- a/src/sat.cc
++++ b/src/sat.cc
+@@ -572,12 +572,12 @@ bool Sat::Initialize() {
+ 
+   if (min_hugepages_mbytes_ > 0)
+     os_->SetMinimumHugepagesSize(min_hugepages_mbytes_ * kMegabyte);
+-  if (modules_.size() > 0) {
++  if (channels_.size() > 0) {
+     logprintf(6, "Log: Decoding memory: %dx%d bit channels,"
+-        " %d byte burst size, %d modules per channel (x%d)\n",
+-        modules_.size(), channel_width_, interleave_size_, modules_[0].size(),
+-        channel_width_/modules_[0].size());
+-    os_->SetDramMappingParams(interleave_size_, channel_width_, &modules_);
++        "%d modules per channel (x%d), decoding hash 0x%x\n",
++        channels_.size(), channel_width_, channels_[0].size(),
++        channel_width_/channels_[0].size(), channel_hash_);
++    os_->SetDramMappingParams(channel_hash_, channel_width_, &channels_);
+   }
+ 
+   if (!os_->Initialize()) {
+@@ -650,7 +650,7 @@ Sat::Sat() {
+   min_hugepages_mbytes_ = 0;
+   freepages_ = 0;
+   paddr_base_ = 0;
+-  interleave_size_ = kCacheLineSize;
++  channel_hash_ = kCacheLineSize;
+   channel_width_ = 64;
+ 
+   user_break_ = false;
+@@ -927,19 +927,19 @@ bool Sat::ParseArgs(int argc, char **argv) {
+       continue;
+     }
+ 
+-    ARG_IVALUE("--interleave_size", interleave_size_);
++    ARG_IVALUE("--channel_hash", channel_hash_);
+     ARG_IVALUE("--channel_width", channel_width_);
+ 
+     if (!strcmp(argv[i], "--memory_channel")) {
+       i++;
+       if (i < argc) {
+-        char *module = argv[i];
+-        modules_.push_back(vector<string>());
+-        while (char* next = strchr(module, ',')) {
+-          modules_.back().push_back(string(module, next - module));
+-          module = next + 1;
++        char *channel = argv[i];
++        channels_.push_back(vector<string>());
++        while (char* next = strchr(channel, ',')) {
++          channels_.back().push_back(string(channel, next - channel));
++          channel = next + 1;
+         }
+-        modules_.back().push_back(string(module));
++        channels_.back().push_back(string(channel));
+       }
+       continue;
+     }
+@@ -990,22 +990,25 @@ bool Sat::ParseArgs(int argc, char **argv) {
+   }
+ 
+   // Validate memory channel parameters if supplied
+-  if (modules_.size()) {
+-    if (interleave_size_ <= 0 ||
+-        interleave_size_ & (interleave_size_ - 1)) {
++  if (channels_.size()) {
++    if (channels_.size() == 1) {
++      channel_hash_ = 0;
++      logprintf(7, "Log: "
++          "Only one memory channel...deactivating interleave decoding.\n");
++    } else if (channels_.size() > 2) {
+       logprintf(6, "Process Error: "
+-          "Interleave size %d is not a power of 2.\n", interleave_size_);
++          "Triple-channel mode not yet supported... sorry.\n");
+       bad_status();
+       return false;
+     }
+-    for (uint i = 0; i < modules_.size(); i++)
+-      if (modules_[i].size() != modules_[0].size()) {
++    for (uint i = 0; i < channels_.size(); i++)
++      if (channels_[i].size() != channels_[0].size()) {
+         logprintf(6, "Process Error: "
+-            "Channels 0 and %d have a different amount of modules.\n",i);
++            "Channels 0 and %d have a different count of dram modules.\n",i);
+         bad_status();
+         return false;
+       }
+-    if (modules_[0].size() & (modules_[0].size() - 1)) {
++    if (channels_[0].size() & (channels_[0].size() - 1)) {
+       logprintf(6, "Process Error: "
+           "Amount of modules per memory channel is not a power of 2.\n");
+       bad_status();
+@@ -1018,9 +1021,9 @@ bool Sat::ParseArgs(int argc, char **argv) {
+       bad_status();
+       return false;
+     }
+-    if (channel_width_ / modules_[0].size() < 8) {
+-      logprintf(6, "Process Error: "
+-          "Chip width x%d must be x8 or greater.\n", channel_width_ / modules_[0].size());
++    if (channel_width_ / channels_[0].size() < 8) {
++      logprintf(6, "Process Error: Chip width x%d must be x8 or greater.\n",
++          channel_width_ / channels_[0].size());
+       bad_status();
+       return false;
+     }
+@@ -1095,8 +1098,8 @@ void Sat::PrintHelp() {
+          "each CPU to be tested by that CPU\n"
+          " --remote_numa    choose memory regions not associated with "
+          "each CPU to be tested by that CPU\n"
+-         " --interleave_size bytes  size in bytes of each channel's data as interleaved "
+-         "between memory channels\n"
++         " --channel_hash   mask of address bits XORed to determine channel.\n"
++         "                  Mask 0x40 interleaves cachelines between channels\n"
+          " --channel_width bits     width in bits of each memory channel\n"
+          " --memory_channel u1,u2   defines a comma-separated list of names\n"
+          "                          for dram packages in a memory channel.\n"
+--- a/src/sat.h
++++ b/src/sat.h
+@@ -151,9 +151,8 @@ class Sat {
+   int64 freepages_;                   // How many invalid pages we need.
+   int disk_pages_;                    // Number of pages per temp file.
+   uint64 paddr_base_;                 // Physical address base.
+-  vector< vector<string> > modules_;  // Memory module names per channel.
+-  int interleave_size_;               // Channel interleaving   chunk size in bytes.
+-                                      // Usually cacheline sized.
++  vector< vector<string> > channels_; // Memory module names per channel.
++  uint64 channel_hash_;               // Mask of address bits XORed for channel.
+   int channel_width_;                 // Channel width in bits.
+ 
+   // Control flags.
+-- 
+2.0.0
+
diff --git a/dev-util/stressapptest/files/stressapptest-1.0.6-misc-fixes.patch b/dev-util/stressapptest/files/stressapptest-1.0.6-misc-fixes.patch
new file mode 100644
index 000000000000..e67bbc52e7c3
--- /dev/null
+++ b/dev-util/stressapptest/files/stressapptest-1.0.6-misc-fixes.patch
@@ -0,0 +1,75 @@
+extracted just a few fixes we care about
+
+From 5fca3981f68115144566ddf91d2d188372603b7b Mon Sep 17 00:00:00 2001
+From: "ewout@google.com"
+ <ewout@google.com@93e54ea4-8218-11de-8aaf-8d8425684b44>
+Date: Tue, 10 Sep 2013 21:27:49 +0000
+Subject: [PATCH] New frequency test, fixed error accounting, added logging
+ timestamps, and miscellaneous smaller changes.
+
+* Added a CPU Frequency test for select X86 processors to verify a minimum frequency is maintained during non-pause periods.
+* Fixed the error accounting in WorkerThread::CheckRegion if more than 128 miscompares are found and when block errors are detected.
+* Updated the logger to include timestamps and the associated timezone.
+* Moved from apicid() to sched_getcpu() for determining the core ID.
+* Added the ability to reserve a specified amount of memory. This can override the requested memory allocation.
+* If not using POSIX shared memory or hugepages, explicitly mmap memory if the pagesize is 4kB otherwise use memalign.
+* Removed the OSLayer's unused PCI device handling.
+* Numerous refactoring changes.
+
+
+
+git-svn-id: http://stressapptest.googlecode.com/svn/trunk@38 93e54ea4-8218-11de-8aaf-8d8425684b44
+---
+ configure.ac       |   6 +-
+ src/Makefile.am    |   1 +
+ src/clock.h        |  29 ++++
+ src/disk_blocks.cc | 187 ++++++++---------------
+ src/disk_blocks.h  | 157 +++++++++++++------
+ src/findmask.c     |   6 +-
+ src/logger.cc      |  56 ++++---
+ src/logger.h       |  17 ++-
+ src/os.cc          | 218 +++++++++++----------------
+ src/os.h           | 132 ++++++++++++++--
+ src/sat.cc         | 144 +++++++++++++++---
+ src/sat.h          |  19 ++-
+ src/sattypes.h     |  58 ++++++-
+ src/worker.cc      | 435 +++++++++++++++++++++++++++++++++++++++++------------
+ src/worker.h       | 100 +++++++++++-
+ stressapptest.1    |   7 +-
+ 16 files changed, 1095 insertions(+), 477 deletions(-)
+ create mode 100644 src/clock.h
+
+diff --git a/src/os.cc b/src/os.cc
+index 7cae23b..6358398 100644
+--- a/src/os.cc
++++ b/src/os.cc
+@@ -130,7 +141,7 @@ int OsLayer::AddressMode() {
+ // Translates user virtual to physical address.
+ uint64 OsLayer::VirtualToPhysical(void *vaddr) {
+   uint64 frame, shift;
+-  off64_t off = ((uintptr_t)vaddr) / getpagesize() * 8;
++  off64_t off = ((uintptr_t)vaddr) / sysconf(_SC_PAGESIZE) * 8;
+   int fd = open(kPagemapPath, O_RDONLY);
+   // /proc/self/pagemap is available in kernel >= 2.6.25
+   if (fd < 0)
+@@ -507,7 +533,7 @@ bool OsLayer::AllocateTestMem(int64 length, uint64 paddr_base) {
+         break;
+       }
+ 
+-      shmaddr = shmat(shmid, NULL, NULL);
++      shmaddr = shmat(shmid, NULL, 0);
+       if (shmaddr == reinterpret_cast<void*>(-1)) {
+         int err = errno;
+         string errtxt = ErrorString(err);
+@@ -564,7 +590,7 @@ bool OsLayer::AllocateTestMem(int64 length, uint64 paddr_base) {
+         // Do a full mapping here otherwise.
+         shmaddr = mmap64(NULL, length, PROT_READ | PROT_WRITE,
+                          MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE,
+-                         shm_object, NULL);
++                         shm_object, 0);
+         if (shmaddr == reinterpret_cast<void*>(-1)) {
+           int err = errno;
+           string errtxt = ErrorString(err);
+-- 
+2.0.0
+
diff --git a/dev-util/stressapptest/files/stressapptest-1.0.6-pthread-test.patch b/dev-util/stressapptest/files/stressapptest-1.0.6-pthread-test.patch
new file mode 100644
index 000000000000..31036b423cda
--- /dev/null
+++ b/dev-util/stressapptest/files/stressapptest-1.0.6-pthread-test.patch
@@ -0,0 +1,136 @@
+From 2cc58e88b26e13e87a36439d7a7e7b44b4a1e47e Mon Sep 17 00:00:00 2001
+From: "nick.j.sanders" <nick.j.sanders@93e54ea4-8218-11de-8aaf-8d8425684b44>
+Date: Wed, 9 Jan 2013 21:13:13 +0000
+Subject: [PATCH] Allow ./configure for cross compile
+
+Fix regression from BARRIER detect change.
+
+
+git-svn-id: http://stressapptest.googlecode.com/svn/trunk@36 93e54ea4-8218-11de-8aaf-8d8425684b44
+---
+ configure                     | 49 +++++++------------------------------------
+ configure.ac                  | 21 +------------------
+ src/stressapptest_config.h.in |  3 +++
+ 3 files changed, 11 insertions(+), 62 deletions(-)
+
+diff --git a/configure b/configure
+index 12bc16b..8c10c52 100755
+--- a/configure
++++ b/configure
+@@ -5064,6 +5064,13 @@ if test "$ac_res" != no; then :
+ 
+ fi
+ 
++ac_fn_c_check_type "$LINENO" "pthread_barrier_t" "ac_cv_type_pthread_barrier_t" "$ac_includes_default"
++if test "x$ac_cv_type_pthread_barrier_t" = x""yes; then :
++
++$as_echo "#define HAVE_PTHREAD_BARRIERS 1" >>confdefs.h
++
++fi
++
+ for ac_header in libaio.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "libaio.h" "ac_cv_header_libaio_h" "$ac_includes_default"
+@@ -5201,48 +5208,6 @@ if test "$ac_res" != no; then :
+ fi
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_barrier" >&5
+-$as_echo_n "checking for pthread_barrier... " >&6; }
+-if test "${ac_cv_func_pthread_barrier+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-      #include <pthread.h>
+-      int main(void)
+-      {
+-        pthread_barrier_t t;
+-        return 0;
+-      }
+-
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_pthread_barrier=yes
+-else
+-  ac_cv_func_pthread_barrier=no
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_pthread_barrier" >&5
+-$as_echo "$ac_cv_func_pthread_barrier" >&6; }
+-if test "$ac_cv_func_pthread_barrier" = "yes"; then
+-
+-$as_echo "#define HAVE_PTHREAD_BARRIER 1" >>confdefs.h
+-
+-fi
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+diff --git a/configure.ac b/configure.ac
+index aba8791..ca10966 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -107,31 +107,12 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h], [], [AC_MSG_FAILURE([Missing some header files.])])
+ AC_CHECK_HEADERS([pthread.h])
+ AC_SEARCH_LIBS([pthread_create], [pthread])
++AC_CHECK_TYPE([pthread_barrier_t], AC_DEFINE(HAVE_PTHREAD_BARRIERS, [1], [Define to 1 if the system has `pthread_barrier'.]))
+ AC_CHECK_HEADERS([libaio.h])
+ AC_SEARCH_LIBS([io_setup], [aio])
+ AC_CHECK_HEADERS([sys/shm.h])
+ AC_SEARCH_LIBS([shm_open], [rt])
+ 
+-AC_MSG_CHECKING(for pthread_barrier)
+-AC_CACHE_VAL(
+-  ac_cv_func_pthread_barrier,
+-  AC_TRY_RUN(
+-    [
+-      #include <pthread.h>
+-      int main(void)
+-      {
+-        pthread_barrier_t t;
+-        return 0;
+-      }
+-    ],
+-    ac_cv_func_pthread_barrier=yes,
+-    ac_cv_func_pthread_barrier=no
+-  )
+-)
+-AC_MSG_RESULT($ac_cv_func_pthread_barrier)
+-if test "$ac_cv_func_pthread_barrier" = "yes"; then
+-  AC_DEFINE(HAVE_PTHREAD_BARRIER, [1], [Define to 1 if the system has `pthread_barrier'.])
+-fi
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff --git a/src/stressapptest_config.h.in b/src/stressapptest_config.h.in
+index 97f306e..5412df4 100644
+--- a/src/stressapptest_config.h.in
++++ b/src/stressapptest_config.h.in
+@@ -53,6 +53,9 @@
+ /* Define to 1 if you have the `posix_memalign' function. */
+ #undef HAVE_POSIX_MEMALIGN
+ 
++/* Define to 1 if the system has `pthread_barrier'. */
++#undef HAVE_PTHREAD_BARRIERS
++
+ /* Define to 1 if you have the <pthread.h> header file. */
+ #undef HAVE_PTHREAD_H
+ 
+-- 
+2.0.0
+
diff --git a/dev-util/stressapptest/metadata.xml b/dev-util/stressapptest/metadata.xml
new file mode 100644
index 000000000000..0947421cbd38
--- /dev/null
+++ b/dev-util/stressapptest/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+ <description>do whatever</description>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/stressapptest/stressapptest-1.0.4.ebuild b/dev-util/stressapptest/stressapptest-1.0.4.ebuild
new file mode 100644
index 000000000000..26dbb5264750
--- /dev/null
+++ b/dev-util/stressapptest/stressapptest-1.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+MY_P="${P}_autoconf"
+DESCRIPTION="Stressful Application Test"
+HOMEPAGE="http://code.google.com/p/stressapptest/"
+SRC_URI="http://stressapptest.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/libaio"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cpuid-pic.patch
+	sed -i \
+		'/CXXFLAGS/s:-O3 -funroll-all-loops  -funroll-loops::' \
+		configure || die
+}
+
+src_install() {
+	default
+	doman "${ED}"/usr/share/doc/${PN}/${PN}.1
+	rm -rf "${ED}"/usr/share/doc # only installs COPYING & man page
+}
diff --git a/dev-util/stressapptest/stressapptest-1.0.6-r1.ebuild b/dev-util/stressapptest/stressapptest-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..b9d24b5def79
--- /dev/null
+++ b/dev-util/stressapptest/stressapptest-1.0.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils autotools
+
+MY_P="${P}_autoconf"
+DESCRIPTION="Stressful Application Test"
+HOMEPAGE="http://code.google.com/p/stressapptest/"
+SRC_URI="http://stressapptest.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/libaio"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-pthread-test.patch
+	epatch "${FILESDIR}"/${P}-misc-fixes.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-default-optimizations
+}
diff --git a/dev-util/stressapptest/stressapptest-1.0.6-r2.ebuild b/dev-util/stressapptest/stressapptest-1.0.6-r2.ebuild
new file mode 100644
index 000000000000..377acc713edb
--- /dev/null
+++ b/dev-util/stressapptest/stressapptest-1.0.6-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils autotools
+
+MY_P="${P}_autoconf"
+DESCRIPTION="Stressful Application Test"
+HOMEPAGE="http://code.google.com/p/stressapptest/"
+SRC_URI="http://stressapptest.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/libaio"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-pthread-test.patch
+	epatch "${FILESDIR}"/${P}-misc-fixes.patch
+	epatch "${FILESDIR}"/${P}-channel-hash.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-default-optimizations
+}
diff --git a/dev-util/stressapptest/stressapptest-1.0.6.ebuild b/dev-util/stressapptest/stressapptest-1.0.6.ebuild
new file mode 100644
index 000000000000..2e592b1e24d7
--- /dev/null
+++ b/dev-util/stressapptest/stressapptest-1.0.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+MY_P="${P}_autoconf"
+DESCRIPTION="Stressful Application Test"
+HOMEPAGE="http://code.google.com/p/stressapptest/"
+SRC_URI="http://stressapptest.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/libaio"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		'/CXXFLAGS/s:-O3 -funroll-all-loops  -funroll-loops::' \
+		configure || die
+}
+
+src_install() {
+	default
+	doman "${ED}"/usr/share/doc/${PN}/${PN}.1
+	rm -rf "${ED}"/usr/share/doc # only installs COPYING & man page
+}
diff --git a/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild b/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild
new file mode 100644
index 000000000000..8dcd88928ac5
--- /dev/null
+++ b/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# This is the 1.0.7 release:
+#  https://code.google.com/p/stressapptest/source/detail?r=44
+# With the one follow up fix applied (hence the p1).
+
+EAPI="4"
+
+inherit flag-o-matic
+
+DESCRIPTION="Stressful Application Test"
+HOMEPAGE="http://code.google.com/p/stressapptest/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/libaio"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# Matches the configure & sat.cc logic
+	use debug || append-cppflags -DNDEBUG -DCHECKOPTS
+	econf --disable-default-optimizations
+}
diff --git a/dev-util/stubgen/Manifest b/dev-util/stubgen/Manifest
new file mode 100644
index 000000000000..8593b025652c
--- /dev/null
+++ b/dev-util/stubgen/Manifest
@@ -0,0 +1 @@
+DIST stubgen-2.08.tar.gz 104152 SHA256 0a47ebd80dc610afd801195b6f8de9e47331e2723542bd8431c306458066317b SHA512 daf8a83963fbc8b6857036a3f67a25031fc9e5f032ffedb1e041246354ede2363f5324b6f52ffe69fb41caa177eeca0a1c120f235e460043da1db5fb78fa5e41 WHIRLPOOL afde6c1413127a03ef27c5b0aaae72aea88f6f1a96d704f1daa545bcc5ffc6bded394b2afe563fbac8f4004f4f14f21668f440d7597e77a8289e3cbae98a8874
diff --git a/dev-util/stubgen/metadata.xml b/dev-util/stubgen/metadata.xml
new file mode 100644
index 000000000000..fb7ec4a9a25a
--- /dev/null
+++ b/dev-util/stubgen/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/stubgen/stubgen-2.08.ebuild b/dev-util/stubgen/stubgen-2.08.ebuild
new file mode 100644
index 000000000000..011fb0ee6776
--- /dev/null
+++ b/dev-util/stubgen/stubgen-2.08.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="a member function stub generator for C++"
+HOMEPAGE="http://www.radwin.org/michael/projects/stubgen/"
+SRC_URI="http://www.radwin.org/michael/projects/${PN}/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+src_compile() {
+	make CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ChangeLog README
+	doman ${PN}.1
+}
diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
new file mode 100644
index 000000000000..f88d30dfc443
--- /dev/null
+++ b/dev-util/suse-build/Manifest
@@ -0,0 +1,2 @@
+DIST obs-build-20140220.tar.gz 156717 SHA256 af959c30a9da0237cbb32a79dd55347156cd68d73f3c8f6e818a74b6c915b328 SHA512 3a66c7ded80f928d8930cb60011a115ec3d6ffa616a290907176fbe65e0dd0abc23b083271fb0d8598d699d1e6a100cc98be908f0079c0db157b8c4c6b960191 WHIRLPOOL 6609726de2f7d8f8d3e082b6323f4046d1121cc81fc58086d8666ddb677ac721e0e4be8597ba1316240d447c7942d2fd8f213bb39e4539c22e2ea0571a0812ce
+DIST obs-build-20140918.tar.gz 192320 SHA256 3b8263fa9f5320d34bcf7c731b5eda9bcedda5f65c2583a57f8640a925dcdbcf SHA512 3eddb6d131cbc405200add39c681365abc704965adb39f52a03936653dd9439d479f6ad8ee7492248399bb015f101c0e41396b70a205bde2cceea2c6646f7c51 WHIRLPOOL 79be4deca3806c2ffbbf2cb55d8e71e9f630b580fa87cfe2bd13bc81634cce83276701ca5bfb464c8bf3f0bbc01229716dbfb5d1da99c2c17d56d2666ef2dbfb
diff --git a/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch b/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch
new file mode 100644
index 000000000000..92bce8090858
--- /dev/null
+++ b/dev-util/suse-build/files/suse-build-2014.09.18-libexec-paths.patch
@@ -0,0 +1,449 @@
+ build                  | 18 +++++++++---------
+ build-recipe-kiwi      |  4 ++--
+ build-recipe-livebuild |  4 ++--
+ build-recipe-spec      |  8 ++++----
+ changelog2spec         |  2 +-
+ createarchdeps         |  2 +-
+ createrepomddeps       |  2 +-
+ createrpmdeps          |  2 +-
+ createyastdeps         |  2 +-
+ createzyppdeps         |  2 +-
+ download               |  2 +-
+ expanddeps             |  4 ++--
+ getbinaryid            |  2 +-
+ init_buildsystem       |  2 +-
+ initvm.c               | 13 +++++++++----
+ mkdrpms                |  2 +-
+ order                  |  4 ++--
+ queryconfig            |  4 ++--
+ spectool               |  2 +-
+ substitutedeps         |  4 ++--
+ test/common            |  2 +-
+ 21 files changed, 46 insertions(+), 41 deletions(-)
+
+diff --git a/build b/build
+old mode 100755
+new mode 100644
+index 9f9fb72..fcfec70
+--- a/build
++++ b/build
+@@ -13,7 +13,7 @@ if test "$0" = /sbin/init ; then
+ fi
+ 
+ test -z "$BUILD_DIR" -a -e /.build/build.data -a -z "$BUILD_IGNORE_2ND_STAGE" && BUILD_DIR=/.build
+-test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build
++test -z "$BUILD_DIR" && BUILD_DIR=/usr/libexec/suse-build
+ test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root
+ test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs"
+ 
+@@ -493,8 +493,8 @@ create_baselibs() {
+ 	if test -e $BUILD_ROOT$TOPDIR/SOURCES/baselibs.conf ; then
+ 	    BASELIBS_CFG="-c $TOPDIR/SOURCES/baselibs.conf"
+ 	fi
+-	if test -e $BUILD_ROOT/usr/lib/build/baselibs_global.conf; then
+-	    BASELIBS_GLOBAL="-c /usr/lib/build/baselibs_global.conf"
++	if test -e $BUILD_ROOT/usr/libexec/suse-build/baselibs_global.conf; then
++	    BASELIBS_GLOBAL="-c /usr/libexec/suse-build/baselibs_global.conf"
+ 	fi
+ 	pkgs=($RPMS)
+     fi
+@@ -503,14 +503,14 @@ create_baselibs() {
+     # don't use -R as extracted sources, build root etc might be below $TOPDIR
+     chown "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"/* "$BUILD_ROOT$TOPDIR"/RPMS/* || true
+ 
+-    local mkbaselibs="/usr/lib/build/mkbaselibs"
++    local mkbaselibs="/usr/libexec/suse-build/mkbaselibs"
+     local whichone=''
+     # $BUILD_DIR is set to /.build when using a vm. So we need to
+-    # hardcode /usr/lib/build instead of $BUILD_DIR to prefer
++    # hardcode /usr/libexec/suse-build instead of $BUILD_DIR to prefer
+     # mkbaselibs from the distro.
+     if test -f $BUILD_ROOT$mkbaselibs; then
+-	if test -z "$BASELIBS_CFG" -a -e $BUILD_ROOT/usr/lib/build/baselibs.conf ; then
+-	    BASELIBS_CFG="-c /usr/lib/build/baselibs.conf"
++	if test -z "$BASELIBS_CFG" -a -e $BUILD_ROOT/usr/libexec/suse-build/baselibs.conf ; then
++	    BASELIBS_CFG="-c /usr/libexec/suse-build/baselibs.conf"
+ 	fi
+     else
+ 	if test "$CREATE_BASELIBS" = 'internal'; then
+@@ -1274,7 +1274,7 @@ if test -n "$RPMS" -a -n "$BUILD_USER_ABUILD_USED" ; then
+     recipe_check_file_owners
+ fi
+ 
+-if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/lib/build/checks" ; then
++if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/libexec/suse-build/checks" ; then
+     export DO_RPM_REMOVE=true
+     # find package name
+     export PNAME=
+@@ -1282,7 +1282,7 @@ if test -n "$RPMS" -a -d "$BUILD_ROOT/usr/lib/build/checks" ; then
+ 	test -f "$SRPM" && PNAME=`rpm --nodigest --nosignature -qp --qf "%{NAME}" $SRPM`
+     done
+     mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null
+-    for CHECKSCRIPT in $BUILD_ROOT/usr/lib/build/checks/* ; do
++    for CHECKSCRIPT in $BUILD_ROOT/usr/libexec/suse-build/checks/* ; do
+ 	echo "... running ${CHECKSCRIPT##*/}"
+ 	$CHECKSCRIPT || cleanup_and_exit 1
+     done
+diff --git a/build-recipe-kiwi b/build-recipe-kiwi
+index 95afd3f..23cafb7 100644
+--- a/build-recipe-kiwi
++++ b/build-recipe-kiwi
+@@ -459,8 +459,8 @@ recipe_build_kiwi() {
+     fi
+ 
+     # Hook for running post kiwi build scripts like QA scripts if installed
+-    if test -x $BUILD_ROOT/usr/lib/build/kiwi_post_run ; then
+-	chroot $BUILD_ROOT su -c /usr/lib/build/kiwi_post_run || cleanup_and_exit 1
++    if test -x $BUILD_ROOT/usr/libexec/suse-build/kiwi_post_run ; then
++	chroot $BUILD_ROOT su -c /usr/libexec/suse-build/kiwi_post_run || cleanup_and_exit 1
+     fi
+ }
+ 
+diff --git a/build-recipe-livebuild b/build-recipe-livebuild
+index 6ae7046..c426ea0 100644
+--- a/build-recipe-livebuild
++++ b/build-recipe-livebuild
+@@ -172,9 +172,9 @@ recipe_build_livebuild() {
+     # TODO: Add the repository public key
+     # cp ... $BUILD_ROOT/$TOPDIR/$LIVEBUILD_ROOT/config/archives/debian.key
+ 
+-    if [ -x $BUILD_ROOT/usr/lib/build/livebuild_pre_run ] ; then
++    if [ -x $BUILD_ROOT/usr/libexec/suse-build/livebuild_pre_run ] ; then
+ 	echo "Running OBS build livebuild_pre_run hook"
+-	chroot $BUILD_ROOT su -c "/usr/lib/build/livebuild_pre_run" - root \
++	chroot $BUILD_ROOT su -c "/usr/libexec/suse-build/livebuild_pre_run" - root \
+ 	    < /dev/null || cleanup_and_exit 1
+     fi
+ 
+diff --git a/build-recipe-spec b/build-recipe-spec
+index b120f02..7a0b424 100644
+--- a/build-recipe-spec
++++ b/build-recipe-spec
+@@ -194,10 +194,10 @@ recipe_run_rpmlint() {
+ }
+ 
+ recipe_compare_oldpackages() {
+-    if test -x "$BUILD_ROOT/usr/lib/build/same-build-result.sh" ; then 
++    if test -x "$BUILD_ROOT/usr/libexec/suse-build/same-build-result.sh" ; then 
+ 	echo "... comparing built packages with the former built"
+ 	mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null
+-	if chroot $BUILD_ROOT /usr/lib/build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS"; then 
++	if chroot $BUILD_ROOT /usr/libexec/suse-build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS"; then 
+ 	    chroot $BUILD_ROOT touch /.build/.same_result_marker
+ 	    # XXX: dirty build service hack. fix bs_worker. Search for
+ 	    # 'same_result_marker' for traces of a first try to get rid of this
+@@ -210,9 +210,9 @@ recipe_compare_oldpackages() {
+ }
+ 
+ recipe_create_deltarpms() {
+-    if test -x "$BUILD_ROOT/usr/bin/makedeltarpm" -a -x $BUILD_ROOT/usr/lib/build/mkdrpms ; then
++    if test -x "$BUILD_ROOT/usr/bin/makedeltarpm" -a -x $BUILD_ROOT/usr/libexec/suse-build/mkdrpms ; then
+ 	echo "... creating delta rpms"
+ 	ds=("$BUILD_ROOT/$TOPDIR"/RPMS/* "$BUILD_ROOT$TOPDIR/SRPMS")
+-	chroot $BUILD_ROOT /usr/lib/build/mkdrpms /.build.oldpackages "${ds[@]#$BUILD_ROOT}"
++	chroot $BUILD_ROOT /usr/libexec/suse-build/mkdrpms /.build.oldpackages "${ds[@]#$BUILD_ROOT}"
+     fi
+ }
+diff --git a/changelog2spec b/changelog2spec
+old mode 100755
+new mode 100644
+index 4b94798..b87f4e1
+--- a/changelog2spec
++++ b/changelog2spec
+@@ -5,7 +5,7 @@
+ #
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Date::Parse;
+diff --git a/createarchdeps b/createarchdeps
+old mode 100755
+new mode 100644
+index 94efdb1..5e6795c
+--- a/createarchdeps
++++ b/createarchdeps
+@@ -3,7 +3,7 @@
+ # Archlinux support, based on the GSoC work of Nikolay Rysev <mad.f3ka@gmail.com>
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/lib/build");
++  unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/libexec/suse-build");
+ }
+ 
+ use strict;
+diff --git a/createrepomddeps b/createrepomddeps
+old mode 100755
+new mode 100644
+index fad84e5..f2292a6
+--- a/createrepomddeps
++++ b/createrepomddeps
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use strict;
+diff --git a/createrpmdeps b/createrpmdeps
+old mode 100755
+new mode 100644
+index c8c796d..c890df1
+--- a/createrpmdeps
++++ b/createrpmdeps
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Build;
+diff --git a/createyastdeps b/createyastdeps
+old mode 100755
+new mode 100644
+index 43c83e7..094c532
+--- a/createyastdeps
++++ b/createyastdeps
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Build;
+diff --git a/createzyppdeps b/createzyppdeps
+index 9abf693..e78937c 100755
+--- a/createzyppdeps
++++ b/createzyppdeps
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use strict;
+diff --git a/download b/download
+old mode 100755
+new mode 100644
+index b0a7c1f..d08770f
+--- a/download
++++ b/download
+@@ -3,7 +3,7 @@
+ use Net::SSL ();
+ BEGIN {
+   $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0,
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use LWP::UserAgent;
+diff --git a/expanddeps b/expanddeps
+old mode 100755
+new mode 100644
+index 48116d8..04b9c20
+--- a/expanddeps
++++ b/expanddeps
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use strict;
+@@ -10,7 +10,7 @@ use Build;
+ 
+ my ($dist, $rpmdeps, $archs, $configdir, $useusedforbuild, $installonly, $noinstall);
+ 
+-$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
++$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
+ 
+ while (@ARGV)  {
+   if ($ARGV[0] eq '--dist') {
+diff --git a/getbinaryid b/getbinaryid
+old mode 100755
+new mode 100644
+index 55c57f6..8f06579
+--- a/getbinaryid
++++ b/getbinaryid
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Build;
+diff --git a/init_buildsystem b/init_buildsystem
+old mode 100755
+new mode 100644
+index 9fec7aa..21c5d4f
+--- a/init_buildsystem
++++ b/init_buildsystem
+@@ -13,7 +13,7 @@
+ # needed globals variables
+ #
+ export SRC
+-export BUILD_DIR=${BUILD_DIR:-/usr/lib/build}
++export BUILD_DIR=${BUILD_DIR:-/usr/libexec/suse-build}
+ 
+ export YAST_IS_RUNNING=instsys
+ 
+diff --git a/initvm.c b/initvm.c
+index 55686ea..f922eb4 100644
+--- a/initvm.c
++++ b/initvm.c
+@@ -54,9 +54,10 @@ const int n_fields = 8;
+ #define SYSFS_BINFMT_MISC_REG	"/proc/sys/fs/binfmt_misc/register"
+ #define SYSFS_BINFMT_MISC_STAT	"/proc/sys/fs/binfmt_misc/status"
+ 
+-/* /usr/lib/build/x paths are copied to /.build inside a virtual machine */
++/* /usr/libexec/suse-build/x paths are copied to /.build inside a virtual machine */
+ #define BINFMT_REGF_0		"/.build/qemu-reg"
+-#define BINFMT_REGF_1		"/usr/lib/build/qemu-reg"
++#define BINFMT_REGF_1		"/usr/libexec/suse-build/qemu-reg"
++#define BINFMT_REGF_2		"/usr/libexec/suse-build/qemu-reg"
+ #define BUILD			"/.build/build"
+ 
+ /* useful constant arrays */
+@@ -324,9 +325,13 @@ int main(int argc, char* argv[], char* env[])
+ 			fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
+ 				BINFMT_REGF_0);
+ 			if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) {
+-				fprintf(stderr, "%s: binfmt registration failed\n",
++				fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
+ 					BINFMT_REGF_1);
+-				exit(1);
++				if (!binfmt_register(BINFMT_REGF_2, SYSFS_BINFMT_MISC_REG)) {
++					fprintf(stderr, "%s: binfmt registration failed\n",
++						BINFMT_REGF_2);
++					exit(1);
++				}
+ 			}
+ 		}
+ 	}
+diff --git a/mkdrpms b/mkdrpms
+old mode 100755
+new mode 100644
+index b3c13b3..11b929c
+--- a/mkdrpms
++++ b/mkdrpms
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, '/usr/lib/build';
++  unshift @INC, '/usr/libexec/suse-build';
+   unshift @INC, $::ENV{'BUILD_DIR'} if $::ENV{'BUILD_DIR'};
+ }
+ 
+diff --git a/order b/order
+old mode 100755
+new mode 100644
+index 2236b46..246b9fd
+--- a/order
++++ b/order
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Build;
+@@ -9,7 +9,7 @@ use strict;
+ 
+ my ($dist, $archs, $configdir, $manifest);
+ 
+-$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
++$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
+ 
+ while (@ARGV)  {
+   if ($ARGV[0] eq '--dist') {
+diff --git a/queryconfig b/queryconfig
+index f4d383c..bb1e018 100755
+--- a/queryconfig
++++ b/queryconfig
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use strict;
+@@ -10,7 +10,7 @@ use Build;
+ 
+ my ($dist, $archs, $configdir, $debug, $type, $argument);
+ 
+-$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
++$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
+ 
+ while (@ARGV)  {
+   if ($ARGV[0] eq '--dist') {
+diff --git a/spectool b/spectool
+old mode 100755
+new mode 100644
+index ef05859..24bd500
+--- a/spectool
++++ b/spectool
+@@ -116,7 +116,7 @@ the algorithm is prepended with colon to the check sum.
+ my $builddir;
+ 
+ BEGIN {
+-  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+   unshift @INC, $builddir;
+ }
+ 
+diff --git a/substitutedeps b/substitutedeps
+old mode 100755
+new mode 100644
+index 54e540c..d327c42
+--- a/substitutedeps
++++ b/substitutedeps
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use strict;
+@@ -19,7 +19,7 @@ sub expand {
+ 
+ my ($dist, $buildroot, $rpmdeps, $archs, $configdir, $release, $changelog);
+ 
+-$configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
++$configdir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build') . '/configs';
+ 
+ while (@ARGV)  {
+   if ($ARGV[0] eq '--root') {
+diff --git a/test/common b/test/common
+index 45c0da2..86a062b 100644
+--- a/test/common
++++ b/test/common
+@@ -22,7 +22,7 @@ if [ -e ${0%/*}/config.local ]; then
+ 	. ${0%/*}/config.local
+ fi
+ 
+-: ${BUILD_DIR:=/usr/lib/build}
++: ${BUILD_DIR:=/usr/libexec/suse-build}
+ 
+ #if [ ! -e "$build_vm_img" ]; then
+ #	sudo dd if=/dev/zero of="$build_vm_img" bs=512 count=0 seek=$((build_vm_image_size*2*1024))
diff --git a/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch b/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch
new file mode 100644
index 000000000000..49b1813a66e0
--- /dev/null
+++ b/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch
@@ -0,0 +1,212 @@
+diff -Naru obs-build-20140220-bak/build obs-build-20140220/build
+--- obs-build-20140220-bak/build	2014-03-02 17:04:18.655731128 +0000
++++ obs-build-20140220/build	2014-03-02 17:04:56.710281988 +0000
+@@ -12,7 +12,7 @@
+    exec /.build/build "$@"
+ fi
+ 
+-test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build
++test -z "$BUILD_DIR" && BUILD_DIR=/usr/libexec/suse-build
+ test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root
+ test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs"
+ 
+diff -Naru obs-build-20140220-bak/createarchdeps obs-build-20140220/createarchdeps
+--- obs-build-20140220-bak/createarchdeps	2014-03-02 17:04:18.659731079 +0000
++++ obs-build-20140220/createarchdeps	2014-03-02 17:04:56.710281988 +0000
+@@ -3,7 +3,7 @@
+ # Archlinux support, based on the GSoC work of Nikolay Rysev <mad.f3ka@gmail.com>
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/lib/build");
++  unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/libexec/suse-build");
+ }
+ 
+ use strict;
+diff -Naru obs-build-20140220-bak/createrepomddeps obs-build-20140220/createrepomddeps
+--- obs-build-20140220-bak/createrepomddeps	2014-03-02 17:04:18.659731079 +0000
++++ obs-build-20140220/createrepomddeps	2014-03-02 17:04:56.710281988 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use strict;
+diff -Naru obs-build-20140220-bak/createrpmdeps obs-build-20140220/createrpmdeps
+--- obs-build-20140220-bak/createrpmdeps	2014-03-02 17:04:18.659731079 +0000
++++ obs-build-20140220/createrpmdeps	2014-03-02 17:04:56.710281988 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Build;
+diff -Naru obs-build-20140220-bak/createyastdeps obs-build-20140220/createyastdeps
+--- obs-build-20140220-bak/createyastdeps	2014-03-02 17:04:18.656731116 +0000
++++ obs-build-20140220/createyastdeps	2014-03-02 17:04:56.711281976 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Build;
+diff -Naru obs-build-20140220-bak/download obs-build-20140220/download
+--- obs-build-20140220-bak/download	2014-03-02 17:04:18.659731079 +0000
++++ obs-build-20140220/download	2014-03-02 17:04:56.711281976 +0000
+@@ -3,7 +3,7 @@
+ use Net::SSL ();
+ BEGIN {
+   $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0,
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use LWP::UserAgent;
+diff -Naru obs-build-20140220-bak/expanddeps obs-build-20140220/expanddeps
+--- obs-build-20140220-bak/expanddeps	2014-03-02 17:04:18.658731091 +0000
++++ obs-build-20140220/expanddeps	2014-03-02 17:04:56.711281976 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use strict;
+diff -Naru obs-build-20140220-bak/getbinaryid obs-build-20140220/getbinaryid
+--- obs-build-20140220-bak/getbinaryid	2014-03-02 17:04:18.659731079 +0000
++++ obs-build-20140220/getbinaryid	2014-03-02 17:04:56.711281976 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Build;
+diff -Naru obs-build-20140220-bak/getoptflags obs-build-20140220/getoptflags
+--- obs-build-20140220-bak/getoptflags	2014-03-02 17:04:18.659731079 +0000
++++ obs-build-20140220/getoptflags	2014-03-02 17:05:22.777976219 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use strict;
+diff -Naru obs-build-20140220-bak/changelog2spec obs-build-20140220/changelog2spec
+--- obs-build-20140220-bak/changelog2spec	2014-03-02 17:04:18.658731091 +0000
++++ obs-build-20140220/changelog2spec	2014-03-02 17:05:24.268958777 +0000
+@@ -5,7 +5,7 @@
+ #
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Date::Parse;
+diff -Naru obs-build-20140220-bak/init_buildsystem obs-build-20140220/init_buildsystem
+--- obs-build-20140220-bak/init_buildsystem	2014-03-02 17:04:18.655731128 +0000
++++ obs-build-20140220/init_buildsystem	2014-03-02 17:05:24.268958777 +0000
+@@ -16,7 +16,7 @@
+ export YAST_IS_RUNNING="instsys"
+ export DEBIAN_FRONTEND=noninteractive
+ export DEBIAN_PRIORITY=critical
+-export BUILD_DIR=${BUILD_DIR:-/usr/lib/build}
++export BUILD_DIR=${BUILD_DIR:-/usr/libexec/suse-build}
+ # need to restore build root owner for non-root builds
+ browner=0
+ definesnstuff=()
+diff -Naru obs-build-20140220-bak/initvm.c obs-build-20140220/initvm.c
+--- obs-build-20140220-bak/initvm.c	2014-03-02 17:04:18.658731091 +0000
++++ obs-build-20140220/initvm.c	2014-03-02 17:05:24.269958765 +0000
+@@ -54,9 +54,10 @@
+ #define SYSFS_BINFMT_MISC_REG	"/proc/sys/fs/binfmt_misc/register"
+ #define SYSFS_BINFMT_MISC_STAT	"/proc/sys/fs/binfmt_misc/status"
+ 
+-/* /usr/lib/build/x paths are copied to /.build inside a virtual machine */
++/* /usr/libexec/suse-build/x paths are copied to /.build inside a virtual machine */
+ #define BINFMT_REGF_0		"/.build/qemu-reg"
+-#define BINFMT_REGF_1		"/usr/lib/build/qemu-reg"
++#define BINFMT_REGF_1		"/usr/libexec/suse-build/qemu-reg"
++#define BINFMT_REGF_2		"/usr/lib/build/qemu-reg"
+ #define BUILD			"/.build/build"
+ 
+ /* useful constant arrays */
+@@ -324,9 +325,13 @@
+ 			fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
+ 				BINFMT_REGF_0);
+ 			if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) {
+-				fprintf(stderr, "%s: binfmt registration failed\n",
++				fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
+ 					BINFMT_REGF_1);
+-				exit(1);
++				if (!binfmt_register(BINFMT_REGF_2, SYSFS_BINFMT_MISC_REG)) {
++					fprintf(stderr, "%s: binfmt registration failed\n",
++						BINFMT_REGF_2);
++					exit(1);
++				}
+ 			}
+ 		}
+ 	}
+diff -Naru obs-build-20140220-bak/mkdrpms obs-build-20140220/mkdrpms
+--- obs-build-20140220-bak/mkdrpms	2014-03-02 17:04:18.656731116 +0000
++++ obs-build-20140220/mkdrpms	2014-03-02 17:05:24.269958765 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, '/usr/lib/build';
++  unshift @INC, '/usr/libexec/suse-build';
+   unshift @INC, $::ENV{'BUILD_DIR'} if $::ENV{'BUILD_DIR'};
+ }
+ 
+diff -Naru obs-build-20140220-bak/order obs-build-20140220/order
+--- obs-build-20140220-bak/order	2014-03-02 17:04:18.658731091 +0000
++++ obs-build-20140220/order	2014-03-02 17:05:24.269958765 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use Build;
+diff -Naru obs-build-20140220-bak/spectool obs-build-20140220/spectool
+--- obs-build-20140220-bak/spectool	2014-03-02 17:04:18.658731091 +0000
++++ obs-build-20140220/spectool	2014-03-02 17:05:24.269958765 +0000
+@@ -116,7 +116,7 @@
+ my $builddir;
+ 
+ BEGIN {
+-  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+   unshift @INC, $builddir;
+ }
+ 
+diff -Naru obs-build-20140220-bak/substitutedeps obs-build-20140220/substitutedeps
+--- obs-build-20140220-bak/substitutedeps	2014-03-02 17:04:18.659731079 +0000
++++ obs-build-20140220/substitutedeps	2014-03-02 17:05:24.269958765 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ 
+ BEGIN {
+-  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
++  unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
+ }
+ 
+ use strict;
diff --git a/dev-util/suse-build/metadata.xml b/dev-util/suse-build/metadata.xml
new file mode 100644
index 000000000000..b12171d137ee
--- /dev/null
+++ b/dev-util/suse-build/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>suse</herd>
+  <use>
+    <flag name="symlink">Provide compatibility symlinks with original openSUSE package (might clash with other packages)</flag>
+  </use>
+  <longdescription lang="en">
+Script for building RPMs for SUSE Linux in a chroot environment.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/suse-build/suse-build-2014.02.20.ebuild b/dev-util/suse-build/suse-build-2014.02.20.ebuild
new file mode 100644
index 000000000000..ca7de4d187a4
--- /dev/null
+++ b/dev-util/suse-build/suse-build-2014.02.20.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/openSUSE/obs-build.git"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	OBS_PACKAGE="build"
+	OBS_PROJECT="openSUSE:Tools"
+	EXTRA_ECLASS="obs-download"
+fi
+
+inherit eutils ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Script to build SUSE Linux RPMs"
+HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="symlink"
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	dev-perl/XML-Parser
+	dev-perl/TimeDate
+	app-shells/bash
+	app-arch/cpio
+	app-arch/rpm
+"
+
+S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
+
+src_prepare() {
+	epatch "${FILESDIR}/suse-build-20140220-libexec-paths.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install
+	cd "${ED}"/usr
+	find bin -type l | while read i; do
+		mv "${i}" "${i/bin\//bin/suse-}"
+		use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}"
+	done
+	find share/man/man1 -type f | while read i; do
+		mv "${i}" "${i/man1\//man1/suse-}"
+		use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
+	done
+
+	# create symlink for default build config
+	dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf
+}
diff --git a/dev-util/suse-build/suse-build-2014.09.18.ebuild b/dev-util/suse-build/suse-build-2014.09.18.ebuild
new file mode 100644
index 000000000000..e7b4c90ed9f5
--- /dev/null
+++ b/dev-util/suse-build/suse-build-2014.09.18.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/openSUSE/obs-build.git"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	OBS_PACKAGE="build"
+	OBS_PROJECT="openSUSE:Tools"
+	EXTRA_ECLASS="obs-download"
+fi
+
+inherit eutils ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Script to build SUSE Linux RPMs"
+HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="symlink"
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	dev-perl/XML-Parser
+	dev-perl/TimeDate
+	app-shells/bash
+	app-arch/cpio
+	app-arch/rpm
+"
+
+S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libexec-paths.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install
+	cd "${ED}"/usr
+	find bin -type l | while read i; do
+		mv "${i}" "${i/bin\//bin/suse-}"
+		use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}"
+	done
+	find share/man/man1 -type f | while read i; do
+		mv "${i}" "${i/man1\//man1/suse-}"
+		use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
+	done
+
+	# create symlink for default build config
+	dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf
+}
diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
new file mode 100644
index 000000000000..3056206b4e11
--- /dev/null
+++ b/dev-util/suse-build/suse-build-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/openSUSE/obs-build.git"
+
+if [[ "${PV}" == "9999" ]]; then
+	EXTRA_ECLASS="git-2"
+else
+	OBS_PACKAGE="build"
+	OBS_PROJECT="openSUSE:Tools"
+	EXTRA_ECLASS="obs-download"
+fi
+
+inherit eutils ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Script to build SUSE Linux RPMs"
+HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build"
+
+[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="symlink"
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	dev-perl/XML-Parser
+	dev-perl/TimeDate
+	app-shells/bash
+	app-arch/cpio
+	app-arch/rpm
+"
+
+S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
+
+src_compile() { :; }
+
+src_install() {
+	emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install
+	cd "${ED}"/usr
+	find bin -type l | while read i; do
+		mv "${i}" "${i/bin\//bin/suse-}"
+		use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}"
+	done
+	find share/man/man1 -type f | while read i; do
+		mv "${i}" "${i/man1\//man1/suse-}"
+		use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
+	done
+	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|' {} +
+
+	# create symlink for default build config
+	dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf
+}
diff --git a/dev-util/synopsis/Manifest b/dev-util/synopsis/Manifest
new file mode 100644
index 000000000000..941d8ba48548
--- /dev/null
+++ b/dev-util/synopsis/Manifest
@@ -0,0 +1 @@
+DIST synopsis-0.13.tar.gz 10691494 SHA256 8a27f39203d828ace4a122b8bdc4f98e3746af724f88a0d75e1380fe736dbe5f SHA512 cdd84f4b9fc8a7b0edaa017e7a332bba06cd4fc804c49b84b1558a84e814e3a8a4b8c5801a8eaf149e6475dbacbb879f04ade57e31d660dfac5e0c83887abd54 WHIRLPOOL 0198437a19b8871428ddc1bcbbf01cad3b9e660cdb577f48c3542fcffc2b31acbb92ef5938b4e2d4a0404c5db85de9915772e953b93c45505fd8341748222aea
diff --git a/dev-util/synopsis/files/synopsis-0.12-gcc45.patch b/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
new file mode 100644
index 000000000000..ff0fe2be5da8
--- /dev/null
+++ b/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
@@ -0,0 +1,17 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318429
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- Synopsis/Parsers/Cxx/Types.cc
++++ Synopsis/Parsers/Cxx/Types.cc
+@@ -169,7 +169,7 @@
+ // Class Types::FuncPtr
+ //
+ 
+-FuncPtr::FuncPtr(Type::Type* ret, const Mods& premods, const Type::vector& params)
++FuncPtr::FuncPtr(Type* ret, const Mods& premods, const Type::vector& params)
+         : m_return(ret), m_premod(premods), m_params(params)
+ {}
+ 
diff --git a/dev-util/synopsis/metadata.xml b/dev-util/synopsis/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/synopsis/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/synopsis/synopsis-0.13.ebuild b/dev-util/synopsis/synopsis-0.13.ebuild
new file mode 100644
index 000000000000..bb62c2cda599
--- /dev/null
+++ b/dev-util/synopsis/synopsis-0.13.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+DISTUTILS_IN_SOURCE_BUILD=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 multilib toolchain-funcs
+
+DESCRIPTION="General source code documentation tool"
+HOMEPAGE="http://synopsis.fresco.org/index.html"
+SRC_URI="http://synopsis.fresco.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/boehm-gc"
+RDEPEND="${COMMON_DEPEND}
+	media-gfx/graphviz"
+DEPEND="${COMMON_DEPEND}
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12-gcc45.patch )
+
+pkg_setup() {
+	tc-export CC CXX
+}
+
+python_prepare() {
+	rm -r src/Synopsis/gc || die "failed to remove bundled lib"
+
+	# the distutils script passes its options to a number of
+	# autoconf scripts, to not all of which these options are
+	# relevant. adding this option disables these useless warnings.
+	sed -e "/self.announce(command)/i\        command += ' --disable-option-checking'" \
+		-i Synopsis/dist/command/config.py || die
+}
+
+python_configure() {
+	local mydistutilsargs=(
+		config
+		--libdir=/usr/$(get_libdir)
+		--with-gc-prefix=/usr
+	)
+	esetup.py
+}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
new file mode 100644
index 000000000000..b042b53a4712
--- /dev/null
+++ b/dev-util/sysdig/Manifest
@@ -0,0 +1,2 @@
+DIST sysdig-0.1.92.tar.xz 244728 SHA256 794ae6cef6ab8dae029979f5985b72c15f209e927518a3881e8a7624d77d5132 SHA512 661af8eece353ba0b0ea518496da89f4525f767c2797ff9f9e5caf670b6b3e7fa0c5cb14c3852971f563b665b42105a143d458a041b270d7107a403b2ec98b11 WHIRLPOOL bb47d717bcb3c5c948f4344a56e45996cfe275a48ea19f0fa12c2fce91f81fad317c9b5c05812e9c2aaf02240b597fb85f60a5ad3ee391a1a825de62a7eab57c
+DIST sysdig-0.1.98.tar.xz 263328 SHA256 5d60896ad2997f3dcf5d7252a53f5f7808ded11bd7c63f3a8c2aaaa1421f018f SHA512 8e4ab622fd0d69567e63054df256bfddda5765e2cf4d89490cd871625e4bb16d3d25ecbf0965f00e312d03ef3044615a7fd94d2f704b1a833ae1da9e2f66f33a WHIRLPOOL a96f8e8635d03351e4f42e8b3959c890a63a1232df5c9cc03f9359e18a926e23561e4f4fb10986285ff757e3ee47305a7fde01905541984e5582ba740962db70
diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
new file mode 100644
index 000000000000..33c7008e71d7
--- /dev/null
+++ b/dev-util/sysdig/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name='modules'>Build kernel modules needed for tracing local
+			events. Disable this only if you intend to use sysdig purely
+			to work with dumpfiles.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/sysdig/sysdig-0.1.92.ebuild b/dev-util/sysdig/sysdig-0.1.92.ebuild
new file mode 100644
index 000000000000..ba9d6addd059
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.1.92.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="http://www.sysdig.org/"
+# mirrored from https://github.com/draios/sysdig/archive/${PV}.tar.gz
+SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+modules"
+
+RDEPEND="dev-lang/luajit:2=
+	dev-libs/jsoncpp:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS TRACEPOINTS"
+
+pkg_pretend() {
+	use modules && linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	use modules && linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_LUAJIT=OFF
+		-DLUAJIT_PREFIX="${EPREFIX}"/usr
+		-DLUAJIT_INCLUDE="${EPREFIX}"/usr/include/luajit-2.0
+		-DUSE_BUNDLED_JSONCPP=OFF
+		-DJSONCPP_PREFIX="${EPREFIX}"/usr
+		-DJSONCPP_INCLUDE="${EPREFIX}"/usr/include/jsoncpp
+		-DUSE_BUNDLED_ZLIB=OFF
+		-DZLIB_PREFIX="${EPREFIX}"/usr
+	)
+
+	cmake-utils_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver:)"
+	BUILD_TARGETS="driver"
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use modules && linux-mod_src_install
+
+	# remove sources
+	rm -r "${ED%/}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED%/}"/usr/etc || die
+}
diff --git a/dev-util/sysdig/sysdig-0.1.98.ebuild b/dev-util/sysdig/sysdig-0.1.98.ebuild
new file mode 100644
index 000000000000..0e5ae122f56b
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.1.98.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="http://www.sysdig.org/"
+# mirrored from https://github.com/draios/sysdig/archive/${PV}.tar.gz
+SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+modules"
+
+RDEPEND="dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS TRACEPOINTS"
+
+pkg_pretend() {
+	use modules && linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	use modules && linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_LUAJIT=OFF
+		-DLUAJIT_PREFIX="${EPREFIX}"/usr
+		-DLUAJIT_INCLUDE="${EPREFIX}"/usr/include/luajit-2.0
+		-DUSE_BUNDLED_JSONCPP=OFF
+		-DJSONCPP_PREFIX="${EPREFIX}"/usr
+		-DJSONCPP_INCLUDE="${EPREFIX}"/usr/include/jsoncpp
+		-DUSE_BUNDLED_ZLIB=OFF
+		-DZLIB_PREFIX="${EPREFIX}"/usr
+	)
+
+	cmake-utils_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver:)"
+	BUILD_TARGETS="driver"
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use modules && linux-mod_src_install
+
+	# remove sources
+	rm -r "${ED%/}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED%/}"/usr/etc || die
+}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
new file mode 100644
index 000000000000..0520b355f13d
--- /dev/null
+++ b/dev-util/sysprof/Manifest
@@ -0,0 +1 @@
+DIST sysprof-1.2.0.tar.gz 273409 SHA256 baf03c6fc01a845c705873e6fc7927aa89539dcda6963f9ec4c8eb4c086a64f1 SHA512 76a150ceff5fd1c98dd3e062a20d1fbf686734350809712022ef76c4da87ad573e36a86ccca070f2fb8f45efc03f2d720c4b12a1cc2a3bd8a46ab33443196954 WHIRLPOOL 77a37d93c524caaf3eede00587d37472ce5a625c8888b8c6d4035f8697ba7603e3e1d8da35b4e0f4df574569148d4ae69e11bbe368aa369c007ae3bd51885163
diff --git a/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
new file mode 100644
index 000000000000..a5875336b194
--- /dev/null
+++ b/dev-util/sysprof/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>tetromino@gentoo.org</email>
+<name>Alexandre Rostovtsev</name>
+</maintainer>
+<maintainer>
+<email>leio@gentoo.org</email>
+<description>Backup maintainer, CC on bugs and assign to remaining</description>
+</maintainer>
+<longdescription lang="en">
+	Sysprof is a sampling CPU profiler for Linux that profiles the entire system,
+	not just a single application.
+	Sysprof handles shared libraries and applications do not need to be recompiled.
+	In fact they don't even have to be restarted.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/sysprof/sysprof-1.2.0.ebuild b/dev-util/sysprof/sysprof-1.2.0.ebuild
new file mode 100644
index 000000000000..35162926bcf8
--- /dev/null
+++ b/dev-util/sysprof/sysprof-1.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit gnome2-utils eutils linux-info udev toolchain-funcs
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+SRC_URI="http://sysprof.com/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/atk
+	>=dev-libs/glib-2.6:2
+	>=gnome-base/libglade-2:2.0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.6:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig"
+
+DOCS="AUTHORS NEWS README TODO" # ChangeLog is empty
+
+pkg_pretend() {
+	kernel_is -ge 2 6 31 && return
+	die "Sysprof will not work with a kernel version less than 2.6.31"
+}
+
+src_install() {
+	# Install udev rules in the proper place
+	export MAKEOPTS="${MAKEOPTS} udevdir=$(get_udevdir)"
+	default
+
+	# Symlink icons for use in application launchers
+	for i in 16 24 32 48; do
+		dosym "/usr/share/pixmaps/sysprof-icon-${i}.png" \
+			"/usr/share/icons/hicolor/${i}x${i}/apps/sysprof.png"
+	done
+	make_desktop_entry sysprof Sysprof sysprof
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
new file mode 100644
index 000000000000..2b5aa57a0ae0
--- /dev/null
+++ b/dev-util/systemtap/Manifest
@@ -0,0 +1,2 @@
+DIST systemtap-2.4.tar.gz 2664988 SHA256 fdcee37c4db188819a69f67a72ad1977251e80673cebf729a443b6c00be779f4 SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c WHIRLPOOL 7441504b167b9f90da52abb7f0c934263c9ce984de4caedc43f3694c7a1c492fe7c5bdd56357d7eebc8d306aea6873cdf8c0dadb0fafcc4f0bb192d5e9cfb9d3
+DIST systemtap-2.5.tar.gz 2767649 SHA256 fdd9e2c6f6325790d3c6c68ada8fa895babbecc1ed7c9e531080e946c2eef075 SHA512 17d64bf19ae72e935b715e72c04802db32453ef49afcbb8bbdad898a654bf3a5e66c68baaf8bc3c877000c1b28c865043c954d33e8d8588e894f7dda405aa0df WHIRLPOOL 4e7e810cb7e6fc735bcfc8d00455091d04ee22b91bf3738f918a8d7b672917f0c30d4fe17540cceba778fe76735e5ae6ebc703b401d5fb09420c6cb56ba903bf
diff --git a/dev-util/systemtap/metadata.xml b/dev-util/systemtap/metadata.xml
new file mode 100644
index 000000000000..169842617ecf
--- /dev/null
+++ b/dev-util/systemtap/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>swegener@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/systemtap/systemtap-2.4-r1.ebuild b/dev-util/systemtap/systemtap-2.4-r1.ebuild
new file mode 100644
index 000000000000..52ce740ddf72
--- /dev/null
+++ b/dev-util/systemtap/systemtap-2.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit linux-info autotools eutils python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="http://www.sourceware.org/systemtap/"
+SRC_URI="http://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="sqlite"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+	sys-libs/libcap
+	${PYTHON_DEPS}
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.18.2"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac \
+		Makefile.am \
+		staprun/Makefile.am \
+		stapdyn/Makefile.am \
+		buildrun.cxx \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py \
+		|| die "Failed to clean up sources"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--without-rpm \
+		--disable-server \
+		--disable-docs \
+		--disable-refdocs \
+		--disable-grapher \
+		$(use_enable sqlite)
+}
diff --git a/dev-util/systemtap/systemtap-2.4.ebuild b/dev-util/systemtap/systemtap-2.4.ebuild
new file mode 100644
index 000000000000..852b62f0b42a
--- /dev/null
+++ b/dev-util/systemtap/systemtap-2.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit linux-info autotools eutils python
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="http://www.sourceware.org/systemtap/"
+SRC_URI="http://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+IUSE="sqlite"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+	sys-libs/libcap
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.18.2"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs 2 dtrace.in
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac \
+		Makefile.am \
+		staprun/Makefile.am \
+		stapdyn/Makefile.am \
+		buildrun.cxx \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py \
+		|| die "Failed to clean up sources"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--without-rpm \
+		--disable-server \
+		--disable-docs \
+		--disable-refdocs \
+		--disable-grapher \
+		$(use_enable sqlite)
+}
diff --git a/dev-util/systemtap/systemtap-2.5.ebuild b/dev-util/systemtap/systemtap-2.5.ebuild
new file mode 100644
index 000000000000..e2e948e66a95
--- /dev/null
+++ b/dev-util/systemtap/systemtap-2.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit linux-info autotools eutils python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="http://www.sourceware.org/systemtap/"
+SRC_URI="http://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="sqlite"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+	sys-libs/libcap
+	${PYTHON_DEPS}
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.18.2"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac \
+		Makefile.am \
+		staprun/Makefile.am \
+		stapdyn/Makefile.am \
+		buildrun.cxx \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py \
+		|| die "Failed to clean up sources"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--without-rpm \
+		--disable-server \
+		--disable-docs \
+		--disable-refdocs \
+		--disable-grapher \
+		$(use_enable sqlite)
+}
diff --git a/dev-util/tailor/Manifest b/dev-util/tailor/Manifest
new file mode 100644
index 000000000000..2b5c38e44f48
--- /dev/null
+++ b/dev-util/tailor/Manifest
@@ -0,0 +1 @@
+DIST tailor-0.9.35.tar.gz 228650 SHA256 50b6eac61103636a9acb72a0b88e915dcc8baa1dcd9675e358aad8deaf622a18 SHA512 184521adac681ccca279215c115913d98d1521aac41fe15ca65a35e3c5075419e1cb0f1b453bca6d5a56a15b09928c34738a264b44f666de7067b2aba0562bed WHIRLPOOL 3ec5acbaa0418eff6c964253e5c7abab267e2a32c66e833192e7492cc16e1da8a8c29a98859e96c776fa3154ddb523d863f27b4872ac6ea1efc5b465375a10e7
diff --git a/dev-util/tailor/metadata.xml b/dev-util/tailor/metadata.xml
new file mode 100644
index 000000000000..3df908a9c339
--- /dev/null
+++ b/dev-util/tailor/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<longdescription lang="en">
+		Tailor is a tool to migrate changesets between ArX, Bazaar,
+		Bazaar-NG, CVS, Codeville, Darcs, Git, Mercurial, Monotone,
+		Subversion and Tla repositories.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/tailor/tailor-0.9.35-r1.ebuild b/dev-util/tailor/tailor-0.9.35-r1.ebuild
new file mode 100644
index 000000000000..2210c213c470
--- /dev/null
+++ b/dev-util/tailor/tailor-0.9.35-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to migrate changesets between version control systems"
+HOMEPAGE="http://wiki.darcs.net/index.html/Tailor"
+SRC_URI="http://darcs.arstecnica.it/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_install_all() {
+	local HTML_DOCS=( README.html )
+	distutils-r1_python_install_all
+	rm "${D}usr/share/doc/${PF}/README.html"
+}
+
+pkg_postinst() {
+	elog "Tailor does not explicitly depend on any other VCS."
+	elog "You should emerge whatever VCS(s) that you want to use seperately."
+}
diff --git a/dev-util/ticpp/Manifest b/dev-util/ticpp/Manifest
new file mode 100644
index 000000000000..c65a276613e6
--- /dev/null
+++ b/dev-util/ticpp/Manifest
@@ -0,0 +1 @@
+DIST ticpp-0_p20120423.tar.bz2 94818 SHA256 b131ecebcd6a7e589a4b1c365c15f73535b4ac07cf538d4cdf26399fd4d2a631 SHA512 3b01a57d6b08722d3f4e1592c7986719d74c9852071b6a20852e987a3534c12758263ad4310ce434ad0c483988fc77900ed4a76f1c98556fc33a35186d9cdf22 WHIRLPOOL da0265a8e840d4cd974f800d4066c8fed8ec5bfcea3efd39ef755fd4837dc46803a45b124b3c8ab99d5da7a7f383d2690506e16913719ce93731c06edc5bee72
diff --git a/dev-util/ticpp/metadata.xml b/dev-util/ticpp/metadata.xml
new file mode 100644
index 000000000000..6c08151bd39f
--- /dev/null
+++ b/dev-util/ticpp/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ago@gentoo.org</email>
+		<name>Agostino Sarubbo</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/ticpp/ticpp-0_p20120423.ebuild b/dev-util/ticpp/ticpp-0_p20120423.ebuild
new file mode 100644
index 000000000000..6d4876e14386
--- /dev/null
+++ b/dev-util/ticpp/ticpp-0_p20120423.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A completely new interface to TinyXML that uses MANY of the C++ strengths"
+HOMEPAGE="http://code.google.com/p/ticpp/"
+SRC_URI="http://dev.gentoo.org/~ago/distfiles/${P}.tar.bz2"
+
+LICENSE="MIT"
+KEYWORDS="amd64 ~ppc x86"
+SLOT="0"
+IUSE="debug doc"
+
+DEPEND="dev-util/premake:4
+	doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_prepare() {
+	premake4 gmake || die
+
+	sed -i "s:\$(ARCH)::g" TiCPP.make || die
+}
+
+src_compile() {
+	local myconf
+	use !debug && myconf="config=release"
+	emake ${myconf}
+
+	if use doc ; then
+		sed -i -e '/GENERATE_HTMLHELP/s:YES:NO:' dox || die
+		doxygen dox || die
+	fi
+}
+
+src_install () {
+	insinto /usr/include/ticpp
+	doins *.h
+
+	if use debug ; then
+		dolib lib/libticppd.a
+	else
+		dolib lib/libticpp.a
+	fi
+
+	dodoc {changes,readme,tutorial_gettingStarted,tutorial_ticpp}.txt
+
+	use doc && dohtml -r docs/*
+}
diff --git a/dev-util/ticpp/ticpp-9999.ebuild b/dev-util/ticpp/ticpp-9999.ebuild
new file mode 100644
index 000000000000..a2d1ad4b8150
--- /dev/null
+++ b/dev-util/ticpp/ticpp-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit subversion
+
+ESVN_REPO_URI="http://${PN}.googlecode.com/svn/trunk/"
+MY_PV=cvs
+
+DESCRIPTION="A completely new interface to TinyXML that uses MANY of the C++ strengths"
+HOMEPAGE="http://code.google.com/p/ticpp/"
+SRC_URI=""
+
+LICENSE="MIT"
+KEYWORDS=""
+SLOT="0"
+IUSE="debug doc"
+
+DEPEND="dev-util/premake:4
+	doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_prepare() {
+	premake4 gmake || die
+
+	sed -i "s:\$(ARCH)::g" TiCPP.make || die
+}
+
+src_compile() {
+	local myconf
+	use !debug && myconf="config=release"
+	emake ${myconf}
+
+	if use doc ; then
+		sed -i -e '/GENERATE_HTMLHELP/s:YES:NO:' dox || die
+		doxygen dox || die
+	fi
+}
+
+src_install () {
+	insinto /usr/include/ticpp
+	doins *.h
+
+	if use debug ; then
+		dolib lib/libticppd.a
+	else
+		dolib lib/libticpp.a
+	fi
+
+	dodoc {changes,readme,tutorial_gettingStarted,tutorial_ticpp}.txt
+
+	use doc && dohtml -r docs/*
+}
diff --git a/dev-util/tinlink/Manifest b/dev-util/tinlink/Manifest
new file mode 100644
index 000000000000..7b8918db79fa
--- /dev/null
+++ b/dev-util/tinlink/Manifest
@@ -0,0 +1 @@
+DIST tinlink-1.0.0.tar.gz 4726 SHA256 541be21de7543b2e3ba549ff033803bf6a308fa423bbc3ae7640003ad78752c1 SHA512 30e81ecba9850caaedc6d295d6ae88a24b8799e1ab74158a3f98da17d68dd6b0dd23a7076f887114f695f1023e832225bff8c4c2044dc105763ef47b0111ebef WHIRLPOOL 4c44829a078acf962a5e2d396690685a99b13b4fea3a8ddf66731fd511987b3241bdfcf66039a9fd3481807fec5f86221cc0b42b8c521b848c595e72752cdae3
diff --git a/dev-util/tinlink/metadata.xml b/dev-util/tinlink/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/dev-util/tinlink/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/tinlink/tinlink-1.0.0.ebuild b/dev-util/tinlink/tinlink-1.0.0.ebuild
new file mode 100644
index 000000000000..020ea0575c7e
--- /dev/null
+++ b/dev-util/tinlink/tinlink-1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="a tool to create very small elf binary from pure binary files"
+HOMEPAGE="http://sed.free.fr/tinlink/"
+SRC_URI="http://sed.free.fr/tinlink/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	rm -f "${S}"/Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" tinlink || die
+}
+
+src_install() {
+	dobin tinlink || die
+	dodoc AUTHORS README example.asm
+}
diff --git a/dev-util/tkdiff/Manifest b/dev-util/tkdiff/Manifest
new file mode 100644
index 000000000000..5bb71047f1df
--- /dev/null
+++ b/dev-util/tkdiff/Manifest
@@ -0,0 +1 @@
+DIST tkdiff-4.2.tar.gz 92063 SHA256 734bb417184c10072eb64e8d274245338e41b7fdeff661b5ef30e89f3e3aa357 SHA512 6c16475b808a9ac4d51a3e0b348d12739d821743eb205281473408a722ef7329e7dee61b4e0536741fab0c88eb67b00080d84598fca5e3215d4b183a858f6984 WHIRLPOOL bb04cdc915a7ac911435640f36ceb395d54682912af0332b2479587ae9fba1256e6c1a6fa530c0abdb447bf8b5eedc3405f87cc125fc040330b9abd261f45f5b
diff --git a/dev-util/tkdiff/files/tkdiff-4.1.4-hg.patch b/dev-util/tkdiff/files/tkdiff-4.1.4-hg.patch
new file mode 100644
index 000000000000..d179b4e65448
--- /dev/null
+++ b/dev-util/tkdiff/files/tkdiff-4.1.4-hg.patch
@@ -0,0 +1,143 @@
+Added support for Mercurial (hg) source control.  Mercurial is an
+open-source distributed source control system, conceptually similar to
+Git, Bazaar (bzr), Darcs, and the commercial system BitKeeper 
+(which tkdiff already supports).  
+
+While Mercurial already comes with a tkdiff wrapper called "hgdiff",
+this script does not support arbitrary revisions in the way that the
+actual hg diff command does (e.g. "hg diff -r2 -r5 filename).  This
+patch gives tkdiff support for all the revision numbers that "hg diff"
+supports.
+
+The code changes are small and mostly boilerplate, but I did add one
+new procedure called "is-mercurial-repository".  This was added
+because mercurial uses a single ".hg" directory at the top-level
+directory of a repository rather than having a directory at each
+different directory inside the repository.  The new procedure simply
+traverses up the parent directories until it either finds a .hg
+directory (indicating that we're in a Mercurial repository) or hits
+the root directory (indicating that we're not).
+
+Since the list of supported source control systems is getting large, I
+alphabetized the list in the command-line help text and also modified
+other parts of this help text to say things like "RCS, CVS, etc."
+rather than exhaustively listing all the supported systems yet again.
+
+More information on Mercurial can be found at
+  http://www.selenic.com/mercurial/wiki/ and
+  http://en.wikipedia.org/wiki/Mercurial_(software)
+
+diff -r 92c7c897cdd3 -r d32253d0cd0f tkdiff
+--- a/tkdiff	Sat Jan 05 00:42:06 2008 -0800
++++ b/tkdiff	Wed Jan 09 06:05:01 2008 -0800
+@@ -743,6 +743,7 @@ proc get-file-rev {f index {r ""}} {
+         set bkopt ""
+         set pvcsopt ""
+         set p4file "$f"
++        set hgopt ""
+     } else {
+         set rev "r$r"
+         set acrev "\"$r\""
+@@ -754,6 +755,7 @@ proc get-file-rev {f index {r ""}} {
+         set bkopt "-r$r"
+         set pvcsopt "-r$r"
+         set p4file "$f#$r"
++        set hgopt "-r$r"
+     }
+ 
+     set finfo(pth,$index) [tmpfile $index]
+@@ -907,6 +909,23 @@ proc get-file-rev {f index {r ""}} {
+             puts "Couldn't deal with $f, exiting..."
+             exit
+         }
++    } elseif {[is-mercurial-repository $dirname]} {
++        # mercurial support
++        set cmd "hg"
++        if {$::tcl_platform(platform) == "windows"} {
++            append cmd ".exe"
++        }
++        if {"$r" == "" || "$rev" == "PARENT"} {
++            # in hg, the revision for cat defaults to the parent revision
++            # of the working directory
++            set finfo(lbl,$index) "$f (HG PARENT)"
++            debug-info "  Setting lbl $finfo(lbl,$index)"
++            die-unless "exec $cmd cat $f" $finfo(pth,$index)
++        } else {
++            set finfo(lbl,$index) "$f (HG $rev)"
++            debug-info "  Setting lbl $finfo(lbl,$index)"
++            die-unless "exec $cmd cat $hgopt $f" $finfo(pth,$index)
++        }
+     } else {
+         fatal-error "File '$f' is not part of a revision control system"
+     }
+@@ -916,6 +935,19 @@ proc get-file-rev {f index {r ""}} {
+         set finfo(lbl,$index) $finfo(userlbl,$index)
+         debug-info "  User label: $finfo(lbl,$index)"
+     }
++}
++
++proc is-mercurial-repository {dirname} {
++    # check for a .hg directory in all parent directories
++    set dirname [file normalize $dirname]
++    set prevdir {}
++    while {$dirname != $prevdir} {
++        set hgfilename [file join $dirname .hg]
++        if {[file isdirectory $hgfilename]} { return true }
++        set prevdir $dirname
++        set dirname [file dirname $dirname]
++    }
++    return false
+ }
+ 
+ proc sccs-is-bk {} {
+@@ -6105,8 +6137,8 @@ proc do-usage {mode} {
+     Plain file with conflict markers:
+      	tkdiff -conflict FILE
+ 
+-    Source control (AccuRev, BitKeeper, CVS, Subversion, Perforce, PVCS,
+-      RCS, SCCS, ClearCase)
++    Source control (AccuRev, BitKeeper, ClearCase, CVS, Mercurial, Perforce, 
++      PVCS, RCS, SCCS, and Subversion)
+      	tkdiff FILE
+ 	tkdiff -rREV FILE
+ 	tkdiff -rREV1 -rREV2 FILE
+@@ -6125,7 +6157,9 @@ proc do-usage {mode} {
+       directory with the same name. It detects and supports PVCS by looking \
+       for a vcs.cfg file. It detects and supports AccuRev, Perforce and \
+       ClearCase by looking for the environment variables named ACCUREV_BIN, \
+-      P4CLIENT, and CLEARCASE_ROOT respectively.
++      P4CLIENT, and CLEARCASE_ROOT respectively.  It detects and supports \
++      Mercurial by looking for a directory named ".hg" in the current \
++      directory or any of its ancestor directories.
+ 
+ In the first form, tkdiff will present a dialog to allow you to choose the \
+       files to diff interactively. At present this dialog only supports a \
+@@ -6139,9 +6173,9 @@ In the second form, at least one of the 
+ 
+ In the remaining forms, <cmp>REV</cmp> (or <cmp>REV1</cmp> and \
+       <cmp>REV2</cmp>) must be a valid revision number for <cmp>FILE</cmp>. \
+-      Where AccuRev, RCS, CVS, Subversion, SCCS, PVCS or Perforce is implied \
++      When a source control system (RCS, CVS, etc.) is detected (see above) \
+       but no revision number is specified, <cmp>FILE</cmp> is compared with \
+-      the the revision most recently checked in.
++      the revision most recently checked in.
+ 
+ To merge a file with conflict markers generated by "<cmp>merge</cmp>", \
+       "<cmp>cvs</cmp>", or "<cmp>vmrg</cmp>", use \
+@@ -6149,13 +6183,10 @@ To merge a file with conflict markers ge
+       files which you can merge as usual (see below).
+ 
+ For "<cmp>tkdiff FILE</cmp>" The CVS version has priority, followed by the \
+-      Subversion version, followed by the SCCS version -- i.e. if a CVS \
++      Subversion version, followed by the SCCS version, followed by RCS, \
++      PVCS, Perforce, AccuRev, ClearCase, and Mercurial -- i.e. if a CVS \
+       directory is present, CVS; if not and a Subversion directory is \
+-      present, Subversion; if not and an SCCS directory is present, SCCS is \
+-      assumed; otherwise, if a CVS.CFG file is found, PVCS is assumed; \
+-      otherwise RCS is assumed. If none of the above apply and the AccuRev \
+-      environment variable ACCUREV_BIN is found, AccuRev is used. If P4CLIENT \
+-      is found, Perforce is used. If CLEARCASE_ROOT is found, ClearCase is used.
++      present, Subversion; etc.
+ 
+ If the merge output filename is not specified, tkdiff will present a dialog \
+       to allow you to choose the name of the merge output file.
diff --git a/dev-util/tkdiff/metadata.xml b/dev-util/tkdiff/metadata.xml
new file mode 100644
index 000000000000..e2cbb4ff9322
--- /dev/null
+++ b/dev-util/tkdiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tcltk</herd>
+	<upstream>
+		<remote-id type="sourceforge">tkdiff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/tkdiff/tkdiff-4.2.ebuild b/dev-util/tkdiff/tkdiff-4.2.ebuild
new file mode 100644
index 000000000000..88dc0850c351
--- /dev/null
+++ b/dev-util/tkdiff/tkdiff-4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Graphical front end to the diff program"
+HOMEPAGE="http://tkdiff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/tk"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-unix"
+
+src_install() {
+	dobin tkdiff
+	dodoc CHANGELOG.txt
+}
diff --git a/dev-util/tmake/Manifest b/dev-util/tmake/Manifest
new file mode 100644
index 000000000000..a7e096acfb72
--- /dev/null
+++ b/dev-util/tmake/Manifest
@@ -0,0 +1 @@
+DIST tmake-2.12.tar.bz2 47558 SHA256 fadb103ec02309a03a309f01a60966a542f2fb0f93ef67486d2840e10a220f09 SHA512 203a37aca7d391cf8bf7c27d9e5a9825472e9464f745d50b40343f71986ea5a48030372fa858ad5dade0807951f5c413145b9521ee1da416ff4952f8bb845ada WHIRLPOOL 68d425f6dc2233b5cd68d4505cf837629b9f932a97f31b3e19bfa489259c41b185a5754f33e97479b6f0bfbccc39324fed53da121b05de7dd373788d2923a145
diff --git a/dev-util/tmake/metadata.xml b/dev-util/tmake/metadata.xml
new file mode 100644
index 000000000000..3f329306900d
--- /dev/null
+++ b/dev-util/tmake/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tmake</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/tmake/tmake-2.12.ebuild b/dev-util/tmake/tmake-2.12.ebuild
new file mode 100644
index 000000000000..ea928efec1e6
--- /dev/null
+++ b/dev-util/tmake/tmake-2.12.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+DESCRIPTION="A Cross platform Makefile tool"
+SRC_URI="mirror://sourceforge/tmake/${P}.tar.bz2"
+HOMEPAGE="http://tmake.sourceforge.net"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5"
+
+src_install () {
+	dobin bin/tmake bin/progen
+	dodir /usr/lib/tmake
+	cp -pPRf "${S}"/lib/* "${ED}"/usr/lib/tmake
+	dodoc README
+	dohtml -r doc/*
+	echo "TMAKEPATH=\"${EPREFIX}/usr/lib/tmake/linux-g++\"" > "${T}"/51tmake
+	doenvd "${T}"/51tmake
+}
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
new file mode 100644
index 000000000000..77bc3103eb96
--- /dev/null
+++ b/dev-util/trace-cmd/Manifest
@@ -0,0 +1 @@
+DIST trace-cmd-2.5.1.tar.xz 1577148 SHA256 591aa00ff90a60fa2bce8637392126623511fd7629a771c7e3276137b31b3966 SHA512 2280eefa130a3914c34798f8bd4097a55f7f4fa4632b3d26ee1317bba54625d259ac61c6576dd3051fb2be48fb593fa54a4203d1828b7fec5fd196de00491ea2 WHIRLPOOL 4185a05c96204fb5ec8256620af53ec4c4bb2e0f7e2f268c7a6814ed788b1ce256f2dba429eef80dcf2b2409b3cd1ff11bed9bae43da558de9f6d3bb2c7c654c
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
new file mode 100644
index 000000000000..ec9fb1774a3a
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
@@ -0,0 +1,34 @@
+diff --git a/Makefile b/Makefile
+index 186e245..9127f23 100644
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,7 @@ plugin_dir = $(HOME)/.trace-cmd/plugins
+ python_dir = $(HOME)/.trace-cmd/python
+ else
+ plugin_dir = $(prefix)/$(libdir)/trace-cmd/plugins
+-python_dir = $(prefix)/$(libdir)/trace-cmd/python
++python_dir ?= $(prefix)/$(libdir)/trace-cmd/python
+ PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
+ PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
+ PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
+@@ -98,8 +98,11 @@ endif # NO_PYTHON
+ test-build = $(if $(shell sh -c 'echo "$(1)" | \
+ 	$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
+ 
++ifndef NO_UDIS86
+ # have udis86 disassembler library?
+-udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
++udis86-flags := -DHAVE_UDIS86
++udis86-ldflags := -ludis86
++endif # NO_UDIS86
+ 
+ define BLK_TC_FLUSH_SOURCE
+ #include <linux/blktrace_api.h>
+@@ -242,6 +245,7 @@ endif
+ # Append required CFLAGS
+ override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
+ override CFLAGS += $(udis86-flags) $(blk-flags)
++override LDFLAGS += $(udis86-ldflags)
+ 
+ ifeq ($(VERBOSE),1)
+   Q =
diff --git a/dev-util/trace-cmd/metadata.xml b/dev-util/trace-cmd/metadata.xml
new file mode 100644
index 000000000000..2bd7dc23471b
--- /dev/null
+++ b/dev-util/trace-cmd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<use>
+		<flag name="udis86">Enable support for dev-libs/udis86 disassembler library</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild b/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
new file mode 100644
index 000000000000..5bb6a80bba44
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils toolchain-funcs linux-info python-single-r1
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc gtk python udis86"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )
+	gtk? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	python? (
+		virtual/pkgconfig
+		dev-lang/swig
+	)
+	gtk? ( virtual/pkgconfig )
+	doc? ( app-text/asciidoc )"
+
+CONFIG_CHECK="
+	~TRACING
+	~FTRACE
+	~BLK_DEV_IO_TRACE"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch_user
+}
+
+src_configure() {
+	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
+
+	if use python; then
+		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
+		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
+	else
+		MAKEOPTS+=" NO_PYTHON=1"
+	fi
+
+	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
+}
+
+src_compile() {
+	emake all_cmd
+	use doc && emake doc
+	use gtk && emake -j1 gui
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && emake DESTDIR="${D}" install_doc
+	use gtk && emake DESTDIR="${D}" install_gui
+}
diff --git a/dev-util/treecc/Manifest b/dev-util/treecc/Manifest
new file mode 100644
index 000000000000..49acc37b3722
--- /dev/null
+++ b/dev-util/treecc/Manifest
@@ -0,0 +1 @@
+DIST treecc-0.3.10.tar.gz 375762 SHA256 5e9d20a6938e0c6fedfed0cabc7e9e984024e4881b748d076e8c75f1aeb6efe7 SHA512 426add1a96913a169a0f03a6e3247a8b48c9073335cf967ef05d4d4188fbe3b8ebc837b38b9a4de94ccdb13685ace47a91b185c75a845cf2670e929802774b73 WHIRLPOOL 5667e873e1c02c25944e07721383c94d7363dcc2132d0c89bb531619d191fb25fdfcce4a8e17e2e4336fac7428925910b5e697298337bf991d87c81c005cad2f
diff --git a/dev-util/treecc/metadata.xml b/dev-util/treecc/metadata.xml
new file mode 100644
index 000000000000..e85974a7fa17
--- /dev/null
+++ b/dev-util/treecc/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>dotnet</herd>
+</pkgmetadata>
diff --git a/dev-util/treecc/treecc-0.3.10.ebuild b/dev-util/treecc/treecc-0.3.10.ebuild
new file mode 100644
index 000000000000..d3a95dfd17e4
--- /dev/null
+++ b/dev-util/treecc/treecc-0.3.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="compiler-compiler tool for aspect-oriented programming"
+HOMEPAGE="http://www.gnu.org/software/dotgnu"
+SRC_URI="http://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="doc examples"
+
+DEPEND="doc? ( app-text/texi2html )"
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+
+	if use doc ; then
+		if [ ! -f "${S}"/doc/treecc.texi ] ; then
+			die "treecc.texi was not generated"
+		fi
+
+		cd "${S}"/doc
+		texi2html -split_chapter "${S}"/doc/treecc.texi \
+			|| die "texi2html failed"
+		cd "${S}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/README
+		dodoc examples/{expr_c.tc,gram_c.y,scan_c.l}
+	fi
+
+	if use doc ; then
+		dodoc doc/*.{txt,html}
+
+		docinto html
+		dohtml doc/treecc/*.html
+	fi
+}
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
new file mode 100644
index 000000000000..6ef37bd6965b
--- /dev/null
+++ b/dev-util/trinity/Manifest
@@ -0,0 +1,5 @@
+DIST trinity-1.1.tgz 115894 SHA256 926a1d6595d9fc29ad79075b6603e4bbfe42df3e04215bfce2502f4b554447cb SHA512 a10af383cf085e4ee3e22a66e0da79409570fa4e72f64b892566c499f04cf23122064e99984e7712c58fc81498300e38248b78c91d8e0397074714205af28b5a WHIRLPOOL dbc3ba3dc3248178652d0d32f787e51a0c617d31b54d9053632b9a8ae23e6dd7426d53c37fbfef7a48846e4afbb3a37b029a54ee98a81179cc90ab75f16dae0b
+DIST trinity-1.2.tgz 171946 SHA256 71132fca0ed016dcb39a3f1d9fa16a68971e2e9eff0b94bbacdf3d7ff101b6d5 SHA512 5a96db85ce0a34c345c803c6983bc4f191a8c25d54ff90f61eafeb6cb747a4170097821bf070a77920831a35a19b8d2bbc7b32d51194e45060abbd235a96b0d7 WHIRLPOOL 3713baba7a7e0a3f8996a8eee658d9905129aeb5d7f8a42179851c0e17b33aae9dbfaa206ff27b3b1786c47ccb8d4d45ba0732df09c689e1341133bcb3f0d119
+DIST trinity-1.3.tgz 192513 SHA256 53ea7ca66c022e1fd86b18a7a38f5dbbf3611a15e1bb1256ea6e8ac570378b0f SHA512 343dac85a2c7a433e3d1e71535e16285f766ded240d2e7ba0527e29ab46cb39e11e2134f95255e8792f0cd21a5fd55f90a34a3a9d348414d03e9e0bd06437f36 WHIRLPOOL c2ff46ad957ec6541f3898000a7e6982f9a34eaa0b849db601cf84a2570131baf1e7817f7c5bd517e8b492880c957d8d5527fec6944fefb5ba24e6c51f276fb8
+DIST trinity-1.4.tar.xz 156212 SHA256 a61fca0e35010820be4ba858dd7d103e6cc5975feef052f2cf56db71c8661ac1 SHA512 ffe7e5e9214056b39c0047ddd6463885701d075256a9416749cba638c625898eb7b0e2f74a17794fd4034dafdc949b8297e842815bb9b6d29392059a6a0d549b WHIRLPOOL 8df2d1a22e3259e00363f71010f723a421109022478dfe8bd318fa0304ec9baa705ad089e535545026066649e751d7c4d310ccfd92561a1dc0692c1df1695658
+DIST trinity-1.5.tar.xz 171684 SHA256 e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655 SHA512 58884c8e226258de6037e06029b6c593a99b467e9b107562458557954fd4af185f88fbcacc04fc52f05318a860ebab4605c227e6a02b32253439807d4071cd8d WHIRLPOOL e737ac877b95a62e40a2cc9273f0b0d4dc79275b6dafab85b54815f1581c9c824189d88781cc26468c56166f6e87273fc5df1b786b69069b1dc4654d2a874f43
diff --git a/dev-util/trinity/files/trinity-1.1-flags.patch b/dev-util/trinity/files/trinity-1.1-flags.patch
new file mode 100644
index 000000000000..fd794c62dc67
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.1-flags.patch
@@ -0,0 +1,20 @@
+--- trinity-1.1/Makefile
++++ trinity-1.1/Makefile
+@@ -3,7 +3,7 @@
+ INSTALL_PREFIX ?= $(DESTDIR)
+ INSTALL_PREFIX ?= $(HOME)
+ 
+-CFLAGS = -Wall -W -g -O2 -I. -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
++CFLAGS += -Wall -W -I. -Wimplicit -D_GNU_SOURCE
+ #CFLAGS += $(shell if $(CC) -m32 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-m32"; fi)
+ CFLAGS += -Wdeclaration-after-statement
+ CFLAGS += -Wformat=2
+@@ -49,7 +49,7 @@
+ -include $(SRCS:%.c=$(DEPDIR)/%.d)
+ 
+ trinity: test $(OBJS) $(HEADERS)
+-	$(CC) $(CFLAGS) -o trinity $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o trinity $(OBJS)
+ 	@mkdir -p tmp
+ 
+ df = $(DEPDIR)/$(*F)
diff --git a/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch b/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch
new file mode 100644
index 000000000000..81eb170fcbae
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch
@@ -0,0 +1,39 @@
+From 2f51ba47d4e16aaa877956e2876f81ed50af5c5d Mon Sep 17 00:00:00 2001
+From: Andi Shyti <andi@etezian.org>
+Date: Wed, 24 Jul 2013 12:31:05 +0200
+Subject: [PATCH] ioctls: btrfs-control: fix header inclusion order
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch enables newer linux/btrfs.h in Kernel headers 3.11,
+where NULL is not recognized as a define. This is done by
+including  stdlib.h before linux/btrfs.h. It gets rid of the
+following compiling error:
+
+In file included from ioctls/btrfs-control.c:5:0:
+/usr/include/linux/btrfs.h: In function ‘btrfs_err_str’:
+/usr/include/linux/btrfs.h:486:11: error: ‘NULL’ undeclared (first use in
+    return NULL;
+           ^
+
+Signed-off-by: Andi Shyti <andi@etezian.org>
+---
+ ioctls/btrfs-control.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ioctls/btrfs-control.c b/ioctls/btrfs-control.c
+index 35e5389..3b0b50a 100644
+--- a/ioctls/btrfs-control.c
++++ b/ioctls/btrfs-control.c
+@@ -2,6 +2,7 @@
+ 
+ #ifdef USE_BTRFS
+ 
++#include <stdlib.h>
+ #include <linux/btrfs.h>
+ 
+ #include "trinity.h"
+-- 
+1.8.3.2
+
diff --git a/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch b/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch
new file mode 100644
index 000000000000..c7240b7c15c0
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch
@@ -0,0 +1,40 @@
+From 54c5f3cce91ed914b1abbd3bafe4877e413947fa Mon Sep 17 00:00:00 2001
+From: Andi Shyti <andi@etezian.org>
+Date: Wed, 24 Jul 2013 00:42:07 +0200
+Subject: [PATCH] ioctls: videodev2: check if defines are obsolete
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In kernel headers 3.11 the VIDIOC_DBG_G_CHIP_IDENT define is
+considered obsolete, therefore removed, generating the following
+compiling error:
+
+ioctls/videodev2.c:72:15: error: ‘VIDIOC_DBG_G_CHIP_IDENT’ undeclared here (not in a function)
+  IOCTL(VIDIOC_DBG_G_CHIP_IDENT),
+               ^
+
+Check the definition of it before using it
+
+Signed-off-by: Andi Shyti <andi@etezian.org>
+---
+ ioctls/videodev2.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ioctls/videodev2.c b/ioctls/videodev2.c
+index 0d1473e..03a5ae5 100644
+--- a/ioctls/videodev2.c
++++ b/ioctls/videodev2.c
+@@ -69,7 +69,9 @@ static const struct ioctl videodev2_ioctls[] = {
+ 	IOCTL(VIDIOC_TRY_ENCODER_CMD),
+ 	IOCTL(VIDIOC_DBG_S_REGISTER),
+ 	IOCTL(VIDIOC_DBG_G_REGISTER),
++#ifdef VIDIOC_DBG_G_CHIP_IDENT
+ 	IOCTL(VIDIOC_DBG_G_CHIP_IDENT),
++#endif
+ 	IOCTL(VIDIOC_S_HW_FREQ_SEEK),
+ #ifdef VIDIOC_ENUM_DV_PRESETS
+ 	IOCTL(VIDIOC_ENUM_DV_PRESETS),
+-- 
+1.8.3.2
+
diff --git a/dev-util/trinity/files/trinity-1.4-flags.patch b/dev-util/trinity/files/trinity-1.4-flags.patch
new file mode 100644
index 000000000000..5b639598044a
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.4-flags.patch
@@ -0,0 +1,20 @@
+--- trinity-1.4/Makefile
++++ trinity-1.4/Makefile
+@@ -9,7 +9,7 @@
+ CC := $(CROSS_COMPILE)$(CC)
+ LD := $(CROSS_COMPILE)$(LD)
+ 
+-CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
++CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
+ ifneq ($(SYSROOT),)
+ CFLAGS += --sysroot=$(SYSROOT)
+ endif
+@@ -84,7 +84,7 @@
+ df = $(DEPDIR)/$(*D)/$(*F)
+ 
+ %.o : %.c
+-	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
++	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $<
+ 	@mkdir -p $(DEPDIR)/$(*D)
+ 	@$(CC) -MM $(CFLAGS) $*.c > $(df).d
+ 	@mv -f $(df).d $(df).d.tmp
diff --git a/dev-util/trinity/files/trinity-1.5-flags.patch b/dev-util/trinity/files/trinity-1.5-flags.patch
new file mode 100644
index 000000000000..bb48287e1d83
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.5-flags.patch
@@ -0,0 +1,11 @@
+--- trinity-1.5/Makefile
++++ trinity-1.5/Makefile
+@@ -10,7 +10,7 @@
+ CC := $(CROSS_COMPILE)$(CC)
+ LD := $(CROSS_COMPILE)$(LD)
+ 
+-CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
++CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
+ ifneq ($(SYSROOT),)
+ CFLAGS += --sysroot=$(SYSROOT)
+ endif
diff --git a/dev-util/trinity/metadata.xml b/dev-util/trinity/metadata.xml
new file mode 100644
index 000000000000..209e56b6d1cf
--- /dev/null
+++ b/dev-util/trinity/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kernelslacker/trinity</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/trinity/trinity-1.1.ebuild b/dev-util/trinity/trinity-1.1.ebuild
new file mode 100644
index 000000000000..edd1d366294d
--- /dev/null
+++ b/dev-util/trinity/trinity-1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-kernel/linux-headers"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+	tc-export CC
+}
+
+src_configure() {
+	./configure.sh || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc Documentation/* README
+}
diff --git a/dev-util/trinity/trinity-1.2.ebuild b/dev-util/trinity/trinity-1.2.ebuild
new file mode 100644
index 000000000000..72989d906081
--- /dev/null
+++ b/dev-util/trinity/trinity-1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="sys-kernel/linux-headers"
+
+src_prepare() {
+	sed -e 's/^CFLAGS = /CFLAGS +=/' \
+		-e 's/-g -O2//' \
+		-e 's/-D_FORTIFY_SOURCE=2//' \
+		-e '/-o trinity/s/$(CFLAGS)/\0 $(LDFLAGS)/' \
+		-e '/^CFLAGS += -Werror/d' \
+		-i Makefile || die
+
+	epatch "${FILESDIR}"/${PN}-1.2-videodev2-ioctls.patch
+	epatch "${FILESDIR}"/${PN}-1.2-btrfs-headers.patch
+	tc-export CC
+}
+
+src_configure() {
+	./configure.sh || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc Documentation/* README
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/scripts
+		doexe scripts/*
+		docompress -x /usr/share/doc/${PF}/scripts
+	fi
+}
diff --git a/dev-util/trinity/trinity-1.3.ebuild b/dev-util/trinity/trinity-1.3.ebuild
new file mode 100644
index 000000000000..e5335daba0ea
--- /dev/null
+++ b/dev-util/trinity/trinity-1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="sys-kernel/linux-headers"
+
+src_prepare() {
+	sed -e 's/^CFLAGS := /CFLAGS +=/' \
+		-e 's/-g -O2//' \
+		-e 's/-D_FORTIFY_SOURCE=2//' \
+		-e '/-o trinity/s/$(CFLAGS)/\0 $(LDFLAGS)/' \
+		-i Makefile || die
+
+	tc-export CC
+}
+
+src_configure() {
+	./configure.sh || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc Documentation/* README
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/scripts
+		doexe scripts/*
+		docompress -x /usr/share/doc/${PF}/scripts
+	fi
+}
diff --git a/dev-util/trinity/trinity-1.4.ebuild b/dev-util/trinity/trinity-1.4.ebuild
new file mode 100644
index 000000000000..f303e35db1ab
--- /dev/null
+++ b/dev-util/trinity/trinity-1.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	app-arch/xz-utils
+	sys-kernel/linux-headers
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+	tc-export CC
+}
+
+src_configure() {
+	./configure.sh || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc Documentation/* README
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/scripts
+		doexe scripts/*
+		docompress -x /usr/share/doc/${PF}/scripts
+	fi
+}
diff --git a/dev-util/trinity/trinity-1.5.ebuild b/dev-util/trinity/trinity-1.5.ebuild
new file mode 100644
index 000000000000..baab1988db2d
--- /dev/null
+++ b/dev-util/trinity/trinity-1.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	app-arch/xz-utils
+	sys-kernel/linux-headers
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+	tc-export CC
+}
+
+src_configure() {
+	./configure.sh || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc Documentation/* README
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/scripts
+		doexe scripts/*
+		docompress -x /usr/share/doc/${PF}/scripts
+	fi
+}
diff --git a/dev-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-9999.ebuild
new file mode 100644
index 000000000000..36b1a4ffe17e
--- /dev/null
+++ b/dev-util/trinity/trinity-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs git-r3
+
+EGIT_REPO_URI="https://github.com/kernelslacker/trinity.git"
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="sys-kernel/linux-headers"
+
+src_prepare() {
+	sed -e 's/-g -O2//' \
+		-e 's/-D_FORTIFY_SOURCE=2//' \
+		-e '/-o $@/s/$(LDFLAGS) //' \
+		-i Makefile || die
+
+	tc-export CC
+}
+
+src_configure() {
+	./configure.sh || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc Documentation/* README
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/scripts
+		doexe scripts/*
+		docompress -x /usr/share/doc/${PF}/scripts
+	fi
+}
diff --git a/dev-util/txt2regex/Manifest b/dev-util/txt2regex/Manifest
new file mode 100644
index 000000000000..eb7735edc1ee
--- /dev/null
+++ b/dev-util/txt2regex/Manifest
@@ -0,0 +1 @@
+DIST txt2regex-0.8.tgz 40514 SHA256 19a10fbcc144ab80d1998488be380e5c4b307101e2740491d9f90685a5c0fc8d SHA512 69d2a682471e3e35fbd0b2ad6f6ffab040803a17bda8082f3dd67baf3a03e7011cb20047940fb9403e180895a1258f720ca4d538187878c5989a1ec51168435f WHIRLPOOL adb6ba8975ea5159ea61a652e0aa0ae8f3661c07a26a65490a0656db35351e67a78557a05490fa783fa8be97cb01cbe33f1443eede1171f6f6877c632a0c94e0
diff --git a/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
new file mode 100644
index 000000000000..107b1b823753
--- /dev/null
+++ b/dev-util/txt2regex/files/txt2regex-0.8-disable-nls.patch
@@ -0,0 +1,20 @@
+diff -ur txt2regex-0.8/Makefile txt2regex-0.8.nonls/Makefile
+--- txt2regex-0.8/Makefile	2004-09-28 16:04:55 -0500
++++ txt2regex-0.8.nonls/Makefile	2005-05-14 15:28:38 -0500
+@@ -80,15 +80,8 @@
+ 	rm -rf $(DISTDIR)
+ 
+ #TODO install man page and README
+-install: mo
+-	@[ -d $(LOCALEDIR) ] || mkdir -p $(LOCALEDIR); \
++install:
+ 	[ -d $(BINDIR) ] || mkdir -p $(BINDIR); \
+-	for pot in `cd $(PODIR) && ls *.mo`; do \
+-		poti=`echo $$pot | sed 's/\.mo$$//'`; \
+-		modir=$(LOCALEDIR)/$$poti/LC_MESSAGES; \
+-		[ -d $$modir ] || mkdir -p $$modir; \
+-		install -m644 $(PODIR)/$$pot $$modir/$(NAME).mo; \
+-	done; \
+ 	sed -e '/^TEXTDOMAINDIR=/s,=.*,=$(LOCALEDIR),' \
+ 	    -e '/^VERSION=/s/=.*/=$(VERSION)/' $(SHSKEL) > $(BINDIR)/$(NAME) && \
+ 	chmod +x $(BINDIR)/$(NAME) && \
diff --git a/dev-util/txt2regex/metadata.xml b/dev-util/txt2regex/metadata.xml
new file mode 100644
index 000000000000..80ac69d9c2f2
--- /dev/null
+++ b/dev-util/txt2regex/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>shell-tools</herd>
+</pkgmetadata>
diff --git a/dev-util/txt2regex/txt2regex-0.8-r1.ebuild b/dev-util/txt2regex/txt2regex-0.8-r1.ebuild
new file mode 100644
index 000000000000..ba29402f2966
--- /dev/null
+++ b/dev-util/txt2regex/txt2regex-0.8-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="A Regular Expression wizard that converts human sentences to regexs"
+HOMEPAGE="http://txt2regex.sourceforge.net/"
+SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ~ppc sparc x86"
+IUSE="nls cjk"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=">=app-shells/bash-2.04"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# See bug 93568
+	use nls || epatch "${FILESDIR}"/${P}-disable-nls.patch
+	use cjk && sed -i -e 's/\xa4/:+:/g' "${S}"/${P}.sh
+}
+
+src_install() {
+	einstall DESTDIR="${D}" MANDIR="${D}"/usr/share/man/man1 || die
+	dodoc Changelog NEWS README README.japanese TODO || die
+	newman txt2regex.man txt2regex.6 || die
+}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
new file mode 100644
index 000000000000..3744305f029c
--- /dev/null
+++ b/dev-util/umockdev/Manifest
@@ -0,0 +1,5 @@
+DIST umockdev-0.8.10.tar.xz 741364 SHA256 5105caf49c240148a826871ee6576e99ed902ea8b58d7908b0dfd121a9f8319d SHA512 74eb2bd58fad181c52a4a968d9cfd895f1723052d046b21a9381a8bf293a135173d1e218c55b824c4cd285fe0f6ae99764d4e4c0c35c55ee9bb08c3bea03292e WHIRLPOOL 912f814fb05520fdc7d18f81b10c1b0ecba0d890086735963b6becfcd685bb4e60d63953792a04d84483f47f54a74b81e20ad717c044305bf56b76d27b2b9bb2
+DIST umockdev-0.8.11.tar.xz 741812 SHA256 222518a634c57b1d6d9f51b042e8c80641251260d9c43e6c6273d446d577ccb7 SHA512 dd6aa23873060c2778796f7300b61aa46e6f9bed8b2b2dc107eb747ade93f9d9027385a414f2107f3da4932065e1f7ec488cc91c6f24c3204a7abbbdf4cb8e84 WHIRLPOOL b736ca9d9f73294e5aabc3be75e006efcfdba8f8ecb96cdeb2fb88a12cc3ba53870c416c82c315acc7da7929d07a9efcdc6ceadaa324e0c63a9a60589d66148c
+DIST umockdev-0.8.2.tar.xz 733196 SHA256 8d7dad9ec6f9105773d1bb57eb844310e7a05ba850c0f28b9b520f848b2a2719 SHA512 a7674abcde7f570d92da4e54bbe7448ffde99515577c05664ea11ed45dcab7345e62b96d42f6e851b8dc5199dfaf7955a54156ae4bc9ffc983a5ccf312755514 WHIRLPOOL 0774f85f09d6e2d03fd500143a0b56a31cbda561e693b46b236d8641f336edc91d05206a36f408911baddce42c9a0aede9a4d6a71830b2e0f17a0859170ba028
+DIST umockdev-0.8.8.tar.xz 741304 SHA256 51fb5f81d895f99c3a3d81a18356db7e6d2cd075732477d8d4be4ffd97817e3f SHA512 5a8991111a7a108e965e4e1446c050dc544ddf7dc4a35db7374be0373b0f74415b3bcc1192547ce32a91ed91e373f5b750adb18a4c4efc2c587f9d03625d417c WHIRLPOOL c2c8dc304dcafbee9dfb8047a41b71ed1ee36905d7a0bcbe46fb2a67110580279bf5ff293636d2030e6cd43f4ab4ee885be76a3c44c76469967d10e1e7867dde
+DIST umockdev-0.8.9.tar.xz 740428 SHA256 5a4e6b43d99c6cad52bd22d7d713ff2d5dcc4db4147c01d08d174606de095adf SHA512 bac7b39eae1623e42db80dc39517d0f7f6c5264be65c089789d5cb17bd7f45584fab6e5930cd44d9b7e4dae987db31a2876b20310a9297f676c38b7461a1ab7b WHIRLPOOL b7253b50f130252c36c23079e454fc346ab9abc5131355c7abcb4573368bcf3d6a71af82563c79276df8c29e97210cadf6195ff498619b61b1734e1be86244ea
diff --git a/dev-util/umockdev/metadata.xml b/dev-util/umockdev/metadata.xml
new file mode 100644
index 000000000000..f6b00353f492
--- /dev/null
+++ b/dev-util/umockdev/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">umockdev</remote-id>
+		<remote-id type="github">martinpitt/umockdev</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/umockdev/umockdev-0.8.10.ebuild b/dev-util/umockdev/umockdev-0.8.10.ebuild
new file mode 100644
index 000000000000..f29eedfc35de
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.8.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-any-r1 autotools-utils
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/libgudev:=
+	virtual/libudev:=
+	>=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+RESTRICT="test"
diff --git a/dev-util/umockdev/umockdev-0.8.11.ebuild b/dev-util/umockdev/umockdev-0.8.11.ebuild
new file mode 100644
index 000000000000..f29eedfc35de
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.8.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-any-r1 autotools-utils
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/libgudev:=
+	virtual/libudev:=
+	>=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+RESTRICT="test"
diff --git a/dev-util/umockdev/umockdev-0.8.2.ebuild b/dev-util/umockdev/umockdev-0.8.2.ebuild
new file mode 100644
index 000000000000..f29eedfc35de
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.8.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-any-r1 autotools-utils
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/libgudev:=
+	virtual/libudev:=
+	>=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+RESTRICT="test"
diff --git a/dev-util/umockdev/umockdev-0.8.8.ebuild b/dev-util/umockdev/umockdev-0.8.8.ebuild
new file mode 100644
index 000000000000..c097b7aacbd4
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.8.8.ebuild
@@ -0,0 +1,27 @@
+# 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} )
+
+inherit python-any-r1 autotools-utils
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/libgudev:=
+	virtual/libudev:=
+	>=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+RESTRICT="test"
diff --git a/dev-util/umockdev/umockdev-0.8.9.ebuild b/dev-util/umockdev/umockdev-0.8.9.ebuild
new file mode 100644
index 000000000000..f29eedfc35de
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.8.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-any-r1 autotools-utils
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/libgudev:=
+	virtual/libudev:=
+	>=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+RESTRICT="test"
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
new file mode 100644
index 000000000000..feadfb60f526
--- /dev/null
+++ b/dev-util/uncrustify/Manifest
@@ -0,0 +1,2 @@
+DIST uncrustify-0.59.tar.gz 983822 SHA256 3f2ba1ca15f7ed1cd0871d54a5dd4ecf006fd167a0fa0fe1d5d76c91106238b5 SHA512 eb228ecb63f777e90ecca44bdef2312fbca2cdbdf9dd899e1f67e9917265667584796b983050138bae39773ab2627e3c3035e519f64dfe51475f207a0e3af900 WHIRLPOOL 85d702e2968d6fbbce7f15fb23d2bbb5e2131f462076e82adf109c684c9b09410c409aa0d75114e7d5b8951d1dfdee80186d483e48d57c1e183d4c3a27bfa8b5
+DIST uncrustify-0.61.tar.gz 1143946 SHA256 1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9 SHA512 b6abd4ee2f22430c57cd47903674f0a5a37b86fe6604426248b24dda17f06fa2e6ca3877035874a31fa668fbf9c238f538813bcc7c1834bc349f94365714aedc WHIRLPOOL 1ad5dfc944910b6831f72f7be86b624273c44d535b359d13b017545c1259d3ed5d2eac7c2cb29f9abd2ecb24e26ea3b8cfd21c0454dd5562ac01a3274f104df7
diff --git a/dev-util/uncrustify/files/uncrustify-0.59-unistdh.patch b/dev-util/uncrustify/files/uncrustify-0.59-unistdh.patch
new file mode 100644
index 000000000000..275c21aba339
--- /dev/null
+++ b/dev-util/uncrustify/files/uncrustify-0.59-unistdh.patch
@@ -0,0 +1,16 @@
+open/close/etc. are defined in unistd.h, GCC 4.7 is stricter in this and
+breaks the build, bug #413859.  Upstream already applied a similar
+change for another issue, so next release should be fine.
+
+--- uncrustify-0.59/src/uncrustify.cpp
++++ uncrustify-0.59/src/uncrustify.cpp
+@@ -24,6 +24,9 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <cerrno>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ #include <fcntl.h>
+ #include "unc_ctype.h"
+ #ifdef HAVE_SYS_STAT_H
diff --git a/dev-util/uncrustify/metadata.xml b/dev-util/uncrustify/metadata.xml
new file mode 100644
index 000000000000..3b0c76d926df
--- /dev/null
+++ b/dev-util/uncrustify/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<maintainer>
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetosov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">uncrustify</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/uncrustify/uncrustify-0.59.ebuild b/dev-util/uncrustify/uncrustify-0.59.ebuild
new file mode 100644
index 000000000000..6f874035c45f
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.59.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="test? ( =dev-lang/python-2* )"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-unistdh.patch
+}
+
+src_test() {
+	cd tests
+	python2 run_tests.py || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+}
diff --git a/dev-util/uncrustify/uncrustify-0.61-r1.ebuild b/dev-util/uncrustify/uncrustify-0.61-r1.ebuild
new file mode 100644
index 000000000000..cf696e3ae8b0
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.61-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ $PV == *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/bengardner/uncrustify.git
+		https://github.com/bengardner/uncrustify.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+python_test() {
+	cd tests
+	${EPYTHON} run_tests.py || die "tests failed"
+}
diff --git a/dev-util/uncrustify/uncrustify-0.61.ebuild b/dev-util/uncrustify/uncrustify-0.61.ebuild
new file mode 100644
index 000000000000..f7d7a947aac5
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.61.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="test? ( =dev-lang/python-2* )"
+RDEPEND=""
+
+src_test() {
+	cd tests
+	python2 run_tests.py || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+}
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
new file mode 100644
index 000000000000..cf696e3ae8b0
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ $PV == *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/bengardner/uncrustify.git
+		https://github.com/bengardner/uncrustify.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+python_test() {
+	cd tests
+	${EPYTHON} run_tests.py || die "tests failed"
+}
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
new file mode 100644
index 000000000000..27ee5a3916dd
--- /dev/null
+++ b/dev-util/unifdef/Manifest
@@ -0,0 +1 @@
+DIST unifdef-2.10.tar.gz 73285 SHA256 1375528c8983de06bbf074b6cfa60fcf0257ea8efcbaec0953b744d2e3dcc5dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3 WHIRLPOOL 54d1e1730cd7eaafba828c508d682dbfa888675e2ae4b709b16c5bc5eb713be6e54afacab10c521a340612ac91d30d9565250e43d4929b13ef2768506bc3ac0a
diff --git a/dev-util/unifdef/metadata.xml b/dev-util/unifdef/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/dev-util/unifdef/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>base-system</herd>
+</pkgmetadata>
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
new file mode 100644
index 000000000000..5d3b0e50eb94
--- /dev/null
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="remove #ifdef'ed lines from a file while otherwise leaving the file alone"
+HOMEPAGE="http://dotat.at/prog/unifdef/"
+SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
+
+DOCS=( README )
+
+src_prepare() {
+	sed -i '/^prefix/s:=.*:=/usr:' Makefile || die
+	tc-export CC
+}
diff --git a/dev-util/universalindentgui/Manifest b/dev-util/universalindentgui/Manifest
new file mode 100644
index 000000000000..b33f19da87ac
--- /dev/null
+++ b/dev-util/universalindentgui/Manifest
@@ -0,0 +1 @@
+DIST universalindentgui-1.2.0.tar.gz 863793 SHA256 78a8d5538b951080c521118a0cefcae5bf1b32a3f0a022087087af3d70e98338 SHA512 73535e2a199f3b0396d2d33cdf6cdf051cc4f01da4907c03ba9fd9fa86033921ff7fc448078ca2d34ae88a421f6ac51ef4c0f98daaceff40d128f55d790e197e WHIRLPOOL b445a1259bb86dbfa282f1b89b60a964deda66eb921288c1298476a47018908a2f49344ced73de1563d3b5132b50df9485a778d8073e304d4f014952d23238b2
diff --git a/dev-util/universalindentgui/metadata.xml b/dev-util/universalindentgui/metadata.xml
new file mode 100644
index 000000000000..c019dcc590d4
--- /dev/null
+++ b/dev-util/universalindentgui/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+	<use>
+		<flag name="html">Add support for HTML files</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">universalindent</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..8b9cd9691638
--- /dev/null
+++ b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+LANGS="de fr ja ru uk zh_TW"
+
+inherit eutils python qt4-r2
+
+DESCRIPTION="Cross platform GUI for several code formatters, beautifiers and indenters"
+HOMEPAGE="http://universalindent.sourceforge.net/"
+SRC_URI="mirror://sourceforge/universalindent/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples html perl php python ruby xml"
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	x11-libs/qscintilla
+"
+RDEPEND="${DEPEND}
+	dev-util/astyle
+	dev-util/bcpp
+	dev-util/indent
+	html? (
+		app-text/htmltidy
+		perl? ( dev-lang/perl )
+	)
+	perl? ( dev-perl/perltidy )
+	php? ( dev-php/PEAR-PHP_Beautifier )
+	ruby? ( dev-lang/ruby )
+	xml? ( dev-util/xmlindent )
+"
+
+DOCS="CHANGELOG.txt readme.html"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# correct translation binaries
+	sed -e "s/lupdate-qt4/lupdate/" \
+		-e "s/lrelease-qt4/lrelease/" \
+		-i UniversalIndentGUI.pro || die "sed pro translation binary"
+
+	if use debug; then
+		sed -i -e 's:release,:debug,:g' UniversalIndentGUI.pro || die
+	fi
+
+	# patch .pro file according to our use flags
+	# basic support
+	UEXAMPLES="cpp sh"
+	local UINDENTERS="shellindent.awk"
+	local UIGUIFILES="shellindent gnuindent bcpp astyle"
+
+	if use html; then
+		UEXAMPLES="${UEXAMPLES} html"
+		UIGUIFILES="${UIGUIFILES} tidy"
+		if use perl; then
+			UINDENTERS="${UINDENTERS} hindent"
+			UIGUIFILES="${UIGUIFILES} hindent"
+		fi
+	fi
+
+	if use perl; then
+		UEXAMPLES="${UEXAMPLES} pl"
+		UIGUIFILES="${UIGUIFILES} perltidy"
+	fi
+
+	if use php; then
+		UEXAMPLES="${UEXAMPLES} php"
+		UINDENTERS="${UINDENTERS} phpStylist.php"
+		UIGUIFILES="${UIGUIFILES} php_Beautifier phpStylist"
+	fi
+
+	if use python; then
+		UEXAMPLES="${UEXAMPLES} py"
+		UINDENTERS="${UINDENTERS} pindent.py"
+		UIGUIFILES="${UIGUIFILES} pindent"
+		python_convert_shebangs -r 2 .
+	fi
+
+	if use ruby; then
+		UEXAMPLES="${UEXAMPLES} rb"
+		UINDENTERS="${UINDENTERS} rbeautify.rb ruby_formatter.rb"
+		UIGUIFILES="${UIGUIFILES} rbeautify rubyformatter"
+	fi
+
+	if use xml; then
+		UEXAMPLES="${UEXAMPLES} xml"
+		UIGUIFILES="${UIGUIFILES} xmlindent"
+	fi
+
+	local IFILES= I=
+	for I in ${UINDENTERS}; do
+		IFILES="${IFILES} indenters/${I}"
+		chmod +x indenters/${I}
+	done
+
+	for I in ${UIGUIFILES}; do
+		IFILES="${IFILES} indenters/uigui_${I}.ini"
+	done
+
+	# apply fixes in .pro file
+	sed -i -e "/^unix:indenters.files +=/d" UniversalIndentGUI.pro ||
+		die ".pro patching failed"
+	sed -i -e "s:indenters/uigui_\*\.ini:${IFILES}:" UniversalIndentGUI.pro ||
+		die ".pro patching failed"
+
+	local lang
+	for lang in ${LANGS}; do
+		if ! use linguas_${lang}; then
+			sed -e "/_${lang}.ts/d" -e "/_${lang}.qm/d" \
+				-i UniversalIndentGUI.pro || die "failed while disabling ${lang}"
+		fi
+	done
+
+	qt4-r2_src_prepare
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	doman doc/${PN}.1.gz
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		local I
+		for I in ${UEXAMPLES}; do
+			doins indenters/example.${I}
+		done
+	fi
+
+	newicon resources/universalIndentGUI_512x512.png ${PN}
+	make_desktop_entry ${PN} UniversalIndentGUI ${PN} "Qt;Development"
+}
diff --git a/dev-util/usb-robot/Manifest b/dev-util/usb-robot/Manifest
new file mode 100644
index 000000000000..2fda62e146a7
--- /dev/null
+++ b/dev-util/usb-robot/Manifest
@@ -0,0 +1 @@
+DIST usb-robot-0.2.0.tar.gz 43682 SHA256 ee7d9c8cbbb22c8ac13387aec5ce88523b48264267dc9fae7f248884c7637eac SHA512 45d7332a10ba881ade03e1f927a6f36e13d31661ac85950c2f31534b313db4bb354e75404b98bdbe522ab22a08a18592a8ab3b4c73bd6cd902e97285b505e37b WHIRLPOOL aa1ea89ff3c8dc8f5938da74e384b6bdfab856b71cbf65415ba2ad9036b40220bee17d22ed8d0b1913cf0c39fe0e0e0f9e262de8526ba0de1ea155f057a4e36a
diff --git a/dev-util/usb-robot/metadata.xml b/dev-util/usb-robot/metadata.xml
new file mode 100644
index 000000000000..32d807567df2
--- /dev/null
+++ b/dev-util/usb-robot/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">usb-robot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/usb-robot/usb-robot-0.2.0.ebuild b/dev-util/usb-robot/usb-robot-0.2.0.ebuild
new file mode 100644
index 000000000000..9fd3a060efae
--- /dev/null
+++ b/dev-util/usb-robot/usb-robot-0.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="USB Reverse engineering tools"
+HOMEPAGE="http://usb-robot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="virtual/libusb:0
+	sys-libs/readline"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install () {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS NEWS README ChangeLog
+}
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
new file mode 100644
index 000000000000..1073c90a648e
--- /dev/null
+++ b/dev-util/valgrind/Manifest
@@ -0,0 +1,4 @@
+DIST valgrind-3.10.1.tar.bz2 10967905 SHA256 fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997 SHA512 8f3d27637c13b06381b3dd44088244e0cf2f7008f40e46f34322f2a5bfa6373d29ce68ff49f19c48f1a5f139d8be5838b9606206e0ce2599c5f74c0db8ce2642 WHIRLPOOL 3d55f35b02195d9859d9192726ea708277f1d3339005d959baa224822c5b71f5347cdd28c7fd8153c10d1e3282855e853caf9c7192751bebdbbc3444c33d885a
+DIST valgrind-3.7.0.tar.bz2 6624216 SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6 SHA512 0ccf6607fe6d26f0dc0f3d6e45f84645925d0a90ce4ecf6acfc6b4d374d3e909b2a628b03c0a964a45d2462cca6877f818a5f72b3e4a5bbf3a2d9b8a9a343d5f WHIRLPOOL 44bf8c423d6f3222f5e777333acc21e94dfa680509b2152289129961296d8afc090466b6407248b6e172b3c42da5448206f257bd63f8e44aba01007f92a6fde1
+DIST valgrind-3.8.1.tar.bz2 7962963 SHA256 473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db SHA512 ba31f5d43bd2d9533846bed6456a0eae40ac071ff8732201dd75c9e2cd7e9ce3224cb5928b9c8fc859a75ce6867a9b6a1fb2ba8ab62cd3944893d6d4156ab25c WHIRLPOOL 81e63bb649455ed29fcd60fc7f3cebde456a610118b9b24530d3b2e8aa4a7561369e992af86ffb158e1f7fc0db7b91738564402931a947a79bb789bd26a8e065
+DIST valgrind-3.9.0.tar.bz2 10003156 SHA256 e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0 SHA512 4b748f9f9a647df50db75fb56f83ee2f25bad9f1f4e4f05c4ac1d1e919e6cd954975c1f325dbedb509c44be1a8516ac2a5f269090946a0d728166ab183016c7b WHIRLPOOL e73c4dcdff829a34889f5654c5ec314f32d2c33f9e64bde3f811359a252749a6c677db80bf2aa2647f935cd38a0ccc19c0358a7b13198032c5d636f97e9e71de
diff --git a/dev-util/valgrind/files/valgrind-3.10.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.10.0-non-exec-stack.patch
new file mode 100644
index 000000000000..d4ae13d45cf1
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.10.0-non-exec-stack.patch
@@ -0,0 +1,148 @@
+diff -Naur valgrind-3.10.0.orig/coregrind/Makefile.am valgrind-3.10.0/coregrind/Makefile.am
+--- valgrind-3.10.0.orig/coregrind/Makefile.am	2014-09-08 08:28:30.000000000 -0400
++++ valgrind-3.10.0/coregrind/Makefile.am	2014-09-12 20:54:25.720389938 -0400
+@@ -333,18 +333,6 @@
+ 	m_demangle/demangle.c \
+ 	m_demangle/dyn-string.c \
+ 	m_demangle/safe-ctype.c \
+-	m_dispatch/dispatch-x86-linux.S \
+-	m_dispatch/dispatch-amd64-linux.S \
+-	m_dispatch/dispatch-ppc32-linux.S \
+-	m_dispatch/dispatch-ppc64be-linux.S \
+-	m_dispatch/dispatch-ppc64le-linux.S \
+-	m_dispatch/dispatch-arm-linux.S \
+-	m_dispatch/dispatch-arm64-linux.S \
+-	m_dispatch/dispatch-s390x-linux.S \
+-	m_dispatch/dispatch-mips32-linux.S \
+-	m_dispatch/dispatch-mips64-linux.S \
+-	m_dispatch/dispatch-x86-darwin.S \
+-	m_dispatch/dispatch-amd64-darwin.S \
+ 	m_gdbserver/inferiors.c \
+ 	m_gdbserver/m_gdbserver.c \
+ 	m_gdbserver/regcache.c \
+@@ -368,8 +356,6 @@
+ 	m_initimg/initimg-pathscan.c \
+ 	m_mach/mach_basics.c \
+ 	m_mach/mach_msg.c \
+-	m_mach/mach_traps-x86-darwin.S \
+-	m_mach/mach_traps-amd64-darwin.S \
+ 	m_replacemalloc/replacemalloc_core.c \
+ 	m_scheduler/scheduler.c \
+ 	m_scheduler/sema.c \
+@@ -386,18 +372,6 @@
+ 	m_sigframe/sigframe-mips64-linux.c \
+ 	m_sigframe/sigframe-x86-darwin.c \
+ 	m_sigframe/sigframe-amd64-darwin.c \
+-	m_syswrap/syscall-x86-linux.S \
+-	m_syswrap/syscall-amd64-linux.S \
+-	m_syswrap/syscall-ppc32-linux.S \
+-	m_syswrap/syscall-ppc64be-linux.S \
+-	m_syswrap/syscall-ppc64le-linux.S \
+-	m_syswrap/syscall-arm-linux.S \
+-	m_syswrap/syscall-arm64-linux.S \
+-	m_syswrap/syscall-s390x-linux.S \
+-	m_syswrap/syscall-mips32-linux.S \
+-	m_syswrap/syscall-mips64-linux.S \
+-	m_syswrap/syscall-x86-darwin.S \
+-	m_syswrap/syscall-amd64-darwin.S \
+ 	m_syswrap/syswrap-main.c \
+ 	m_syswrap/syswrap-generic.c \
+ 	m_syswrap/syswrap-linux.c \
+@@ -420,6 +394,29 @@
+ 	m_ume/main.c \
+ 	m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -Naur valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.10.0/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S	2014-09-08 08:28:46.000000000 -0400
++++ valgrind-3.10.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2014-09-12 20:49:14.681385751 -0400
+@@ -249,11 +249,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.10.0/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S	2014-09-08 08:28:46.000000000 -0400
++++ valgrind-3.10.0/coregrind/m_dispatch/dispatch-x86-linux.S	2014-09-12 20:49:14.681385751 -0400
+@@ -240,11 +240,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.10.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.10.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.10.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S	2014-09-08 08:28:45.000000000 -0400
++++ valgrind-3.10.0/coregrind/m_syswrap/syscall-amd64-linux.S	2014-09-12 20:49:14.681385751 -0400
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished):	.quad 5b
+ .previous
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.10.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.10.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.10.0.orig/coregrind/m_syswrap/syscall-x86-linux.S	2014-09-08 08:28:45.000000000 -0400
++++ valgrind-3.10.0/coregrind/m_syswrap/syscall-x86-linux.S	2014-09-12 20:49:14.681385751 -0400
+@@ -165,11 +165,11 @@
+ ML_(blksys_finished):	.long 5b
+ .previous
+ 	
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
new file mode 100644
index 000000000000..286e431b0dd6
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
@@ -0,0 +1,17 @@
+diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
+--- valgrind-3.10.1.orig/configure.ac	2014-11-25 14:41:13.000000000 -0500
++++ valgrind-3.10.1/configure.ac	2015-07-28 22:35:22.315604804 -0400
+@@ -1018,6 +1018,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.21)
++	AC_MSG_RESULT(2.21 family)
++	AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
new file mode 100644
index 000000000000..63918c2c1d0e
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
@@ -0,0 +1,29 @@
+From ecb3746d69820905c076b89e1be7042f52ceaa5f Mon Sep 17 00:00:00 2001
+From: Janne Grunau <j@jannau.net>
+Date: Thu, 19 Mar 2015 22:44:51 +0100
+Subject: [PATCH 1/1] configure: support linux 4.*
+
+There is nothing special in linux 4.0. Handle it as another 3.* (or
+another 2.6.*) release. Compare changeset 14955 in valgrind's
+subversion repository. Valgrind trunk also drops support for linux 2.4
+but there is no need to do that for realeased software.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fd2a41..33c7954 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -303,7 +303,7 @@ case "${host_os}" in
+         kernel=`uname -r`
+ 
+         case "${kernel}" in
+-             2.6.*|3.*) 
++             2.6.*|3.*|4.*)
+         	    AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
+         	    AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
+         	    ;;
+-- 
+2.3.3
+
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
new file mode 100644
index 000000000000..e25de99e7902
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
@@ -0,0 +1,148 @@
+diff -Naur valgrind-3.10.1.orig/coregrind/Makefile.am valgrind-3.10.1/coregrind/Makefile.am
+--- valgrind-3.10.1.orig/coregrind/Makefile.am	2014-11-25 14:41:19.000000000 -0500
++++ valgrind-3.10.1/coregrind/Makefile.am	2014-11-26 13:36:44.113678744 -0500
+@@ -333,18 +333,6 @@
+ 	m_demangle/demangle.c \
+ 	m_demangle/dyn-string.c \
+ 	m_demangle/safe-ctype.c \
+-	m_dispatch/dispatch-x86-linux.S \
+-	m_dispatch/dispatch-amd64-linux.S \
+-	m_dispatch/dispatch-ppc32-linux.S \
+-	m_dispatch/dispatch-ppc64be-linux.S \
+-	m_dispatch/dispatch-ppc64le-linux.S \
+-	m_dispatch/dispatch-arm-linux.S \
+-	m_dispatch/dispatch-arm64-linux.S \
+-	m_dispatch/dispatch-s390x-linux.S \
+-	m_dispatch/dispatch-mips32-linux.S \
+-	m_dispatch/dispatch-mips64-linux.S \
+-	m_dispatch/dispatch-x86-darwin.S \
+-	m_dispatch/dispatch-amd64-darwin.S \
+ 	m_gdbserver/inferiors.c \
+ 	m_gdbserver/m_gdbserver.c \
+ 	m_gdbserver/regcache.c \
+@@ -368,8 +356,6 @@
+ 	m_initimg/initimg-pathscan.c \
+ 	m_mach/mach_basics.c \
+ 	m_mach/mach_msg.c \
+-	m_mach/mach_traps-x86-darwin.S \
+-	m_mach/mach_traps-amd64-darwin.S \
+ 	m_replacemalloc/replacemalloc_core.c \
+ 	m_scheduler/scheduler.c \
+ 	m_scheduler/sema.c \
+@@ -386,18 +372,6 @@
+ 	m_sigframe/sigframe-mips64-linux.c \
+ 	m_sigframe/sigframe-x86-darwin.c \
+ 	m_sigframe/sigframe-amd64-darwin.c \
+-	m_syswrap/syscall-x86-linux.S \
+-	m_syswrap/syscall-amd64-linux.S \
+-	m_syswrap/syscall-ppc32-linux.S \
+-	m_syswrap/syscall-ppc64be-linux.S \
+-	m_syswrap/syscall-ppc64le-linux.S \
+-	m_syswrap/syscall-arm-linux.S \
+-	m_syswrap/syscall-arm64-linux.S \
+-	m_syswrap/syscall-s390x-linux.S \
+-	m_syswrap/syscall-mips32-linux.S \
+-	m_syswrap/syscall-mips64-linux.S \
+-	m_syswrap/syscall-x86-darwin.S \
+-	m_syswrap/syscall-amd64-darwin.S \
+ 	m_syswrap/syswrap-main.c \
+ 	m_syswrap/syswrap-generic.c \
+ 	m_syswrap/syswrap-linux.c \
+@@ -420,6 +394,29 @@
+ 	m_ume/main.c \
+ 	m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -Naur valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.10.1/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-amd64-linux.S	2014-11-25 14:41:20.000000000 -0500
++++ valgrind-3.10.1/coregrind/m_dispatch/dispatch-amd64-linux.S	2014-11-26 13:30:11.840660890 -0500
+@@ -249,11 +249,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.10.1/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-x86-linux.S	2014-11-25 14:41:20.000000000 -0500
++++ valgrind-3.10.1/coregrind/m_dispatch/dispatch-x86-linux.S	2014-11-26 13:30:11.840660890 -0500
+@@ -240,11 +240,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.10.1/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-amd64-linux.S	2014-11-25 14:41:20.000000000 -0500
++++ valgrind-3.10.1/coregrind/m_syswrap/syscall-amd64-linux.S	2014-11-26 13:30:11.840660890 -0500
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished):	.quad 5b
+ .previous
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.10.1/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-x86-linux.S	2014-11-25 14:41:20.000000000 -0500
++++ valgrind-3.10.1/coregrind/m_syswrap/syscall-x86-linux.S	2014-11-26 13:30:11.840660890 -0500
+@@ -165,11 +165,11 @@
+ ML_(blksys_finished):	.long 5b
+ .previous
+ 	
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
new file mode 100644
index 000000000000..68e682255611
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
@@ -0,0 +1,24 @@
+--- coregrind/m_libcassert.c	2010-10-21 04:19:45.000000000 +0800
++++ coregrind/m_libcassert.c	2010-10-24 20:23:17.800001876 +0800
+@@ -81,8 +81,8 @@
+       { UInt cia, r1, lr;                                 \
+         __asm__ __volatile__(                             \
+            "mflr 0;"                   /* r0 = lr */      \
+-           "bl m_libcassert_get_ip;"   /* lr = pc */      \
+-           "m_libcassert_get_ip:\n"                       \
++           "bl 0f;"                    /* lr = pc */      \
++           "0:\n"                                         \
+            "mflr %0;"                  /* %0 = pc */      \
+            "mtlr 0;"                   /* restore lr */   \
+            "mr %1,1;"                  /* %1 = r1 */      \
+@@ -100,8 +100,8 @@
+       { ULong cia, r1, lr;                                \
+         __asm__ __volatile__(                             \
+            "mflr 0;"                   /* r0 = lr */      \
+-           "bl .m_libcassert_get_ip;"  /* lr = pc */      \
+-           ".m_libcassert_get_ip:\n"                      \
++           "bl 0f;"                    /* lr = pc */      \
++           "0:\n"                                         \
+            "mflr %0;"                  /* %0 = pc */      \
+            "mtlr 0;"                   /* restore lr */   \
+            "mr %1,1;"                  /* %1 = r1 */      \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
new file mode 100644
index 000000000000..b0b57bf3a098
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
@@ -0,0 +1,37 @@
+From: Gregorio Guidi <gregorio.guidi@gmail.com>
+
+Retain the old behavior of the build system even with automake 1.11.2.
+
+Reported-by: Oleg Bulatov <dmage@bk.ru>
+X-Gentoo-Bug: 397429
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397429
+X-KDE-Bug: 290719
+X-KDE-Bug-URL: https://bugs.kde.org/show_bug.cgi?id=290719
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -Nur valgrind-3.7.0.orig/coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
+--- valgrind-3.7.0.orig/coregrind/Makefile.am	2011-10-27 12:55:06.000000000 +0200
++++ valgrind-3.7.0/coregrind/Makefile.am	2012-01-06 17:23:48.717115986 +0100
+@@ -495,7 +495,8 @@
+ 	m_gdbserver/powerpc-altivec64l.xml
+ 
+ # so as to make sure these get copied into the install tree
+-pkglib_DATA  = $(GDBSERVER_XML_FILES)
++vgdatadir = $(pkglibdir)
++vgdata_DATA  = $(GDBSERVER_XML_FILES)
+ 
+ # so as to make sure these get copied into the tarball
+ EXTRA_DIST  += $(GDBSERVER_XML_FILES)
+diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am
+--- valgrind-3.7.0.orig/Makefile.am	2011-10-26 23:24:45.000000000 +0200
++++ valgrind-3.7.0/Makefile.am	2012-01-06 17:23:17.445114847 +0100
+@@ -61,7 +61,8 @@
+ # default.supp, as it is built from the base .supp files at compile-time.
+ dist_noinst_DATA = $(SUPP_FILES)
+ 
+-pkglib_DATA = default.supp
++vgdatadir = $(pkglibdir)
++vgdata_DATA = default.supp
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = valgrind.pc
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
new file mode 100644
index 000000000000..feabf069354a
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
@@ -0,0 +1,35 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 12273)
++++ configure.in	(revision 12274)
+@@ -98,18 +98,21 @@
+ # We don't want gcc < 3.0
+ AC_MSG_CHECKING([for a supported version of gcc])
+ 
+-# Try to get the gcc version, sed-ing out some unexpected stuff
+-# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
+-# Without this, the version number comes out as 686, 10 or 11 :-(
++# Obtain the compiler version.
+ # 
+-# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
+-# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
++# A few examples of how the ${CC} --version output looks like:
+ #
++# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
++# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
++# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
++# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
++# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
++# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
++# Clang: clang version 2.9 (tags/RELEASE_29/final)
++#
+ [gcc_version=`${CC} --version \
+-             | head -n 1 \
+-             | $SED 's/i686-apple-darwin10//' \
+-             | $SED 's/i686-apple-darwin11//' \
+-             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
++             | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
++                       -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`]
+ 
+ is_clang="notclang"
+ if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
new file mode 100644
index 000000000000..6af455319567
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
@@ -0,0 +1,12 @@
+diff -Naur valgrind-3.7.0.orig//Makefile.all.am valgrind-3.7.0/Makefile.all.am
+--- valgrind-3.7.0.orig//Makefile.all.am	2011-10-26 17:24:45.000000000 -0400
++++ valgrind-3.7.0/Makefile.all.am	2011-11-10 16:18:18.000000000 -0500
+@@ -82,7 +82,7 @@
+ # performance and get whatever useful warnings we can out of gcc.
+ # -fno-builtin is important for defeating LLVM's idiom recognition
+ # that somehow causes VG_(memset) to get into infinite recursion.
+-AM_CFLAGS_BASE = \
++AM_CFLAGS_BASE = -fno-stack-protector \
+ 	-O2 -g \
+ 	-Wall \
+ 	-Wmissing-prototypes \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-glibc-2.15.patch b/dev-util/valgrind/files/valgrind-3.7.0-glibc-2.15.patch
new file mode 100644
index 000000000000..f5098a43cf8e
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-glibc-2.15.patch
@@ -0,0 +1,26 @@
+diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in
+--- valgrind-3.7.0.orig//configure.in	2012-01-14 17:49:13.000000000 -0500
++++ valgrind-3.7.0/configure.in	2012-01-14 18:13:45.000000000 -0500
+@@ -778,6 +778,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.15)
++	AC_MSG_RESULT(2.15 family)
++	AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -791,7 +798,7 @@
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.15])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+ esac
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch
new file mode 100644
index 000000000000..90c0bf111146
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch
@@ -0,0 +1,143 @@
+diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
+--- valgrind-3.7.0.orig//coregrind/Makefile.am	2011-11-10 20:02:47.000000000 -0500
++++ valgrind-3.7.0/coregrind/Makefile.am	2011-11-10 20:03:00.000000000 -0500
+@@ -292,14 +292,6 @@
+ 	m_demangle/demangle.c \
+ 	m_demangle/dyn-string.c \
+ 	m_demangle/safe-ctype.c \
+-	m_dispatch/dispatch-x86-linux.S \
+-	m_dispatch/dispatch-amd64-linux.S \
+-	m_dispatch/dispatch-ppc32-linux.S \
+-	m_dispatch/dispatch-ppc64-linux.S \
+-	m_dispatch/dispatch-arm-linux.S \
+-	m_dispatch/dispatch-s390x-linux.S \
+-	m_dispatch/dispatch-x86-darwin.S \
+-	m_dispatch/dispatch-amd64-darwin.S \
+ 	m_gdbserver/m_gdbserver.c \
+ 	m_gdbserver/inferiors.c \
+ 	m_gdbserver/m_gdbserver.c \
+@@ -322,8 +314,6 @@
+ 	m_initimg/initimg-pathscan.c \
+ 	m_mach/mach_basics.c \
+ 	m_mach/mach_msg.c \
+-	m_mach/mach_traps-x86-darwin.S \
+-	m_mach/mach_traps-amd64-darwin.S \
+ 	m_replacemalloc/replacemalloc_core.c \
+ 	m_scheduler/scheduler.c \
+ 	m_scheduler/sema.c \
+@@ -335,14 +325,6 @@
+ 	m_sigframe/sigframe-s390x-linux.c \
+ 	m_sigframe/sigframe-x86-darwin.c \
+ 	m_sigframe/sigframe-amd64-darwin.c \
+-	m_syswrap/syscall-x86-linux.S \
+-	m_syswrap/syscall-amd64-linux.S \
+-	m_syswrap/syscall-ppc32-linux.S \
+-	m_syswrap/syscall-ppc64-linux.S \
+-	m_syswrap/syscall-arm-linux.S \
+-	m_syswrap/syscall-s390x-linux.S \
+-	m_syswrap/syscall-x86-darwin.S \
+-	m_syswrap/syscall-amd64-darwin.S \
+ 	m_syswrap/syswrap-main.c \
+ 	m_syswrap/syswrap-generic.c \
+ 	m_syswrap/syswrap-linux.c \
+@@ -361,6 +343,29 @@
+ 	m_ume/main.c \
+ 	m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S	2011-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2011-11-10 20:07:40.000000000 -0500
+@@ -349,11 +349,11 @@
+ 	ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S	2011-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S	2011-11-10 20:04:07.000000000 -0500
+@@ -320,12 +320,11 @@
+ 	ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+ 
+-			
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:02:47.000000000 -0500
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:03:00.000000000 -0500
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished):	.quad 5b
+ .previous
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:02:47.000000000 -0500
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:03:00.000000000 -0500
+@@ -164,12 +164,12 @@
+ ML_(blksys_committed):	.long 4b
+ ML_(blksys_finished):	.long 5b
+ .previous
+-	
+-/* Let the linker know we don't need an executable stack */
+-.section .note.GNU-stack,"",@progbits
+ 
+ #endif // defined(VGP_x86_linux)
+ 
++/* Let the linker know we don't need an executable stack */
++.section .note.GNU-stack,"",@progbits
++
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
new file mode 100644
index 000000000000..d6cc26dab112
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
@@ -0,0 +1,138 @@
+diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
+--- valgrind-3.7.0.orig//coregrind/Makefile.am	2011-11-10 20:02:47.000000000 -0500
++++ valgrind-3.7.0/coregrind/Makefile.am	2011-11-10 20:03:00.000000000 -0500
+@@ -292,14 +292,6 @@
+ 	m_demangle/demangle.c \
+ 	m_demangle/dyn-string.c \
+ 	m_demangle/safe-ctype.c \
+-	m_dispatch/dispatch-x86-linux.S \
+-	m_dispatch/dispatch-amd64-linux.S \
+-	m_dispatch/dispatch-ppc32-linux.S \
+-	m_dispatch/dispatch-ppc64-linux.S \
+-	m_dispatch/dispatch-arm-linux.S \
+-	m_dispatch/dispatch-s390x-linux.S \
+-	m_dispatch/dispatch-x86-darwin.S \
+-	m_dispatch/dispatch-amd64-darwin.S \
+ 	m_gdbserver/m_gdbserver.c \
+ 	m_gdbserver/inferiors.c \
+ 	m_gdbserver/m_gdbserver.c \
+@@ -322,8 +314,6 @@
+ 	m_initimg/initimg-pathscan.c \
+ 	m_mach/mach_basics.c \
+ 	m_mach/mach_msg.c \
+-	m_mach/mach_traps-x86-darwin.S \
+-	m_mach/mach_traps-amd64-darwin.S \
+ 	m_replacemalloc/replacemalloc_core.c \
+ 	m_scheduler/scheduler.c \
+ 	m_scheduler/sema.c \
+@@ -335,14 +325,6 @@
+ 	m_sigframe/sigframe-s390x-linux.c \
+ 	m_sigframe/sigframe-x86-darwin.c \
+ 	m_sigframe/sigframe-amd64-darwin.c \
+-	m_syswrap/syscall-x86-linux.S \
+-	m_syswrap/syscall-amd64-linux.S \
+-	m_syswrap/syscall-ppc32-linux.S \
+-	m_syswrap/syscall-ppc64-linux.S \
+-	m_syswrap/syscall-arm-linux.S \
+-	m_syswrap/syscall-s390x-linux.S \
+-	m_syswrap/syscall-x86-darwin.S \
+-	m_syswrap/syscall-amd64-darwin.S \
+ 	m_syswrap/syswrap-main.c \
+ 	m_syswrap/syswrap-generic.c \
+ 	m_syswrap/syswrap-linux.c \
+@@ -361,6 +343,24 @@
+ 	m_ume/main.c \
+ 	m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++	m_start-@VGCONF_ARCH_PRI@-darwin.S \
++	m_start-@VGCONF_ARCH_SEC@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S	2011-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2011-11-10 20:07:40.000000000 -0500
+@@ -349,11 +349,11 @@
+ 	ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S	2011-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S	2011-11-10 20:04:07.000000000 -0500
+@@ -320,12 +320,11 @@
+ 	ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+ 
+-			
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:02:47.000000000 -0500
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:03:00.000000000 -0500
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished):	.quad 5b
+ .previous
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:02:47.000000000 -0500
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:03:00.000000000 -0500
+@@ -164,12 +164,12 @@
+ ML_(blksys_committed):	.long 4b
+ ML_(blksys_finished):	.long 5b
+ .previous
+-	
+-/* Let the linker know we don't need an executable stack */
+-.section .note.GNU-stack,"",@progbits
+ 
+ #endif // defined(VGP_x86_linux)
+ 
++/* Let the linker know we don't need an executable stack */
++.section .note.GNU-stack,"",@progbits
++
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
new file mode 100644
index 000000000000..860e09c86ed3
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
@@ -0,0 +1,13 @@
+diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
+--- valgrind-3.7.0.orig//mpi/Makefile.am	2011-10-26 17:24:23.000000000 -0400
++++ valgrind-3.7.0/mpi/Makefile.am	2011-11-10 16:03:14.000000000 -0500
+@@ -7,9 +7,6 @@
+ CC = $(MPI_CC)
+ DEFS =
+ DEFAULT_INCLUDES =
+-CPPFLAGS =
+-CFLAGS =
+-LDFLAGS =
+ 
+ EXTRA_DIST = \
+ 	mpiwrap_type_test.c
diff --git a/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch
new file mode 100644
index 000000000000..66c97764d31b
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch
@@ -0,0 +1,142 @@
+diff -Naur valgrind-3.8.0.orig//coregrind/Makefile.am valgrind-3.8.0/coregrind/Makefile.am
+--- valgrind-3.8.0.orig//coregrind/Makefile.am	2012-08-05 03:47:20.000000000 -0400
++++ valgrind-3.8.0/coregrind/Makefile.am	2012-08-18 04:14:35.000000000 -0400
+@@ -297,15 +297,6 @@
+ 	m_demangle/demangle.c \
+ 	m_demangle/dyn-string.c \
+ 	m_demangle/safe-ctype.c \
+-	m_dispatch/dispatch-x86-linux.S \
+-	m_dispatch/dispatch-amd64-linux.S \
+-	m_dispatch/dispatch-ppc32-linux.S \
+-	m_dispatch/dispatch-ppc64-linux.S \
+-	m_dispatch/dispatch-arm-linux.S \
+-	m_dispatch/dispatch-s390x-linux.S \
+-	m_dispatch/dispatch-mips32-linux.S \
+-	m_dispatch/dispatch-x86-darwin.S \
+-	m_dispatch/dispatch-amd64-darwin.S \
+ 	m_gdbserver/inferiors.c \
+ 	m_gdbserver/m_gdbserver.c \
+ 	m_gdbserver/regcache.c \
+@@ -327,8 +318,6 @@
+ 	m_initimg/initimg-pathscan.c \
+ 	m_mach/mach_basics.c \
+ 	m_mach/mach_msg.c \
+-	m_mach/mach_traps-x86-darwin.S \
+-	m_mach/mach_traps-amd64-darwin.S \
+ 	m_replacemalloc/replacemalloc_core.c \
+ 	m_scheduler/scheduler.c \
+ 	m_scheduler/sema.c \
+@@ -343,15 +332,6 @@
+ 	m_sigframe/sigframe-mips32-linux.c \
+ 	m_sigframe/sigframe-x86-darwin.c \
+ 	m_sigframe/sigframe-amd64-darwin.c \
+-	m_syswrap/syscall-x86-linux.S \
+-	m_syswrap/syscall-amd64-linux.S \
+-	m_syswrap/syscall-ppc32-linux.S \
+-	m_syswrap/syscall-ppc64-linux.S \
+-	m_syswrap/syscall-arm-linux.S \
+-	m_syswrap/syscall-s390x-linux.S \
+-	m_syswrap/syscall-mips32-linux.S \
+-	m_syswrap/syscall-x86-darwin.S \
+-	m_syswrap/syscall-amd64-darwin.S \
+ 	m_syswrap/syswrap-main.c \
+ 	m_syswrap/syswrap-generic.c \
+ 	m_syswrap/syswrap-linux.c \
+@@ -371,6 +351,29 @@
+ 	m_ume/main.c \
+ 	m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -Naur valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.8.0/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S	2012-08-05 12:04:11.000000000 -0400
++++ valgrind-3.8.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2012-08-18 04:15:57.000000000 -0400
+@@ -249,11 +249,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.8.0/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S	2012-08-05 12:04:11.000000000 -0400
++++ valgrind-3.8.0/coregrind/m_dispatch/dispatch-x86-linux.S	2012-08-18 04:16:44.000000000 -0400
+@@ -240,11 +240,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.8.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S	2012-08-05 12:04:11.000000000 -0400
++++ valgrind-3.8.0/coregrind/m_syswrap/syscall-amd64-linux.S	2012-08-18 04:17:21.000000000 -0400
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished):	.quad 5b
+ .previous
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.8.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-x86-linux.S	2012-08-05 12:04:11.000000000 -0400
++++ valgrind-3.8.0/coregrind/m_syswrap/syscall-x86-linux.S	2012-08-18 04:17:59.000000000 -0400
+@@ -165,11 +165,11 @@
+ ML_(blksys_finished):	.long 5b
+ .previous
+ 	
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.8.1-gcc-4.8-memmove.patch b/dev-util/valgrind/files/valgrind-3.8.1-gcc-4.8-memmove.patch
new file mode 100644
index 000000000000..453a67859ee7
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.8.1-gcc-4.8-memmove.patch
@@ -0,0 +1,26 @@
+Index: coregrind/m_main.c
+===================================================================
+--- coregrind/m_main.c	(revision 13287)
++++ coregrind/m_main.c	(revision 13288)
+@@ -2636,8 +2636,8 @@
+ 
+    From this derive two requirements:
+ 
+-   1. gcc may emit calls to memcpy and memset to deal with structure
+-      assignments etc.  Since we have chosen to ignore all the
++   1. gcc may emit calls to memcpy, memmove and memset to deal with
++      structure assignments etc.  Since we have chosen to ignore all the
+       "normal" supporting libraries, we have to provide our own
+       implementations of them.  No problem.
+ 
+@@ -2651,6 +2651,10 @@
+ void* memcpy(void *dest, const void *src, SizeT n) {
+    return VG_(memcpy)(dest,src,n);
+ }
++void* memmove(void *dest, const void *src, SizeT n);
++void* memmove(void *dest, const void *src, SizeT n) {
++   return VG_(memmove)(dest,src,n);
++}
+ void* memset(void *s, int c, SizeT n);
+ void* memset(void *s, int c, SizeT n) {
+   return VG_(memset)(s,c,n);
diff --git a/dev-util/valgrind/files/valgrind-3.8.1-glibc-2.17.patch b/dev-util/valgrind/files/valgrind-3.8.1-glibc-2.17.patch
new file mode 100644
index 000000000000..605b80a038e6
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.8.1-glibc-2.17.patch
@@ -0,0 +1,26 @@
+diff -Nuar valgrind-3.8.1.orig/configure.in valgrind-3.8.1/configure.in
+--- valgrind-3.8.1.orig/configure.in	2012-09-18 15:17:32.000000000 -0400
++++ valgrind-3.8.1/configure.in	2013-02-19 13:00:26.000000000 -0500
+@@ -906,6 +906,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.17)
++	AC_MSG_RESULT(2.17 family)
++	AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -919,7 +926,7 @@
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+ esac
diff --git a/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch b/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch
new file mode 100644
index 000000000000..79a3283c9c13
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch
@@ -0,0 +1,37 @@
+diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
+--- valgrind-3.9.0-orig/configure	2013-11-01 09:33:32.000000000 +1000
++++ valgrind-3.9.0/configure	2014-02-08 09:28:06.063248544 +1000
+@@ -6689,6 +6689,16 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
++$as_echo "2.19 family" >&6; }
++
++$as_echo "#define GLIBC_2_19 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
+--- valgrind-3.9.0-orig/configure.ac	2013-11-01 09:28:16.000000000 +1000
++++ valgrind-3.9.0/configure.ac	2014-02-08 09:27:38.870385366 +1000
+@@ -918,6 +918,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	AC_MSG_RESULT(2.19 family)
++	AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/dev-util/valgrind/files/valgrind-3.9.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.9.0-non-exec-stack.patch
new file mode 100644
index 000000000000..41be42aca003
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.9.0-non-exec-stack.patch
@@ -0,0 +1,144 @@
+diff -Naur valgrind-3.9.0.orig/coregrind/Makefile.am valgrind-3.9.0/coregrind/Makefile.am
+--- valgrind-3.9.0.orig/coregrind/Makefile.am	2013-10-23 06:50:13.000000000 -0400
++++ valgrind-3.9.0/coregrind/Makefile.am	2013-11-02 19:41:26.984017770 -0400
+@@ -309,16 +309,6 @@
+ 	m_demangle/demangle.c \
+ 	m_demangle/dyn-string.c \
+ 	m_demangle/safe-ctype.c \
+-	m_dispatch/dispatch-x86-linux.S \
+-	m_dispatch/dispatch-amd64-linux.S \
+-	m_dispatch/dispatch-ppc32-linux.S \
+-	m_dispatch/dispatch-ppc64-linux.S \
+-	m_dispatch/dispatch-arm-linux.S \
+-	m_dispatch/dispatch-s390x-linux.S \
+-	m_dispatch/dispatch-mips32-linux.S \
+-	m_dispatch/dispatch-mips64-linux.S \
+-	m_dispatch/dispatch-x86-darwin.S \
+-	m_dispatch/dispatch-amd64-darwin.S \
+ 	m_gdbserver/inferiors.c \
+ 	m_gdbserver/m_gdbserver.c \
+ 	m_gdbserver/regcache.c \
+@@ -341,8 +331,6 @@
+ 	m_initimg/initimg-pathscan.c \
+ 	m_mach/mach_basics.c \
+ 	m_mach/mach_msg.c \
+-	m_mach/mach_traps-x86-darwin.S \
+-	m_mach/mach_traps-amd64-darwin.S \
+ 	m_replacemalloc/replacemalloc_core.c \
+ 	m_scheduler/scheduler.c \
+ 	m_scheduler/sema.c \
+@@ -358,16 +346,6 @@
+ 	m_sigframe/sigframe-mips64-linux.c \
+ 	m_sigframe/sigframe-x86-darwin.c \
+ 	m_sigframe/sigframe-amd64-darwin.c \
+-	m_syswrap/syscall-x86-linux.S \
+-	m_syswrap/syscall-amd64-linux.S \
+-	m_syswrap/syscall-ppc32-linux.S \
+-	m_syswrap/syscall-ppc64-linux.S \
+-	m_syswrap/syscall-arm-linux.S \
+-	m_syswrap/syscall-s390x-linux.S \
+-	m_syswrap/syscall-mips32-linux.S \
+-	m_syswrap/syscall-mips64-linux.S \
+-	m_syswrap/syscall-x86-darwin.S \
+-	m_syswrap/syscall-amd64-darwin.S \
+ 	m_syswrap/syswrap-main.c \
+ 	m_syswrap/syswrap-generic.c \
+ 	m_syswrap/syswrap-linux.c \
+@@ -389,6 +367,29 @@
+ 	m_ume/main.c \
+ 	m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -Naur valgrind-3.9.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.9.0/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.9.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S	2013-10-23 06:50:09.000000000 -0400
++++ valgrind-3.9.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2013-11-02 19:31:54.688991721 -0400
+@@ -249,11 +249,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.9.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.9.0/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.9.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S	2013-10-23 06:50:09.000000000 -0400
++++ valgrind-3.9.0/coregrind/m_dispatch/dispatch-x86-linux.S	2013-11-02 19:31:54.688991721 -0400
+@@ -240,11 +240,11 @@
+ 
+ .size VG_(disp_run_translations), .-VG_(disp_run_translations)
+ 
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.9.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.9.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.9.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S	2013-10-23 06:50:12.000000000 -0400
++++ valgrind-3.9.0/coregrind/m_syswrap/syscall-amd64-linux.S	2013-11-02 19:31:54.689991721 -0400
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished):	.quad 5b
+ .previous
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.9.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.9.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.9.0.orig/coregrind/m_syswrap/syscall-x86-linux.S	2013-10-23 06:50:12.000000000 -0400
++++ valgrind-3.9.0/coregrind/m_syswrap/syscall-x86-linux.S	2013-11-02 19:31:54.689991721 -0400
+@@ -165,11 +165,11 @@
+ ML_(blksys_finished):	.long 5b
+ .previous
+ 	
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
new file mode 100644
index 000000000000..e20d0c3fba5f
--- /dev/null
+++ b/dev-util/valgrind/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<longdescription>
+		Valgrind is a GPL'd tool to help you find memory-management problems
+		in your programs. When a program is run under Valgrind's supervision,
+		all reads and writes of memory are checked, and calls to
+		malloc/new/free/delete are intercepted. As a result, Valgrind can
+		detect problems such as
+
+		- Use of uninitialised memory
+		- Reading/writing memory after it has been free'd
+		- Reading/writing off the end of malloc'd blocks
+		- Reading/writing inappropriate areas on the stack
+		- Memory leaks -- where pointers to malloc'd blocks are lost forever
+		- Passing of uninitialised and/or unaddressible memory to system calls
+		- Mismatched use of malloc/new/new [] vs free/delete/delete []
+		- Some abuses of the POSIX Pthreads API
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/valgrind/valgrind-3.10.1.ebuild b/dev-util/valgrind/valgrind-3.10.1.ebuild
new file mode 100644
index 000000000000..7dd15a4e7a6f
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.10.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	# Changing Makefile.all.am to disable SSP
+	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+	# Don't build in empty assembly files for other platforms or we'll get a QA
+	# warning about executable stacks.
+	epatch "${FILESDIR}"/${PN}-3.10.1-non-exec-stack.patch
+
+	# glibc 2.19 fix
+	epatch "${FILESDIR}"/${PN}-3.9.0-glibc-2.19.patch
+
+	# valgrind works fine on linux-4, bug #543648
+	epatch "${FILESDIR}"/${PN}-3.10.1-linux-4.patch
+
+	# glibc 2.21 fix.  Bug #554808.
+	epatch "${FILESDIR}"/${PN}-3.10.1-glibc-2.21.patch
+
+	# Allow users to test their own patches
+	epatch_user
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf="${myconf} --enable-only32bit"
+	use x64-macos && myconf="${myconf} --enable-only64bit"
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf="${myconf} --without-mpicc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/valgrind/valgrind-3.7.0-r4.ebuild b/dev-util/valgrind/valgrind-3.7.0-r4.ebuild
new file mode 100644
index 000000000000..9d756f0127a2
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.7.0-r4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	# Changing Makefile.all.am to disable SSP
+	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+	# Don't build in empty assembly files for other platforms or we'll get a QA
+	# warning about executable stacks.
+	epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack-v2.patch
+
+	# Fix the regex to get gcc's version
+	epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch
+
+	# Fix stricter use of dir variables, bug #397429
+	epatch "${FILESDIR}"/${PN}-3.7.0-automake-1.11.2.patch
+
+	# Fix for glibc 2.15, bug #398921
+	epatch "${FILESDIR}"/${PN}-3.7.0-glibc-2.15.patch
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf="${myconf} --enable-only32bit"
+	use x64-macos && myconf="${myconf} --enable-only64bit"
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf="${myconf} --without-mpicc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/valgrind/valgrind-3.8.1.ebuild b/dev-util/valgrind/valgrind-3.8.1.ebuild
new file mode 100644
index 000000000000..f2e4801eea7b
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.8.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	# Changing Makefile.all.am to disable SSP
+	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+	# Don't build in empty assembly files for other platforms or we'll get a QA
+	# warning about executable stacks.
+	epatch "${FILESDIR}"/${PN}-3.8.0-non-exec-stack.patch
+
+	# Fix for glibc 2.18, bug #458326
+	epatch "${FILESDIR}"/${PN}-3.8.1-glibc-2.17.patch
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf="${myconf} --enable-only32bit"
+	use x64-macos && myconf="${myconf} --enable-only64bit"
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf="${myconf} --without-mpicc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/valgrind/valgrind-3.9.0.ebuild b/dev-util/valgrind/valgrind-3.9.0.ebuild
new file mode 100644
index 000000000000..0ab2a5517640
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.9.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	# Changing Makefile.all.am to disable SSP
+	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+	# Don't build in empty assembly files for other platforms or we'll get a QA
+	# warning about executable stacks.
+	epatch "${FILESDIR}"/${PN}-3.9.0-non-exec-stack.patch
+
+	# glibc 2.19 fix
+	epatch "${FILESDIR}"/${PN}-3.9.0-glibc-2.19.patch
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf="${myconf} --enable-only32bit"
+	use x64-macos && myconf="${myconf} --enable-only64bit"
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf="${myconf} --without-mpicc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/valkyrie/Manifest b/dev-util/valkyrie/Manifest
new file mode 100644
index 000000000000..6d03a3266910
--- /dev/null
+++ b/dev-util/valkyrie/Manifest
@@ -0,0 +1 @@
+DIST valkyrie-2.0.0.tar.bz2 260690 SHA256 a70b9ffb2409c96c263823212b4be6819154eb858825c9a19aad0ae398d59b43 SHA512 435abb17ecad114c3e492fa193e508bad7ca61884bd09bf1bf0b8398c63151d33e571fea927b84f05bc2b647183af441da1550161a6f766db9e9a15d00cfc888 WHIRLPOOL a7b394976012df7a28b02ba63c092354daff2a55912b6ccc88914aac5811b09064227a08e0fdbd23dc41bcd453dc3fe9846c2517c83d8eed1d4131dbbafdac4a
diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch
new file mode 100644
index 000000000000..d2d33166a85c
--- /dev/null
+++ b/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch
@@ -0,0 +1,37 @@
+Fix building with gcc-4.7
+
+https://bugs.gentoo.org/show_bug.cgi?id=421867
+
+Patch written by LE GARREC Vincent <legarrec.vincent@gmail.com>
+--- a/src/objects/tool_object.cpp
++++ b/src/objects/tool_object.cpp
+@@ -50,6 +50,7 @@ stopProcess()
+ #include <QKeySequence>
+ #include <QString>
+ #include <QStringList>
++#include <unistd.h>              // usleep
+ 
+ 
+ #if 1
+--- a/src/utils/vk_config.cpp
++++ b/src/utils/vk_config.cpp
+@@ -25,6 +25,8 @@
+ #include "utils/vk_utils.h"
+ 
+ #include <pwd.h>     // getpwuid
++#include <sys/types.h>         // getuid
++#include <unistd.h>            // getuid
+ 
+ #include <QColor>
+ #include <QDir>
+--- a/src/utils/vk_utils.cpp
++++ b/src/utils/vk_utils.cpp
+@@ -22,6 +22,8 @@
+ #include "utils/vk_config.h"        // vkname()
+ 
+ #include <cstdlib>                  // exit, mkstemp, free/malloc, etc
++#include <sys/types.h>              // getpid
++#include <unistd.h>                 // getpid
+ 
+ #include <QDateTime>
+ #include <QFile>
diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch
new file mode 100644
index 000000000000..2f18491e8f81
--- /dev/null
+++ b/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch
@@ -0,0 +1,11 @@
+--- valkyrie-2.0.0/vk_config.pri
++++ valkyrie-2.0.0/vk_config.pri
+@@ -14,7 +14,7 @@
+ # Set a default value for PREFIX (etc) in the generated makefiles
+ # Note: ignore INSTALL_ROOT: it's a qt special, can't be set from here
+ isEmpty(PREFIX) {
+-  PREFIX = /usr/local
++  PREFIX = /usr
+ }
+ isEmpty(BINDIR) {
+   BINDIR = $$PREFIX/bin
diff --git a/dev-util/valkyrie/metadata.xml b/dev-util/valkyrie/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/dev-util/valkyrie/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/dev-util/valkyrie/valkyrie-2.0.0.ebuild b/dev-util/valkyrie/valkyrie-2.0.0.ebuild
new file mode 100644
index 000000000000..a6d6206cab52
--- /dev/null
+++ b/dev-util/valkyrie/valkyrie-2.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit qt4-r2
+
+DESCRIPTION="Graphical front-end to the Valgrind suite of tools"
+HOMEPAGE="http://www.valgrind.org/"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=dev-util/valgrind-3.6.0
+	dev-qt/qtgui:4
+	dev-qt/qtcore:4"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+PATCHES=(
+	"${FILESDIR}"/${P}-prefix.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+)
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
new file mode 100644
index 000000000000..799287572ba5
--- /dev/null
+++ b/dev-util/vbindiff/Manifest
@@ -0,0 +1,2 @@
+DIST vbindiff-3.0_beta1.tar.gz 106317 SHA256 56ec4910f5a5a93c1b8b674d515d4ed64626ae2c2cfed144229eecfefc5b6248 SHA512 61b0cda7005b5793ae7a760020bcd93e2bfc3ef8bcc92e522a2790ab0799d2d50fc041bb11a7c1b823fc86c27ecb5d8ddb49ac7b2a86601dab2bcd4c95c6716c WHIRLPOOL 8f25c4d1454eafd1de145eb41bfb3515c53ba53ec672ff6eedc8877f5cc450da4cecfb4dabad15d962ac1f11be8b427b11feabdadedb67e400e4a6652ed13e6b
+DIST vbindiff-3.0_beta4.tar.gz 121538 SHA256 7d5d5a87fde953dc2089746f6f6ab811d60e127b01074c97611898fb1ef1983d SHA512 6437f107fe58e8343ccd8cb65b3c562d5cb25445fcce284c7ce73fe4a2ed7191100595b9cd0c88d5a630a176f4c4bd374625c97c109a6ee14f1f56ca136d23da WHIRLPOOL 49c9cb66846c3fe48fdfde5febf25435fd23db066d6556479a656eeca913415c116f1a5ab43e2986c24839906103f9647a4aa322a7cf5122012ee5e0436732fa
diff --git a/dev-util/vbindiff/metadata.xml b/dev-util/vbindiff/metadata.xml
new file mode 100644
index 000000000000..9f002726a698
--- /dev/null
+++ b/dev-util/vbindiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+    <name>Diego Pettenò</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta1.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta1.ebuild
new file mode 100644
index 000000000000..76c053d30df3
--- /dev/null
+++ b/dev-util/vbindiff/vbindiff-3.0_beta1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2007-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Visual binary diff utility"
+
+HOMEPAGE="http://www.cjmweb.net/vbindiff/"
+SRC_URI="http://www.cjmweb.net/vbindiff/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS NEWS README README.PuTTY
+}
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta4.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta4.ebuild
new file mode 100644
index 000000000000..2f4ce186d3ae
--- /dev/null
+++ b/dev-util/vbindiff/vbindiff-3.0_beta4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Visual binary diff utility"
+
+HOMEPAGE="http://www.cjmweb.net/vbindiff/"
+SRC_URI="http://www.cjmweb.net/vbindiff/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
+IUSE="debug"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	econf $(use_enable debug)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS NEWS README README.PuTTY || die
+}
diff --git a/dev-util/vdkbuilder/Manifest b/dev-util/vdkbuilder/Manifest
new file mode 100644
index 000000000000..d6100bb18d98
--- /dev/null
+++ b/dev-util/vdkbuilder/Manifest
@@ -0,0 +1,2 @@
+DIST vdkbuilder2-2.4.0.tar.gz 1079112 SHA256 549a298214f314933d7b8d0e7785c98a388faad3ea0725a0dffc08d660174381 SHA512 9a40c7c4ea17aaa565cd2a3d8392f11d2cd336e7361134ea9f2a8b12bf6ee888f6e02daec60dbc0f80b37defb08eef54edf9547f209d8ddd43388c9bc514ff33 WHIRLPOOL 8d3cf5827c94e59bf0b9944ab4e4f7acba66b9962f58b602a79d2983349fae92e5e6a3ff623d59a7d691dfb8f03ce2f8731316bb401ad8d204525fffef0116ec
+DIST vdkbuilder2-2.5.0.tar.gz 1159849 SHA256 75053fa125b203e1aa4143eba8dd74698286eeb2458e52fa20c68c822c0640b4 SHA512 b100d433e0c8addafcece943a9da05c48985b18dfc7154df203fb0a2befbfa7caca42bd6ac4f764d66685dbaeb11916ae777da07d0b5e413a577bd764bcc4281 WHIRLPOOL a5116067491ebdbb6fcb622f7ed0de4c044adc4ede00e5f0cfdead013f2d1e55ac4c91b3bf46397bf925475399de9c979449a9638daf594e6a8293952b1df82c
diff --git a/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch b/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch
new file mode 100644
index 000000000000..4b0dc099607c
--- /dev/null
+++ b/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/334847
+
+--- intl/Makefile.in
++++ intl/Makefile.in
+@@ -202,12 +202,12 @@
+ # The dependency for intlh.inst is different in gettext and all other
+ # packages.  Because we cannot you GNU make features we have to solve
+ # the problem while rewriting Makefile.in.
+-@GT_YES@intlh.inst: intlh.inst.in ../config.status
+-@GT_YES@	cd .. \
+-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+-@GT_YES@	  $(SHELL) ./config.status
+-@GT_NO@.PHONY: intlh.inst
+-@GT_NO@intlh.inst:
++intlh.inst: intlh.inst.in ../config.status
++	cd .. \
++	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
++	  $(SHELL) ./config.status
++.PHONY: intlh.inst
++intlh.inst:
+ 
+ # Tell versions [3.59,3.63) of GNU make not to export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dev-util/vdkbuilder/metadata.xml b/dev-util/vdkbuilder/metadata.xml
new file mode 100644
index 000000000000..7f6fbc2997c2
--- /dev/null
+++ b/dev-util/vdkbuilder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>lang-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">vdkbuilder</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild
new file mode 100644
index 000000000000..0c7ceebffeed
--- /dev/null
+++ b/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="The Visual Development Kit used for VDK Builder"
+HOMEPAGE="http://vdkbuilder.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=" ppc x86"
+IUSE="nls debug"
+
+RDEPEND=">=dev-libs/vdk-2.4.0"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+custom_cflags() {
+	for files in *
+	do
+		if [ -e ${files}/Makefile ]
+		then
+			sed -e "s/CFLAGS = .*/CFLAGS = ${CFLAGS} -I../include/" -i ${files}/Makefile
+			sed -e "s/CXXFLAGS = .*/CFLAGS = ${CXXFLAGS} -I../include/" -i ${files}/Makefile
+		fi
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-make-382.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	use debug \
+		&& myconf="${myconf} --enable-devel=yes" \
+		|| myconf="${myconf} --enable-devel=no"
+
+	econf \
+		$(use_enable nls) \
+		--disable-vdktest \
+		${myconf} || die "econf failed"
+
+	custom_cflags
+
+	emake -j1 || die
+}
+
+src_install () {
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+}
diff --git a/dev-util/vdkbuilder/vdkbuilder-2.5.0.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.5.0.ebuild
new file mode 100644
index 000000000000..f59bf8453d8a
--- /dev/null
+++ b/dev-util/vdkbuilder/vdkbuilder-2.5.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="The Visual Development Kit used for VDK Builder"
+HOMEPAGE="http://vdkbuilder.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=" ~amd64 ~ppc ~x86"
+IUSE="nls debug"
+
+RDEPEND=">=dev-libs/vdk-2.5.0"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+custom_cflags() {
+	for files in *
+	do
+		if [ -e ${files}/Makefile ]
+		then
+			sed -e "s/CFLAGS = .*/CFLAGS = ${CFLAGS} -I../include/" -i ${files}/Makefile
+			sed -e "s/CXXFLAGS = .*/CFLAGS = ${CXXFLAGS} -I../include/" -i ${files}/Makefile
+		fi
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.0-make-382.patch || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	eautoreconf
+
+	local myconf=""
+
+	use debug \
+		&& myconf="${myconf} --enable-devel=yes" \
+		|| myconf="${myconf} --enable-devel=no"
+
+	econf \
+		$(use_enable nls) \
+		--disable-vdktest \
+		${myconf} || die "econf failed"
+
+	custom_cflags
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_install () {
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+}
diff --git a/dev-util/visual-regexp/Manifest b/dev-util/visual-regexp/Manifest
new file mode 100644
index 000000000000..7c7a58060d06
--- /dev/null
+++ b/dev-util/visual-regexp/Manifest
@@ -0,0 +1,3 @@
+DIST visual_regexp-3.0.tar.gz 25659 SHA256 07a22a498e32476c7ae17b00d131c04a53def4e5f174ffe42ddbc42e44752c0f SHA512 3c8b3e44d20f8cdc69fdb501ac82a44f6b755715c9bd6309bbca01193acc72a97595d6012ad889c957adba587c3f8f1f888c0f42993bb81bf3f730adff42c655 WHIRLPOOL 56be241b1653fbb0b0fa5f4a1b13e755424a2d193b267e68b938ca34dbe636bcf7fdd2bb65611abe9d3e8ebb2080614c1224534424b9a83840f5ade3015a3964
+DIST visual_regexp-3.1.tcl 71183 SHA256 153bccbce71da7b208f95abc7408a126f819e4a0e57ad053866080c82e282752 SHA512 f36729800e0e66ee22339614b47f068eeb440cac501f73898250ddda9865cd5c3cc09bd57a8ea601ef7a3240bddbe524a69b704ae58b8e56decb81b25166818b WHIRLPOOL bdb4f35e8a5fd7267848e43a9eb8ea4d02633ace08bf9336826cecf5c4370857a31d54042f92b4cd79e934c468a07c0ba5f3c4ae8eabf7d98cb5ae8198629bbe
+DIST visualregexp-icon.png.tar 20480 SHA256 8704b626f9318d62fe6bdf7f2b4fb4ef7b72c6b4fe7376e55c486d5dc89fd064 SHA512 af0a5ec63d2d5fa71842ed85a83541b0f1ee72a4b37941e11f4f212874564b0255a97dfa953ea1684b056a4ab6f86ce47b6df9374628551c9cf8e775f7d12fb2 WHIRLPOOL 7dd0e70e4f419e0f4d9a6ad57260267b674b2f2ebe904ec5ec582a539d3cc619eac968e580318b003babf0b36885298b4a7c8d8ff8c4591d61794f83da807834
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch
new file mode 100644
index 000000000000..ec3763cc9dd1
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch
@@ -0,0 +1,26 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-10 01:35:49.959609478 +0100
++++ b/visual_regexp.tcl	2013-11-10 01:34:10.491151352 +0100
+@@ -494,15 +494,18 @@
+ 	pack .help.l -side top -padx 10 -pady 10
+ 	# help text
+ 	if {$tcl_platform(platform) == "windows"} {
+-		text .help.t -bd 2 -relief groove -font {Courier 10}
++        set hfont {Courier 10}
++        set hbfont {Courier 10 bold}
+ 	} else {
+-		text .help.t -bd 2 -relief groove
++        set hfont {9x15}
++        set hbfont {9x15bold}
+ 	}
++    text .help.t -bd 2 -relief groove -font $hfont
+ 	pack .help.t -side top -padx 20
+-	.help.t tag configure bold -font "[.help.t cget -font] bold"
++	.help.t tag configure bold -font $hbfont
+ 	.help.t insert 1.0 "Version:" bold " $::version
+ 
+-" normal "Usage:" bold " tkregexp <sampleFile>
++" normal "Usage:" bold " [file tail $::argv0] <sampleFile>
+ 
+ " normal "Key bindings:" bold " Alt-q               exit
+               Alt-a               toggle 'all' flag
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch
new file mode 100644
index 000000000000..c86202ae05fb
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch
@@ -0,0 +1,56 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-12 23:23:59.730171882 +0100
++++ b/visual_regexp.tcl	2013-11-12 23:24:42.134085257 +0100
+@@ -1062,27 +1060,38 @@
+ #==============================================================================================
+ 
+ # try to get customization from 'visual_regexp.ini'
+-puts "[file exists visual_regexp.ini]"
+-set filename [file dirname [info nameofexecutable]]/visual_regexp.ini
+-if {[file exists $filename]} {
+-	source $filename
+-} elseif {[file exists visual_regexp.ini]} {
+-	source visual_regexp.ini
++set localfilename visual_regexp.ini
++set homefilename ""
++if {[info exists ::env(HOME)]} {
++	set homefilename [file join $::env(HOME) .visual_regexp visual_regexp.ini]
+ }
+-
+-# try to auto user patterns
+-set filename [file dirname [info nameofexecutable]]/regexp.txt
+-if {[file exists $filename]} {
+-	regexp::pattern:load $filename
+-} elseif {[file exists regexp.txt]} {
+-	regexp::pattern:load regexp.txt
++set binfilename [file join [file dirname [info nameofexecutable]] visual_regexp.ini]
++foreach filename [list $localfilename $homefilename $binfilename] {
++	if {[file exists $filename]} {
++		source $filename
++		break
++	}
+ }
+ 
+-# buld the GUI
++# build the GUI
+ regexp::history:init
+ regexp::gui
+ regexp::go
+ 
++# try to auto user patterns
++set localfilename regexp.txt
++set homefilename ""
++if {[info exists ::env(HOME)]} {
++	set homefilename [file join $::env(HOME) .visual_regexp regexp.txt]
++}
++set binfilename [file join [file dirname [info nameofexecutable]] regexp.txt]
++foreach filename [list $localfilename $homefilename $binfilename] {
++	if {[file exists $filename]} {
++		regexp::pattern:load $filename
++		break
++	}
++}
++
+ if {$argc > 1} {
+ 	puts "Usage: $argv0 <sampleFile>"
+ } elseif {$argc == 1} {
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch
new file mode 100644
index 000000000000..18dbf509f45a
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch
@@ -0,0 +1,31 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-12 23:23:59.730171882 +0100
++++ b/visual_regexp.tcl	2013-11-12 23:24:42.134085257 +0100
+@@ -380,19 +380,17 @@
+ 	}
+ 	# do it
+ 	set in [open $file "r"]
+-	$data(w:menu) delete [expr 4+[llength $::regexp_db]/2] end
+-	while {![eof $in]} {
+-		set name [gets $in]
+-		while {$name == ""} {
+-			set name [gets $in]
+-		}
+-		set pattern [gets $in]
+-		while {$pattern == ""} {
+-			set pattern [gets $in]
++	set contents {}
++	foreach line [split [read $in] \n] {
++		if {$line != ""} {
++			lappend contents $line
+ 		}
+-		$data(w:menu) add command -label $name -command "regexp::regexp:insert [list $pattern]"
+ 	}
+ 	close $in
++	$data(w:menu) delete [expr 4+[llength $::regexp_db]/2] end
++	foreach {name pattern} $contents {
++		$data(w:menu) add command -label $name -command "regexp::regexp:insert [list $pattern]"
++	}
+ }
+ 
+ 
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch
new file mode 100644
index 000000000000..bfb7478d1fec
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch
@@ -0,0 +1,12 @@
+diff -ur visual_regexp-3.0/visual_regexp.tcl visual_regexp-current/visual_regexp.tcl
+--- visual_regexp-3.0/visual_regexp.tcl	2002-09-01 08:24:56.000000000 -0500
++++ visual_regexp-current/visual_regexp.tcl	2004-03-29 23:20:43.000000000 -0500
+@@ -1,7 +1,7 @@
+ #!/bin/sh  
+ #-*-tcl-*-  
+ # the next line restarts using wish \
+-exec wish8.3 "$0" -- ${1+"$@"}
++exec wish "$0" -- ${1+"$@"}
+ 
+ 
+ set version 3.0
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch
new file mode 100644
index 000000000000..1dd7e7021b4f
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch
@@ -0,0 +1,32 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-10 01:49:14.987065220 +0100
++++ b/visual_regexp.tcl	2013-11-10 01:49:04.177341077 +0100
+@@ -740,10 +740,13 @@
+ 	frame .help.text;
+ 
+ 	if {$tcl_platform(platform) == "windows"} {
+-		text .help.text.t -borderwidth 2 -relief groove -font {Courier 10} -yscrollcommand [list .help.text.sy set];
++        set hfont {Courier 10}
++        set hbfont {Courier 10 bold}
+ 	} else {
+-		text .help.text.t -borderwidth 2 -relief groove -yscrollcommand [list .help.text.sy set];
++        set hfont {9x15}
++        set hbfont {9x15bold}
+ 	}
++    text .help.text.t -borderwidth 2 -relief groove -font $hfont -yscrollcommand [list .help.text.sy set];
+ 
+ 	scrollbar	.help.text.sy \
+ 		-command			".help.text.t yview" \
+@@ -755,10 +758,10 @@
+ 
+ 	pack .help.text -side top -fill both -expand 1 -padx 20
+ 
+-	.help.text.t tag configure bold -font "[.help.text.t cget -font] bold"
++	.help.text.t tag configure bold -font $hbfont
+ 	.help.text.t insert 1.0 "Version:" bold " $::version
+ 
+-" normal "Usage:" bold " tkregexp <sampleFile>
++" normal "Usage:" bold " [file tail $::argv0] <sampleFile>
+ 
+ " normal "Key bindings:" bold " Alt-q               exit
+               Alt-a               toggle 'all' flag
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch
new file mode 100644
index 000000000000..6610b16e76ff
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch
@@ -0,0 +1,12 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-11 12:11:34.256631106 +0100
++++ b/visual_regexp.tcl	2013-11-11 11:50:46.614881803 +0100
+@@ -1437,7 +1439,7 @@
+ 		set output [text	$f.output \
+ 			-wrap						char \
+ 			-undo						1 \
+-			-background				white 
++			-background				white \
+ 			-font						$::font_regexp \
+ 			-selectbackground		lightblue \
+ 			-selectborderwidth	0 \
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch
new file mode 100644
index 000000000000..3fae9d095025
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch
@@ -0,0 +1,13 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-10-29 03:42:43.443932232 +0100
++++ b/visual_regexp.tcl	2013-10-29 03:35:35.441951822 +0100
+@@ -1,7 +1,6 @@
+-package require starkit
+-starkit::startup
++#!/usr/bin/wish
+ 
+-set version 3.0
++set version 3.1
+ 
+ ###############################################################################################
+ #
diff --git a/dev-util/visual-regexp/files/visualregexp.desktop b/dev-util/visual-regexp/files/visualregexp.desktop
new file mode 100644
index 000000000000..1d66181bc2c1
--- /dev/null
+++ b/dev-util/visual-regexp/files/visualregexp.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Exec=visualregexp
+Icon=visualregexp-icon
+Name=Visual Regexp
+Comment=An interactive regular expression editor
+Categories=Development;
diff --git a/dev-util/visual-regexp/metadata.xml b/dev-util/visual-regexp/metadata.xml
new file mode 100644
index 000000000000..f5b2d29b8036
--- /dev/null
+++ b/dev-util/visual-regexp/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>quentin@minster.io</email>
+		<name>Quentin Minster</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild b/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
new file mode 100644
index 000000000000..6a2d8cce9c68
--- /dev/null
+++ b/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Type the regexp and visualize it on a sample of your choice"
+HOMEPAGE="http://laurent.riesterer.free.fr/regexp/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar
+	http://laurent.riesterer.free.fr/regexp/visual_regexp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/tk-8.3"
+
+S=${WORKDIR}/visual_regexp-${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-wish-fix.patch \
+		"${FILESDIR}"/${P}-help-font-fix.patch \
+		"${FILESDIR}"/${P}-home-conf-fix.patch \
+		"${FILESDIR}"/${P}-pattern-load-fix.patch
+}
+
+src_install() {
+	dodoc README
+
+	newbin visual_regexp.tcl visualregexp
+
+	dosym visualregexp /usr/bin/tkregexp
+
+	doicon "${WORKDIR}"/visualregexp-icon.png
+
+	domenu "${FILESDIR}"/visualregexp.desktop
+}
diff --git a/dev-util/visual-regexp/visual-regexp-3.1.ebuild b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
new file mode 100644
index 000000000000..e27584728509
--- /dev/null
+++ b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Type the regexp and visualize it on a sample of your choice"
+HOMEPAGE="http://laurent.riesterer.free.fr/regexp/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar
+	http://laurent.riesterer.free.fr/regexp/visual_regexp-${PV}.tcl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/tk-8.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# Manually copy the source file since unpack gets confused by things it can't unpack
+	cp "${DISTDIR}/visual_regexp-${PV}.tcl" "${WORKDIR}/visual_regexp.tcl"
+
+	default
+}
+
+src_prepare() {
+	# File comes with DOS newlines
+	edos2unix visual_regexp.tcl
+
+	epatch \
+		"${FILESDIR}/${P}-wish-fix.patch" \
+		"${FILESDIR}/${P}-help-font-fix.patch" \
+		"${FILESDIR}/${P}-make-regexp-fix.patch" \
+		"${FILESDIR}/${PN}-3.0-home-conf-fix.patch" \
+		"${FILESDIR}/${PN}-3.0-pattern-load-fix.patch"
+
+	epatch_user
+}
+
+src_install() {
+	newbin visual_regexp.tcl visualregexp
+	dosym visualregexp /usr/bin/tkregexp
+	doicon "${WORKDIR}/visualregexp-icon.png"
+	domenu "${FILESDIR}/visualregexp.desktop"
+}
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
new file mode 100644
index 000000000000..534f47c89f32
--- /dev/null
+++ b/dev-util/visualvm/Manifest
@@ -0,0 +1 @@
+DIST visualvm_138-src.tar.gz 1052176 SHA256 e34cd0425d74055e03394c572735067d3b98095ed5c04268707b52f1dc7c6144 SHA512 f418fcd3316f793c6fc77c6bcdf1e53dc543f7de2ee638f3d500a4de61505246fd07829b25cdf988836f515b72c59c71a2a4fecbb569910e9203e5b490e837a1 WHIRLPOOL c2d83fd92687d07d2f240d4a6c1f150471041e0e0ab1c13f7cd1804a98d3565ed1df29c5124002ced0c403fec98b5464f8ad113cc76ae264d95413c81c4dc129
diff --git a/dev-util/visualvm/files/netbeans-platform-version.patch b/dev-util/visualvm/files/netbeans-platform-version.patch
new file mode 100644
index 000000000000..bf78fbc4cd73
--- /dev/null
+++ b/dev-util/visualvm/files/netbeans-platform-version.patch
@@ -0,0 +1,13 @@
+--- acinclude.m4.orig	2011-12-18 17:04:39.247567465 +0100
++++ acinclude.m4	2011-12-18 17:06:45.785726437 +0100
+@@ -152,7 +152,9 @@
+             ])
+ AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
+ AC_SUBST(SYSTEM_NETBEANS_DIR)
+-if test "$VVVERSION" = "1.3.3"; then
++if test -n "$NB_PLATFORM"; then
++   :
++elif test "$VVVERSION" = "1.3.3"; then
+    NB_PLATFORM=platform13;
+ else if test "$VVVERSION" = "1.3.2"; then
+    NB_PLATFORM=platform12;
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-kit.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-kit.xml
new file mode 100644
index 000000000000..94021f8ef293
--- /dev/null
+++ b/dev-util/visualvm/files/org-netbeans-modules-profiler-kit.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
+                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
+<module name="org.netbeans.modules.profiler.kit">
+    <param name="autoload">false</param>
+    <param name="eager">false</param>
+    <param name="enabled">false</param>
+    <param name="jar">modules/org-netbeans-modules-profiler-kit.jar</param>
+    <param name="reloadable">false</param>
+</module>
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-nbimpl.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-nbimpl.xml
new file mode 100644
index 000000000000..d33e48d5b7f5
--- /dev/null
+++ b/dev-util/visualvm/files/org-netbeans-modules-profiler-nbimpl.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
+                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
+<module name="org.netbeans.modules.profiler.nbimpl">
+    <param name="autoload">false</param>
+    <param name="eager">false</param>
+    <param name="enabled">false</param>
+    <param name="jar">modules/org-netbeans-modules-profiler-nbimpl.jar</param>
+    <param name="reloadable">false</param>
+</module>
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-options.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-options.xml
new file mode 100644
index 000000000000..d56b0c8fe32a
--- /dev/null
+++ b/dev-util/visualvm/files/org-netbeans-modules-profiler-options.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
+                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
+<module name="org.netbeans.modules.profiler.options">
+    <param name="autoload">false</param>
+    <param name="eager">false</param>
+    <param name="enabled">false</param>
+    <param name="jar">modules/org-netbeans-modules-profiler-options.jar</param>
+    <param name="reloadable">false</param>
+</module>
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-oql-language.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-oql-language.xml
new file mode 100644
index 000000000000..0ba0c5aa0660
--- /dev/null
+++ b/dev-util/visualvm/files/org-netbeans-modules-profiler-oql-language.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
+                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
+<module name="org.netbeans.modules.profiler.oql.language">
+    <param name="autoload">false</param>
+    <param name="eager">false</param>
+    <param name="enabled">false</param>
+    <param name="jar">modules/org-netbeans-modules-profiler-oql-language.jar</param>
+    <param name="reloadable">false</param>
+</module>
diff --git a/dev-util/visualvm/files/visualvm.conf b/dev-util/visualvm/files/visualvm.conf
new file mode 100644
index 000000000000..117e25436e8d
--- /dev/null
+++ b/dev-util/visualvm/files/visualvm.conf
@@ -0,0 +1,8 @@
+# Default user directory
+visualvm_default_userdir="${HOME}/.visualvm"
+
+# Default runtime options
+visualvm_default_options="-J-Dnetbeans.logger.console=true -J-ea -J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false"
+
+# JDK home
+visualvm_jdkhome="$(java-config -O)"
diff --git a/dev-util/visualvm/files/visualvm.sh b/dev-util/visualvm/files/visualvm.sh
new file mode 100644
index 000000000000..d26306a9ac37
--- /dev/null
+++ b/dev-util/visualvm/files/visualvm.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# source the configuration file
+source /etc/visualvm/visualvm.conf
+
+# if visualvm userdir does not exist, create it and put in the default module configuration
+# so that user does not face warning that some (unneeded) modules were not found
+if [ ! -e "${visualvm_default_userdir}" ] ; then
+	mkdir -p "${visualvm_default_userdir}/config/Modules"
+	cp /usr/share/visualvm/config/* "${visualvm_default_userdir}/config/Modules/"
+fi
+
+# launch visualvm
+/usr/share/netbeans-platform-8.0/lib/nbexec --jdkhome ${visualvm_jdkhome} --userdir ${visualvm_default_userdir} \
+	--branding visualvm --clusters /usr/share/visualvm/cluster:/usr/share/netbeans-platform-8.0:/usr/share/netbeans-profiler-8.0 \
+	${visualvm_default_options}
diff --git a/dev-util/visualvm/metadata.xml b/dev-util/visualvm/metadata.xml
new file mode 100644
index 000000000000..2c5fccdf3d93
--- /dev/null
+++ b/dev-util/visualvm/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription>The IcedTea project provides a harness to build the source code from VisualVM. </longdescription>
+</pkgmetadata>
diff --git a/dev-util/visualvm/visualvm-1.3.8-r1.ebuild b/dev-util/visualvm/visualvm-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..c3175a3a6e98
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.3.8-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilites"
+HOMEPAGE="http://visualvm.java.net/"
+SRC_URI="https://java.net/downloads/visualvm/release138/visualvm_138-src.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEP="
+	|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
+	dev-java/netbeans-platform:8.0
+	dev-java/netbeans-profiler:8.0"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	dev-java/netbeans-harness:8.0"
+
+S="${WORKDIR}/visualvm"
+INSTALL_DIR=/usr/share/${PN}
+
+EANT_BUILD_TARGET="build"
+
+src_prepare() {
+	mkdir "${S}/netbeans" || die "Failed to create netbeans directory"
+	ln -s /usr/share/netbeans-harness-8.0 "${S}/netbeans/harness" || die "Failed to symlink harness"
+	ln -s /usr/share/netbeans-platform-8.0 "${S}/netbeans/platform" || die "Failed to symlink platform"
+	ln -s /usr/share/netbeans-profiler-8.0 "${S}/netbeans/profiler" || die "Failed to symlink profiler"
+}
+
+src_install() {
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r "${S}/build/cluster"
+
+	# these are netbeans platform configuration files that prevent display of missing modules during startup
+	insinto ${INSTALL_DIR}/config
+	doins "${FILESDIR}"/org-netbeans-modules-profiler-*.xml
+
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/visualvm
+	doins "${FILESDIR}/visualvm.conf"
+
+	# visualvm runtime script
+	into ${INSTALL_DIR}
+	dobin "${FILESDIR}/visualvm.sh"
+	fperms 755 ${INSTALL_DIR}/bin/visualvm.sh
+	dosym ${INSTALL_DIR}/bin/visualvm.sh /usr/bin/visualvm
+
+	# makes visualvm entry
+	make_desktop_entry "/usr/bin/visualvm" "VisualVM" "java" "Development;Java;"
+}
diff --git a/dev-util/vmtouch/Manifest b/dev-util/vmtouch/Manifest
new file mode 100644
index 000000000000..ffdd57e5c4d0
--- /dev/null
+++ b/dev-util/vmtouch/Manifest
@@ -0,0 +1 @@
+DIST vmtouch-0.8.0.tar.gz 224882 SHA256 6848b9355451e8ab848501b5604f47a396bce1ef1dcb613577feaaaea1dfe262 SHA512 71756a2b93545f916441913b11a6d366fe886df99d131303df2ae2ac382346321f47809620711f57f0a2df4133c175524234128abafdea47747b5c74017062bb WHIRLPOOL 54b645fa1a7eeb5fe86182de0bb3c9f54684698f9da0ad5392910bf8316008560a6f4592bf3c7720519db11bbd3759c306637acfb3f33e76c163b697936e459d
diff --git a/dev-util/vmtouch/metadata.xml b/dev-util/vmtouch/metadata.xml
new file mode 100644
index 000000000000..72646f6e1649
--- /dev/null
+++ b/dev-util/vmtouch/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <longdescription>
+  vmtouch is a tool for learning about and controlling the file system cache
+  of unix and unix-like systems. It is BSD licensed so you can basically 
+  do whatever you want with it.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">hoytech/vmtouch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/vmtouch/vmtouch-0.8.0.ebuild b/dev-util/vmtouch/vmtouch-0.8.0.ebuild
new file mode 100644
index 000000000000..51d07ae29413
--- /dev/null
+++ b/dev-util/vmtouch/vmtouch-0.8.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Virtual Memory Toucher, portable file system cache diagnostics and control"
+HOMEPAGE="http://hoytech.com/vmtouch/"
+SRC_URI="https://github.com/hoytech/${PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"/${PN}-${P}
+
+src_install() {
+	default
+	doman vmtouch.8
+}
diff --git a/dev-util/w32api/Manifest b/dev-util/w32api/Manifest
new file mode 100644
index 000000000000..5b49b956138e
--- /dev/null
+++ b/dev-util/w32api/Manifest
@@ -0,0 +1,2 @@
+DIST w32api-3.17-2-mingw32-src.tar.lzma 965844 SHA256 8b23391c9cc7f6884c9f6a3c6ad32fbe6530992ca54660d2f2adcef80db53027 SHA512 4fc8f319ab895366fb3757713e2724f8f4c90593687f1ccfdbfa6a52881ddc430167326e782117ae937c7e456e029132b971c3a041889bcfb876a84741475a1f WHIRLPOOL 2c5bc864f967fab73fde3eabdecdae1fad66dd14ffc2c66c69cbe39ba02f31cce94a63c4bf2a05ffe39dcd7bb1f58c372be6293761ff2c9a16ce23ddeec188be
+DIST w32api-4.0.3-1-mingw32-src.tar.lzma 1341804 SHA256 ea0ff65fae99624078f8c42754def4d63a97624779bab73e858683def7bc936f SHA512 9295b7e803b1551dfefbf527e98fa315d60c70f6b63b4565942f7bc3d6032483d5ec4f76265b376fc6776c5ecfd1ad47fd912764c390b0b6917b1ad382250977 WHIRLPOOL f0e6a9a90916f43ac8eddb0a4bd56514c4e598b6bc851364405f420836c6ae892850ffdf2ba80705ae349b20d6aa1370553353ab3df441feb34069b80ce56e2d
diff --git a/dev-util/w32api/metadata.xml b/dev-util/w32api/metadata.xml
new file mode 100644
index 000000000000..a4d63710b914
--- /dev/null
+++ b/dev-util/w32api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>toolchain</herd>
+	<upstream>
+		<remote-id type="sourceforge">mingw</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild
new file mode 100644
index 000000000000..2b8a78f1c5bc
--- /dev/null
+++ b/dev-util/w32api/w32api-3.17.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit eutils flag-o-matic
+
+MY_P="${P:0:${#P}-2}-${PV:0-1}-mingw32"
+DESCRIPTION="Free Win32 runtime and import library definitions"
+HOMEPAGE="http://www.mingw.org/"
+# http://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/
+SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+DEPEND="app-arch/xz-utils"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration; do not emerge this directly"
+	fi
+}
+
+src_compile() {
+	just_headers && return 0
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	econf \
+		--host=${CTARGET} \
+		--prefix=/usr/${CTARGET}/usr
+	emake || die
+}
+
+src_install() {
+	if just_headers ; then
+		insinto /usr/${CTARGET}/usr/include
+		doins -r include/* || die
+	else
+		emake install DESTDIR="${D}" || die
+		env -uRESTRICT CHOST=${CTARGET} prepallstrip
+		dodoc CONTRIBUTIONS ChangeLog README.w32api TODO
+
+		# Make sure diff cross-compilers don't collide #414075
+		mv "${D}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
+	fi
+}
diff --git a/dev-util/w32api/w32api-4.0.3.1.ebuild b/dev-util/w32api/w32api-4.0.3.1.ebuild
new file mode 100644
index 000000000000..96a5bb12d674
--- /dev/null
+++ b/dev-util/w32api/w32api-4.0.3.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P="${P:0:${#P}-2}-${PV:0-1}-mingw32"
+DESCRIPTION="Free Win32 runtime and import library definitions"
+HOMEPAGE="http://www.mingw.org/"
+# http://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/
+SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
+
+LICENSE="BSD"
+SLOT="0"
+# Collides with mingw-runtime-4.x
+#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+DEPEND="app-arch/xz-utils"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/-m/.m}-src
+
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration; do not emerge this directly"
+	fi
+}
+
+src_configure() {
+	just_headers && return 0
+
+	CHOST=${CTARGET} strip-unsupported-flags
+	filter-flags -frecord-gcc-switches
+	tc-export AR
+	econf \
+		--host=${CTARGET} \
+		--prefix=/usr/${CTARGET}/usr \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_install() {
+	if just_headers ; then
+		insinto /usr/${CTARGET}/usr/include
+		doins -r include/*
+	else
+		emake -j1 install DESTDIR="${D}"
+		env -uRESTRICT CHOST=${CTARGET} prepallstrip
+
+		# Make sure diff cross-compilers don't collide #414075
+		mv "${D}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
+	fi
+}
diff --git a/dev-util/watchr/Manifest b/dev-util/watchr/Manifest
new file mode 100644
index 000000000000..9ca5b940a08e
--- /dev/null
+++ b/dev-util/watchr/Manifest
@@ -0,0 +1 @@
+DIST watchr-0.7.gem 19456 SHA256 c3a81d544dda23c476992132ab47718aa978fe0b528cc42d6ef08a1e973514ff SHA512 fea5081142f451523d307bdfa152254213e72e7760d08a6e010ad492b742668f418d079af32f6d82ed2f3c869e51e82507377403169be688615377de0825416b WHIRLPOOL 1eb86947375363397e7c5fc64f553b67bd6958f0f4f8ef671c798c630d9f8c965dc318cf6c1bcf5d710837b85858904dabaf32c92b8c71f6cc32c23686fa141c
diff --git a/dev-util/watchr/metadata.xml b/dev-util/watchr/metadata.xml
new file mode 100644
index 000000000000..69263d2c8e3c
--- /dev/null
+++ b/dev-util/watchr/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>graaff@gentoo.org</email></maintainer>
+<herd>ruby</herd>
+</pkgmetadata>
diff --git a/dev-util/watchr/watchr-0.7.ebuild b/dev-util/watchr/watchr-0.7.ebuild
new file mode 100644
index 000000000000..56a890aa97f0
--- /dev/null
+++ b/dev-util/watchr/watchr-0.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 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=""
+
+# Requires every which we don't have packaged.
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern continuous testing (flexible alternative to Autotest)"
+HOMEPAGE="http://mynyml.com/ruby/flexible-continuous-testing"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+SLOT="0"
+IUSE=""
+
+# This is an optional dependency, but highly recommended on unix systems
+ruby_add_rdepend "dev-ruby/rev"
diff --git a/dev-util/webcpp/Manifest b/dev-util/webcpp/Manifest
new file mode 100644
index 000000000000..97d166ad8f08
--- /dev/null
+++ b/dev-util/webcpp/Manifest
@@ -0,0 +1 @@
+DIST webcpp-0.8.4-src.tar.gz 430757 SHA256 f6cdb047d36a24a4d0e2aad8c54f45c78ad5058a756d86a358a00fec24a91275 SHA512 12e5cd7487f34de16ea32b21d53006f7b0c1416213da2a4af15aadf1af582ba52944bc188df8f13e8fd9b19091acc18f173a4be48bb0a28739130b35659fb663 WHIRLPOOL c2a2b880da08bcd037c7d45b0b2f0eb30c237cd2365fd2094e51c3f04d0f4d04ecf62b7135930a0c148c930a64c76a9bf73bd93615e8e081acf8de405f2dd31b
diff --git a/dev-util/webcpp/files/webcpp-0.8.4-gcc.patch b/dev-util/webcpp/files/webcpp-0.8.4-gcc.patch
new file mode 100644
index 000000000000..b7c0cbe4886b
--- /dev/null
+++ b/dev-util/webcpp/files/webcpp-0.8.4-gcc.patch
@@ -0,0 +1,15 @@
+scrub stray \
+
+http://bugs.gentoo.org/202210
+
+--- webcpp/engine.cpp
++++ webcpp/engine.cpp
+@@ -1005,7 +1005,7 @@
+ </tr><tr><td colspan=6>\n\
+ <a href=\"http://webcpp.sf.net\"><center><b>\
+ <font color=#ffffff>web c plus plus</font></b></center>\n\
+-</a></td></tr>\n\</table>\n<br>\n</center>";
++</a></td></tr>\n</table>\n<br>\n</center>";
+ 
+ 		*IO << made;
+ 	}
diff --git a/dev-util/webcpp/files/webcpp-0.8.4-gcc43.patch b/dev-util/webcpp/files/webcpp-0.8.4-gcc43.patch
new file mode 100644
index 000000000000..47ffb5515a06
--- /dev/null
+++ b/dev-util/webcpp/files/webcpp-0.8.4-gcc43.patch
@@ -0,0 +1,10 @@
+--- webcpp/main.cpp.orig	2008-06-17 19:03:37.000000000 -0500
++++ webcpp/main.cpp	2008-06-17 19:03:50.000000000 -0500
+@@ -24,6 +24,7 @@
+ 
+ #include "driver.h"
+ #include <fstream>
++#include <cstdlib>
+ using namespace std;
+ 
+ int main(int argc, char **argv) {
diff --git a/dev-util/webcpp/metadata.xml b/dev-util/webcpp/metadata.xml
new file mode 100644
index 000000000000..99516485b367
--- /dev/null
+++ b/dev-util/webcpp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">webcpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/webcpp/webcpp-0.8.4.ebuild b/dev-util/webcpp/webcpp-0.8.4.ebuild
new file mode 100644
index 000000000000..651d93970c8b
--- /dev/null
+++ b/dev-util/webcpp/webcpp-0.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="converts source code into HTML using a customizable syntax highlight engine and colour schemes"
+HOMEPAGE="http://webcpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/webcpp/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS CREDITS ChangeLog README TODO
+	fperms a+x /usr/bin/webc++ /usr/bin/scs2scs2.pl
+}
diff --git a/dev-util/weblint/Manifest b/dev-util/weblint/Manifest
new file mode 100644
index 000000000000..ea012cf15dac
--- /dev/null
+++ b/dev-util/weblint/Manifest
@@ -0,0 +1 @@
+DIST weblint-1.020.tar.gz 41264 SHA256 6d84c2b044fdaede92d39bc6647d187c5b1adca932265f1ae8c5aefae0ca0ec0 SHA512 dedcbdc43dd2edd786849bf0b919d3e808440a9f1f801b24aae1c4891da33f6801ab3b8abc030cfd7ba993b32ff90a811bd08c3ceeff7a77bbdc3c9877dff2b0 WHIRLPOOL 812362b2504c3e3aa482a81c76735b9fe1b57853b48f76c061240fd84c3269708f2e5b8c0292fddd2fcbe8b9f8ab063760c0c695caeadaa8dbe721ca78218d66
diff --git a/dev-util/weblint/metadata.xml b/dev-util/weblint/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/dev-util/weblint/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/weblint/weblint-1.020.ebuild b/dev-util/weblint/weblint-1.020.ebuild
new file mode 100644
index 000000000000..2118af3f963c
--- /dev/null
+++ b/dev-util/weblint/weblint-1.020.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="syntax and minimal style checker for HTML by Neil Bowers"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://www.w3.org/Tools/weblint.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE=""
+
+src_install() {
+	dobin weblint
+	doman weblint.1
+
+	insinto /etc
+	doins weblintrc
+}
diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
new file mode 100644
index 000000000000..91f6154144cf
--- /dev/null
+++ b/dev-util/weka/Manifest
@@ -0,0 +1,2 @@
+DIST weka-3-6-12.zip 24335916 SHA256 504f8ccc0915cd6664eb6aff74bcf5b3796dbdd55917e0b37c3d976cc38eb069 SHA512 4301e1c2a751e26ff8d860e24e54e71511276f8cb90020c935595aaaab547f8614381ca8087b83a670d13ef0ff3fa13084f4984b9249e16042703ef9f43c0bd1 WHIRLPOOL 0c09e8c476f69ae0b13ebdd03ca220ffebd0aa0369597fc3424d7e71be81acb817e46a725d42d56d9679e032e414d9533eb79f03393f2b93b740cb44ed86b91a
+DIST weka-3-6-6.zip 22444607 SHA256 a548bea251b7e774427158cfbd52f2d22706cebde1bde703748f3c7df4519e1c SHA512 e06e4a2b213fb161255d3c5ab3dfa4e176ddfc40ff8261608957d2fcd101eddde2cec789bf15f99d2c75156a4b5c42e28a1702d27ac8c09967a54f8321781f6e WHIRLPOOL 412759cdd2c8ef24c39171926f299c658057f72ebba32b492812d1f63a10c15430f559997a991b57aa411d3f752ef949bc7761116640931ca0b707a007a3266e
diff --git a/dev-util/weka/files/weka-3.6.12-build.xml.patch b/dev-util/weka/files/weka-3.6.12-build.xml.patch
new file mode 100644
index 000000000000..29310866649c
--- /dev/null
+++ b/dev-util/weka/files/weka-3.6.12-build.xml.patch
@@ -0,0 +1,23 @@
+--- build.xml	2010-04-17 08:12:29.000000000 +0300
++++ build.xml.fixed	2010-04-17 08:37:58.000000000 +0300
+@@ -90,11 +90,6 @@
+     </copy>
+     <rmic base="${build}/classes"
+        classname="weka.experiment.RemoteEngine"/>
+-    <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
+-      <patternset>
+-        <include name="java_cup/runtime/**/*"/>
+-      </patternset>
+-    </unzip>
+   </target>
+ 
+   <!-- Make the javadocs -->
+@@ -139,7 +134,7 @@
+   </target>
+ 
+   <!-- compile the testcases -->
+-  <target name="compile_tests" depends="init_tests, compile" 
++  <target name="compile_tests" depends="init_tests" 
+    description="Compile unit tests into build/testcases">
+      <javac srcdir="${src-test}" 
+        fork="yes" memoryMaximumSize="${javac_max_memory}"
diff --git a/dev-util/weka/files/weka-3.6.6-build.xml.patch b/dev-util/weka/files/weka-3.6.6-build.xml.patch
new file mode 100644
index 000000000000..29310866649c
--- /dev/null
+++ b/dev-util/weka/files/weka-3.6.6-build.xml.patch
@@ -0,0 +1,23 @@
+--- build.xml	2010-04-17 08:12:29.000000000 +0300
++++ build.xml.fixed	2010-04-17 08:37:58.000000000 +0300
+@@ -90,11 +90,6 @@
+     </copy>
+     <rmic base="${build}/classes"
+        classname="weka.experiment.RemoteEngine"/>
+-    <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
+-      <patternset>
+-        <include name="java_cup/runtime/**/*"/>
+-      </patternset>
+-    </unzip>
+   </target>
+ 
+   <!-- Make the javadocs -->
+@@ -139,7 +134,7 @@
+   </target>
+ 
+   <!-- compile the testcases -->
+-  <target name="compile_tests" depends="init_tests, compile" 
++  <target name="compile_tests" depends="init_tests" 
+    description="Compile unit tests into build/testcases">
+      <javac srcdir="${src-test}" 
+        fork="yes" memoryMaximumSize="${javac_max_memory}"
diff --git a/dev-util/weka/metadata.xml b/dev-util/weka/metadata.xml
new file mode 100644
index 000000000000..90427530e907
--- /dev/null
+++ b/dev-util/weka/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+	    <email>amynka@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">weka</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/weka/weka-3.6.12.ebuild b/dev-util/weka/weka-3.6.12.ebuild
new file mode 100644
index 000000000000..187c62a81d6c
--- /dev/null
+++ b/dev-util/weka/weka-3.6.12.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+MY_P="${PN}-$(replace_all_version_separators '-')"
+DESCRIPTION="A Java data mining package"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	>=dev-java/javacup-0.11a_beta20060608:0"
+RDEPEND=">=virtual/jre-1.6
+	>=dev-java/javacup-0.11a_beta20060608:0"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+EANT_BUILD_TARGET="exejar"
+EANT_DOC_TARGET="docs"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+
+weka_get_max_memory() {
+	if use amd64; then
+		echo 512m
+	else
+		echo 256m
+	fi
+}
+
+java_prepare() {
+	unzip -qq "${PN}-src.jar" -d . || die "Failed to unpack the source"
+	rm -v *.jar lib/*.jar || die
+	rm -rf doc || die
+	java-pkg_jar-from --into lib javacup
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+	sed -i -e "s/256m/$(weka_get_max_memory)/g" build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher weka --main "${PN}.gui.GUIChooser"
+
+	# Really need a virtual to list all available drivers and pull the ones
+	# instaled
+	java-pkg_register-optional-dependency hsqldb,jdbc-mysql,mckoi-1
+
+	use source && java-pkg_dosrc src/main/java/weka/
+
+	dodoc README || die
+	if use doc; then
+		java-pkg_dojavadoc doc/
+		insinto /usr/share/doc/${PF}
+		doins WekaManual.pdf || die
+	fi
+
+	dodir /usr/share/${PN}/data/
+	insinto /usr/share/${PN}/data/
+	doins data/*
+
+	newicon "${S}/weka.gif" "${PN}".png
+	#make_desktop_entry "${PN}" "Waikato Environment for Knowledge Analysis" "${PN}" "Education;Science;ArtificialIntelligence;" "Comment=Start Weka"
+}
diff --git a/dev-util/weka/weka-3.6.6-r1.ebuild b/dev-util/weka/weka-3.6.6-r1.ebuild
new file mode 100644
index 000000000000..f0621ba35a83
--- /dev/null
+++ b/dev-util/weka/weka-3.6.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+MY_P="${PN}-$(replace_all_version_separators '-')"
+DESCRIPTION="A Java data mining package"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	>=dev-java/javacup-0.11a_beta20060608:0"
+RDEPEND=">=virtual/jre-1.5
+	>=dev-java/javacup-0.11a_beta20060608:0"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+EANT_BUILD_TARGET="exejar"
+EANT_DOC_TARGET="docs"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+
+weka_get_max_memory() {
+	if use amd64; then
+		echo 512m
+	else
+		echo 256m
+	fi
+}
+
+java_prepare() {
+	unzip -qq "${PN}-src.jar" -d . || die "Failed to unpack the source"
+	rm -v *.jar lib/*.jar || die
+	rm -rf doc || die
+	java-pkg_jar-from --into lib javacup
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+	sed -i -e "s/256m/$(weka_get_max_memory)/g" build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher weka --main "${PN}.gui.GUIChooser"
+
+	# Really need a virtual to list all available drivers and pull the ones
+	# instaled
+	java-pkg_register-optional-dependency hsqldb,jdbc-mysql,mckoi-1
+
+	use source && java-pkg_dosrc src/main/java/weka/
+
+	dodoc README || die
+	if use doc; then
+		java-pkg_dojavadoc doc/
+		insinto /usr/share/doc/${PF}
+		doins WekaManual.pdf || die
+	fi
+
+	dodir /usr/share/${PN}/data/
+	insinto /usr/share/${PN}/data/
+	doins data/*
+
+	newicon "${S}/weka.gif" "${PN}".png
+	make_desktop_entry "${PN}" "Waikato Environment for Knowledge Analysis" "${PN}" "Education;Science;ArtificialIntelligence;" "Comment=Start Weka"
+}
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
new file mode 100644
index 000000000000..247d26d72794
--- /dev/null
+++ b/dev-util/wiggle/Manifest
@@ -0,0 +1,2 @@
+DIST wiggle-0.8.tar.gz 2097175 SHA256 f8bf7981f5e5811dcf6c519c5e335031a1c9b7833c919a2c5707ac8d5524b94a SHA512 536bfd8ed09decdefcba7ecf49eaa8085b9a88c163079b4a256c6796dc373f25c9947353c28f225b6c25c21b6684acbf973504838fc200e8acf746bb8e16632f WHIRLPOOL c5bc6e06079a8e856ab29e9aad4e2a36a48b618e3fb3277949eedf462668ce7afb3916d849f192cfe8bdd5d324aa7f34241c4269cb3ae5a4538f2aa0bb9fc5a6
+DIST wiggle-0.9.tar.gz 809756 SHA256 fe3dcf05a2cda07f42db2099ae8407acdb4d58bb9cfdc58c72395b7ae4a4e6b5 SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9 WHIRLPOOL 95a12f73458abdb999681de7af08c407d9f7c4762c71287eb6e80e38a322459c6e1767f2bec72199cf7d8cb33912981b9fd48fbe95957f854b43e4c148c04c14
diff --git a/dev-util/wiggle/files/wiggle-0.8-buffer-overflow.patch b/dev-util/wiggle/files/wiggle-0.8-buffer-overflow.patch
new file mode 100644
index 000000000000..c0ad9188818b
--- /dev/null
+++ b/dev-util/wiggle/files/wiggle-0.8-buffer-overflow.patch
@@ -0,0 +1,11 @@
+--- wiggle-0.8.orig/vpatch.c
++++ wiggle-0.8/vpatch.c
+@@ -391,7 +391,7 @@
+ 
+ void draw_one(int row, struct plist *pl, FILE *f, int reverse)
+ {
+-	char hdr[10];
++	char hdr[12];
+ 	hdr[0] = 0;
+ 
+ 	if (pl == NULL) {
diff --git a/dev-util/wiggle/metadata.xml b/dev-util/wiggle/metadata.xml
new file mode 100644
index 000000000000..557ca512951a
--- /dev/null
+++ b/dev-util/wiggle/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/wiggle/wiggle-0.8-r1.ebuild b/dev-util/wiggle/wiggle-0.8-r1.ebuild
new file mode 100644
index 000000000000..ed270e30e970
--- /dev/null
+++ b/dev-util/wiggle/wiggle-0.8-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils fixheadtails toolchain-funcs
+
+DESCRIPTION="program for applying patches that patch cannot apply because of conflicting changes"
+HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle"
+SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# The 'p' tool does support bitkeeper, but I'm against just dumping it in here
+# due to it's size.  I've explictly listed every other dependancy here due to
+# the nature of the shell program 'p'
+RDEPEND="dev-util/diffstat
+	dev-util/patchutils
+	sys-apps/diffutils
+	sys-apps/findutils
+	virtual/awk
+	sys-apps/grep
+	sys-apps/less
+	sys-apps/sed
+	sys-apps/coreutils
+	sys-devel/patch"
+DEPEND="${RDEPEND}
+	sys-apps/groff
+	test? ( sys-process/time )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-buffer-overflow.patch"
+
+	# Fix the reference to the help file so `p help' works
+	sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p"
+
+	# Don't add Neil Brown's default sign off line to every patch
+	sed -i '/$CERT/,+4s,^,#,' p || die "sed failed on p"
+
+	# Use prefixed time binary
+	sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest"
+
+	ht_fix_file p
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" \
+		wiggle || die "emake wiggle failed."
+}
+
+src_install() {
+	dobin wiggle p || die "failed to install binaries"
+	doman wiggle.1 || die "failed to install man page"
+	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes || die "failed to install docs"
+	insinto /usr/share/wiggle
+	doins p.help || die "failed to install help file"
+}
diff --git a/dev-util/wiggle/wiggle-0.9.ebuild b/dev-util/wiggle/wiggle-0.9.ebuild
new file mode 100644
index 000000000000..58f69bd8270d
--- /dev/null
+++ b/dev-util/wiggle/wiggle-0.9.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils fixheadtails flag-o-matic toolchain-funcs
+
+DESCRIPTION="program for applying patches that patch cannot apply because of conflicting changes"
+HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle"
+SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# The 'p' tool does support bitkeeper, but I'm against just dumping it in here
+# due to it's size.  I've explictly listed every other dependancy here due to
+# the nature of the shell program 'p'
+RDEPEND="
+	dev-util/diffstat
+	dev-util/patchutils
+	sys-apps/diffutils
+	sys-apps/findutils
+	virtual/awk
+	sys-apps/grep
+	sys-apps/less
+	sys-apps/sed
+	sys-apps/coreutils
+	sys-devel/patch"
+DEPEND="${RDEPEND}
+	sys-apps/groff
+	test? ( sys-process/time )"
+
+src_prepare() {
+	# Fix the reference to the help file so `p help' works
+	sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p"
+
+	# Don't add Neil Brown's default sign off line to every patch
+	sed -i '/$CERT/,+4s,^,#,' p || die "sed failed on p"
+
+	# Use prefixed time binary
+	sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest"
+
+	sed \
+		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i Makefile || die
+
+	ht_fix_file p
+
+	append-cppflags -I.
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" ${PN}
+}
+
+src_install() {
+	dobin wiggle p
+	doman wiggle.1
+	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes
+	insinto /usr/share/wiggle
+	doins p.help
+}
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
new file mode 100644
index 000000000000..12c0c87c58ab
--- /dev/null
+++ b/dev-util/wxglade/Manifest
@@ -0,0 +1 @@
+DIST wxGlade-0.6.3.tar.gz 595243 SHA256 28f0a15a8eb4d16039a1981bdcdc74bed12b595a4de8c11cf068b970fb80a68d SHA512 7cb8cb99f2a3d97c2aa43a6ad5cbb8c1b6aafff0e5d120fca1760acbb44d2c8fb3bf8a4d5b42055e1b4bef061bfdbe8eee884f4e087b9d6572874b5b818a61f9 WHIRLPOOL d7af96614f12216c74af0120012925284408b59eb46c2379de4b3080d5fcad73b1e369c01944505bfe271d238e6d32dae54ffa2b377a48adffa4ff62e905a6ba
diff --git a/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch b/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch
new file mode 100644
index 000000000000..319bb85c1663
--- /dev/null
+++ b/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch
@@ -0,0 +1,12 @@
+diff -Naur wxGlade-0.6.1-orig/main.py wxGlade-0.6.1/main.py
+--- wxGlade-0.6.1-orig/main.py	2007-10-25 01:03:22.000000000 -0600
++++ wxGlade-0.6.1/main.py	2007-12-04 09:36:20.000000000 -0600
+@@ -7,7 +7,7 @@
+ # THIS PROGRAM COMES WITH NO WARRANTY
+ 
+ import wxversion
+-wxversion.ensureMinimal("2.6")
++wxversion.select("2.8")
+ 
+ #from wxPython.wx import *
+ import wx
diff --git a/dev-util/wxglade/metadata.xml b/dev-util/wxglade/metadata.xml
new file mode 100644
index 000000000000..72b7c58382b4
--- /dev/null
+++ b/dev-util/wxglade/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>wxwidgets</herd>
+	<upstream>
+		<remote-id type="sourceforge">wxglade</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/wxglade/wxglade-0.6.3-r1.ebuild b/dev-util/wxglade/wxglade-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..54ec6b075558
--- /dev/null
+++ b/dev-util/wxglade/wxglade-0.6.3-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils multilib python
+
+MY_P="wxGlade-${PV}"
+
+DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
+HOMEPAGE="http://wxglade.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wxglade/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="dev-python/wxpython:2.8"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wxversion.patch
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt TODO.txt
+	newicon icons/icon.xpm wxglade.xpm || die "installing wxglade.xpm failed"
+	doman "${S}"/debian/wxglade.1 || die "installing man failed"
+	rm -rf "${S}"/debian
+	dohtml -r "${S}"/docs/* || die "installing docs failied"
+	rm -rf "${S}"/docs
+
+	python_copy_sources
+
+	installation() {
+		pydir=$(python_get_sitedir)/${PN}
+		insinto "${pydir}"
+		doins "${S}"/credits.txt || die "installing credits.txt failed"
+		doins -r ./* || die "installing failed"
+		dosym /usr/share/doc/${PF}/html "${pydir}"/docs || die "doc symlink failed"
+		fperms 775 "${pydir}"/wxglade.py
+		dosym "${pydir}"/wxglade.py /usr/bin/wxglade-$(python_get_version) \
+			|| die "main symlink failed"
+	}
+	python_execute_function -s installation
+
+	python_generate_wrapper_scripts -E -f -q "${D}"usr/bin/wxglade
+
+	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
+}
+
+pkg_postinst() {
+	python_mod_optimize wxglade
+}
+
+pkg_postrm() {
+	python_mod_cleanup wxglade
+}
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
new file mode 100644
index 000000000000..6bbea1b42131
--- /dev/null
+++ b/dev-util/xdelta/Manifest
@@ -0,0 +1,4 @@
+DIST xdelta-1.1.4.tar.gz 423529 SHA256 345503b60432812840991ea1d79cb10db5f34bfaba9499bd0e7d5c57ac5d5c6d SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b WHIRLPOOL 246d7b50ef528e0a761e334fb9c0af06028364ba6851aee4de0a11db42ae25fbecbf4f603e0a01f3daa5d89caecc549deea79f795af08925bdac282103056150
+DIST xdelta3-3.0.5.tar.gz 483596 SHA256 bf7ba664c5656256c5b358dd4963bc64b58cc1a76ebc6aa399e512b94dd6f0ce SHA512 a133da72483a3824f161afe0da7d6e1dc7437cf233c0d1e9141e594c691f71d8a4798b7a875227fe6619b3a5062d24f945e00ac3e1a5da3a06dfad304ff7123d WHIRLPOOL 695625ac32265eb0b123fb75b6fa578793396610983ad68731c19460d7482334f3c3e56587e0948d84682aa71cfab50e8f6e93d3254d645fbeb0d9cf9225e833
+DIST xdelta3-3.0.6.tar.gz 495860 SHA256 b9a439c27c26e8397dd1b438a2fac710b561e0961fe75682230e6c8f69340da5 SHA512 1b8afc4492129d45e2fecf7bd24616d684eb0ea9b7d5e383a15b6b343459490512697c947561fc854b9454b2c2b831d4396bbc95267813df71211bc0e5f9c0f1 WHIRLPOOL 9d06cfad22490dcebd869ca118d18d84a86770e542ad8e827f642a9a64f199bfb7ea8cd67d36b18c2775f3bce41a1b6179876bf6b5980cdebe94e072842b5ed1
+DIST xdelta3-3.0.8.tar.xz 429964 SHA256 3a86f29c95664fb44b8a40ff22d9bcc3e87aa8c01f0ff75931a7fa78ed3d2e55 SHA512 c0ac97769bd1d80d74909cb271e0396d78dccfa555de834e3bedce59cb6616f7bc6e6f18699932a6677e05d243102648979331db1d2c18b429b76ad29a7b32a3 WHIRLPOOL e8c75938ebbd96f0097f7596ab63ab5edeceb215d0ab18d440ce10b3ea98f4ef36b75e63eeaf8c41988690a546e4076c4cbd911dffe40ef07f602792fda9bcef
diff --git a/dev-util/xdelta/files/xdelta-1.1.4-glib2.patch b/dev-util/xdelta/files/xdelta-1.1.4-glib2.patch
new file mode 100644
index 000000000000..916b3ee2c007
--- /dev/null
+++ b/dev-util/xdelta/files/xdelta-1.1.4-glib2.patch
@@ -0,0 +1,221 @@
+Nicked from http://cvs.fedoraproject.org/viewvc/devel/xdelta/xdelta-1.1.4-glib2.patch
+
+
+--- xdelta-1.1.4pre1/libedsio/edsio.c.glib2	2007-01-29 14:55:10.000000000 +0100
++++ xdelta-1.1.4pre1/libedsio/edsio.c	2007-01-29 14:56:52.000000000 +0100
+@@ -179,9 +179,9 @@
+ 		    }
+ 		}
+ 
+-	      while (g_queue_get_size (queued) > 0)
++	      while (g_queue_get_length (queued) > 0)
+ 		{
+-		  DelayedEvent* de = g_queue_pop (queued);
++		  DelayedEvent* de = g_queue_pop_head (queued);
+ 
+ 		  for (i = 0; i < all_event_watchers->len; i += 1)
+ 		    {
+@@ -211,7 +211,7 @@
+ 	      de->def = def;
+ 	      de->msg = out->str;
+ 
+-	      g_queue_push (queued, de);
++	      g_queue_push_tail (queued, de);
+ 
+ 	      g_ptr_array_add (free_strings, out);
+ 	    }
+@@ -1482,129 +1482,3 @@
+   g_free (source);
+ }
+ 
+-/* Missing glib stuff
+- */
+-
+-GQueue *
+-g_queue_new (void)
+-{
+-  GQueue *q = g_new (GQueue, 1);
+-
+-  q->list = q->list_end = NULL;
+-  q->list_size = 0;
+-
+-  return q;
+-}
+-
+-
+-void
+-g_queue_free (GQueue *q)
+-{
+-  if (q)
+-    {
+-      if (q->list)
+-        g_list_free (q->list);
+-      g_free (q);
+-    }
+-}
+-
+-
+-guint
+-g_queue_get_size (GQueue *q)
+-{
+-  return (q == NULL) ? 0 : q->list_size;
+-}
+-
+-
+-void
+-g_queue_push_front (GQueue *q, gpointer data)
+-{
+-  if (q)
+-    {
+-      q->list = g_list_prepend (q->list, data);
+-
+-      if (q->list_end == NULL)
+-        q->list_end = q->list;
+-
+-      q->list_size++;
+-    }
+-}
+-
+-
+-void
+-g_queue_push_back (GQueue *q, gpointer data)
+-{
+-  if (q)
+-    {
+-      q->list_end = g_list_append (q->list_end, data);
+-
+-      if (! q->list)
+-        q->list = q->list_end;
+-      else
+-        q->list_end = q->list_end->next;
+-
+-      q->list_size++;
+-    }
+-}
+-
+-
+-gpointer
+-g_queue_pop_front (GQueue *q)
+-{
+-  gpointer data = NULL;
+-
+-  if ((q) && (q->list))
+-    {
+-      GList *node;
+-
+-      node = q->list;
+-      data = node->data;
+-
+-      if (! node->next)
+-        {
+-          q->list = q->list_end = NULL;
+-          q->list_size = 0;
+-        }
+-      else
+-        {
+-          q->list = node->next;
+-          q->list->prev = NULL;
+-          q->list_size--;
+-        }
+-
+-      g_list_free_1 (node);
+-    }
+-
+-  return data;
+-}
+-
+-
+-gpointer
+-g_queue_pop_back (GQueue *q)
+-{
+-  gpointer data = NULL;
+-
+-  if ((q) && (q->list))
+-    {
+-      GList *node;
+-
+-      node = q->list_end;
+-      data = node->data;
+-
+-      if (! node->prev)
+-	{
+-          q->list = q->list_end = NULL;
+-          q->list_size = 0;
+-        }
+-      else
+-	{
+-          q->list_end = node->prev;
+-          q->list_end->next = NULL;
+-          q->list_size--;
+-        }
+-
+-      g_list_free_1 (node);
+-    }
+-
+-  return data;
+-}
+--- xdelta-1.1.4pre1/libedsio/edsio.h.glib2	2007-01-29 14:54:38.000000000 +0100
++++ xdelta-1.1.4pre1/libedsio/edsio.h	2007-01-29 14:55:00.000000000 +0100
+@@ -481,49 +481,6 @@
+ 
+ #endif
+ 
+-/* Missing glib stuff
+- */
+-
+-typedef struct _GQueue		GQueue;
+-
+-struct _GQueue
+-{
+-  GList *list;
+-  GList *list_end;
+-  guint list_size;
+-};
+-
+-/* Queues
+- */
+-
+-GQueue *	g_queue_new		(void);
+-void		g_queue_free		(GQueue *q);
+-guint		g_queue_get_size	(GQueue *q);
+-void		g_queue_push_front	(GQueue *q, gpointer data);
+-void		g_queue_push_back	(GQueue *q, gpointer data);
+-gpointer	g_queue_pop_front	(GQueue *q);
+-gpointer	g_queue_pop_back	(GQueue *q);
+-
+-#define g_queue_empty(queue) \
+-	((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? FALSE : TRUE)
+-
+-#define g_queue_peek_front(queue) \
+-	((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
+-		((GQueue *)(queue))->list->data : NULL)
+-
+-#define g_queue_peek_back(queue) \
+-	((((GQueue *)(queue)) && ((GQueue *)(queue))->list_end) ? \
+-		((GQueue *)(queue))->list_end->data : NULL)
+-
+-#define g_queue_index(queue,ptr) \
+-	((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
+-		g_list_index (((GQueue *)(queue))->list, (ptr)) : -1)
+-
+-#define		g_queue_push		g_queue_push_back
+-#define		g_queue_pop		g_queue_pop_front
+-#define		g_queue_peek		g_queue_peek_front
+-
+-
+ #ifdef __cplusplus
+ }
+ #endif
+--- xdelta-1.1.4pre1/configure.in.glib2	2007-01-29 14:58:06.000000000 +0100
++++ xdelta-1.1.4pre1/configure.in	2007-01-29 14:59:18.000000000 +0100
+@@ -71,8 +71,8 @@
+ top_srcdir_absolute=`cd $srcdir; pwd`
+ AC_SUBST(top_srcdir_absolute)
+ 
+-AM_PATH_GLIB(1.2.8,,
+-  AC_MSG_ERROR(Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/gtk/v1.2/))
++AM_PATH_GLIB_2_0(2.10.0,,
++  AC_MSG_ERROR(Test for GLIB2.0 failed. Download it from ftp://ftp.gtk.org/pub/gtk/v2.10/))
+ 
+ dnl AC_CHECK_LIB(z, gzsetparams, */
+ dnl   AC_CHECK_HEADER(zlib.h,, */
diff --git a/dev-util/xdelta/files/xdelta-1.1.4-m4.patch b/dev-util/xdelta/files/xdelta-1.1.4-m4.patch
new file mode 100644
index 000000000000..ad8c99de5970
--- /dev/null
+++ b/dev-util/xdelta/files/xdelta-1.1.4-m4.patch
@@ -0,0 +1,11 @@
+--- xdelta-1.1.3/xdelta.m4.aclocal	2004-10-20 00:20:47.875648144 +0200
++++ xdelta-1.1.3/xdelta.m4	2004-10-20 00:21:47.205628616 +0200
+@@ -4,7 +4,7 @@
+ dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or
+ dnl
+-AC_DEFUN(AM_PATH_XDELTA,
++AC_DEFUN([AM_PATH_XDELTA],
+ [dnl
+ dnl Get the cflags and libraries from the xdelta-config script
+ dnl
diff --git a/dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch b/dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch
new file mode 100644
index 000000000000..bb509b8d4356
--- /dev/null
+++ b/dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch
@@ -0,0 +1,113 @@
+Nicked from http://cvs.fedoraproject.org/viewvc/devel/xdelta/xdelta-1.1.3-pkgconfig.patch
+
+--- /dev/null	2006-05-17 14:47:01.398050000 +0200
++++ xdelta-1.1.3/xdelta.pc.in	2006-05-30 16:00:55.000000000 +0200
+@@ -0,0 +1,13 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++pkgdatadir=@pkgdatadir@
++
++Name: xdelta
++Description: A binary file delta generator and an RCS replacement library.
++Version: @VERSION@
++Requires: glib-2.0
++Libs: -L${libdir} -lxdelta -ledsio
++Cflags: -I${includedir}
++
+--- /dev/null	2006-05-17 14:47:01.398050000 +0200
++++ xdelta-1.1.3/xdelta-config	2006-05-30 16:04:22.000000000 +0200
+@@ -0,0 +1,60 @@
++#!/bin/bash
++#
++# Simple wrapper around pkg-config to replace /usr/bin/<foo>-config scripts
++# 
++# Copyright 2006 Red Hat, Inc.  
++# Jeremy Katz <katzj@redhat.com>
++
++CFGPATH=$(basename $0)
++MODULE=${CFGPATH%-config}
++
++usage() {
++    pkg-config --help
++    exit 1
++}
++
++if [ $# -lt 1 ]; then
++    usage 1>&2
++fi
++
++ARGS=""
++
++while test $# -gt 0; do
++  case $1 in 
++      --version)
++	  ARGS="$ARGS --modversion"
++	  ;;
++      --cflags)
++	  ARGS="$ARGS --cflags"
++	  ;;
++      --libs)
++	  ARGS="$ARGS --libs"
++	  ;;
++      --libdir*)
++	  ARGS="$ARGS --libs-only-L"
++	  ;;
++      --includedir*)
++	  ARGS="$ARGS --cflags-only-I"
++	  ;;
++      --prefix*)
++          ARGS="$ARGS --variable=prefix"
++          ;;
++      --exec-prefix*)
++          ARGS="$ARGS --variable=exec_prefix"
++          ;;
++      --module*)
++	  if echo $1 | grep -q '=' ; then
++	      MODULE=`echo $1 | sed 's/^--module=//'`
++	  else
++	      MODULE=$2
++	      shift
++	  fi
++	  ;;
++      *)
++	  usage 1>&2
++	  ;;
++  esac
++  shift
++done
++
++pkg-config $ARGS $MODULE
+--- xdelta-1.1.3/Makefile.am.pkgconfig	2006-05-30 16:00:55.000000000 +0200
++++ xdelta-1.1.3/Makefile.am	2006-05-30 16:00:55.000000000 +0200
+@@ -27,6 +27,9 @@
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = xdelta.m4
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = xdelta.pc
++
+ ## $Format: "libxdelta_la_LDFLAGS = -version-info $LibCurrent$:$LibRevision$:$LibAge$" $
+ libxdelta_la_LDFLAGS = -version-info 2:0:0
+ 
+--- xdelta-1.1.3/configure.in.pkgconfig	2006-05-30 16:00:55.000000000 +0200
++++ xdelta-1.1.3/configure.in	2006-05-30 16:00:55.000000000 +0200
+@@ -63,6 +63,8 @@
+ AC_HEADER_STDC
+ AC_PROG_MAKE_SET
+ 
++PKG_PROG_PKG_CONFIG
++
+ AC_CHECK_FUNCS(gettimeofday)
+ AC_HEADER_TIME
+ 
+@@ -83,7 +85,7 @@
+ 	  doc/Makefile
+           test/Makefile
+           djgpp/Makefile
+-	  xdelta-config
++	  xdelta.pc
+ 	  libedsio/Makefile
+ 	  libedsio/edsio-comp,
+ 
diff --git a/dev-util/xdelta/metadata.xml b/dev-util/xdelta/metadata.xml
new file mode 100644
index 000000000000..b84ede9ae666
--- /dev/null
+++ b/dev-util/xdelta/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">xdelta</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/xdelta/xdelta-1.1.4-r1.ebuild b/dev-util/xdelta/xdelta-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..acdf89b9bed8
--- /dev/null
+++ b/dev-util/xdelta/xdelta-1.1.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
+HOMEPAGE="http://xdelta.googlecode.com/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+	>=sys-libs/zlib-1.1.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-glib2.patch
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	tc-export CC
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/dev-util/xdelta/xdelta-3.0.5.ebuild b/dev-util/xdelta/xdelta-3.0.5.ebuild
new file mode 100644
index 000000000000..4f817a08b4f2
--- /dev/null
+++ b/dev-util/xdelta/xdelta-3.0.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools python
+
+MY_P=${PN}${PV%.*.*}-${PV}
+
+DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression"
+HOMEPAGE="http://xdelta.org/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="examples test"
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}
+	test? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use test; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	>py-compile
+
+	# huh
+	sed -i -e '/python/s:2.6:2:' testing/xdelta3-regtest.py || die
+	sed -i -e '/python/s:2.7:2:' testing/xdelta3-test.py || die
+
+	# only build tests when required
+	sed -i -e '/xdelta3regtest/s:noinst_P:check_P:' Makefile.am || die
+	eautoreconf
+}
+
+src_test() {
+	default
+	./xdelta3regtest || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc draft-korn-vcdiff.txt README
+	use examples && dodoc -r examples
+}
diff --git a/dev-util/xdelta/xdelta-3.0.6.ebuild b/dev-util/xdelta/xdelta-3.0.6.ebuild
new file mode 100644
index 000000000000..9ad77508f1ab
--- /dev/null
+++ b/dev-util/xdelta/xdelta-3.0.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+MY_P=${PN}${PV%.*.*}-${PV}
+
+DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression"
+HOMEPAGE="http://xdelta.org/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="examples test"
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}
+	test? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	>py-compile
+
+	# huh
+	sed -i -e '/python/s:2.6:2:' testing/xdelta3-regtest.py || die
+	sed -i -e '/python/s:2.7:2:' testing/xdelta3-test.py || die
+
+	# only build tests when required
+	sed -i -e '/xdelta3regtest/s:noinst_P:check_P:' Makefile.am || die
+	eautoreconf
+}
+
+src_test() {
+	default
+	./xdelta3regtest || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc draft-korn-vcdiff.txt README
+	use examples && dodoc -r examples
+}
diff --git a/dev-util/xdelta/xdelta-3.0.8.ebuild b/dev-util/xdelta/xdelta-3.0.8.ebuild
new file mode 100644
index 000000000000..20b927bee148
--- /dev/null
+++ b/dev-util/xdelta/xdelta-3.0.8.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=( python2_7 )
+
+inherit autotools python-single-r1
+
+MY_P=${PN}${PV%.*.*}-${PV}
+
+DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression"
+HOMEPAGE="http://xdelta.org/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples lzma test"
+
+RDEPEND="lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	test? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# huh
+	sed -i -e '/python/s:2.6:2:' testing/xdelta3-regtest.py || die
+	sed -i -e '/python/s:2.7:2:' testing/xdelta3-test.py || die
+
+	# only build tests when required
+	sed -i -e '/xdelta3regtest/s:noinst_P:check_P:' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		ac_cv_header_lzma_h=$(usex lzma) \
+		ac_cv_lib_lzma_lzma_easy_buffer_encode=$(usex lzma)
+}
+
+src_test() {
+	default
+	./xdelta3regtest || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc draft-korn-vcdiff.txt README
+	use examples && dodoc -r examples
+}
diff --git a/dev-util/xesam-tools/Manifest b/dev-util/xesam-tools/Manifest
new file mode 100644
index 000000000000..c7d1358a05a1
--- /dev/null
+++ b/dev-util/xesam-tools/Manifest
@@ -0,0 +1 @@
+DIST xesam-tools-0.7.0.tar.gz 73173 SHA256 b73264bd392e3031c54cc112bd6d6780d78d9d20150954653415a25c9ab6ff96 SHA512 3428e18eb52fa205bca872c8b0b1f12f01f58a8fb43239bc2cc78fe52f9903940702dae4116d4775340b69ec949ad2198b57c0c1246fe58dd8ed8b7a6562bf71 WHIRLPOOL d2645d395ceafdcaf852ed287d5c472d5d666e461d1f35ebb289ee91f60aaae50e2b468d37ec5e815a2abd0a25c5b250be42f2da2bb213d15f7b29dfecd72868
diff --git a/dev-util/xesam-tools/metadata.xml b/dev-util/xesam-tools/metadata.xml
new file mode 100644
index 000000000000..5db1e619e0b5
--- /dev/null
+++ b/dev-util/xesam-tools/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    xesam-tools provides a set of tools and examples to help developers
+    who are working on servers or clients which implement the Xesam desktop
+    search specification
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild b/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..81e959e49d03
--- /dev/null
+++ b/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Development tools and examples for the Xesam desktop search API"
+HOMEPAGE="http://xesam.org/people/kamstrup/xesam-tools"
+SRC_URI="http://xesam.org/people/kamstrup/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto "/usr/share/doc/${PF}"
+	doins -r samples
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/demo"
+		doins "demo/demo.py"
+		insopts -m 0755
+		doins demo/[^d]*
+	fi
+}
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
new file mode 100644
index 000000000000..ab41c406a3a6
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -0,0 +1,3 @@
+DIST xfce4-dev-tools-4.10.0.tar.bz2 283987 SHA256 f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8 SHA512 8b08689656da8c103b1b9bfa92b34e5dc407f8a5969b04975bb48b3fe68d837af083dab389a092e2ec60319a59a46576eb6a01b7dde827d5be5092bb7ed903eb WHIRLPOOL 1819112eccd02d66b3860b7718efc414f2124d48a159370fe060dc8da579263ae613fbf21fb11a1f54b3fcf62dc4cb341d4fd620bc50cb2f03460ae5d0800bdb
+DIST xfce4-dev-tools-4.11.0.tar.bz2 291093 SHA256 2dccdd4935716a97db28464ba2403572ce03134fd7adf294e1a59eaf297e6555 SHA512 9c4a9251b5469cb002566f412ec80be9b61c6b74de19849427bd6ce1d0d81bb2eede71655225b5d606a2382e0342509c15014228b135f0acfc330bbefeec6232 WHIRLPOOL 3485845dc42557e18c830ea1d67bf910080b2ba7a76b3f081797748ee73ddbb36d1e66f1d1eb8d613fcbcd48dafb05b28ab39a11e3a9d4bff7a49e5fc792feae
+DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 SHA256 e2e3a654fe9110df81f8c2483c9cbfa6d656fed15d5e5e717d6ef10bd0f5b5cb SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31 WHIRLPOOL 27963f582fc568097c943133fbe7517cc27c526b795ca7813b4b91c2707ee82e55012044c6cedc1120b24614f988048fbeb2a0eb528c57d63cd016d3faa22d23
diff --git a/dev-util/xfce4-dev-tools/metadata.xml b/dev-util/xfce4-dev-tools/metadata.xml
new file mode 100644
index 000000000000..008cf479f615
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.10.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.10.0.ebuild
new file mode 100644
index 000000000000..29bcf7cc4923
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="http://www.xfce.org/ http://foo-projects.org/~benny/projects/xfce4-dev-tools/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.24"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+}
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.11.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.11.0.ebuild
new file mode 100644
index 000000000000..f69934a92f8e
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.11.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="http://www.xfce.org/ http://foo-projects.org/~benny/projects/xfce4-dev-tools/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.24"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+}
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
new file mode 100644
index 000000000000..73d715a96927
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="http://www.xfce.org/ http://foo-projects.org/~benny/projects/xfce4-dev-tools/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.30"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+}
diff --git a/dev-util/xmlindent/Manifest b/dev-util/xmlindent/Manifest
new file mode 100644
index 000000000000..d60cc002cb5f
--- /dev/null
+++ b/dev-util/xmlindent/Manifest
@@ -0,0 +1 @@
+DIST xmlindent-0.2.17.tar.gz 18333 SHA256 3a0f6887b696087b8dad4901d3994954214dbbd78499eaf622b9a85060cf254c SHA512 ab4b46dbd68f29e7adba6283485eb9d1c614ece640c18e1eabbe7f0e1e6f27f14d00d694e4e1981aaf66e0ddcf208c6cb2c80dda1cbeb0ceb1a40987a419f716 WHIRLPOOL 28b9ea143efb19152554ef5aa69dce6dd0652df3bc84ff36fc23ac9ac7804b3b43716917b0bbc043bf37680df492c0c1cd9358644b22b2037c4fc15baeee3c01
diff --git a/dev-util/xmlindent/metadata.xml b/dev-util/xmlindent/metadata.xml
new file mode 100644
index 000000000000..bfcd6bf8d100
--- /dev/null
+++ b/dev-util/xmlindent/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>dev-tools</herd>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xmlindent</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild b/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild
new file mode 100644
index 000000000000..e853bfe620a5
--- /dev/null
+++ b/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="XML Indent is an XML stream reformatter written in ANSI C, analogous to GNU indent"
+HOMEPAGE="http://xmlindent.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmlindent/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+DEPEND="sys-devel/flex"
+RDEPEND=""
+
+src_prepare() {
+	sed -i Makefile \
+		-e 's|gcc|$(CC)|g' \
+		-e 's|-g|$(CFLAGS) $(LDFLAGS) |g' \
+		|| die "sed failed"
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin xmlindent || die "dobin failed"
+	doman *.1
+}
diff --git a/dev-util/xxdi/Manifest b/dev-util/xxdi/Manifest
new file mode 100644
index 000000000000..3e4bced4e862
--- /dev/null
+++ b/dev-util/xxdi/Manifest
@@ -0,0 +1 @@
+DIST xxdi-1.0.0.tar.gz 8039 SHA256 5279cd356a680ef22dafc13a8b674eafa81c2bc82f57b38b04059b16c046f1b0 SHA512 ebf026f61f0b0a339e3dfa5c9dd6a819ef23f0d29948073cbf5f6ae9668e68a7dd903f695ab5a824494f8424dad8b79aace5742bc23484a25303a15aa32ab698 WHIRLPOOL ed3199facbd8cdef6f37e8e595d6c91d994e0fdbe449ab95e4db6bb95e1ae6f0ed0c8650281a7aab9de7d22e8ef9f96dfb9383716043a99ca4c6ebbfd815248a
diff --git a/dev-util/xxdi/metadata.xml b/dev-util/xxdi/metadata.xml
new file mode 100644
index 000000000000..f4afb903d1d8
--- /dev/null
+++ b/dev-util/xxdi/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>gregkh@gentoo.org</email>
+		<name>Greg Kroah-Hartman</name>
+		<description>Maintainer, assign bugs to him.</description>
+	</maintainer>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+		<description>Backup maintainer, CC him on bugs.</description>
+	</maintainer>
+	<longdescription lang="en">
+		xxdi.pl is a perl script that implements vim's 'xxd -i' mode
+		so that packages do not have to use all of vim just to get this
+		functionality.
+
+		efitools is an example of a package that uses it in this manner,
+		and in some build configurations, mediastreamer also does.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>gregkh@linuxfoundation.org</email>
+			<name>Greg Kroah-Hartman</name>
+		</maintainer>
+		<bugs-to>https://github.com/gregkh/xxdi/issues</bugs-to>
+		<remote-id type="github">gregkh/xxdi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/xxdi/xxdi-1.0.0.ebuild b/dev-util/xxdi/xxdi-1.0.0.ebuild
new file mode 100644
index 000000000000..897ce7252cea
--- /dev/null
+++ b/dev-util/xxdi/xxdi-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_VERSION=001
+
+DESCRIPTION="Simple alternative to vim's 'xxd -i' mode"
+HOMEPAGE="https://github.com/gregkh/xxdi"
+SRC_URI="https://github.com/gregkh/xxdi/archive/v${MODULE_VERSION}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-perl/File-Slurp"
+
+S=${WORKDIR}/${PN}-${MODULE_VERSION}
+
+src_install() {
+	dobin xxdi.pl
+	dodoc README.md
+}
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
new file mode 100644
index 000000000000..a866cc983446
--- /dev/null
+++ b/dev-util/xxdiff/Manifest
@@ -0,0 +1 @@
+DIST xxdiff-4.0_beta1_p20110426.tar.bz2 1770035 SHA256 70718eeb26e8880e2cda06d7ff6fe2e3fa9ea407086086f70ec1eb0e32301afe SHA512 d0be7a5775ed90aa1ac73320144aa24947c1bcc305bbb8f95c64009990dc44b96fd05abd7dc3f69c3a74fb93632099f4a40c76029ed29949854c5f3d7a890097 WHIRLPOOL 05048f3594d042f0130f0da20951bb124867ebfea55902bcabead5c8ba097fa4eb1f834b1f19b1ba7d36536f53240942414d143b3c4b6e0678909a5c4a5c6855
diff --git a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch
new file mode 100644
index 000000000000..fba71996b217
--- /dev/null
+++ b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch
@@ -0,0 +1,100 @@
+http://bugs.gentoo.org/511560
+
+Description: Fix compilation with Bison 3
+YYPARSE_PARAM was deprecated in Bison 1.875 and removed in Bison 3;
+%parse-param can be used instead. Also fix a warning about %pure_parser
+Author: Florian Schlichting <fsfs@debian.org>
+
+--- a/src/resParser.y
++++ b/src/resParser.y
+@@ -39,12 +39,11 @@
+ 
+ // The parser input is the resources object to fill in.
+ #define RESOURCES  ( static_cast<XxResources*>(resources) )
+-#define YYPARSE_PARAM resources
+ 
+ // Declare lexer from other compilation unit.
+ int resParserlex( YYSTYPE* yylval );
+ 
+-void resParsererror( const char* msg );
++void resParsererror( void *resources, const char* msg );
+ 
+ // Declare some parser functions and data defined in resParser.cpp
+ namespace XxResParserNS {
+@@ -58,6 +57,9 @@
+ 
+ %}
+ 
++/* The parser input is the resources object to fill in. */
++%parse-param { void *resources }
++
+ /* generate header file */
+ %defines
+ 
+@@ -144,7 +146,7 @@
+ %type <num> boolkwd
+ 
+ %start xxdiffrc
+-%pure_parser
++%pure-parser
+ 
+ %%
+ xxdiffrc	: stmts
+@@ -188,7 +190,7 @@
+                       RESOURCES->setPreferredGeometry( geometry );
+                    }
+                    else {
+-                      yyerror( "Bad geometry specification." );
++                      yyerror( resources, "Bad geometry specification." );
+                       // Should never happen, the lexer regexp should be tough
+                       // enough.
+                    }
+@@ -212,7 +214,7 @@
+                       QString err = QString( "Requested style key does not exist." );
+                       err += QString( "\nValid styles are: " );
+                       err += styles.join( ", " );
+-                      yyerror( err.toLatin1().constData() );
++                      yyerror( resources, err.toLatin1().constData() );
+                    }
+                 }
+                 ;
+@@ -224,7 +226,7 @@
+                       char buf[2048];
+                       ::snprintf( buf, 2048,
+                                   "Unrecognized accelerator: %s\n", $5 );
+-                      yyerror( buf );
++                      yyerror( resources, buf );
+                    }
+                 }
+ 		;
+--- a/src/resParser.l
++++ b/src/resParser.l
+@@ -298,7 +298,7 @@
+                      QString os;
+                      QTextOStream oss( &os );
+                      oss << "ignoring char: " << yytext << flush;
+-                     yyerror( os.latin1() );
++                     yyerror( resources, os.latin1() );
+                      */
+                   }
+                 }
+--- a/src/resParser.cpp
++++ b/src/resParser.cpp
+@@ -73,7 +73,7 @@
+ 
+ //------------------------------------------------------------------------------
+ //
+-void resParsererror( const char* msg )
++void resParsererror( void* resources __attribute__((__unused__)), const char* msg )
+ {
+    // Send errors to stdout so we can filter out the debug info shmeglu while
+    // debugging parser.
+@@ -794,7 +794,7 @@
+       QString os;
+       QTextStream oss( &os );
+       oss << "Unknown " << errmsg << ": " << name << flush;
+-      resParsererror( os.toLatin1().constData() );
++      resParsererror( NULL, os.toLatin1().constData() );
+    }
+    num = ERROR_TOKEN;
+    return ERROR_TOKEN;
diff --git a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch
new file mode 100644
index 000000000000..2dcea00bcba2
--- /dev/null
+++ b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/show_bug.cgi?id=442302
+
+# HG changeset patch
+# User Martin Blais <mblais@marketfactory.com>
+# Date 1339464558 14400
+# Node ID 00d868ea5f4a92f4b5c7e2665403eb18c7390aca
+# Parent  fdc247a7d9e51ca71b284f592be33f0465140f6b
+Fixed compile error that only shows up in FC17 with gcc-4.7.
+
+diff -r fdc247a7d9e5 -r 00d868ea5f4a src/main.h
+--- a/src/main.h	Mon Feb 20 10:46:22 2012 -0500
++++ b/src/main.h	Mon Jun 11 21:29:18 2012 -0400
+@@ -35,6 +35,10 @@
+  * PUBLIC DECLARATIONS
+  *============================================================================*/
+ 
++extern "C" {
++
+ extern char** environ;
+ 
++}
++
+ #endif
+
diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
new file mode 100644
index 000000000000..dc439f7e84f5
--- /dev/null
+++ b/dev-util/xxdiff/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>qt</herd>
+</pkgmetadata>
diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
new file mode 100644
index 000000000000..e1dfd32949b0
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils qt4-r2
+
+DESCRIPTION="A graphical file and directories comparator and merge tool"
+HOMEPAGE="http://furius.ca/xxdiff/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-bison3.patch
+
+	pushd src >/dev/null
+	sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
+	qt4-r2_src_prepare
+	popd
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	pushd src >/dev/null
+	qt4-r2_src_configure
+	cat Makefile.extra >> Makefile
+	popd
+
+	distutils-r1_src_configure
+}
+
+src_compile() {
+	pushd src >/dev/null
+	qt4-r2_src_compile
+	popd
+
+	distutils-r1_src_compile
+}
+
+src_install() {
+	dobin bin/xxdiff
+
+	distutils-r1_src_install
+
+	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
+
+	dohtml doc/*.{png,html} src/doc.html
+
+	# example tools, use these to build your own ones
+	insinto /usr/share/doc/${PF}
+	doins -r tools
+}
diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
new file mode 100644
index 000000000000..0128e520fb27
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils qt4-r2
+
+DESCRIPTION="A graphical file and directories comparator and merge tool"
+HOMEPAGE="http://furius.ca/xxdiff/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtgui:4
+	!>=sys-devel/bison-3"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+
+	pushd src >/dev/null
+	sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
+	qt4-r2_src_prepare
+	popd
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	pushd src >/dev/null
+	qt4-r2_src_configure
+	cat Makefile.extra >> Makefile
+	popd
+
+	distutils-r1_src_configure
+}
+
+src_compile() {
+	pushd src >/dev/null
+	qt4-r2_src_compile
+	popd
+
+	distutils-r1_src_compile
+}
+
+src_install() {
+	dobin bin/xxdiff
+
+	distutils-r1_src_install
+
+	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
+
+	dohtml doc/*.{png,html} src/doc.html
+
+	# example tools, use these to build your own ones
+	insinto /usr/share/doc/${PF}
+	doins -r tools
+}
diff --git a/dev-util/yacc/Manifest b/dev-util/yacc/Manifest
new file mode 100644
index 000000000000..279e44ad8ef2
--- /dev/null
+++ b/dev-util/yacc/Manifest
@@ -0,0 +1 @@
+DIST yacc-1.9.1.tar.Z 64805 SHA256 8a0f3faf78d0ada00eea5ffd1e141bb7a979d5d570a4c8a9a6ea57e5f3751477 SHA512 6adb51c5f07e8084a86688589f52d9eee0183fb4d77508e36621a6b0ba91a5c4195feb87db3401ec69560554f71f2f6984dec01266e41e0fd54fa72ef1780e80 WHIRLPOOL 91bcefbf56374559c83c40ff5c15303d6547c607aa0ab98eea2883dc78fd82d638d6638787eb89fa283cc19791bf9e1cc3041ecc435404b012d913ee04664560
diff --git a/dev-util/yacc/files/mkstemp.patch b/dev-util/yacc/files/mkstemp.patch
new file mode 100644
index 000000000000..f037e331fb5b
--- /dev/null
+++ b/dev-util/yacc/files/mkstemp.patch
@@ -0,0 +1,15 @@
+--- main.c.orig	2002-12-17 14:28:54.000000000 -0500
++++ main.c	2002-12-17 14:29:31.000000000 -0500
+@@ -264,9 +264,9 @@
+     text_file_name[len + 5] = 't';
+     union_file_name[len + 5] = 'u';
+ 
+-    mktemp(action_file_name);
+-    mktemp(text_file_name);
+-    mktemp(union_file_name);
++    mkstemp(action_file_name);
++    mkstemp(text_file_name);
++    mkstemp(union_file_name);
+ 
+     len = strlen(file_prefix);
+ 
diff --git a/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch b/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch
new file mode 100644
index 000000000000..2fbb83cfc6b1
--- /dev/null
+++ b/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch
@@ -0,0 +1,33 @@
+Tue Jul 8 15:06:50 2008 UTC by otto
+
+Fix an venerable bug: if we're reducing a rule that has an empty
+right hand side and the yacc stackpointer is pointing at the very
+end of the allocated stack, we end up accessing the stack out of
+bounds by the implicit $$ = $1 action.  Detected by my new malloc,
+experienced by sturm@ on sparc64; ok deraadt@
+
+
+Index: yacc-1.9.1/skeleton.c
+===================================================================
+--- yacc-1.9.1.orig/skeleton.c
++++ yacc-1.9.1/skeleton.c
+@@ -18,6 +18,7 @@ char *banner[] =
+     "/*static char yysccsid[] = \"from: @(#)yaccpar	1.9 (Berkeley) 02/21/93\";*/",
+     "static char yyrcsid[] = \"$Id: yacc-1.9.1-CVE-2008-3196.patch,v 1.1 2008/10/04 18:57:18 rbu Exp $\";",
+     "#endif",
++    "#include <string.h>",
+     "#define YYBYACC 1",
+     "#define YYMAJOR 1",
+     "#define YYMINOR 9",
+@@ -226,7 +227,10 @@ char *body[] =
+     "                YYPREFIX, yystate, yyn, yyrule[yyn]);",
+     "#endif",
+     "    yym = yylen[yyn];",
+-    "    yyval = yyvsp[1-yym];",
++    "    if (yym)",
++    "        yyval = yyvsp[1-yym];",
++    "    else",
++    "        memset(&yyval, 0, sizeof yyval);",
+     "    switch (yyn)",
+     "    {",
+     0
diff --git a/dev-util/yacc/files/yacc-1.9.1-ia64.patch b/dev-util/yacc/files/yacc-1.9.1-ia64.patch
new file mode 100644
index 000000000000..c10e88541287
--- /dev/null
+++ b/dev-util/yacc/files/yacc-1.9.1-ia64.patch
@@ -0,0 +1,24 @@
+--- byacc-1.9/defs.h.busted	Sat May  6 21:10:56 2000
++++ byacc-1.9/defs.h	Sat May  6 21:11:22 2000
+@@ -1,7 +1,8 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <stdio.h>
+-
++#include <string.h>
++#include <stdlib.h>
+ 
+ /*  machine-dependent definitions			*/
+ /*  the following definitions are for the Tahoe		*/
+@@ -280,10 +281,3 @@
+ extern int errno;
+ 
+ 
+-/* system functions */
+-
+-extern void free();
+-extern char *calloc();
+-extern char *malloc();
+-extern char *realloc();
+-extern char *strcpy();
+
diff --git a/dev-util/yacc/metadata.xml b/dev-util/yacc/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/dev-util/yacc/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/yacc/yacc-1.9.1-r4.ebuild b/dev-util/yacc/yacc-1.9.1-r4.ebuild
new file mode 100644
index 000000000000..448e2541336a
--- /dev/null
+++ b/dev-util/yacc/yacc-1.9.1-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Yacc: Yet Another Compiler-Compiler"
+HOMEPAGE="http://dinosaur.compilertools.net/#yacc"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Use our CFLAGS
+	sed -i -e 's: -O : $(CFLAGS) :' Makefile || die 'sed failed'
+
+	# mkstemp patch from byacc ebuild
+	epatch "${FILESDIR}"/mkstemp.patch
+
+	# The following patch fixes yacc to run correctly on ia64 (and
+	# other 64-bit arches).  See bug 46233
+	epatch "${FILESDIR}"/${P}-ia64.patch
+
+	# avoid stack access error, bug 232005
+	epatch "${FILESDIR}"/${P}-CVE-2008-3196.patch
+}
+
+src_compile() {
+	make clean || die
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	dobin yacc || die
+	doman yacc.1
+	dodoc 00README* ACKNOWLEDGEMENTS NEW_FEATURES NO_WARRANTY NOTES README*
+}
+
+pkg_preinst() {
+	# bison installs a /usr/bin/yacc symlink ...
+	# we need to remove it to avoid triggering
+	# collision-protect errors #90089
+	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
+		rm -f "${ROOT}"/usr/bin/yacc
+	fi
+}
+
+pkg_postrm() {
+	# and if we uninstall yacc but keep bison,
+	# lets restore the /usr/bin/yacc symlink
+	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
+		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
+	fi
+}
diff --git a/dev-util/yacc/yacc-1.9.1-r5.ebuild b/dev-util/yacc/yacc-1.9.1-r5.ebuild
new file mode 100644
index 000000000000..fcee41a056c0
--- /dev/null
+++ b/dev-util/yacc/yacc-1.9.1-r5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Yacc: Yet Another Compiler-Compiler"
+HOMEPAGE="http://dinosaur.compilertools.net/#yacc"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Use our CFLAGS and LDFLAGS
+	sed -i -e 's: -O : $(CFLAGS) $(LDFLAGS) :' Makefile || die 'sed failed'
+
+	# mkstemp patch from byacc ebuild
+	epatch "${FILESDIR}"/mkstemp.patch
+
+	# The following patch fixes yacc to run correctly on ia64 (and
+	# other 64-bit arches).  See bug 46233
+	epatch "${FILESDIR}"/${P}-ia64.patch
+
+	# avoid stack access error, bug 232005
+	epatch "${FILESDIR}"/${P}-CVE-2008-3196.patch
+}
+
+src_compile() {
+	emake clean || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	dobin yacc || die
+	doman yacc.1
+	dodoc 00README* ACKNOWLEDGEMENTS NEW_FEATURES NO_WARRANTY NOTES README*
+}
+
+pkg_preinst() {
+	# bison installs a /usr/bin/yacc symlink ...
+	# we need to remove it to avoid triggering
+	# collision-protect errors #90089
+	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
+		rm -f "${ROOT}"/usr/bin/yacc
+	fi
+}
+
+pkg_postrm() {
+	# and if we uninstall yacc but keep bison,
+	# lets restore the /usr/bin/yacc symlink
+	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
+		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
+	fi
+}