Sync with portage [Wed Dec 16 00:36:24 MSK 2015].

9 years ago · a9cc939b3a
parent dd93e382db
commit a9cc939b3a
3952 changed files with 10504 additions and 6043 deletions
--- a/app-crypt/gkeys/gkeys-9999.ebuild
+++ b/app-crypt/gkeys/gkeys-9999.ebuild
@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 	app-crypt/gnupg
 	=dev-python/pyGPG-9999[${PYTHON_USEDEP}]
 	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
-	dev-python/snakeoil[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 	>=app-crypt/gentoo-keys-201501052117
 	"

--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@ -1,3 +1,4 @@
 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
 DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727
 DIST pinentry-0.9.6.tar.bz2 432889 SHA256 2a1124e9097f24f866cab7982610677e222cea71be0a71a5566f223177e01e66 SHA512 c9f94e5ce5baf6779f6effc13f82c8c7f99d426dc232114fc4e11a8684eaefbaf4f60363db78cdb9f4c8e91ba7af40779ec1c5d7e01ee15b84c7de77ccf46e72 WHIRLPOOL 954d185ce60eeb28717dd5986c4bdfda0472944b99d52caa213919b4dd1368b2d2b4cff27bfc4158a0fd7f70f7f6549b3415de7ba33239ec9305a2e0e0bdcbc0
+DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a
--- a/app-crypt/pinentry/pinentry-0.9.6-r4.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.6-r4.ebuild
@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="http://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs gtk ncurses qt4 caps gnome-keyring static"
-
-CDEPEND="
-	>=dev-libs/libgpg-error-1.17
-	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.6.3
-	ncurses? ( sys-libs/ncurses:0= )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
-	caps? ( sys-libs/libcap )
-	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
-	app-eselect/eselect-pinentry
-	gnome-keyring? ( app-crypt/libsecret )
-"
-
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-RDEPEND="
-	${CDEPEND}
-	gnome-keyring? ( app-crypt/gcr )
-"
-
-REQUIRED_USE="
-	|| ( ncurses gtk qt4 )
-	gtk? ( !static )
-	qt4? ( !static )
-	static? ( ncurses )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-	epatch "${FILESDIR}/${P}-Remove-detection-of-Qt5.patch"
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
-	# Issues finding qt on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
-
-	econf \
-		--enable-pinentry-tty \
-		$(use_enable emacs pinentry-emacs) \
-		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_enable qt4 pinentry-qt) \
-		$(use_with caps libcap) \
-		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gnome-keyring pinentry-gnome3) \
-		MOC="$(qt4_get_bindir)"/moc
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/bin/pinentry || die
-
-	if use_enable qt4; then
-		dosym pinentry-qt /usr/bin/pinentry-qt4
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
-		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
-		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
-		elog "The soft resource limit for memory locking specifies the limit an"
-		elog "unprivileged process may lock into memory. You can also use POSIX"
-		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
-		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
-		elog "your users."
-	fi
-
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
--- a/app-crypt/pinentry/pinentry-0.9.6-r5.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.6-r5.ebuild
@ -17,7 +17,7 @@ IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"

 CDEPEND="
 	>=dev-libs/libgpg-error-1.17
-	>=dev-libs/libassuan-2
+	>=dev-libs/libassuan-2.1
 	>=dev-libs/libgcrypt-1.6.3
 	ncurses? ( sys-libs/ncurses:0= )
 	gtk? ( x11-libs/gtk+:2 )
@ -45,7 +45,7 @@ RDEPEND="
 "

 REQUIRED_USE="
-	|| ( ncurses gtk qt4 )
+	|| ( ncurses gtk qt4 qt5 )
 	gtk? ( !static )
 	qt4? ( !static )
 	qt5? ( !static )
@ -57,7 +57,6 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )

 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-	epatch "${FILESDIR}/${P}-add-disable-pinentry-qt5-option.patch"
 	eautoreconf
 }

@ -99,7 +98,7 @@ src_install() {
 	default
 	rm -f "${ED}"/usr/bin/pinentry || die

-	if use_enable qt4 || use_enable qt5; then
+	if use qt4 || use qt5; then
 		dosym pinentry-qt /usr/bin/pinentry-qt4
 	fi
 }
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@ -1,3 +1,4 @@
 DIST kicad-doc-4.0.0.tar.gz 23358151 SHA256 8599873bfbb3ae824e93e0f78464ae303ef1df3331fbf9bc5591a5610a375d89 SHA512 4a7b2095af51bfa6f4399ba45d5f54e1c8c576195e640b025b07448fc0eb7a6144cf60630e30405ab57afc39cfb778dc63a9c675a0fc01cb3dfc870aed15e1ae WHIRLPOOL b24690e44c5e1832d95f4f83a25130a3b7d9986359da4919b7a778a6e2aaca4022cc27617b88815af5a4aa78f53b73adeb7ec7d15e69eb35d47cc7a39480f444
 DIST kicad-doc-4.0.0_rc1.tar.gz 35078269 SHA256 3e26397455f36ff902f3c93d32b4c0063f44069e88a0d477475bb0b1dbf75140 SHA512 77c5ae067ec480ae0bec4fe8b6de53d05e675ba29695b5de2b39d9019262cd2b376123e8f978db5d362b157b8dd6fba8ecf1604262d0ae31ee5a37de5538dff7 WHIRLPOOL 9afebc3419a69d57377ec10c44d5a4346bd6ccb75c50795809205e9490f35fdd7d0046a37319d49a99766aecec53c8b0287d1beca4788310a957bf854f58e641
 DIST kicad-doc-4.0.0_rc2.tar.gz 23393365 SHA256 fc86546a370c43f0f00b78ea32276defed68fded1d56069bc82ef6d44f359099 SHA512 a0bf17e833e91e334530f7e19a2450fbecfef5640060b463b6351cf7dc7ab25bdd7575dd12150dc17cea9a2c5890ac29e88bad851d15840f47143e6de6eac318 WHIRLPOOL 2fbf65bab1a19da9be0fa6dce80c027795515bc4e196960ed8edbcd9fad0120a350ffcb712bc4469d16a5cef8b1a6dd470dd7e31f7fd7f2c7d73c436bf1e46bf
+DIST kicad-doc-4.0.1.tar.gz 23365382 SHA256 be8dc4bddb89869996956d3d1421584c5a8197282997902e22fda888a8d433bb SHA512 ae57a9c29f3cd4b3d85d4b7d7bc940957c33b0e1c1404b82c8a9261695c0670866cb4a95ab7ad5c35b1faa6fbd3969f277467fa7d33e38e728a3dd9b65203021 WHIRLPOOL d9834312a0a315bf1d5dca048999d5adcb2ee60c42a41d8266522ad6c0ca49ec7bad5c9bad322b6d73c41c9f24cb1f4088d6889c6a51abf4671271dd7ec8af9d
--- a/app-doc/kicad-doc/kicad-doc-4.0.1.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-4.0.1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="http://www.kicad-pcb.org"
+SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+FUSE="html pdf"
+LANGS="en fr it ja nl pl"
+LINGUAS=""
+for lang in ${LANGS} ; do
+	LINGUAS="${LINGUAS} linguas_${lang}"
+done
+IUSE="${FUSE} ${LINGUAS}"
+
+REQUIRED_USE="( || ( pdf html ) ) ( ^^ ( ${LINGUAS} ) )"
+
+DEPEND=">=app-text/asciidoc-8.6.9
+	app-text/dblatex
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-util/source-highlight
+	dev-perl/Unicode-LineBreak
+	linguas_ja? ( media-fonts/vlgothic )"
+RDEPEND=""
+
+src_prepare() {
+	DOCPATH="KICAD_DOC_INSTALL_PATH share/doc/kicad"
+	sed "s|${DOCPATH}|${DOCPATH}-${PV}|g" -i CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	local formats=""
+	local doclang=""
+
+	# construct format string
+	for format in ${FUSE}; do
+		use $format && formats+="${format};"
+	done
+
+	# find out which language is requested
+	for lang in ${LANGS}; do
+		if use linguas_${lang}; then
+			doclang=${lang}
+		fi
+	done
+
+	local mycmakeargs+=(
+		-DBUILD_FORMATS="${formats}"
+		-DSINGLE_LANGUAGE="${doclang}"
+	)
+	cmake-utils_src_configure
+}
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@ -1,2 +1,3 @@
 DIST focuswriter-1.5.3-src.tar.bz2 5201148 SHA256 1c48c72879a7b40cf7d97c28abf5cf713c063b7f83a1179093b1241f5797a8c4 SHA512 6796fc8dbe5d5ba545fc8ee5797f620e56dea67a038f4c4eb9e404940a863b32ea2ceb30ed7ea8e22187be2763cc128def3f08f61187ba11de94ec9ae16f807f WHIRLPOOL c5dbf0e739928833bbccdc2e5de6305ca553a3e8f0f1d54d1d2a6bd4636b8ede85c3adedcaee85d66779e25cd53678428cc3817bdedcf30be42c89fc1aebdf07
 DIST focuswriter-1.5.4-src.tar.bz2 5247111 SHA256 5ffd74a2d5a790e432d819dfd269ddb8d6c1a0168c91e441b2121fa6eaf8f565 SHA512 f532dac5a0691d7b82a16b5dae115c7d79b161484ba1ad2243fd1ccaeba8ae9c9ed0019eba6cd87cc4155a51f5a97cad16c92b9453671426e214e139d78bc526 WHIRLPOOL aca3722b60aee8bec0979f71a04d28217c82c9a2fb60b49a19a58596c9d67bd160626d14cc950eeaa9c0543001f93ec9576a1561c24bbe29a98eeec708287331
+DIST focuswriter-1.5.5-src.tar.bz2 5249014 SHA256 b6a2085587864b2685516d20870d9375803ccdf3472e66bf457382d028c1da0e SHA512 aed6a2e203dcf349ff7fef6caa8e7ab1dbba80da988933c06d6f4ea1ad49ad4c4546b30aaacf9373d1234cb8934daac36f00d0d7b3512d9c3fc4f1e1b273a766 WHIRLPOOL 29795304e6d6687d16d2774cd4d28d0c45382474391d7ad62fa557a134e7c5d11ba6bf81bb81df2b0fb3727b4bb32f705d8fe73a7129f44c8485cc9d8b19b2e1
--- a/app-editors/focuswriter/focuswriter-1.5.5.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.5.5.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="ar ca cs da de el en en_GB es_MX es fi fr he hu hy id it ja ko nl pl
+pt_BR pt ro ru sk sr sv tr uk vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+inherit fdo-mime gnome2-utils l10n readme.gentoo qt4-r2
+
+DESCRIPTION="A fullscreen and distraction-free word processor"
+HOMEPAGE="http://gottcode.org/focuswriter/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="app-text/hunspell
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsingleapplication[qt4(+),X]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog CREDITS NEWS README )
+DOC_CONTENTS="Focuswriter has optional sound support if media-libs/sdl-mixer is
+installed with wav useflag enabled."
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.2-unbundle-qtsingleapplication.patch" )
+
+rm_loc() {
+	sed -e "s|translations/${PN}_${1}.ts||"	-i ${PN}.pro || die 'sed failed'
+	rm translations/${PN}_${1}.{ts,qm} || die "removing ${1} locale failed"
+}
+
+src_prepare() {
+	l10n_for_each_disabled_locale_do rm_loc
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	eqmake4 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	readme.gentoo_create_doc
+	qt4-r2_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@ -1,2 +1 @@
-DIST qxmledit-0.8.5-src.tgz 6727188 SHA256 aedb70f27493ba50f0c8bde4acdd8913fcf4221611b24f9042769df47aa701c4 SHA512 c974dc0787fdc1831a39e9e36f842ed92ca5b57e9e66e64822eea4646d88a0755f9aa791e4d7724872856561eac213413696fa7b0f61d89b54e29cbc95049a8a WHIRLPOOL 362d898005677dea5bb7372bc78d8b5d9376f2c7555be3086448778202a55fff5766856c39a55561c92b08498ecafaeace033121ba4706b4c1aa923ea45f28d8
 DIST qxmledit-0.8.8-1-src.tgz 8885329 SHA256 d43ccd0029b1094a970d58170a095cbe5fddfe3d93da7c52388783d321386e17 SHA512 5440d33c052507d3b5c840cdd2966c151a77e2027703f7c1d33f80ec786affab915053d2ae17ef72fd856223ca85dbb70d39d8800170449a26ea88632c0069b5 WHIRLPOOL 68f8d73c39ce490f13d88283053ad045125f007132a25d965ffb603ab1de1d42b62944659a76aa9bbb5adc884b37ad90f7eaf4487f314678d8a1923cd16f1078
--- a/app-editors/qxmledit/qxmledit-0.8.5.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.8.5.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib eutils qt4-r2
-
-MY_P="qxmledit-${PV}-src"
-
-DESCRIPTION="Qt4 XML Editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND=">=dev-qt/qtcore-4.7:4
-	>=dev-qt/qtgui-4.7:4
-	>=dev-qt/qtsql-4.7:4
-	>=dev-qt/qtsvg-4.7:4
-	>=dev-qt/qtxmlpatterns-4.7:4"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS NEWS README ROADMAP TODO"
-
-src_prepare() {
-	# fix doc dir
-	sed -i "/INST_DOC_DIR = / s|/opt/${PN}|/usr/share/doc/${PF}|" \
-		src/QXmlEdit{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
-		die "failed to fix doc installation path"
-	# fix binary installation path
-	sed -i "/INST_DIR = / s|/opt/${PN}|/usr/bin|" \
-		src/QXmlEdit{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
-		die "failed to fix binary installation path"
-	# fix helper libraries installation path
-	sed -i "/INST_LIB_DIR = / s|/opt/${PN}|/usr/$(get_libdir)|" \
-		src/QXmlEdit{,Widget}.pro \
-		src/sessions/QXmlEditSessions.pro || \
-		die "failed to fix library installation path"
-	# fix translations
-	sed -i "/INST_DATA_DIR = / s|/opt|/usr/share|" src/QXmlEdit{,Widget}.pro \
-		src/sessions/QXmlEditSessions.pro || \
-		die "failed to fix translations"
-	# fix include
-	sed -i "/INST_INCLUDE_DIR = / s|/opt|/usr/share|" src/QXmlEditWidget.pro \
-		|| die "failed to fix include directory"
-
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	newicon src/images/icon.png ${PN}.png
-	make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor"
-}
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@ -1,2 +1,2 @@
-DIST tea-36.0.2.tar.bz2 315046 SHA256 6541b645451de3f6eefce58b55a302224b925bdbdb9efcfa1491bcf867baad6f SHA512 e04df49e8381c69f0e2fb6900d6f095b0eb15bdc2d8fb935230129b2fef7560fd91936d66a2440d1922a6fc6c2e7d07e40fe1106b5cf22dd495bba667cf5def8 WHIRLPOOL 1da79f26126c98876ff6bfef04c799f476a204294466cbd47834748a12e8c59d10f7c2e36d4ebc089fcef21caca1beeab1293acee13da9af341466c117873e1f
 DIST tea-41.0.0.tar.bz2 381891 SHA256 b20bfe3235a4f405bcd984adfabde2302a15cf8512e19f8b97bc43ce9911632b SHA512 aff52922be7650a23fcafe5a8106d5955bc7c68a901ad6a3982b71196ac8856939d3bc61236babbed21a749c2fc205510ef081ac35d7d33fcf2d2700ebb5cbaf WHIRLPOOL ed913f3fb424e47fbbecab445ccd9c34c9ad66befdda950fee05958459b87efad67cfea37548c5ab8456b849c860f0cd3ef59e386aaa99c01b5041dae02c1afc
+DIST tea-41.1.0.tar.bz2 381370 SHA256 65ea128739802b7626a5a59de12b0e885dcef7a83f7bcd06b6d3aea830ed8717 SHA512 a46e0cdfce5c7d453c7783c59ad98b2b029847ddcc8ce0655c6e1ae45825426ac1b271ca7ad90f0219d8f796f507f6bdba0f2c764c563c8c23503b94be817eb7 WHIRLPOOL a3d00f5e42a145be2a7f3bf846832bf2a7e95e957abf4c928118be7607adb57fddfb906fbedaf7fa51665b25629beae0fe5b4db40886f42dfcf5c166e43717b5
--- a/app-editors/tea/tea-41.1.0.ebuild
+++ b/app-editors/tea/tea-41.1.0.ebuild
@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5
 PLOCALES="de fr ru"

-inherit eutils l10n qt4-r2
+inherit eutils l10n qmake-utils

 DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="http://semiletov.org/tea/"
-SRC_URI="http://semiletov.org/${PN}/dloads/${P}.tar.bz2"
+HOMEPAGE="http://tea.ourproject.org/ http://semiletov.org/tea/"
+SRC_URI="http://tea.ourproject.org/dloads/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
 IUSE="aspell hunspell"

 RDEPEND="
-	sys-libs/zlib
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
+	sys-libs/zlib
 	aspell? ( app-text/aspell )
 	hunspell? ( app-text/hunspell )
 "
@ -31,15 +31,14 @@ DOCS=( AUTHORS ChangeLog NEWS TODO )

 src_configure() {
 	eqmake4 src.pro \
-		PREFIX="${EPREFIX}/usr/bin" \
-		USE_ASPELL=$(use aspell && echo true || echo false) \
-		USE_HUNSPELL=$(use hunspell && echo true || echo false)
+		$(use aspell || echo CONFIG+=noaspell) \
+		$(use hunspell || echo CONFIG+=nohunspell)
 }

 src_install() {
-	qt4-r2_src_install
+	dobin bin/tea

-	newicon icons/tea_icon_v2.png ${PN}.png
+	newicon icons/tea-icon-v3-01.png ${PN}.png
 	make_desktop_entry ${PN} 'Tea Editor'

 	# translations
--- a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7549.patch
+++ b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7549.patch
@ -0,0 +1,62 @@
+https://bugs.gentoo.org/568214
+
+From 43b11a91dd861a946b231b89b7542856ade23d1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
+Date: Fri, 26 Jun 2015 14:25:29 +0200
+Subject: [PATCH] msix: implement pba write (but read-only)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+qpci_msix_pending() writes on pba region, causing qemu to SEGV:
+
+  Program received signal SIGSEGV, Segmentation fault.
+  [Switching to Thread 0x7ffff7fba8c0 (LWP 25882)]
+  0x0000000000000000 in ?? ()
+  (gdb) bt
+  #0  0x0000000000000000 in  ()
+  #1  0x00005555556556c5 in memory_region_oldmmio_write_accessor (mr=0x5555579f3f80, addr=0, value=0x7fffffffbf68, size=4, shift=0, mask=4294967295, attrs=...) at /home/elmarco/src/qemu/memory.c:434
+  #2  0x00005555556558e1 in access_with_adjusted_size (addr=0, value=0x7fffffffbf68, size=4, access_size_min=1, access_size_max=4, access=0x55555565563e <memory_region_oldmmio_write_accessor>, mr=0x5555579f3f80, attrs=...) at /home/elmarco/src/qemu/memory.c:506
+  #3  0x00005555556581eb in memory_region_dispatch_write (mr=0x5555579f3f80, addr=0, data=0, size=4, attrs=...) at /home/elmarco/src/qemu/memory.c:1176
+  #4  0x000055555560b6f9 in address_space_rw (as=0x555555eff4e0 <address_space_memory>, addr=3759147008, attrs=..., buf=0x7fffffffc1b0 "", len=4, is_write=true) at /home/elmarco/src/qemu/exec.c:2439
+  #5  0x000055555560baa2 in cpu_physical_memory_rw (addr=3759147008, buf=0x7fffffffc1b0 "", len=4, is_write=1) at /home/elmarco/src/qemu/exec.c:2534
+  #6  0x000055555564c005 in cpu_physical_memory_write (addr=3759147008, buf=0x7fffffffc1b0, len=4) at /home/elmarco/src/qemu/include/exec/cpu-common.h:80
+  #7  0x000055555564cd9c in qtest_process_command (chr=0x55555642b890, words=0x5555578de4b0) at /home/elmarco/src/qemu/qtest.c:378
+  #8  0x000055555564db77 in qtest_process_inbuf (chr=0x55555642b890, inbuf=0x55555641b340) at /home/elmarco/src/qemu/qtest.c:569
+  #9  0x000055555564dc07 in qtest_read (opaque=0x55555642b890, buf=0x7fffffffc2e0 "writel 0xe0100800 0x0\n", size=22) at /home/elmarco/src/qemu/qtest.c:581
+  #10 0x000055555574ce3e in qemu_chr_be_write (s=0x55555642b890, buf=0x7fffffffc2e0 "writel 0xe0100800 0x0\n", len=22) at qemu-char.c:306
+  #11 0x0000555555751263 in tcp_chr_read (chan=0x55555642bcf0, cond=G_IO_IN, opaque=0x55555642b890) at qemu-char.c:2876
+  #12 0x00007ffff64c9a8a in g_main_context_dispatch (context=0x55555641c400) at gmain.c:3122
+
+(without this patch, this can be reproduced with the ivshmem qtest)
+
+Implement an empty mmio write to avoid the crash.
+
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ hw/pci/msix.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/hw/pci/msix.c b/hw/pci/msix.c
+index 2fdada4..64c93d8 100644
+--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
+@@ -200,8 +200,14 @@ static uint64_t msix_pba_mmio_read(void *opaque, hwaddr addr,
+     return pci_get_long(dev->msix_pba + addr);
+ }
+ 
+static void msix_pba_mmio_write(void *opaque, hwaddr addr,
+                                uint64_t val, unsigned size)
+{
+}
+
+ static const MemoryRegionOps msix_pba_mmio_ops = {
+     .read = msix_pba_mmio_read,
+    .write = msix_pba_mmio_write,
+     .endianness = DEVICE_LITTLE_ENDIAN,
+     .valid = {
+         .min_access_size = 4,
+-- 
+2.6.2
+
--- a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8504.patch
+++ b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8504.patch
@ -0,0 +1,46 @@
+https://bugs.gentoo.org/567828
+
+From 4c65fed8bdf96780735dbdb92a8bd0d6b6526cc3 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Thu, 3 Dec 2015 18:54:17 +0530
+Subject: [PATCH] ui: vnc: avoid floating point exception
+
+While sending 'SetPixelFormat' messages to a VNC server,
+the client could set the 'red-max', 'green-max' and 'blue-max'
+values to be zero. This leads to a floating point exception in
+write_png_palette while doing frame buffer updates.
+
+Reported-by: Lian Yihan <lianyihan@360.cn>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+---
+ ui/vnc.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ui/vnc.c b/ui/vnc.c
+index 7538405..cbe4d33 100644
+--- a/ui/vnc.c
+++ b/ui/vnc.c
+@@ -2198,15 +2198,15 @@ static void set_pixel_format(VncState *vs,
+         return;
+     }
+ 
+-    vs->client_pf.rmax = red_max;
+    vs->client_pf.rmax = red_max ? red_max : 0xFF;
+     vs->client_pf.rbits = hweight_long(red_max);
+     vs->client_pf.rshift = red_shift;
+     vs->client_pf.rmask = red_max << red_shift;
+-    vs->client_pf.gmax = green_max;
+    vs->client_pf.gmax = green_max ? green_max : 0xFF;
+     vs->client_pf.gbits = hweight_long(green_max);
+     vs->client_pf.gshift = green_shift;
+     vs->client_pf.gmask = green_max << green_shift;
+-    vs->client_pf.bmax = blue_max;
+    vs->client_pf.bmax = blue_max ? blue_max : 0xFF;
+     vs->client_pf.bbits = hweight_long(blue_max);
+     vs->client_pf.bshift = blue_shift;
+     vs->client_pf.bmask = blue_max << blue_shift;
+-- 
+2.6.2
+
--- a/app-emulation/qemu/qemu-2.3.0-r5.ebuild
+++ b/app-emulation/qemu/qemu-2.3.0-r5.ebuild
@ -595,10 +595,6 @@ pkg_postinst() {
 	fi

 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
 }

 pkg_info() {
--- a/app-emulation/qemu/qemu-2.3.0-r6.ebuild
+++ b/app-emulation/qemu/qemu-2.3.0-r6.ebuild
@ -596,10 +596,6 @@ pkg_postinst() {
 	fi

 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
 }

 pkg_info() {
--- a/app-emulation/qemu/qemu-2.3.1.ebuild
+++ b/app-emulation/qemu/qemu-2.3.1.ebuild
@ -582,10 +582,6 @@ pkg_postinst() {
 	fi

 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
 }

 pkg_info() {
--- a/app-emulation/qemu/qemu-2.4.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
@ -624,10 +624,6 @@ pkg_postinst() {
 	fi

 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
 }

 pkg_info() {
--- a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
@ -629,10 +629,6 @@ pkg_postinst() {
 	fi

 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
 }

 pkg_info() {
--- a/app-emulation/qemu/qemu-2.4.0.1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0.1.ebuild
@ -624,10 +624,6 @@ pkg_postinst() {
 	fi

 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
 }

 pkg_info() {
--- a/app-emulation/qemu/qemu-2.4.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.1-r1.ebuild
@ -624,10 +624,6 @@ pkg_postinst() {
 	fi

 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
 }

 pkg_info() {
--- a/app-emulation/qemu/qemu-2.4.1-r2.ebuild
+++ b/app-emulation/qemu/qemu-2.4.1-r2.ebuild
@ -0,0 +1,642 @@
+# 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="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo pax-utils
+
+BACKPORTS=
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+	${BACKPORTS:+
+		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
+gtk gtk2 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
+rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
+static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
+virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? ( app-accessibility/brltty[static-libs(+)] )
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.90 )
+		)
+	)
+	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gles2]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( dev-libs/nss !app-emulation/libcacard )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.8.2
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+CDEPEND="
+	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xen? ( app-emulation/xen-tools:= )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	# Cheap hack to disable gettext .mo generation.
+	use nls || rm -f po/*.po
+
+	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+	epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-{7504,7512}.patch #567144
+	epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-8345.patch #566792
+	epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-8504.patch #567828
+	epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-7549.patch #568214
+	epatch "${FILESDIR}"/${PN}-2.4-mips-* #563162
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	epatch_user
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+	local static_flag="static-${buildtype}"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard smartcard-nss)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu tls vnc-tls)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu vte)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+		)
+		static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		default
+	fi
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets
+		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		emake DESTDIR="${ED}" install
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	# Remove the docdir placed qmp-commands.txt
+	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp/*.txt
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+		fi
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+			dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+	fi
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/vgabios)"
+}
--- a/app-emulation/qemu/qemu-2.4.1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.1.ebuild
@ -622,10 +622,6 @@ pkg_postinst() {
 	fi

 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
 }

 pkg_info() {
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -629,10 +629,6 @@ pkg_postinst() {
 	fi

 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
 }

 pkg_info() {
--- a/dev-cpp/gstreamermm/Manifest
+++ b/dev-cpp/gstreamermm/Manifest
@ -1,3 +1,2 @@
 DIST gstreamermm-0.10.11.tar.xz 5840552 SHA256 12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6 SHA512 2ad370f6902dcb4663ea801bdbbf744a98de9e24fc04f27b5044a4a95337168e2bb195761a07ac9c1011f9ed4936287fcc5f4c2b984f0a362b429d05be7d3909 WHIRLPOOL d9be72d4691b9b0769b75819ca9403a2df7f1dbdad4974e4b26e4fd87d4b7ea0503fb2ba6a500a008ec9d1c29f6677e61649798801e6babf7e4d7b8562cc72f2
-DIST gstreamermm-1.0.10.tar.xz 4649144 SHA256 dd9e9b2d2bc7f52ab9196f4613b99700e1c9f2ab7c076bd87c657f3f435f1dc6 SHA512 6f67e823b9f4d1384b139cef47c3de5f28df437452cbba54369973c00f675d40ce9937f38e063b31f5a824f0facdc53d54a2ec4c04e03ed8eee89ad39f9e1229 WHIRLPOOL cf045345fed45d94aa61b5a4c75f1149f9ae280476d284c00bdd3cb33be9369215be3fe540443f6c015ae1e9c25558173d86775b5fbd9d821cb7f8616197c8b0
 DIST gstreamermm-1.4.3.tar.xz 5886048 SHA256 f1c11ee1cf7537d77de7f8d486e09c5140cc4bb78882849718cd88959a55462e SHA512 ea4d281a4f3b79113fc3a0474e23d82442facac6eaf66215de412310b9c306aa5d586ee5570087d94d90acbfc09c5766edba1414b50f0fd9a3111cda610f5671 WHIRLPOOL b8bee1e9672c5ca527718e1826a4b486ea47fd772b079dddb532716c2082bb4cca55823a8b3dcd5eabe8819ee944b0cb68740c6b986ff329b71dad47240fe904
--- a/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild
@ -5,7 +5,7 @@
 EAPI="5"
 GNOME2_LA_PUNT="yes"

-inherit gnome2
+inherit flag-o-matic gnome2

 DESCRIPTION="C++ interface for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
 		media-plugins/gst-plugins-x:0.10 )
 "

-DOCS="AUTHORS ChangeLog NEWS README"
 # Installs reference docs into /usr/share/doc/gstreamermm-0.10/
 # but that's okay, because the rest of dev-cpp/*mm stuff does the same
+
+src_prepare() {
+	gnome2_src_prepare
+	append-cxxflags -std=c++11 #568254
+}
--- a/dev-cpp/gstreamermm/gstreamermm-1.0.10.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-1.0.10.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for GStreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=media-libs/gstreamer-1.0.10:1.0
-	>=media-libs/gst-plugins-base-1.0.10:1.0
-	>=dev-cpp/glibmm-2.36:2
-	>=dev-cpp/libxmlpp-2.14:2.6
-	>=dev-libs/libsigc++-2:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz )
-	test? (
-		dev-cpp/gtest
-		media-libs/gst-plugins-base:1.0[X,ogg,theora,vorbis]
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-jpeg:1.0 )
-"
-#   dev-cpp/mm-common"
-# eautoreconf needs mm-common
-
-# Installs reference docs into /usr/share/doc/gstreamermm-1.0/
-# but that's okay, because the rest of dev-cpp/*mm stuff does the same
-
-src_prepare() {
-	if ! use examples; then
-		# don't waste time building examples
-		sed -e 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	# FIXME: disable endless unittests, report upstream
-	sed -e '/test-regression-rewritefile$(EXEEXT) \\/d' \
-		-e '/test-regression-seekonstartup$(EXEEXT) \\/d' \
-		-i tests/Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable doc documentation)
-}
-
-src_test() {
-	# running tests in parallel fails
-	emake -j1 check || die
-}
--- a/dev-cpp/gstreamermm/gstreamermm-1.4.3.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-1.4.3.ebuild
@ -3,8 +3,7 @@
 # $Id$

 EAPI="5"
-
-inherit gnome2
+inherit flag-o-matic gnome2

 DESCRIPTION="C++ interface for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
@ -47,6 +46,7 @@ src_prepare() {
 	fi

 	gnome2_src_prepare
+	append-cxxflags -std=c++11 #568254 , fixed in master
 }

 src_configure() {
@ -55,5 +55,5 @@ src_configure() {

 src_test() {
 	# running tests in parallel fails
-	emake -j1 check || die
+	emake -j1 check
 }
--- a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
+++ b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME_TARBALL_SUFFIX="bz2"

-inherit gnome2
+inherit flag-o-matic gnome2

 DESCRIPTION="C++ bindings for libgnomecanvas"
 HOMEPAGE="http://www.gtkmm.org"
@ -32,6 +32,7 @@ src_prepare() {
 			die "sed Makefile.in failed"
 	fi
 	gnome2_src_prepare
+	append-cxxflags -std=c++11 #568300
 }

 src_compile() {
--- a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
@ -167,7 +167,7 @@ multilib_src_test() {
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help plugins.cracklib_password_check \
 			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
 		done

 		# Run mysql tests
--- a/dev-db/mysql/mysql-5.6.28.ebuild
+++ b/dev-db/mysql/mysql-5.6.28.ebuild
@ -123,13 +123,13 @@ multilib_src_test() {
 			rpl.rpl_plugin_load \
 			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
 		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
 		done

 		if ! use extraengine ; then
 			# bug 401673, 530766
 			for t in federated.federated_plugin ; do
-				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
 			done
 		fi

--- a/dev-db/percona-server/percona-server-5.6.27.75.0-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.27.75.0-r1.ebuild
@ -131,7 +131,7 @@ multilib_src_test() {
 			engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
 			engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
 			main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
 		done

 		# Run mysql tests
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@ -1,9 +1,5 @@
 DIST postgis-2.0.3.tar.gz 5581619 SHA256 7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0 SHA512 e49232a0aebd202a053e2f6cb741551e932e49a8c535fadd22fe15c654e3823c2f43a4c78dc0340cddbbc7f9298651dc16e1737be3bfe0779cc4feede032facc WHIRLPOOL 9c7985ab6d50a4a8ffa4e8fa5ea69c7e365aae8d90a3ea70c978149e5a9efe4a29a29d11db5d2a6b5c830dcd5ba458a3263288f32a5af54665f5d1cab3357415
 DIST postgis-2.0.6.tar.gz 5651448 SHA256 438fc9cf8d008c537ed2d6776bc30e726eb1f9a85247df945c2beccc42f33489 SHA512 c838b68b03d08bfd427d8a78c67754697a9409d6333e23e4bf8b63efc4320369258f14a03ba9e21ca4bd967fbfdf99d02720fa370170d4d34c20e31ad47bbf0c WHIRLPOOL 5795385bd146d280c0a8108ccb704417bf206ed80bfa9383c793d1313a3029186d26799438e21b3d6920e92d8859de947e61c1cd55cd0cc275ad800ef128f542
-DIST postgis-2.1.0.tar.gz 6518378 SHA256 fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c SHA512 ed5140aef0e68cb075fc06eaa91733c46d38ce4e01cbf1d97d14ff1a4d447f7cfcaf32924150946c7bb388d334bd5bc9f97753c47c84c16068b9dff6438e8493 WHIRLPOOL a52000a334dd2bb246b665ec7bcd743833c4699cb0cabdd1d9bab3538ee18df6e7b766c06728a97274647f63da1cc130f79902a32cf0621d9a3b8190c8fe596e
 DIST postgis-2.1.1.tar.gz 6717940 SHA256 f55acf056362e7e78766bec7a403e02a3b6b087a6d18b4222647b6a932d5c945 SHA512 f85c4d1db32802b3acbda3f4c391ca961bf1301c699a00682265c7a984fbc74ee7b9fbfc5580fc04dff0491921eb6dbe4d8bd73dded216794a4b7f90c3ed650f WHIRLPOOL 807d0ce975b72315a72d4c2ecd192c612b00530a7e542b18429fed0c69cf6cb95285554c34be58e3d2a2c513f436289449dfbe82c7430fba87e901a4bea49c2d
-DIST postgis-2.1.4.tar.gz 6854492 SHA256 cd73c2a38428c8736f6cae73b955aee0bd42f9ca4fd8d93c1af464524cb100fc SHA512 1d7dd2547fe9819addea0c9dfb4f4c78f30593af21f7cf05c4e40c2684ea3e04ad50c1937ba72172c69df713384c866e6a336b6cab733c9dd0f273f41df568d2 WHIRLPOOL f685cb2e991319b1a2f7a54ce050217d8ea636c02491fca2dafb1a2f66fe3548d4daff6d3de67925a700d9de42af29dfc4af0d26727e77f969a100a1fe964567
-DIST postgis-2.1.5.tar.gz 6827999 SHA256 0d0e27f72f12b8dba456fbde25ed0f6913f42baf57332a7f1b9bbc6f29fddbf4 SHA512 c1d186b237114c951feb78e97dc7d69896dcb0884c02e49d93e8602590e82d34a808eb12c127c7dc78db3237ac619709f8bd7febb4670909b03615f8278aede2 WHIRLPOOL c203aa2034e899647139445ce0b1e6e7637a0e2ad3c1f6d4ee1f303d9734b219b68d18fb6d6e7da6c9df53f90e8dfd30ce8d4ab8a6c942b96db7e8b55d632417
-DIST postgis-2.1.6.tar.gz 6803831 SHA256 6ffdf655bc4fca2b5495dd96f44b266e84111912d5c3f91b832023c4fec5c222 SHA512 a6c1263d64f2c1828656d5613840d721fb70ecbdfab3e28099c8f6b80d5404d46a9376913c0ab46c7f1109517c04430800b8c3be0c94d964421c6681afb2f997 WHIRLPOOL 98bfcae992f444b63840a28ef90077c01473ea528aa72ae5fd283b4fdcf7b7e37732afeac1a29fc87e330f687ca491d5afbed44b0792fb00763dc682501d37a3
-DIST postgis-2.1.7.tar.gz 6804372 SHA256 00ab79a3f609d7ea458f6fc358032ad059cb720baf88285243d6436a597a7ec2 SHA512 021fcb73c2109dafb67cb9d459eb08e0da7e55cf1a5fab81115aad3b0a61809b8f83d7a278aa04e41ecd633164e4257a90d5dfc0e81339b0c322e7d41d3c5eae WHIRLPOOL 938cacf1af4ba8a2f0f3bbefe11c0014a31cd331186cd7fc7fc0a242528094efb617326a484bdad76704bfb98fd065a7f280ab663088440af0555fc69862e36b
 DIST postgis-2.1.8.tar.gz 6811272 SHA256 7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4 WHIRLPOOL b6675fecbb922379bd50c351abe1553fdbda53543fce56451c688e25a3fa2e9d0813d8f3a349b623b85fcb4016fc4710f6746a224ba7673ec0d2106c7635d3d1
+DIST postgis-2.2.0.tar.gz 10164837 SHA256 66f0f8480d535959b8bb9abb5ee5d602d1001413ca770df120baf3de627f9e91 SHA512 e9954d5c4aa381536ae87c32bb37b166a7ede0f9b9fc96cfb300dc2350b9351f40870429f64e755c3371be692a1956f5f8ea21733b64aab490f42d2232ae5d8f WHIRLPOOL 639c6b278dd6e5c3a11ed1d8de179ee72a4e6e9c54ba1e74e585e9233167a3c2cdca0704c47966cf757db22221ebbc8970a68375894a6179970ab6c0e6c637a2
--- a/dev-db/postgis/files/postgis-2.2.0-arflags.patch
+++ b/dev-db/postgis/files/postgis-2.2.0-arflags.patch
@ -0,0 +1,18 @@
+diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
+--- a/raster/rt_core/Makefile.in	2015-05-13 14:13:18.000000000 -0400
+++ b/raster/rt_core/Makefile.in	2015-12-14 16:49:49.166156232 -0500
+@@ -18,7 +18,7 @@
+ #
+ #############################################################################
+ 
+-AR = ar rs
+ARFLAGS = rs
+ 
+ CC = @CC@
+ LIBLWGEOM_LDFLAGS = ../../liblwgeom/.libs/liblwgeom.a
+@@ -64,4 +64,4 @@
+ 	rm -f Makefile
+ 
+ librtcore.a: $(RT_OBJS)
+-	$(AR) $(RT_LIB) $(RT_OBJS)
+	$(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS)
--- a/dev-db/postgis/postgis-2.1.0.ebuild
+++ b/dev-db/postgis/postgis-2.1.0.ebuild
@ -1,293 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{0,1,2,3} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql:9.3[server]
-			dev-db/postgresql:9.2[server]
-			dev-db/postgresql:9.1[server]
-			dev-db/postgresql:9.0[server]
-		)
-		dev-libs/json-c
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.3.8
-		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.3
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-RESTRICT="test"
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-# Because developers have been fooled into thinking recursive make is a
-# good thing.
-MAKEOPTS="-j1"
-
-postgres_check_slot() {
-	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-		die 'POSTGRES_COMPAT not declared.'
-	fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-	local res=$(echo ${POSTGRES_COMPAT[@]} \
-		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-	if [[ "$res" -eq "0" ]] ; then
-			eerror "PostgreSQL slot must be set to one of: "
-			eerror "    ${POSTGRES_COMPAT[@]}"
-			return 1
-	fi
-
-	return 0
-}
-
-pkg_pretend() {
-	postgres_check_slot || die
-}
-
-pkg_setup() {
-	postgres_check_slot || die
-	export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-		"${FILESDIR}/${PN}-2.0-arflags.patch" \
-		"${FILESDIR}/${PN}-2.1-pkgconfig-json.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-		${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-
-	if use doc ; then
-		emake comments
-		emake cheatsheets
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" comments-install
-	emake -C topology DESTDIR="${D}" install
-	dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	use doc && dohtml -r doc/html/*
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
-	if [[ $? = 0 ]] ; then
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		local comment_file
-		for comment_file in "${postgis_path}"/*_comments.sql ; do
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-			retval=$?
-			[[ $retval == 0 ]] && continue || safe_exit
-		done
-		eend 0
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
-}
--- a/dev-db/postgis/postgis-2.1.4.ebuild
+++ b/dev-db/postgis/postgis-2.1.4.ebuild
@ -1,291 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql:9.4[server]
-			dev-db/postgresql:9.3[server]
-			dev-db/postgresql:9.2[server]
-			dev-db/postgresql:9.1[server]
-			dev-db/postgresql:9.0[server]
-		)
-		dev-libs/json-c
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.4.2
-		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc )"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-postgres_check_slot() {
-	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-		die 'POSTGRES_COMPAT not declared.'
-	fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-	local res=$(echo ${POSTGRES_COMPAT[@]} \
-		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-	if [[ "$res" -eq "0" ]] ; then
-			eerror "PostgreSQL slot must be set to one of: "
-			eerror "    ${POSTGRES_COMPAT[@]}"
-			return 1
-	fi
-
-	return 0
-}
-
-pkg_pretend() {
-	postgres_check_slot || die
-}
-
-pkg_setup() {
-	postgres_check_slot || die
-	export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-		"${FILESDIR}/${PN}-2.0-arflags.patch" \
-		"${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-		${myargs}
-}
-
-src_compile() {
-	emake
-	emake -C topology
-
-	if use doc ; then
-		emake comments
-		emake cheatsheets
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" comments-install
-	emake -C topology DESTDIR="${D}" install
-	dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	use doc && dohtml -r doc/html/*
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_match
-	server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-	if [[ $? = 0 ]] ; then
-		if [[ $server_match -ne 1 ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		local comment_file
-		for comment_file in "${postgis_path}"/*_comments.sql ; do
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-			retval=$?
-			[[ $retval == 0 ]] && continue || safe_exit
-		done
-		eend 0
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
--- a/dev-db/postgis/postgis-2.1.5.ebuild
+++ b/dev-db/postgis/postgis-2.1.5.ebuild
@ -1,291 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql:9.4[server]
-			dev-db/postgresql:9.3[server]
-			dev-db/postgresql:9.2[server]
-			dev-db/postgresql:9.1[server]
-			dev-db/postgresql:9.0[server]
-		)
-		dev-libs/json-c
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.4.2
-		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc )"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-postgres_check_slot() {
-	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-		die 'POSTGRES_COMPAT not declared.'
-	fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-	local res=$(echo ${POSTGRES_COMPAT[@]} \
-		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-	if [[ "$res" -eq "0" ]] ; then
-			eerror "PostgreSQL slot must be set to one of: "
-			eerror "    ${POSTGRES_COMPAT[@]}"
-			return 1
-	fi
-
-	return 0
-}
-
-pkg_pretend() {
-	postgres_check_slot || die
-}
-
-pkg_setup() {
-	postgres_check_slot || die
-	export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-		"${FILESDIR}/${PN}-2.0-arflags.patch" \
-		"${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-		${myargs}
-}
-
-src_compile() {
-	emake
-	emake -C topology
-
-	if use doc ; then
-		emake comments
-		emake cheatsheets
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" comments-install
-	emake -C topology DESTDIR="${D}" install
-	dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	use doc && dohtml -r doc/html/*
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_match
-	server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-	if [[ $? = 0 ]] ; then
-		if [[ $server_match -ne 1 ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		local comment_file
-		for comment_file in "${postgis_path}"/*_comments.sql ; do
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-			retval=$?
-			[[ $retval == 0 ]] && continue || safe_exit
-		done
-		eend 0
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
--- a/dev-db/postgis/postgis-2.1.6.ebuild
+++ b/dev-db/postgis/postgis-2.1.6.ebuild
@ -1,287 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{0,1,2,3,4} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql:9.4[server]
-			dev-db/postgresql:9.3[server]
-			dev-db/postgresql:9.2[server]
-			dev-db/postgresql:9.1[server]
-			dev-db/postgresql:9.0[server]
-		)
-		dev-libs/json-c
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.4.2
-		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc )"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-postgres_check_slot() {
-	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-		die 'POSTGRES_COMPAT not declared.'
-	fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-	local res=$(echo ${POSTGRES_COMPAT[@]} \
-		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-	if [[ "$res" -eq "0" ]] ; then
-			eerror "PostgreSQL slot must be set to one of: "
-			eerror "    ${POSTGRES_COMPAT[@]}"
-			return 1
-	fi
-
-	return 0
-}
-
-pkg_setup() {
-	postgres_check_slot || die
-	export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-		"${FILESDIR}/${PN}-2.0-arflags.patch" \
-		"${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-		${myargs}
-}
-
-src_compile() {
-	emake
-	emake -C topology
-
-	if use doc ; then
-		emake comments
-		emake cheatsheets
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" comments-install
-	emake -C topology DESTDIR="${D}" install
-	dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	use doc && dohtml -r doc/html/*
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_match
-	server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-	if [[ $? = 0 ]] ; then
-		if [[ $server_match -ne 1 ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		local comment_file
-		for comment_file in "${postgis_path}"/*_comments.sql ; do
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-			retval=$?
-			[[ $retval == 0 ]] && continue || safe_exit
-		done
-		eend 0
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
--- a/dev-db/postgis/postgis-2.1.7.ebuild
+++ b/dev-db/postgis/postgis-2.1.7.ebuild
@ -1,287 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-POSTGRES_COMPAT=( 9.{0,1,2,3,4,5} )
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk static-libs test"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql:9.4[server]
-			dev-db/postgresql:9.3[server]
-			dev-db/postgresql:9.2[server]
-			dev-db/postgresql:9.1[server]
-			dev-db/postgresql:9.0[server]
-		)
-		dev-libs/json-c
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.4.2
-		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.5
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-		test? ( dev-util/cunit )
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-REQUIRED_USE="test? ( doc )"
-
-# Needs a running psql instance, doesn't work out of the box
-RESTRICT="test"
-
-MAKEOPTS+=' -j1'
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-postgres_check_slot() {
-	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-		die 'POSTGRES_COMPAT not declared.'
-	fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" \
-	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
-
-	local res=$(echo ${POSTGRES_COMPAT[@]} \
-		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-	if [[ "$res" -eq "0" ]] ; then
-			eerror "PostgreSQL slot must be set to one of: "
-			eerror "    ${POSTGRES_COMPAT[@]}"
-			return 1
-	fi
-
-	return 0
-}
-
-pkg_setup() {
-	postgres_check_slot || die
-	export PGSLOT="$(postgresql-config show)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \
-		"${FILESDIR}/${PN}-2.0-arflags.patch" \
-		"${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
-		${myargs}
-}
-
-src_compile() {
-	emake
-	emake -C topology
-
-	if use doc ; then
-		emake comments
-		emake cheatsheets
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" comments-install
-	emake -C topology DESTDIR="${D}" install
-	dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	use doc && dohtml -r doc/html/*
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_match
-	server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-	if [[ $? = 0 ]] ; then
-		if [[ $server_match -ne 1 ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		local comment_file
-		for comment_file in "${postgis_path}"/*_comments.sql ; do
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-			retval=$?
-			[[ $retval == 0 ]] && continue || safe_exit
-		done
-		eend 0
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
--- a/dev-db/postgis/postgis-2.2.0.ebuild
+++ b/dev-db/postgis/postgis-2.2.0.ebuild
@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+POSTGRES_COMPAT=( 9.{1,2,3,4,5} )
+
+inherit autotools eutils versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net"
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gtk static-libs test"
+
+RDEPEND="
+		|| (
+			dev-db/postgresql:9.5[server]
+			dev-db/postgresql:9.4[server]
+			dev-db/postgresql:9.3[server]
+			dev-db/postgresql:9.2[server]
+			dev-db/postgresql:9.1[server]
+		)
+		dev-libs/json-c
+		dev-libs/libxml2:2
+		>=sci-libs/geos-3.5.0
+		>=sci-libs/proj-4.6.0
+		>=sci-libs/gdal-1.10.0
+		gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+		doc? (
+				app-text/docbook-xsl-stylesheets
+				app-text/docbook-xml-dtd:4.5
+				dev-libs/libxslt
+				|| (
+					media-gfx/imagemagick[png]
+					media-gfx/graphicsmagick[imagemagick,png]
+				)
+		)
+		virtual/pkgconfig
+		test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc )"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+postgres_check_slot() {
+	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+		die 'POSTGRES_COMPAT not declared.'
+	fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" \
+	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
+
+	local res=$(echo ${POSTGRES_COMPAT[@]} \
+		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+	if [[ "$res" -eq "0" ]] ; then
+			eerror "PostgreSQL slot must be set to one of: "
+			eerror "    ${POSTGRES_COMPAT[@]}"
+			return 1
+	fi
+
+	return 0
+}
+
+pkg_pretend() {
+	postgres_check_slot || die
+}
+
+pkg_setup() {
+	postgres_check_slot || die
+	export PGSLOT="$(postgresql-config show)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+
+	local AT_M4DIR="macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myargs=""
+	use gtk && myargs+=" --with-gui"
+	econf \
+		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
+		${myargs}
+}
+
+src_compile() {
+	emake
+	emake -C topology
+
+	if use doc ; then
+		emake comments
+		emake cheatsheets
+		emake -C doc html
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && emake DESTDIR="${D}" comments-install
+	emake -C topology DESTDIR="${D}" install
+	dobin ./utils/postgis_restore.pl
+
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	use doc && dohtml -r doc/html/*
+
+	docinto topology
+	dodoc topology/{TODO,README}
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "To finish installing PostGIS, follow the directions detailed at:"
+	elog "http://postgis.net/docs/manual-${MY_PV}/postgis_installation.html#create_new_db_extensions"
+}
--- a/dev-lang/python/python-2.7.10-r1.ebuild
+++ b/dev-lang/python/python-2.7.10-r1.ebuild
@ -46,7 +46,7 @@ RDEPEND="app-arch/bzip2
 		) )
 		gdbm? ( sys-libs/gdbm[berkdb] )
 		ncurses? (
-			>=sys-libs/ncurses-5.2
+			>=sys-libs/ncurses-5.2:0
 			readline? ( >=sys-libs/readline-4.1 )
 		)
 		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
--- a/dev-lang/python/python-3.3.5-r1.ebuild
+++ b/dev-lang/python/python-3.3.5-r1.ebuild
@ -35,7 +35,7 @@ RDEPEND="app-arch/bzip2
 	!build? (
 		gdbm? ( sys-libs/gdbm[berkdb] )
 		ncurses? (
-			>=sys-libs/ncurses-5.2
+			>=sys-libs/ncurses-5.2:0
 			readline? ( >=sys-libs/readline-4.1 )
 		)
 		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3.ebuild
@ -34,7 +34,7 @@ RDEPEND="app-arch/bzip2
 	!build? (
 		gdbm? ( sys-libs/gdbm[berkdb] )
 		ncurses? (
-			>=sys-libs/ncurses-5.2
+			>=sys-libs/ncurses-5.2:0
 			readline? ( >=sys-libs/readline-4.1 )
 		)
 		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
--- a/dev-libs/qcustomplot/Manifest
+++ b/dev-libs/qcustomplot/Manifest
@ -1,6 +1,2 @@
-DIST qcustomplot-sharedlib-1.2.1.tar.gz 1920 SHA256 16b3f59182d3703152589d71da580fbded0a67f88ab7df81b86095422d27685b SHA512 51df754a6657621a5e5b2e3dcc295890ac76ab4839089f25c65eb84758e7ac5c9821dd47acbaaa8da7a69b609abb1b6a829939eee616111994278856d371be78 WHIRLPOOL 02a3476811f89dbd21003d1da063615a9776d67436c5f525f5a773b21274a6aa091ba44130e7989f842bd85aad7633efa8a361cadadea2f3343b57a120f62cc4
-DIST qcustomplot-sharedlib-1.3.0.tar.gz 1927 SHA256 68f4574b53f0cbdaafdee06ad0048b60e4905d5031033f1721886cf763e1f774 SHA512 6ab098a676dc3ed4caba2b0784b79ebca70de52296dc1ca0caca7c00b2abc46d92ff1903785a9185eedd78044f9b9d730d798dc91cff5cc76b463796a74e3e9e WHIRLPOOL 0e919fb38e799217d3eb2f62915a6a9077ad621eb248cbd722cfd659e929471bff09c015df1be46c1d6a8f23b77c7bc437ec7ae430980dbfe0b07292909c99b0
 DIST qcustomplot-sharedlib-1.3.1.tar.gz 1926 SHA256 214b4dc82c612822b46976159864cc34732ebf0ce717bbe6d930760374344495 SHA512 1debdffed022dd3cd419d0a928176b6b0b1365739feaf8ca69458a9c6e16aa64c95d9b68eed2cde0699d7ab82e5dd66bcff8bbdb2f26e4a14e3186b3350342e6 WHIRLPOOL a51fd6ec8e46619a61b778656475ee2b3ff194d2b15c160246b1689f1b945160beece5a8762bf3fb1c8e9bc7f0cd570472379b0a679138d80609d6c3b38b481b
-DIST qcustomplot-source-1.2.1.tar.gz 208367 SHA256 9ac31c797ce9116c0b062249028c25a8b04a0cb4ae5cd5dcca52c2000a64bcd2 SHA512 f4613b4e85b98616974588edfe35c262eaa7975486a252b18f73c28aa3ed5e867955ddd6243f082b4fa080a93890d7d20b64e8f12e03bf6fdcb8417554438523 WHIRLPOOL 0c1dd80e0220ee9f80deff0b8baf373da587622084b834b6b3a9194d7286aae5a29bc352bf8d7bddcc8f27df6ebf7044709973d2179c1b4bed402cea9b94cdb2
-DIST qcustomplot-source-1.3.0.tar.gz 222695 SHA256 1b4c9d5ad4581fc33465e4e5a3ec63938fdaad78944e6118d1aa25dd0235afd6 SHA512 6991c05d38677f24697516fd41c6a6e85d6becd1de8e1e413577170246945fc318519d74407c6a995d72e2c6c05114469e6fbbdea2b17b1060f6d2fc35fb3d7f WHIRLPOOL 32e98f2b2d6e5d80017711d92a9587dce29880c9e707cfe291ee71a8b04a06680ca96aa52be0092875bc98cefe02f052eb98a6c1990b976b9ae3e68b26e61ec7
 DIST qcustomplot-source-1.3.1.tar.gz 224892 SHA256 b557728956945931ff75d21c0894c52a6341850ad246811affdda8b10bbc8486 SHA512 ce5d74d7ae1fb8f4547368c712e3e6f5192cf64df9ece4b055910f0ab4c4244446b3869f078214e38bb5337e755647e07f9a111f96553172b7960ae434d7800b WHIRLPOOL c1d3a817bf389d2e64df489961f072d5b0317c321a3a5d77f5176e8200ea01dc721953a396cd63e87a8ae1ece79406b3b6e6453af0c9550272850eb4f6ac33c4
--- a/dev-libs/qcustomplot/qcustomplot-1.2.1.ebuild
+++ b/dev-libs/qcustomplot/qcustomplot-1.2.1.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="Qt C++ widget for plotting and data visualization"
-HOMEPAGE="http://www.qcustomplot.com/"
-SRC_URI="
-	http://www.qcustomplot.com/release/${PV}/QCustomPlot-sharedlib.tar.gz -> ${PN}-sharedlib-${PV}.tar.gz
-	http://www.qcustomplot.com/release/${PV}/QCustomPlot-source.tar.gz -> ${PN}-source-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}-source
-
-src_prepare() {
-	sed \
-		-e 's:../../::g' \
-		-e '/CONFIG/s:shared.*:shared:g' \
-		"${WORKDIR}"/${PN}-sharedlib/sharedlib-compilation/sharedlib-compilation.pro > ${PN}.pro || die
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	dolib.so lib${PN}*
-	doheader ${PN}.h
-	dodoc changelog.txt
-}
--- a/dev-libs/qcustomplot/qcustomplot-1.3.0.ebuild
+++ b/dev-libs/qcustomplot/qcustomplot-1.3.0.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qmake-utils
-
-DESCRIPTION="Qt C++ widget for plotting and data visualization"
-HOMEPAGE="http://www.qcustomplot.com/"
-SRC_URI="
-	http://www.qcustomplot.com/release/${PV}/QCustomPlot-sharedlib.tar.gz -> ${PN}-sharedlib-${PV}.tar.gz
-	http://www.qcustomplot.com/release/${PV}/QCustomPlot-source.tar.gz -> ${PN}-source-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-		"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}-source
-
-src_prepare() {
-	sed \
-		-e 's:../../::g' \
-		-e '/CONFIG/s:shared.*:shared:g' \
-		"${WORKDIR}"/${PN}-sharedlib/sharedlib-compilation/sharedlib-compilation.pro > ${PN}.pro || die
-}
-
-src_configure() {
-	use qt4 && eqmake4
-	use qt5 && eqmake5
-}
-
-src_install() {
-	dolib.so lib${PN}*
-	doheader ${PN}.h
-	dodoc changelog.txt
-}
--- a/dev-libs/vanessa-adt/vanessa-adt-0.0.6.ebuild
+++ b/dev-libs/vanessa-adt/vanessa-adt-0.0.6.ebuild
@ -6,8 +6,8 @@ MY_PN="${PN/-/_}"
 MY_P="${MY_PN}-${PV}"

 DESCRIPTION="Provides Abstract Data Types (ADTs) Includes queue, dynamic array, hash and key value ADT"
-HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
-SRC_URI="http://www.vergenet.net/linux/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="http://horms.net/projects/vanessa/"
+SRC_URI="http://horms.net/projects/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/dev-libs/vanessa-adt/vanessa-adt-0.0.9.ebuild
+++ b/dev-libs/vanessa-adt/vanessa-adt-0.0.9.ebuild
@ -6,8 +6,8 @@ MY_PN="${PN/-/_}"
 MY_P="${MY_PN}-${PV}"

 DESCRIPTION="Provides Abstract Data Types (ADTs) Includes queue, dynamic array, hash and key value ADT"
-HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
-SRC_URI="http://www.vergenet.net/linux/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="http://horms.net/projects/vanessa/"
+SRC_URI="http://horms.net/projects/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/dev-libs/vanessa-logger/vanessa-logger-0.0.10.ebuild
+++ b/dev-libs/vanessa-logger/vanessa-logger-0.0.10.ebuild
@ -5,8 +5,8 @@
 MY_PN="${PN/-/_}"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Generic logging layer that to log to syslog, an open file handle or a file name"
-HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
-SRC_URI="http://www.vergenet.net/linux/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="http://horms.net/projects/vanessa/"
+SRC_URI="http://horms.net/projects/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@ -1,4 +1,5 @@
 DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b
+DIST numpy-1.10.2.tar.gz 4055005 SHA256 23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9 SHA512 040db49593f3c53c9b43301eacffc3b5817310f1dbb91fd650efcf5ba65ce7e217549dc5268bc56846f19f1a03dd19470989005aa176531af44d602b3546b007 WHIRLPOOL 30c4b365aac6623241afd72fc30d3a543183205eb23db1366937e39fc50dee862923dd249775fee67cce0199940a57ec1423f1cb0e65ff7c65764c7969d7a76f
 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
 DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201
 DIST numpy-1.9.3.tar.gz 3984430 SHA256 c3b74d3b9da4ceb11f66abd21e117da8cf584b63a0efbd01a9b7e91b693fbbd6 SHA512 32531cd8d1480a50812454ef8e3b68c0f84b2a4bc5de0df1457070db7f6fd94cdb50e6479a85fa4d1dc569a10d28f6864d5069fcf2a32fa20fa8803476a3df8c WHIRLPOOL a0235594e793625d5e3cef57956f4710587158885f39d7d1267c9845b12fb1d39fb9987ec095720c2d285c7c726383a15471f3629b739b77186470e2c40ba093
--- a/dev-python/numpy/numpy-1.10.2.ebuild
+++ b/dev-python/numpy/numpy-1.10.2.ebuild
@ -0,0 +1,155 @@
+# 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,5} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+	sed \
+		-e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
+		-i numpy/tests/test_scripts.py || die
+
+	sed \
+		-e "s:\"cblas\":\"$(pc_libs cblas)\":g" \
+		-i numpy/distutils/system_info.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/*
+		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+
+	# absent in 1.9
+	#docinto f2py
+	#dodoc numpy/f2py/docs/*.txt
+	#doman numpy/f2py/f2py.1
+}
--- a/dev-python/numpy/numpy-9999.ebuild
+++ b/dev-python/numpy/numpy-9999.ebuild
@ -0,0 +1,138 @@
+# 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,5} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 git-r3 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/numpy/numpy.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="lapack test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+)
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+	sed \
+		-e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
+		-i numpy/tests/test_scripts.py || die
+
+	sed \
+		-e "s:\"cblas\":\"$(pc_libs cblas)\":g" \
+		-i numpy/distutils/system_info.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	# absent in 1.9
+	#docinto f2py
+	#dodoc numpy/f2py/docs/*.txt
+	#doman numpy/f2py/f2py.1
+}
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@ -3,3 +3,4 @@ DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3
 DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
 DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
 DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cbaf938fd7cbe96241ba0ad03c SHA512 0ebec5b04a2b28abc24936ba6082edd08aa45cd6e59eef0ff94cce189c57bd0fdb5f5464110c07d563cf5bf9748c309a1659cf37fb61bdff423747f85f9fd1b7 WHIRLPOOL bf55006fa98c6bf9625b8517c2c775ae515147847f8a611e2d3f46eca21c6f3be270015903c4134e5dcd39039e9870abd4f2f3adaabfeb1e62c4957b642ba014
+DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
--- a/dev-ros/libmavconn/libmavconn-0.16.4.ebuild
+++ b/dev-ros/libmavconn/libmavconn-0.16.4.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2015.12.12
+	dev-libs/boost:=
+	dev-libs/console_bridge
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/libmavconn/libmavconn-9999.ebuild
+++ b/dev-ros/libmavconn/libmavconn-9999.ebuild
@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""

 RDEPEND="
-	>=dev-ros/mavlink-gbp-release-2015
+	>=dev-ros/mavlink-gbp-release-2015.12.12
 	dev-libs/boost:=
 	dev-libs/console_bridge
 "
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@ -1 +1,2 @@
 DIST mavlink-gbp-release-2015.10.10.tar.gz 472939 SHA256 a9b6c80a0e8b1df4623e22d83b1e7cebf5242e843f0c83faa699687e2d03d0fd SHA512 9686513a28ec4942da292c0ecf8c8ad84f0e79538272ce4ef353da76bc8ce2f34c20d1d74085b086f7fee315abd64948fe462e40036addfd167b579f86ea5393 WHIRLPOOL 59316cfa5ba2c003dec9299c6e6f2f2920a12cf9379c58ee64ddb2aeca3112915934b67cd1be04370e3571e674c9f6c1010cf8f1d0480121682c8ac3570a15ab
+DIST mavlink-gbp-release-2015.12.12.tar.gz 479433 SHA256 f5bab2ca92ef9c82aebffa69448eabfe26a9beedd4daa03301bc284ed65b63d8 SHA512 afadec6ed2b1a479c8c264f6805d0237843a4d501a1a7ed376749e7312dc2f5562d1af3bcac07670823abda9ba4f3104a16b5bfc18e0083b00ed4cbf44a780fc WHIRLPOOL 41a92dfd53fad94b56a5c0153b7e920ce7778ad606c5bda7f78bfff4b998bd89365119070a15143f8929dfd5e56c36181abd350fd7e824dc1e688cc17bb56420
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.12.12.ebuild
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.12.12.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
+VER_PREFIX=release/jade/mavlink/
+VER_SUFFIX=-${PV#*_p}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+EGIT_BRANCH="release/jade/mavlink"
+DESCRIPTION="MAVLink message marshaling library"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@ -1 +1,2 @@
 DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cbaf938fd7cbe96241ba0ad03c SHA512 0ebec5b04a2b28abc24936ba6082edd08aa45cd6e59eef0ff94cce189c57bd0fdb5f5464110c07d563cf5bf9748c309a1659cf37fb61bdff423747f85f9fd1b7 WHIRLPOOL bf55006fa98c6bf9625b8517c2c775ae515147847f8a611e2d3f46eca21c6f3be270015903c4134e5dcd39039e9870abd4f2f3adaabfeb1e62c4957b642ba014
+DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
--- a/dev-ros/mavros/mavros-0.16.4.ebuild
+++ b/dev-ros/mavros/mavros-0.16.4.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/eigen_conversions
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavros_msgs-0.16.4[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavlink-gbp-release-2015.12.12
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-9999.ebuild
@ -26,10 +26,11 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-ros/eigen_conversions
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavros_msgs-0.16.4[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavlink-gbp-release-2015.12.12
 "
 DEPEND="${RDEPEND}"
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@ -3,3 +3,4 @@ DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3
 DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
 DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
 DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cbaf938fd7cbe96241ba0ad03c SHA512 0ebec5b04a2b28abc24936ba6082edd08aa45cd6e59eef0ff94cce189c57bd0fdb5f5464110c07d563cf5bf9748c309a1659cf37fb61bdff423747f85f9fd1b7 WHIRLPOOL bf55006fa98c6bf9625b8517c2c775ae515147847f8a611e2d3f46eca21c6f3be270015903c4134e5dcd39039e9870abd4f2f3adaabfeb1e62c4957b642ba014
+DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
--- a/dev-ros/mavros_extras/mavros_extras-0.16.4.ebuild
+++ b/dev-ros/mavros_extras/mavros_extras-0.16.4.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@ -3,3 +3,4 @@ DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3
 DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
 DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
 DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cbaf938fd7cbe96241ba0ad03c SHA512 0ebec5b04a2b28abc24936ba6082edd08aa45cd6e59eef0ff94cce189c57bd0fdb5f5464110c07d563cf5bf9748c309a1659cf37fb61bdff423747f85f9fd1b7 WHIRLPOOL bf55006fa98c6bf9625b8517c2c775ae515147847f8a611e2d3f46eca21c6f3be270015903c4134e5dcd39039e9870abd4f2f3adaabfeb1e62c4957b642ba014
+DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
--- a/dev-ros/mavros_msgs/mavros_msgs-0.16.4.ebuild
+++ b/dev-ros/mavros_msgs/mavros_msgs-0.16.4.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@ -1,2 +1 @@
-DIST curb-0.8.6.gem 79872 SHA256 8c36f7f88f70fe12c23abd2238c6a83055a0bec41acd5c85695dea9ce91c54d0 SHA512 5dcba8907128bab39ce498ca6549ed8c4908754a2db1eeb1864915a6da59f52ef72aa173e03aa7ed1ff9be25da8c58d8af904d775cfdde5fd829634ea86389ec WHIRLPOOL 4a1ddace01046e19d480537efd29b0bd048ce55f9c32b4f68cc62de58b5295262b700fd0023760087b38597c90ff0b33ef9c3128f3a0320201ffffb9df82f5e9
 DIST curb-0.8.8.gem 80384 SHA256 ec3b5880d92c9a9140555fc5c86524025474a905e6548e1c37816247ad60903e SHA512 441025ae199266009bc3f8a2068245a4ee0b83f72babc35cc4fa744b0f3efe13ba26c5f795ff6f429bb7bfbd5ce31d51e5de6b65c3f10285d9a9f5909eff286f WHIRLPOOL e3e371d948fe1f008e34de944fc602267421f643eeec32a7408806dc6e7abc440e73ab63583273247330657ea7bebe7caa4957d95160ab66509110f2acf99ce5
--- a/dev-ruby/curb/curb-0.8.6.ebuild
+++ b/dev-ruby/curb/curb-0.8.6.ebuild
@ -1,42 +0,0 @@
-# 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_RECIPE_TEST="rake"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby-language bindings for libcurl"
-HOMEPAGE="http://curb.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" net-misc/curl[ssl]"
-RDEPEND+=" net-misc/curl[ssl]"
-
-all_ruby_prepare() {
-	# fix tests when localhost is also ::1
-	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
-
-	# avoid tests making outside network connections
-	rm tests/bug_postfields_crash.rb || die
-	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
-		-i tests/tc_curl_easy.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}" V=1
-	cp -l ext/curb_core$(get_modname) lib || die
-}
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@ -1,4 +1,3 @@
-DIST gettext_i18n_rails-1.2.2.tar.gz 20254 SHA256 4bdaff360864211ee8739155f881cbe505d36ae8ec0d592c8180779f6f84a35e SHA512 c2a02a2aaa118581e81b3ff375ebfb8b4e58fc2313e8d7f321d881370b546d906eec51f848d27f2996ca16938bc7580ed6c27d780d1531a251578ce9260bcb40 WHIRLPOOL c674993506104a8475b7a2be422f11558aa001f362cdc7786fc27cf3b44368ce5855a0ecdc555e28345ad81cd14c70d785c5952cd8bbf6506a0720534c658d38
-DIST gettext_i18n_rails-1.2.3.tar.gz 20252 SHA256 48af9946c8165ece5c1c94c01045596e25f00bc679e3eb835e45992663444fd7 SHA512 b28bea0100ca5dd307ead1b77f4e71b491eb12899d772394c6e3ea73150ef4277c7305de0dfd2429ccc635af462f0b0f4f42280cdb666ebc7cee2cf9a43a04a2 WHIRLPOOL f54222b9940b58e16a2e1e27eb36d044ae42fe4b9ed1e06edeb57f5ea1e1ebc727de1cd564cd3679f0851b47fc5ebe93d3913a2ef90de8ebd56917a08ba19913
 DIST gettext_i18n_rails-1.3.0.tar.gz 20218 SHA256 b52a90e45d6bcdfac828cebbf52892ccadb320d148bb14a8267f8545b4347877 SHA512 90136a441aad8c5b26fe39454b675b444ff5cdfa87c4d6ec1738583ea5b6db793b1d05db94e9084905249a75f19239acf5812e6e8350d3ee2537aed76387c2d2 WHIRLPOOL b8503ad978faeeaff0a966be62392bbc0ef4361f28575e50afb799431fb311368b656a4c702749d4dd12f2e342f4c79abe5fe1cd56f64aa41441c073e53449e6
 DIST gettext_i18n_rails-1.3.1.tar.gz 20261 SHA256 d50193878e7b8eee61ba48fe33c10f7eed28afdcb7e500dd135743cbc9ffd72f SHA512 761c941aa4d4a746067b84c703b7ca661af3229a2886113a0c5beb1872efd5e74dae7bcf0c6bb476078e636835d19a66e93c8c9c7850024c4ca025e153f1b708 WHIRLPOOL 0b865211641224a5dfc6e76e88297fc2cc8576789a099ca65bc3deefb95318313ec8bae24070fde65c0cd219402cc928265b7ef626435836d3fa8e908ad4ece4
+DIST gettext_i18n_rails-1.3.2.tar.gz 20260 SHA256 7c11f3a1d6d9ae394fd77070013a4fa19330bf4b203a7972d651d2ca2b9056de SHA512 04412b5e6b7389b3882d33385fbec22de7c61cd93e4cc7bc09c2bb4afb5d61d08e4c513e17aac18cf250f8efe12c6362633f9722f0e335bb9913484ce7abca15 WHIRLPOOL c96c23242a5ffc03d7e929bf1e05d12a41a8f01957efaebfbad122df842e212b2f6f306125b2047a2366328181fe40959c9fabf3b672bfc8074f8b9f1d6fb785
--- a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.2.2.ebuild
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.2.2.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="FastGettext / Rails integration"
-HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activerecord:4.0[sqlite] dev-ruby/temple )"
-ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0"
-
-all_ruby_prepare() {
-	rm Gemfile Gemfile.lock || die
-
-	# Remove specs for slim and hamlet, template engines we don't package.
-	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
-
-	# Test against Rails 4.0 (newer versions don't work and we don't use
-	# appraisals for now).
-	sed -e '1igem "rails", "~>4.0.0"' -i spec/spec_helper.rb || die
-}
--- a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.2.ebuild
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.2.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"

 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
@ -33,5 +33,5 @@ all_ruby_prepare() {

 	# Test against Rails 4.0 (newer versions don't work and we don't use
 	# appraisals for now).
-	sed -e '1igem "rails", "~>4.0.0"' -i spec/spec_helper.rb || die
+	sed -e '1igem "rails", "~>4.2.0"' -i spec/spec_helper.rb || die
 }
--- a/dev-tex/chktex/Manifest
+++ b/dev-tex/chktex/Manifest
@ -2,3 +2,4 @@ DIST chktex-1.7.1.tar.gz 349551 SHA256 be01222e819c00bdf0fb411c232e585fd6a116adc
 DIST chktex-1.7.2.tar.gz 356981 SHA256 d7f37985e3a122990f2a29fe7cac5d1f31acb1e50035457ef7ceb07c30550158 SHA512 f0ac3ed74471d33da55591e6ca2a4b6847340540ef1911eef37bfad38ffc7c64ca4709966d52a22f871268edf893bf360c8429e1be7f62157d2fac9e58ea40af WHIRLPOOL b32e1927734ee1ba6af77bbe2a0e64ec640718ea26ebcd89a54c06555ec3b0c275fee3e81809b846b25f440f32397536d12eb85b3dde49bf55a7def09a19658a
 DIST chktex-1.7.3.tar.gz 150801 SHA256 22a2a1af8d6c8b901a66b3729c114080f722b3ba59a73ca000035686590c98dd SHA512 29018229176d3bfd7bff92e68739d32262b01414d7df3d379ef1604abcd28c28abdeb83a2513f6d439e5c888a05e5a636e4a7ab34275d40d20fc63a275985c4a WHIRLPOOL 6fcb533ce1bf0f5dede29825a6477f8961e08fe0e03a596fab76492fd97b5a5179bffc70bf7fdf3e8caffa15b2722ec1be46d58f304000760f4c9f3a6871d82b
 DIST chktex-1.7.4.tar.gz 150839 SHA256 77ed995eabe7088dacf53761933da23e6bf8be14d461f364bd06e090978bf6d2 SHA512 d5bf056f67ca520d9df95237b777380d9b98c792d5e20c16bcec2d78a4c68ec3c35308e4525eab33efa2abaf8f2d67ad62e65988b8885f30d1a3f29d27975a1f WHIRLPOOL e0cba6f01526d97304bd27804508c38a2ea1ca843f459d6e88dd7db84ba1745e8f37372f1b8aa393dbbe5fa1a62a71956849b2222859b36e125f24cdbc5333f3
+DIST chktex-1.7.5.tar.gz 151833 SHA256 4b5cfcf8430642e0fce925b2fd62e141d179cb71010565056f7cf40ba2770331 SHA512 035bd6af4d946464fc1d14bc5556a45f5a9aee8af18a50b300d3d797b91a36b9089e95c60f519aa95d8c21a75e102e950c88b97a52d4fe9e53243ab8484239dc WHIRLPOOL 9921dcb72c58b80f91b230d436cabf58dc25aa4711783b240844bdc5724a2f2ee5089a99e3827afe70425686f201cfd59dd4198f945d6811857b5daf1588e00c
--- a/dev-tex/chktex/chktex-1.7.5.ebuild
+++ b/dev-tex/chktex/chktex-1.7.5.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Checks latex source for common mistakes"
+HOMEPAGE="http://www.nongnu.org/chktex/"
+SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc +pcre test"
+# Tests fail without pcre. Enable pcre by default and make tests depend on it.
+REQUIRED_USE="test? ( pcre )"
+
+RDEPEND="virtual/latex-base
+	dev-lang/perl
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	sys-apps/groff
+	doc? ( dev-tex/latex2html )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.1-asneeded.patch" )
+DOCS=( NEWS )
+
+src_configure() {
+	export VARTEXFONTS="${T}/fonts" #538672
+
+	local myeconfargs=(
+		$(use_enable debug debug-info)
+		$(use_enable pcre)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile html
+}
+
+src_install() {
+	if use doc ; then
+		HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX/")
+		DOCS+=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX.tex")
+	fi
+	autotools-utils_src_install
+	doman *.1
+}
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@ -1,2 +1,3 @@
 DIST jenkins-bin-1.625.3.war 63322455 SHA256 9964b10581414b5504921dd8a717b172c07bcdf5f9d1bae50595aca07ddacf20 SHA512 daa739c902d417949dd348780fe4c3d088d64917231273083638bbfe87a47c69007669298175d5bc60623aa7bb6c3ce19c250764b6108ae026e0622d968a3b26 WHIRLPOOL da0e99183bb22ef4b1475acd840c67c3d0e2cc2f3d998340ea0d6cbb0ce4cc4e26d60871d65aaf08d9af0026b51152274640c485592e6cb36cd95813848eddc6
 DIST jenkins-bin-1.641.war 63662610 SHA256 f7656c38fe4e3c11b58ab506512655dd6dd3c69275de61442cfc9f9c3ebf5b93 SHA512 f8929496d9d4081ff87f26a60965b1a3d5eb93e8c04d76a219541ddeb2d3da7fef7f39fa94199b4436c6759ed2ba5d516c32cc3825605aced2c7c1db90b1fe67 WHIRLPOOL 30caf6eba8dc8dcd5a534e1e27fbf54c0a3973c6d61997352015524d7d688569ebff6fdfafa06e12a210727b8c3278af9375c10fca2ab3cd2ab05428e8a200cf
+DIST jenkins-bin-1.642.war 63664946 SHA256 724cdb1815834c8b00ca84db548550e2c2b8a4bedf3e068bfc65bdfa953c20a9 SHA512 1a24cb111c0967f240cad3ff0b11bde93d37718d4dc0a86f667c6cc360cbdb69c33dc7fb85ed73e6852f6bf697984036bf6e8d71bd39dcd292058975fdb0e131 WHIRLPOOL d5f9603f00f7db7978489491986b910f300b64209dcc84611c387c1a8b0e8494941336c9b889aa02f97e385c6279c94d37d3189d9e4401646420922030d4d8b3
--- a/dev-util/jenkins-bin/jenkins-bin-1.642.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.642.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
+}
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@ -1,4 +1,5 @@
 DIST subversion-1.7.21.tar.bz2 5996788 SHA256 efeb349c5ba6d529ff8e9730a2abd9cb70f276b249238a6b7f27ba7da1190620 SHA512 d0ba3f0771c523b44efd2f12c1d101d720b7d834bc6bef12b8e47789a2fb76a2d399c041c1cdcd0e04411c29abfb9b2974ca9df6f2389f8a01d82e7738881975 WHIRLPOOL 0d12286ab0e5043f28622529ff5d2af5a1c8a61ef65227cc069cf93de35479bf79433fa201417456499fa16f11b03474127b66547b9c2e2a8c0d209fa2108e59
 DIST subversion-1.8.14.tar.bz2 6850562 SHA256 7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f SHA512 95e1501494f5355f0c331fbe81422ca8f0b4d69e6d303125f4a5aac5f6fe946e958ca76fc96fe6b096cc0a530634ca103bf35622c12af90489ae17d0b9a9d987 WHIRLPOOL 0323746d40830109e081e002f499f1c73c15fe77acd4f1c9b790ae12440b3361d189f1d5212d49ba6f6c449297aec3513761375f748800686892607705310a56
-DIST subversion-1.9.1.tar.bz2 7747098 SHA256 91548f9fce38bdb2958848f54fd8007e357c22db09b7ef4763fc85cbcbc2c913 SHA512 57b8f913aefb06bbeac065ae6bb8113853018bdaefdb80c74a337479b9f3cf89834e8656591dbe8ab66b2cadf5f99f1036ff826a886ed6a9f643d6e5adb6a972 WHIRLPOOL 58bd1e41a7643befe6e9800ce0a270379b980746b14eda2c2230f96ea9e07b17ab115959e5b61f324f51055697c898526ac3b4be9b883147b1156f7c20b1f010
+DIST subversion-1.8.15.tar.bz2 6917489 SHA256 cf98a1f7686cfd6a15cbcde8379f15730fd5e00a3573cdb035a6491dbcccc82c SHA512 f5a33b0b2c87eae48a3c21c41164786e92aa061e774e9cc951bc93c1936db58a5d901904ad9dc28e85926f38c7d75645f39bb7e8543333943d3883ee9718aeb0 WHIRLPOOL 101c00a059e350d4999c37977059a439c5253d7ef185664ff8133b152bccdf386a8556f6d47390246ac742a4b4b77c89abd06e5cce76b6e276db6cc55f205374
 DIST subversion-1.9.2.tar.bz2 7910994 SHA256 023da881139b4514647b6f8a830a244071034efcaad8c8e98c6b92393122b4eb SHA512 debe1be153a7abd89d1c0c8d665725a9003e280a7fcde666c21818627bef0c47c30b27560aaa5a9a75251ba0d9c1490613cc79237704f4777a3cad0def52f08a WHIRLPOOL 3a5ff8067079d7e81f9414e3858afb98839cbdcb989b086d1696b4f0eac46ae2ed7c9933d3fa232431ad32578bf2fab986052a05dac7c528415bb5057fa5d213
+DIST subversion-1.9.3.tar.bz2 7909193 SHA256 8bbf6bb125003d88ee1c22935a36b7b1ab7d957e0c8b5fbfe5cb6310b6e86ae0 SHA512 2197c5076e688ac09e63c345e45f2a5ee2999426edb76a91c6b92d229fa8c87772d76e99003a4438035771b4c11c502de399d44f4f42c0d759dcbd01b628a4cb WHIRLPOOL d0b515c53384da558d0838a78f3be75e3bac643f5d95e536e65e0034e1814c91e0d2c218dd41bb5ee76447d47a0484105a25da1abef7851e7461a2a84c320a79
--- a/dev-vcs/subversion/subversion-1.8.14-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.14-r1.ebuild
@ -117,7 +117,7 @@ pkg_setup() {
 	if use ruby ; then
 		local rbslot
 		RB_VER=""
-		for rbslot in 2.2 2.1 2.0 1.9 ; do
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@' <<< ${USE_RUBY/ruby}) ; do
 			if has_version dev-lang/ruby:${rbslot} ;  then
 				RB_VER="${rbslot/.}"
 				break
--- a/dev-vcs/subversion/subversion-1.9.3.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.3.ebuild
@ -4,11 +4,12 @@

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby21 ruby20 ruby19"
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"

-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module eutils
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single

 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"
@ -34,8 +35,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
 	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( >=dev-lang/ruby-2.1:2.1
-		dev-ruby/rubygems[ruby_targets_ruby21] )
+	ruby? ( ${RUBY_DEPS} )
 	sasl? ( dev-libs/cyrus-sasl )
 	http? ( >=net-libs/serf-1.2.1 )"
 RDEPEND="${COMMON_DEPEND}
@ -113,6 +113,18 @@ pkg_setup() {

 	# Allow for custom repository locations.
 	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+	if use ruby ; then
+		local rbslot
+		RB_VER=""
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@' <<< ${USE_RUBY/ruby}) ; do
+			if has_version dev-lang/ruby:${rbslot} ;  then
+				RB_VER="${rbslot/.}"
+				break
+			fi
+		done
+		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+	fi
 }

 src_prepare() {
@ -190,7 +202,7 @@ src_configure() {

 	# for build-time scripts
 	if use ctypes-python || use python || use test; then
-		python_export_best
+		python_setup
 	fi

 	if use python && [[ ${CHOST} == *-darwin* ]] ; then
@ -199,10 +211,9 @@ src_configure() {
 		export ac_cv_python_compile="$(tc-getCC)"
 	fi

-	# force ruby-2.1
 	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby21" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc21" "none") \
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
 	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
 		$(use_with apache2 apache-libexecdir) \
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@ -3,4 +3,4 @@ DIST tortoisehg-3.3.3.tar.gz 8230380 SHA256 a22ec794b0152b25b085447a253594dde27f
 DIST tortoisehg-3.4.2.tar.gz 8205349 SHA256 d22692166dc6ff61c9d12bfe5ceb77fbf87e7dd52222c956976e7987d84145a1 SHA512 f771536508f1c72c15b1fe7fbf5b3ef6dafbb14314db45776632231dd2d74b46b862476fe78505a08b2271c2ce6419926e6090a2e0a6451da60314ba154fe9f4 WHIRLPOOL cfe0db33da10b2fcafff3e831937488a276924420cfff8a50396e0109c3edef7fb182036d38b72ff8fbf6aafae714eb1b6c4caf109938361babf04eed3addce4
 DIST tortoisehg-3.5.2.tar.gz 7399407 SHA256 f5d36d8f19b508dd00a7ac720af3889defd40e99fcb60d907a0fefb9c867dd63 SHA512 43ab341b4b01b2b28a9ac4290c9902720a10094390d323ab0c4e0962276cd333def7bec818e59a8bbacac9390cb22fd310875eb58f7092573c1254c517ada310 WHIRLPOOL c49707205e06fe269be3c69330d78ca8194a54d709b9056bea502403b4e047a1da46f1cd73ca5d7b052aab6f0d4b3ae4aa93f0544b78f12a6a9ffd8459edfb37
 DIST tortoisehg-3.6.1.tar.gz 7440140 SHA256 28e2ce770731616570b7c8be726cc7b2045887d66c166b8e514a144ca8650b37 SHA512 53717171ae627c59043f1dd6796e3f81459b2a88a28a557caad659ecba6353df0f21e4a6a1b21658c2a16ef9e508feb3c500ece28c78d151fa661f7447684b06 WHIRLPOOL de22061bf1f1a110691fd4991085d29d989f22b1df468d107d3239c4c25978f819a671a7b677e49e66d2e9a6df71ce4fdfb01da8c459076962c657dd52c658cf
-DIST tortoisehg-3.6.tar.gz 7439819 SHA256 ec43d13f029bb23a12129d2a2c3b3b4daf3d8121cbb5c9c23e4872f7b0b75ad8 SHA512 2a0b90f3a7c0fdcb63f21c7885ebfa26de5da369b6a64b12282b72e144ef1c12a29a78f793c487f37dd5bf7b7ab93d3c6ea393c4607deabe5b0c4be7eb16342d WHIRLPOOL 73684fa3912c3fb1e7b8878ef20a1b1b49bc28cfde707ab626549e076bc176edd94b96f8ae67ae05e7a6a98389262b5872595c1d057369b4f928c391f03c72e8
+DIST tortoisehg-3.6.2.tar.gz 7748075 SHA256 3ed668010e7f850ed3932aab83f87f0d0cc8726969283b190e002e9a1d2a3cac SHA512 901962b7f09a4823401ef50407b0767c280089fd00ebbd9c06dd4e88c66fa3814364a82fb7726a53d53837948c623f09d3fdb3c6f432cc9107be3c1a8a826d5f WHIRLPOOL e378aa9a162538196ec127d30788b34aa76e2e786f06d3bb69b0b2e66c96a1c3c3f4a98e8e2f6b3d6a30887a76646473708710596aa77e7c2e6f7d292f55a787
--- a/dev-vcs/tortoisehg/tortoisehg-3.6.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-3.6.2.ebuild
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@ -556,8 +556,11 @@ enable_cmake-utils_src_configure() {
 	# Convert mycmakeargs to an array, for backwards compatibility
 	# Make the array a local variable since <=portage-2.1.6.x does not
 	# support global arrays (see bug #297255).
-	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
-		eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
+	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
+		if [[ -n "${mycmakeargstype}" ]] ; then
+			eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+		fi
 		local mycmakeargs_local=(${mycmakeargs})
 	else
 		local mycmakeargs_local=("${mycmakeargs[@]}")
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@ -1,2 +1,3 @@
 DIST bluedevil-5.4.3.tar.xz 129024 SHA256 7364cf95850fb30cbf487ab8e01686b82d5c7817fe45046f75bdc654a846f413 SHA512 d28b2d85322dab9d0680e7ef371f10e197a1a4dd9acc2e96df424f0928a19634363469671908f0dfb188b3ccfbd936bd7469b797bd010dad42717fa7322db930 WHIRLPOOL bf09237e2c830b9aa75a46991f6bc51b2e38588f1df5d6eeef94c87a89e25524d98c26bb0e72e172fe0f18017df08827b69db9eac8e5cccfea6dfadf8f211f64
 DIST bluedevil-5.5.0.tar.xz 132872 SHA256 f3e154a95845fd7cc78903808a4fdc7c4ab7a29267824654cd948a58af351140 SHA512 bae2ff37459bcebe53881ba8ec3154cc95c60b8041793cdb2f3c17548fc4094710a052196995246e33d82ad6c88539813b5d20850e618ad1e5c398c5785bdfa0 WHIRLPOOL d497454c5a767c7357b0008342cc6d7e33bebdc7a3123274e764773fbb3f50cf649bca4d138b267402084e2075a081367ecedae07e63969bf60088efbece4d31
+DIST bluedevil-5.5.1.tar.xz 132812 SHA256 27f18ad0c776e8b0d3809f3defb2172b7b9dc587dc7d50271094d726fd162d26 SHA512 1dbd48c04bcc56fc8ca2abec164dc06152494387d2cd13d740cede3b6b2b72bfd9b6881ff345ce2edf7640144990d3d92cd7dbdc429e72b0d58cd89a8e1ae6f3 WHIRLPOOL 9a2f0246bd9db1e73373dade209601f85028997677bebfaaa62fed6b41d4045aa43b0b275163fbb2b53074e00003f90045c9285c52f5f94428c4be883d49341a
--- a/kde-plasma/bluedevil/bluedevil-5.5.1.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.5.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
+
+inherit fdo-mime kde5
+
+DESCRIPTION="Bluetooth stack for KDE"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep bluez-qt)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!app-mobilephone/obexd
+	!app-mobilephone/obex-data-server
+	!net-wireless/bluedevil
+	!net-wireless/kbluetooth
+"
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@ -1 +1,2 @@
 DIST breeze-gtk-5.5.0.1.tar.xz 257736 SHA256 96d80eea894d95b7360f4ccf9385a7d5c65340b4aad50fbfeb670a01025a5212 SHA512 9deaed7cc4fdc9eddc344083d0ca67ecdf51097ab954302fbd56151fb79ee437442c70034e87331121b5949600eec1a46f23572984ea8a04a7d7af19f42b15f5 WHIRLPOOL 71759b37c0b4177583b5a5577540abb6e7c7bab4e77cbe020b3d2d00ce43c445e3b4bd3f4cf1571804673159007b394393c3946ff02593ba1950ed5cf6842164
+DIST breeze-gtk-5.5.1.tar.xz 257636 SHA256 f856dd5d8555623f6752674f9ec42ab2d06b38943d7f4eb281f950af1b54d682 SHA512 1a41326160e816d57f0de3d7ba3fe877af2b8f5ea0f949c6dc23d76da5531fb29b9bceab646d36790a3cf51e44406b1245ded2e82238a173bc0b59d955d9d35a WHIRLPOOL 98cf37f8132afdfa7361aae5ceebc9eee2314314018db2c8a93c445c328ef9bebe2aa2bc072cd062c797f74c346b0b5845db03e766850d714f1035230a51fa54
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild
@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
+LICENSE="LGPL-2.1+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@ -1,2 +1,3 @@
 DIST breeze-5.4.3.tar.xz 36568668 SHA256 fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa SHA512 3c76d5ccf465c2392dd47a213c70111c3714edcb10f21ce3f44593c9c88feef4bc28b35ca40dc1ac96c62746f219b10c1af114c32163b58dc34c6181b1d57626 WHIRLPOOL ec2d05516929cedb416a905711d28f7bfa9f9aa9a394eb994177a9fdac72604708f041fc82ca499a893689c0768468cb88a91a1cea37f9d97748f2c61495fc39
 DIST breeze-5.5.0.tar.xz 29670848 SHA256 77a8d5732437ccb1cec08aa1c89ab409e75aa8cd55940e49cc6ab45d72445c49 SHA512 3c2886935f06888371e361f1efc1b0fcdd8a9f89a82e5048bf5739e7126ee266903f06c7c05474c3d6c19b021779b711173282bf6a98abee00010e9fbbdd4a88 WHIRLPOOL 2d3a49415f9ac42892890ccee6d40c18cade2cc4af4ed13bebe706cd44749d69afdfd588f435e8608c34b0ac2ae19223ccd2ab1afb8460fcb2d7c821b9d70560
+DIST breeze-5.5.1.tar.xz 29670368 SHA256 7cc284bcad00fc7505c76e6d6baff5f953a4aa03fd1ebfcd6729a383a293900d SHA512 f65bb0ccc1c604593a5f31d7e4d3d3c12adca435c27e4026354dcf7b62e6c95025ad66a0a079718637377112eddf64e915bb20eb5194e66eb581fe25a4de0e98 WHIRLPOOL 1d429a5d147e687154c46f2ef9ad52395955837a046b23f2ca4ee08affa95d2d8abaa12710228c2e441c187c21ce7835a36f7a7bdb4a0b0b009c0e605d830e79
--- a/kde-plasma/breeze/breeze-5.5.1.ebuild
+++ b/kde-plasma/breeze/breeze-5.5.1.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 kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="qt4"
+
+DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kdecoration)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	qt4? (
+		kde-base/kdelibs:4
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep breeze-icons)
+	$(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			mycmakeargs+=( -DUSE_KDE4=true )
+		fi
+
+		kde5_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@ -1,2 +1,3 @@
 DIST kde-cli-tools-5.4.3.tar.xz 484060 SHA256 19e1c443e74f4472dd85fe3065fd204bebff0e3358b9f34c82c0e4b5fb74a799 SHA512 6e9970fd492097319be2c3d84e08fa6cf885befdac8c8f4c8a328080c0f1091f976f885650156ee0e073a6c9af294c47482a1aeef8276b880538e2ef5d018b28 WHIRLPOOL aa8f48e0464de0f35597d7889203a743f575eb4cc29405f945b345cd92e3d158a3dcb1b2b829e10a0020ea3076cc980c3d39355dd863f2fd5e566763ffd3796b
 DIST kde-cli-tools-5.5.0.tar.xz 485988 SHA256 9b4fadc2d7d2526f30ce22fcbcf375aefd7793aa8d53609e5ecedfc043878550 SHA512 e0201b134c86f7b02b8016e2cb6c7910847f2c3a8dc71b93c2a9e94c0f83c70324d7532f3ffd4bc17472185988cf9034f90c5fbe8a8b6adbba6bea1f0c6bc7cd WHIRLPOOL e36443897b2870a036be38037da5dee44d38e8949baf55eaf379cf791bccc2418a8662f586e3f20972f32f582db6573d5d0473d9f48ce99b79894fbf5e96fbfa
+DIST kde-cli-tools-5.5.1.tar.xz 485636 SHA256 72a5923d34b8f80a53d284950c20e24afcafa41085642739bfaccbbcb04bf647 SHA512 49f7d87f792e9ffbb46960f96a76d411603f7cea0619222201d1cd2b515192968d8f013c698ed7eb5692ceca935f88247390daa1790cd158ccde119952271f8f WHIRLPOOL 9c418b725101072295734c2e43b2de91f10b2deeb7ea44dd05e3ebbd993ca4d9ce5d3c129d56bf6ebf3978ab924faf4f4a833c6cd7f64e469091985eb41eb56e
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.1.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.1.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	handbook? ( !kde-apps/kdesu[handbook] )
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@ -1,2 +1,3 @@
 DIST kde-gtk-config-5.4.3.tar.xz 144832 SHA256 2839198cfb470095a550cf574beb7a699fe532f77337d0a700afdccf2bdbee2a SHA512 4cbfcab8b2bb905627b7ec17fa78c5a6ae538aba20a5f83b762aad0837f33fd8cfb89bece94cca7f36bbd93328c5d77c6de02c95111b6fd27792de9891d54117 WHIRLPOOL 8f9f69edaf5a1025e4c5acb783169018030ee2ad8ec7563dfcfdf9368c0e5808faff8cd4c80591ca74016840bb339798774d2547663f458d359bbebca5b6654c
 DIST kde-gtk-config-5.5.0.tar.xz 145896 SHA256 6a8454c6275668c871d6e52fa5367d1dcdb84ace5804e164b15990bd4e6e26ae SHA512 a920d060fc0d94d9ddc7705a26cafa3a3142211f811acde471ca91f47870e27cccc1a1974908f2dbbb9ee8d4d28a1d7ebacb45c3970e37f4fbec1b021cb382ca WHIRLPOOL 302e5f21693b3ff6d09ddfec8f19a63473e80bcd4b54afe1c0a7057ec83ca8990d1d1491ff1d011ee63ac9be334445cc4e4217ab8dae15445f18a3d9d9103fc7
+DIST kde-gtk-config-5.5.1.tar.xz 145880 SHA256 20e6d69243f1843ee9dc94a2aa5ac0c61c7b1859bb62839a66e3f39e622a5ade SHA512 b17ddee3ddd22b5da298a73cfeb9bdcf274482a247548796a2f927c691021bcf6d07fc8520744d421a7fcd7f818a99ec1094db1fb4d78c8abbc749f324c2ea81 WHIRLPOOL 212a545612a7b4e8e10174f3dbb823c4bf938040325538f7cd82c05e7209e05439ac45cd0e78af03338509eb0f852efc471336ac12aaef2af0124214e01929de
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.1.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.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
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://projects.kde.org/kde-gtk-config"
+LICENSE="GPL-3"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+gtk3"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-libs/glib:2
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	x11-libs/gtk+:2
+	gtk3? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/kde-gtk-config:4
+	!kde-misc/kde-gtk-config
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+		-DBUILD_gtk3proxies=$(usex gtk3)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	einfo
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+	einfo
+}
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@ -1,2 +1,3 @@
 DIST kdecoration-5.4.3.tar.xz 33580 SHA256 38056c388568e65976e8579825f863eccf01e730c159c81f674d3d80ebd522d5 SHA512 b346a370ddcc7ad3bda74c57f30e0eb586333e0a50d432382af1495ab292b2eeb0541e0d0638517c8133a75fd26e4f1e8c8ae731bc995ce6ad3b80a835b6b303 WHIRLPOOL 6926d3afba79a93c3d4473ba66f9b8409d2d347ccd19fd54229c0b3a1376be0419599614dd75068c313162af303b81c88925ce8ee304178872368d3db0ae3f5a
 DIST kdecoration-5.5.0.tar.xz 34700 SHA256 2a276c1423b20afb5e0d785b4208b0c0b7d3bced29d6570b39b3c5dc86b4bcf1 SHA512 7dbf3974830c96756f52dd57e2e82292ad677a89a38d17f0b08bcfacb62de239451befa59b741c3f2beab3d4049f0b5632a2655d0a738961a0ba9519f0a42981 WHIRLPOOL 36b41e640c02103ee5687c251eb746ab4a627b30d4db32ac5445ac51675c1849beb5e14d7c85bd15d3b20d26b37572d4534f85e16cb95dbdc4cfb684f6fdb10a
+DIST kdecoration-5.5.1.tar.xz 34696 SHA256 561222ff4a0328b10589f4135c3a2c9361ea0ce3605890eef03b2eb76ea4aeb9 SHA512 b9efbb714e6f1a6a3126542f494b2b7f19a24394678edac2c300e4d0e4ac66a1e6228dee8b1aec679462471b4d146c47081ee24e589e7645c634ea05bcb5cf0b WHIRLPOOL 24449db15e7280a535f734af6dc0a011a2012ca4dfd482da4cee4f72efd7a85df3a99df024b0785000c469ccaf54bd96aa02653bd8fcdca16faf98bccac0b87d
--- a/kde-plasma/kdecoration/kdecoration-5.5.1.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.5.1.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:5"
+RDEPEND="${DEPEND}"
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@ -1,2 +1,3 @@
 DIST kdeplasma-addons-5.4.3.tar.xz 2076536 SHA256 b7672cfea66f08d1fb8732157caf920788b3c5ace20cbe98e662a60a69e6d873 SHA512 6f499a19ad89c433f18977485730d27a4d553e2fbf8002772797e7ad08648f6b576848083ae53066b6b6c27ff4ab2d4569952b9427f72610e5d94d9cbe1a2c44 WHIRLPOOL b621a6db0c7cdf2c9f78ba050cd59b7ce1e856087eea93c187884d4f470afb71adc2ff514f59bfe593aef25ac9486a95852b91df020424ff034cd0bcfca7c8ea
 DIST kdeplasma-addons-5.5.0.tar.xz 2111268 SHA256 3fd3fdbfb8b11a4552f1d9607234e6c54a3a88120875717f158d88b7ee497cf8 SHA512 67ba7306f0b1e6e04e5a69906e1aff650d2fc502926d599f846c0f45bf8c1d24ca21d8146e03d79f6e7e2e691e7ab7949eebfe80dd32a4a5cd1824e04e68923c WHIRLPOOL 6c030f073c59a8fe2b9c8138f633971341aff4b7178ba666fc3e3eed1f8c8ec9b7035d08add25c2276461105031525854ce9f8c0aa00b839ca3137a6a04e4b72
+DIST kdeplasma-addons-5.5.1.tar.xz 2111936 SHA256 3486d8bf1e686d33196b342dc5c8d47ce9c3c6e3178ace72faf37ce51bb9a944 SHA512 2943fcf9fc0c41f3ce1522801c2ea760544254c91c5089731b1ba098b546edd3da573f37cf84e81db99ea97ccb188d6c7d114f0578f58a8c079f2a5bb6297f26 WHIRLPOOL 47261c1415329cfacaf7e73373d076b95e2a6c854b2065307f07811f3df48288aeafeaa94abd7b1757aa89095a09d83def97920b292680d788f3710c78936469
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.1.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 kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="ibus scim"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep sonnet)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		dev-qt/qtx11extras:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	!kde-base/kdeplasma-addons:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package scim)
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@ -1,2 +1,3 @@
 DIST kgamma5-5.4.3.tar.xz 60308 SHA256 f9a143b29d862097d11ab497b8e672c9d27874e2ed92b971e4a3228e0098cb50 SHA512 9417d434a315c0debdec58ca1691babb002485184b5e02f21510dbdcdc4ef37614b96f69b625839efe6266aeb99ae21008a23734ce0201d1992130a29047881c WHIRLPOOL ce0f68e688a794d2959c1e0d0022f3508ab366198c81b2e5009f7745cf3cdb3bc9157a3cb8b3f565d141670a3e9e42c8c9d6d2f88e8a7be85cb948f01d6c0af4
 DIST kgamma5-5.5.0.tar.xz 60352 SHA256 0e2947636a4a8e1e4bb9b5f38eb557b62e6482b2ccb51c72027f88dc4005ccc4 SHA512 a10d8312559e84428a082ee1fb7492c9310bcdfa703951b7a39646da6c59972c46274c7d206762f0080f6cad3d23c20d91ed99e2d0756f369dd706341fa65623 WHIRLPOOL 55678f95a4885869efc762c9a9d6002a0cfd8860c2dcdea324db07b3e268ee67dd3af4619c121dd8a1a654044b72a3a1fcd952288e29539cab6375d1151ea93e
+DIST kgamma5-5.5.1.tar.xz 60276 SHA256 7e20648aeb2c81e563485a743aac7a50ab0b791020c32daac9f9de23a8138b63 SHA512 17d609432cc3773732ed474a392f73d22f085dd54687e073c48b9b7bc92f20d6221e923ce4ecda840b9a2855038da3ae51e58f8e2825259b78c2979c6e351815 WHIRLPOOL 2bee2c3a90faac2a706a237c278d1313a926a02a17d0de0b9e8b7d24e40f198cdffee8d27739705efd2b862709d598660e803360d248b2e4b14b00a98e6047c6
--- a/kde-plasma/kgamma/kgamma-5.5.1.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.5.1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	!<kde-apps/kde4-l10n-15.08.0
+	!kde-apps/kgamma:5
+"
--- a/kde-plasma/khelpcenter/Manifest
+++ b/kde-plasma/khelpcenter/Manifest
@ -1,2 +1,3 @@
 DIST khelpcenter-5.4.3.tar.xz 1797076 SHA256 02630934f3fa5c03d384808ef2daef38a49db836fb64d384a95e54865545c64d SHA512 63becef909a2c1631f606418b6d2c435797e8ab02b272372c89d214d9ea943eb286bd9ddf644ad956159844bb0996820aa9501cfaf02e943f8bf1093dd54a223 WHIRLPOOL ed6c484a70ff5be1fe8e57944460d8695316b2911a1bb3514485d5685c66d5c7989a3601820d7c5b06120ace611db853b5efb7608ec6b79dd40866407dab7fce
 DIST khelpcenter-5.5.0.tar.xz 1800740 SHA256 0930f4a75e7f49bd0cd39db0dbfc62f0e05571ff5023d6677546494388d23c5e SHA512 0c31b3fa86952453f5320041e9018242b2427a09c227e344ddccb4942f5bca8a29f418143a1d468b7f0a3a990ac0c51035a8379d90a602d6617aeb3d8ce8e2dd WHIRLPOOL 40a3935e8e4a327af0d5cb6cf4f79deab8e04a1a1fbef1b2bb8a6196ed29abaa8f8c5e97f2a4a400ef6c0c46fcde4f38ea303c2fdf9c93b5eb0b3c5c2601cff4
+DIST khelpcenter-5.5.1.tar.xz 1800548 SHA256 1a2cb19a725728b30bb88390f77018e4ed3f3e57dba5a9db171430a53bb29a2a SHA512 ce7aa87862d02f890e146c42d8394cfc656e8df218e5e5809044f86ccf2c116fd630a2d1bff64fa3bb644441ee58b5c9d903aea0455c04418c4b7fa010548d27 WHIRLPOOL 9e5d8008a9ce3d0cba0bf54c5b174b69bcc03c320042e678e88a16da5b7779d4521db9304edcc9c4f8e6b347cdfe2831efc43f8efead478cb719e0e4c9c586dd
--- a/kde-plasma/khelpcenter/khelpcenter-5.5.1.ebuild
+++ b/kde-plasma/khelpcenter/khelpcenter-5.5.1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/khelpcenter:4
+"
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@ -1,2 +1,3 @@
 DIST khotkeys-5.4.3.tar.xz 607124 SHA256 495c9ef896a550f076266099ad396f8bf4ee32b94575166acc0329696bd69624 SHA512 9e9bbec5b3e6c9e912b7679a5f8bdc3cd59a913c6af5da9dcfd866aafb3706b0edcc5ab13ccaa5a9bd356db2fc749c38b73128510e618de11f9edbdce47fee22 WHIRLPOOL b8cb7bc155d9bd6cd7f5e8fc2058f2acc580d756e14577d6b279252da24054911be08349f35eb4c1b942aeb0e609d2ed5da5d1ef0271f64d1d54364b569ba6cf
 DIST khotkeys-5.5.0.tar.xz 603560 SHA256 146a1c5ed5052a3ebff4da84f27eabf17667f5a71cb816d12ca6b21cea87eea4 SHA512 f93bdad84f0b34936cfa1db8de64ffd00bd02ef79f7b59a309ac68d9b6a6d1270bf86bceef6b0336cbbf534098245a863954287fd9b11c82f934d4194cdc972c WHIRLPOOL 8fe5f44d7aa6b445ef6d1a0c61255902668f39acb50804879389f823c4a8bee47e8d49496cc7c13882cff5719c180e9f906980d7854bb747d873f9705c394a08
+DIST khotkeys-5.5.1.tar.xz 603544 SHA256 1132aa80ef8c3548d82d85c50e65b131530efc6318e461670abaa2ed116c7565 SHA512 f82bf4bdff746feb49916f5b6ae949695da7e66ebb7551feb48645be33b5451f78bd32f6b4c3b5d96be667cd9b8736d26669f0e563bb0f8df766fca91b96dce4 WHIRLPOOL b316c5d323fee62acf56e963b49fe7937f499f64ff5d2237f5c642a863071ba179fe25143a2742475dec03d9870844c4bf495025a010c9d0136118c2f53ec859
--- a/kde-plasma/khotkeys/khotkeys-5.5.1.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.5.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
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE workspace hotkey module"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support X)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep plasma-workspace)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/khotkeys:4
+	!kde-base/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-proto/xproto
+"
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@ -1,3 +1,4 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
 DIST kinfocenter-5.4.3.tar.xz 1131908 SHA256 475bf963a3b0bc5c6c267889ad96f2bf8666f051e3dbeb47b21e3ab4630bdeec SHA512 9ca50172136607e835be9dc7e9767988b11aa746d9c2236167d36c82858e0c0127f396c0d7a7884a33de025ce3a7f122eadbee0414bc5b4f7f138bea3c2312f9 WHIRLPOOL 419c49cddd263335858e70252809f5771f75ac69f76b0795ca1343195780a49951a6fdf0c42dd2d48e8bfd73b0a1613a6a56d7c335baabfd01f66d0056ba20ec
 DIST kinfocenter-5.5.0.tar.xz 1143256 SHA256 7e2b4446afc53985a21f5b387692a395bf1a17f42fa75e9e77c002f138a229f7 SHA512 8c9ab3a5878cf05fe8b40bb0b5fa3954c6cb9d841764dbe3d0da961d47332b9e28cbf20fbbb8079efea0ad7c05788952c86fd7dfcf475155f5c861ca567eef2c WHIRLPOOL fdf6c0d436eaa20cf414f06c8d338e50ea06348332d0155d1680f4b817d52e2bd35491aff2d35b1f049f25a6d29b46c723a82c20f8fef7f37d0c6261f9c6d1da
+DIST kinfocenter-5.5.1.tar.xz 1143244 SHA256 80b86a8316c24b3e725935bc6c53c884f81c1729013d35024ff4e2a034463f2c SHA512 9f42177168198d6b49af8ea510eab0e2b1e2d569e7d6f6dad0155567c023d7650149774a63af30f539eaba5edec6b1b2b7c0f5dfea9c69f6af6e57ee20795951 WHIRLPOOL 7461c893cff933f65a4b8951db66a3518d05c7fc17cdd00d055df31573bad49f3e6a599b3c30932d145ce09aa2ca9dfa3e8993e235fe87b3ffc86a0704ba715d
--- a/Show More
+++ b/Show More