Sync with portage [Sun May 13 00:11:41 MSK 2018].

6 years ago · 06a7864662
parent 11fd6dd2e7
commit 06a7864662
1374 changed files with 4604 additions and 3845 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch
+++ b/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch
@ -1,85 +0,0 @@
-From eeb3da6eb717ed6a1a1069a7611eb37503e8672d Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Tue, 19 Sep 2017 12:28:43 +0900
-Subject: [PATCH 2/3] common: Fix gnupg_wait_processes.
-
-* common/exechelp-posix.c (gnupg_wait_processes): Loop for r_exitcodes
-even if we already see an error.
-
--
-
-The value stored by waitpid for exit code is encoded;  It requires
-decoded by WEXITSTATUS macro, regardless of an error.
-
-For example, when one of processes is already exited and another is
-still running, it resulted wrong value of in r_exitcodes[n].
-
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
- common/exechelp-posix.c | 50 +++++++++++++++++++++++++------------------------
- 1 file changed, 26 insertions(+), 24 deletions(-)
-
-diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
-index 7237993a2..3acf74ad6 100644
--- a/common/exechelp-posix.c
-+++ b/common/exechelp-posix.c
-@@ -784,30 +784,32 @@ gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count,
-         }
-     }
- 
-  if (ec == 0)
-    for (i = 0; i < count; i++)
-      {
-        if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]) == 127)
-          {
-            log_error (_("error running '%s': probably not installed\n"),
-                       pgmnames[i]);
-            ec = GPG_ERR_CONFIGURATION;
-          }
-        else if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]))
-          {
-            if (dummy)
-              log_error (_("error running '%s': exit status %d\n"),
-                         pgmnames[i], WEXITSTATUS (r_exitcodes[i]));
-            else
-              r_exitcodes[i] = WEXITSTATUS (r_exitcodes[i]);
-            ec = GPG_ERR_GENERAL;
-          }
-        else if (!WIFEXITED (r_exitcodes[i]))
-          {
-            log_error (_("error running '%s': terminated\n"), pgmnames[i]);
-            ec = GPG_ERR_GENERAL;
-          }
-      }
-+  for (i = 0; i < count; i++)
-+    {
-+      if (r_exitcodes[i] == -1)
-+        continue;
-+
-+      if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]) == 127)
-+        {
-+          log_error (_("error running '%s': probably not installed\n"),
-+                     pgmnames[i]);
-+          ec = GPG_ERR_CONFIGURATION;
-+        }
-+      else if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]))
-+        {
-+          if (dummy)
-+            log_error (_("error running '%s': exit status %d\n"),
-+                       pgmnames[i], WEXITSTATUS (r_exitcodes[i]));
-+          else
-+            r_exitcodes[i] = WEXITSTATUS (r_exitcodes[i]);
-+          ec = GPG_ERR_GENERAL;
-+        }
-+      else if (!WIFEXITED (r_exitcodes[i]))
-+        {
-+          log_error (_("error running '%s': terminated\n"), pgmnames[i]);
-+          ec = GPG_ERR_GENERAL;
-+        }
-+    }
- 
-   xfree (dummy);
-   return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec);
-- 
-2.13.5
-
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="https://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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
+
+CDEPEND="
+	app-eselect/eselect-pinentry
+	>=dev-libs/libassuan-2.1
+	>=dev-libs/libgcrypt-1.6.3
+	>=dev-libs/libgpg-error-1.17
+	caps? ( sys-libs/libcap )
+	fltk? ( x11-libs/fltk )
+	gnome-keyring? ( app-crypt/libsecret )
+	gtk? ( x11-libs/gtk+:2 )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+
+REQUIRED_USE="
+	gtk? ( !static )
+	qt5? ( !static )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
+	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	export QTLIB="$(qt5_get_libdir)"
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_with caps libcap) \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable fltk pinentry-fltk) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt5 pinentry-qt) \
+		MOC="$(qt5_get_bindir)"/moc
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+
+	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
+}
+
+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-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/fuse-utils/Manifest
+++ b/app-emulation/fuse-utils/Manifest
@ -1,2 +1,2 @@
-DIST fuse-utils-1.3.4.tar.gz 493813 BLAKE2B 29ff39a3dc98019aa548b78d7e3c0fe08863ea4f51103b5e0949b96e83a217458771c19a72f7a93150b2654903904343f038032442f74c662ccaaec56f05c997 SHA512 878f0481f7b62a989c1c1e947996b9c3ffafbfde4eb6c0af46aaabe765768f308ca26d3a451f438e48c795a6f08791c9ebf672448519a5d0790d5781c9bad6bb
 DIST fuse-utils-1.4.0.tar.gz 499865 BLAKE2B 23a09e88a468b207fa1b0782535251729d8212092da6d04c2732171ebb88e453a9df1f9af3056fa3114f4e6717a4e54c95d5b1a71477980f54d274b05e0c210b SHA512 dafedc66659c0f89d90bed2dcdc76aecddd91818db5f843d7480c78eaaa4c298531936af1fe34a4997ca23aab7b32dabf4b8bc03a552e75370edfd56aee0c2b4
+DIST fuse-utils-1.4.1.tar.gz 500533 BLAKE2B 58d75c336e0b46b500b614ce858978391986c0950f011986860c86ce153227a5116859aafb26ffbef8f5989e32e7df6fe77974943277e83c64ccee1217409b54 SHA512 973ae172fa38dab27da4b305bbcaad95ba8d2c3d60a9a1e7d8032113b66536506a458fc0ef5d1faf3b2082255a0d54d6bbbf7eaac4c2981b6a77bc7afae9974b
--- a/app-emulation/fuse-utils/fuse-utils-1.4.1.ebuild
+++ b/app-emulation/fuse-utils/fuse-utils-1.4.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audiofile gcrypt jpeg png zlib"

-RDEPEND=">=app-emulation/libspectrum-1.4.0[gcrypt?,zlib?]
+RDEPEND=">=app-emulation/libspectrum-1.4.2[gcrypt?,zlib?]
 	audiofile? ( >=media-libs/audiofile-0.3.6 )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0 )
@ -21,10 +21,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_configure() {
-	econf \
-		$(use_with audiofile) \
-		$(use_with gcrypt libgcrypt) \
-		$(use_with jpeg libjpeg) \
-		$(use_with png libpng) \
+	local myconf=(
+		$(use_with audiofile)
+		$(use_with gcrypt libgcrypt)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
 		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
 }
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@ -1,2 +1,2 @@
-DIST fuse-1.5.1.tar.gz 1623081 BLAKE2B 4b6cf747d15bc2d33a0baba88254a08187e8a615564236835da19d32f9afb312d5a5c90ac07a88d904019626b153546ecd8cd09b88fa16731af94ea54cd0e346 SHA512 d5f5b8a0e61f298a955450de208b29f8ab4fc0133c5c58e596f36f3834c088c946e19d7437dd1a6e73a89d32dcaf6ca9ce0fed8ec310c37aa6a6568be482abe4
 DIST fuse-1.5.2.tar.gz 1626746 BLAKE2B 38236b9457e975fe227e2a19ed0fb80cac022fbb0bd8fcb1e51666103c4abe8960b1bd166fc1d12ab4e0f32954f7c3f59625d57d456313f75ca023bf51477e0b SHA512 45507834eb70d1e74c8f58017f4ae0bb54e2560456eeadfa8b6888a1c79e9c9443cccb7ae9733b96a895f94040be820c57a7d698115c2f483e64ebc4fd734268
+DIST fuse-1.5.3.tar.gz 1627487 BLAKE2B d942f0131ce713e8592abec6443015aca3f1ae73739f1db0eae84a19e4320fd8bffbd7d36afaf65b08cf059305f85a8854d39d46519ed7abd3705b11156d069c SHA512 6596f789a685c46752c46b2432953c0d9abb620b23541cdbfc066c224fcba47ac7be75db678e2ff76622a7d02cc81b7dfeae672dfdaee1085d2ae5f768a4d8c0
--- a/app-emulation/fuse/fuse-1.5.3.ebuild
+++ b/app-emulation/fuse/fuse-1.5.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -10,22 +10,23 @@ SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa ao backend-fbcon +backend-gtk backend-sdl backend-svga backend-X gpm joystick memlimit png xml"
+IUSE="alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml"

 # Only one UI back-end can be enabled at a time
-REQUIRED_USE="^^ ( backend-fbcon backend-gtk backend-sdl backend-svga backend-X )"
+REQUIRED_USE="?? ( backend-fbcon backend-sdl backend-svga backend-X )"

-RDEPEND=">=app-emulation/libspectrum-1.4.1
+RDEPEND="
+	>=app-emulation/libspectrum-1.4.2
 	dev-libs/glib:2
 	alsa? ( media-libs/alsa-lib )
 	ao? ( media-libs/libao )
-	gpm? ( sys-libs/gpm )
-	joystick? ( media-libs/libjsw )
-	png? ( media-libs/libpng:0= sys-libs/zlib )
-	backend-gtk? ( x11-libs/gtk+:3 )
 	backend-sdl? ( media-libs/libsdl )
 	backend-svga? ( media-libs/svgalib )
 	backend-X? ( x11-libs/libX11 x11-libs/libXext )
+	!backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) )
+	gpm? ( sys-libs/gpm )
+	joystick? ( media-libs/libjsw )
+	png? ( media-libs/libpng:0= sys-libs/zlib )
 	xml? ( dev-libs/libxml2:2 )"
 DEPEND="${RDEPEND}
 	backend-fbcon? ( virtual/linux-sources )
@ -47,9 +48,7 @@ src_configure() {
 		$(use_with xml libxml2)
 	)

-	if use backend-gtk; then
-		:
-	elif use backend-sdl; then
+	if use backend-sdl; then
 		myconf+=("--with-sdl")
 	elif use backend-X; then
 		myconf+=("--without-gtk")
@ -57,7 +56,13 @@ src_configure() {
 		myconf+=("--with-svgalib")
 	elif use backend-fbcon; then
 		myconf+=("--with-fb")
+	else
+		myconf+=("--with-gtk")
 	fi

 	econf "${myconf[@]}"
 }
+
+src_test() {
+	emake test
+}
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@ -14,7 +14,6 @@
 	</upstream>
 	<use>
 		<flag name="backend-fbcon">Use framebuffer rendering backend</flag>
-		<flag name="backend-gtk">Use GTK+ rendering backend</flag>
 		<flag name="backend-sdl">Use SDL rendering backend</flag>
 		<flag name="backend-svga">Use svgalib rendering backend</flag>
 		<flag name="backend-X">Use X11 rendering backend</flag>
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@ -1,2 +1,2 @@
-DIST libspectrum-1.4.0.tar.gz 514972 BLAKE2B 698ada3d404db15d95946b8098d80b791c63548a6d09a442f926e4fb36b01e00ab8d9fea60b33edee688e02cf753fa37f91bd09a97090b152ac16e4d41d482f8 SHA512 4005133185bc677ac8c960fb3f731fa6dc29caa31e008ba59f1791626999717cb79e9be284d1534a3a3550fa2ea5f2b1616256f3deeac73853f5b8fe3031e3f3
 DIST libspectrum-1.4.1.tar.gz 516697 BLAKE2B 863030fabf37b03f15af389d8ab625f0f54c439153900e8b44bfefe2196fd576fbed9c23a6d2cfd7b07ca804a20329d8e646d3b7741ee1ded3d42246e36f203d SHA512 550d96c2432400a5b6ba86534acc0a2786dcdb9a8c847caf7768f1053cdbe0825d208128713a3f4b7fa42547bb3eac56329433a4c0a6753eec3ba9623eef5bf5
+DIST libspectrum-1.4.2.tar.gz 568052 BLAKE2B 84ffa5b2ac376c72d309c623610e5e30ebc98ab81a4505ffd88c8fc88145c6d63a112c60a57585c827b352e0a73ec330fc9f3601a714d1a6ad522cc40105d171 SHA512 391eb6fd805ab5a7ba5186ced8aa06be8b25973512860bfd0680585120a9617a1406f9327a7acb3ad7b7e473be8214c9b228d8b4adcf45a8bf3d3b6d27ee4d6f
--- a/app-emulation/libspectrum/libspectrum-1.4.2.ebuild
+++ b/app-emulation/libspectrum/libspectrum-1.4.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -22,11 +22,19 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_configure() {
-	econf \
-		$(use_with audiofile libaudiofile) \
-		$(use_with bzip2 bzip2) \
-		$(use_with gcrypt libgcrypt) \
-		$(use_with zlib zlib)
+	local myconf=(
+		$(use_with audiofile libaudiofile)
+		$(use_with bzip2)
+		$(use_with gcrypt libgcrypt)
+		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# check only builds test executable but doesn't run it
+	emake check
+	./test/test || die
 }

 src_install() {
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@ -1,6 +1,3 @@
 DIST elasticsearch-1.7.6.tar.gz 28488767 BLAKE2B 0dc4fb10355e2139ee3a7e7e65366e8aa533b9714bf0f00d2bd8f4ef0669ba9f8f10dc5255c8c7a62abc0362e08ab5fda3c8b6b6f2bacfe5cce7255973293162 SHA512 2746f09b66919912e785c8d25c50ae74dbb38a41d99d9c926550786f9c2d7953d1ae1a54a32dae59a7269e5fbfa74dfbc91c3d412e415efd01c391ef7d329ba7
-DIST elasticsearch-5.6.6.tar.gz 33780290 BLAKE2B ce4014b8eb74098990d97d7d87a0bd88df06f6719772f310c97cc33e740f44e84ebf74750c1f81b77c713c661a0e2e9ca826b6ab91b3625023fb9a061005d8ef SHA512 582fc3c2d1dcd5c208c229307ce387015ef8b25d9974fcac9ad4b8b3bc1c983a27daa171f0f242d367cc0776c545a82c5a4c07f6340104e739d83831e0d2210c
-DIST elasticsearch-5.6.8.tar.gz 33781024 BLAKE2B 8b946b76997ed68baaeaab110f78824c21df7bd7647474f239996191d14c6ca9a5ae4ed564f998d036aa55074f2299e4e3214043058a1984ebfbe9fad1f5d230 SHA512 b306b7e09ad14aaf7e20c3dbac1bc1496b9cb4cfb98b6111aaabf955af88f3fa0d77c72153f278bec11356e022f5c339248d185618b47cb140717bbd3fae09cb
-DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2 SHA512 b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee
-DIST elasticsearch-6.1.2.tar.gz 28455845 BLAKE2B 36215cf3131c8ac24e9b974d6c12892679e1896242119bf88182a229286a8391fc9575b068c6e692b9931022df299920fdc5dbf8f04651bd4bcfd544c1b65b2e SHA512 c72e69700b60faf3b1a542c2317b83189926738affb38033c4b8d7cc0a1b3c21c4f743f441fb10657d4684111746ebb18c9dba2f54845ea6e02e4fb8dc950e5a
-DIST elasticsearch-6.2.3.tar.gz 29050159 BLAKE2B 32a722e3861abf024a4b82ffe97877896cf3ffc76aac34fd942eeb9ca490ac41f3bf530b6313104fdf2c4900ea377d57837c465c6de6f983afac99802586b1c7 SHA512 8103c2b817cd5e14057c28372f379bb9c2b7833698818882c649d349904163d0c69d147836d03428619535652902532f7e5abc1e23214ad735c54b1d914acabf
+DIST elasticsearch-5.6.9.tar.gz 33794793 BLAKE2B a056443b1f71b3af773b5195147927017456e1c9a6517c549cfe7e4ec70f0ff4ec9363c9ef6376b7b942e82f811cd5927d44eb9f9eb8022a56e54a85b4ba7c46 SHA512 4e61a4c5f79d0439a414f1e9361f855cdb2f79322cf592bad43132605922fb8ded6368b01e05ef6bcbee49911943c2a3b6be5fd6d0900abddfe03c736cca96d6
+DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
--- a/app-misc/elasticsearch/elasticsearch-5.6.8.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.8.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="virtual/jre:1.8"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -rv config || die
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.2" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-}
--- a/app-misc/elasticsearch/elasticsearch-5.6.9.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.9.ebuild
--- a/app-misc/elasticsearch/elasticsearch-6.0.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.0.1.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="virtual/jre:1.8"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-
-	default
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins config/*
-	rm -rv config || die
-
-	insinto /usr/share/${PN}
-	doins -r ./*
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.2 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-}
--- a/app-misc/elasticsearch/elasticsearch-6.1.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.1.2.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="virtual/jre:1.8"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -rv config || die
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.2 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-}
--- a/app-misc/elasticsearch/elasticsearch-6.2.4.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.2.4.ebuild
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/icon/icon-9.5.1-r1.ebuild
+++ b/dev-lang/icon/icon-9.5.1-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v${MY_PV}src.tgz"

 LICENSE="public-domain HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X iplsrc"

 S="${WORKDIR}/icon-v${MY_PV}src"
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libsodium/libsodium-1.0.15.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"

 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
--- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild
+++ b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -11,7 +11,7 @@ SRC_URI="https://fedorahosted.org/releases/l/i/libverto/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="glib +libev libevent tevent +threads static-libs"

 # file collisions
--- a/dev-libs/openssl/files/gentoo.config-1.0.2
+++ b/dev-libs/openssl/files/gentoo.config-1.0.2
@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # Openssl doesn't play along nicely with cross-compiling
@ -81,8 +81,8 @@ chost_machine=${CHOST%%-*}
 case ${system} in
 linux)
 	case ${chost_machine}:${ABI} in
-		aarch64*be*)  machine="generic64 -DB_ENDIAN";;
-		aarch64*)     machine="generic64 -DL_ENDIAN";;
+		aarch64*be*)  machine="aarch64 -DB_ENDIAN";;
+		aarch64*)     machine="aarch64 -DL_ENDIAN";;
 		alphaev56*|\
 		alphaev[678]*)machine=alpha+bwx-${compiler};;
 		alpha*)       machine=alpha-${compiler};;
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ b/dev-libs/ppl/ppl-1.1.ebuild
@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz

 LICENSE="GPL-3"
 SLOT="0/4.13" # SONAMEs
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"

 RDEPEND=">=dev-libs/gmp-6[cxx]
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@ -1 +1,2 @@
 DIST inflect-0.2.5.tar.gz 109756 BLAKE2B ecb64b0fea04602f112dfba11ade6828eae7a7f3f44d4c4fb15c2300ac18025ea4c51f9c36aae5e7e92bd09e24d08091ce096b888a520fd2d4c40374356333d5 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616
+DIST inflect-0.3.1.tar.gz 109456 BLAKE2B b57009a933f49762da315c55950ca20ad04a53559b1bd1fb7d8395bf4bfbb74b618eb1a0d0a0ca0f2b64adde93665fdf1f643f56299820ffe0c56a20f57237dc SHA512 c832f0f36b56f5f59d8c3a7c0b128c0ae00f7a90c57f303e79a2118657ee7b62ed3db7cd4c3297e41a07c4d2bdbc18d6c754c319a43004af6d35cab3701169a6
--- a/dev-python/inflect/inflect-0.2.5.ebuild
+++ b/dev-python/inflect/inflect-0.2.5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1

 DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/pwdyson/inflect.py"
+HOMEPAGE="https://github.com/jazzband/inflect"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="AGPL-3"
--- a/dev-python/inflect/inflect-0.3.1.ebuild
+++ b/dev-python/inflect/inflect-0.3.1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jazzband/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests -v tests || die "tests failed with ${EPYTHON}"
+}
--- a/dev-python/inflect/metadata.xml
+++ b/dev-python/inflect/metadata.xml
@ -11,6 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">inflect</remote-id>
-		<remote-id type="github">pwdyson/inflect.py</remote-id>
+		<remote-id type="github">jazzband/inflect</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
--- a/dev-ros/eigen_conversions/Manifest
+++ b/dev-ros/eigen_conversions/Manifest
@ -1 +1,2 @@
 DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
+DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
--- a/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild
+++ b/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between Eigen and KDL and Eigen and geometry_msgs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-libs/orocos_kdl:=
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/cmake_modules
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/kdl_conversions/Manifest
+++ b/dev-ros/kdl_conversions/Manifest
@ -1 +1,2 @@
 DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
+DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
--- a/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild
+++ b/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between KDL and geometry_msgs types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	sci-libs/orocos_kdl:=
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@ -1 +1,2 @@
+DIST moveit_msgs-0.10.0.tar.gz 17847 BLAKE2B f80d7c267aab47b38e426b88e7a1e5487c738a8aeda143eee3d4c83a5929b66380aff939536d8f587b7acacbe239bfb2d5a8489fa3100a1f9f15cbe0cff310db SHA512 80a7dca2e9bda4bcf191691671ba179a42fb031b9ba2ac64c8e73854a94dc15ffaaedb1dce06da42d994c9c8b3161e6d55a8ef7a9c3c5a1f3629779eac5c1dba
 DIST moveit_msgs-0.9.1.tar.gz 17760 BLAKE2B 1ac7c9c30e5873ecf51db435c66553d3ded4104cfca6a5daaa3396d96380eb41580b3c494b94c002b2829f01c001f947f126935c5dd9f239362da08bc8567ff2 SHA512 af998019a5c1c82a2026c6d2071feb7494616b6eef942450dbb81178f0c393c173ca8b8c17018f6da15b5b0ac438515a762914122ad315572cc5ef25567be758
--- a/dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild
+++ b/dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="
+	dev-ros/actionlib_msgs
+	dev-ros/sensor_msgs
+	dev-ros/geometry_msgs
+	dev-ros/trajectory_msgs
+	dev-ros/shape_msgs
+	dev-ros/std_msgs
+	dev-ros/octomap_msgs
+	dev-ros/object_recognition_msgs
+"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages, services and actions used by MoveIt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@ -1,2 +1,3 @@
 DIST rviz-1.12.15.tar.gz 5088184 BLAKE2B 9096cd707ff265847fdb0ddc71b31ec50dcfb9af0cb658ccbe8530d75cf82abcfa7d5a76f220e1bf2393e28807b44fec3d8690463f19dfb6482bc7b51a07f2c2 SHA512 d12ca4b56a7a2a19f37ca69a4efc0f474ff1409cdd9e1f1d357d6c2b6033a21183e469c712b5583ddc41f579f697d55145516c79797e846d3345019e57615ad6
 DIST rviz-1.13.0.tar.gz 5090158 BLAKE2B 40f5135a0518be5c97b713e43d29bd16f115d3759d16a82853e85aa8a4f918e4c11d2e78781d8c2d0ee8337d3d60865e3e76434b6a7fdc4c96ebc39288290809 SHA512 5ab9d24ffeeb41db4c12ead22a38b5815c5660c884c23bf20769a59f18603938c4c804fc9de506f9d5137e438f7241d06f0968ab80be70b7e9e281f9693e1ad8
+DIST rviz-1.13.1.tar.gz 5094089 BLAKE2B 7f4c106bf51b2465177107f5eb19602323045423b3ee5149f70b177170af9eea1cea0d4069f859c3c9bf3a2bdbe7feb91b802c758a66f6b990bd890b124d2a52 SHA512 cace4d41341647a8e4d5ab3be64ca71a4b41134a15a4df8556f35824c550c5fb7024f7338d0ffac1ea9c7f574c10757b773a8df37625d6e616eafdcd7f0aab09
--- a/dev-ros/rviz/rviz-1.13.1.ebuild
+++ b/dev-ros/rviz/rviz-1.13.1.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/rviz"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="3D visualization tool for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/assimp
+	dev-games/ogre
+	virtual/opengl
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-cpp/eigen:3
+	dev-cpp/yaml-cpp:=
+	dev-libs/urdfdom:=
+	dev-libs/tinyxml:=
+
+	dev-ros/angles
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/interactive_markers
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	dev-ros/resource_retriever
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/urdf
+	dev-ros/media_export
+
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)"
+
+src_configure() {
+	local mycatkincmakeargs=( "-DUseQt5=ON" )
+	ros-catkin_src_configure
+}
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@ -25,7 +25,7 @@ RDEPEND="
 	dev-cpp/eigen:3
 	dev-cpp/yaml-cpp:=
 	dev-libs/urdfdom:=
-	dev-libs/tinyxml:=
+	dev-libs/tinyxml2:=

 	dev-ros/angles
 	dev-ros/image_geometry
@ -34,7 +34,6 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/message_filters
 	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
 	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
 	dev-ros/resource_retriever
 	dev-ros/rosbag[${PYTHON_USEDEP}]
--- a/dev-ros/test_tf2/Manifest
+++ b/dev-ros/test_tf2/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/test_tf2/metadata.xml
+++ b/dev-ros/test_tf2/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/test_tf2/test_tf2-0.6.2.ebuild
+++ b/dev-ros/test_tf2/test_tf2-0.6.2.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/tf2
+	dev-ros/tf2_bullet
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
+	dev-ros/tf2_kdl[${PYTHON_USEDEP}]
+	dev-ros/tf2_msgs
+	sci-libs/orocos_kdl
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+	dev-cpp/gtest"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@ -1,2 +1,2 @@
-DIST geometry-1.11.8.tar.gz 186749 BLAKE2B f4d2579586221014ae50a649aa8cc19fdf975184091e9f50912494f3f3d4a2963160c63bbf9ee9466ae3f26aed533b5fba35c20663681009a69b71dbb595f879 SHA512 a7d1383635d96b8a95486cbb9d1fdfc762846cb6ecc41c0deef76cea4d9f9cde99c4b079527a25bc5ac559d4987fe7a4c3159e2435942bb3d4fb992da68e0e04
 DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
+DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
--- a/dev-ros/tf/files/gcc6.patch
+++ b/dev-ros/tf/files/gcc6.patch
@ -1,22 +0,0 @@
-commit b0d31cc1e9a43b45d216ee7f804e901a5c0f8936
-Author: Hodorgasm <nsane457@gmail.com>
-Date:   Mon Sep 19 17:58:22 2016 -0400
-
-    Fix "stdlib.h: No such file or directory" errors in GCC-6
-    
-    Including '-isystem /usr/include' breaks building with GCC-6.
-    See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
-
-diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
-index 8077561..cf72127 100644
--- a/tf/CMakeLists.txt
-+++ b/tf/CMakeLists.txt
-@@ -8,7 +8,7 @@ find_package(catkin COMPONENTS angles geometry_msgs message_filters message_gene
- 
- catkin_python_setup()
- 
-include_directories(SYSTEM ${Boost_INCLUDE_DIR}
-+include_directories(${Boost_INCLUDE_DIR}
-                            ${catkin_INCLUDE_DIRS}
- )
- include_directories(include)
--- a/dev-ros/tf/tf-1.12.0.ebuild
+++ b/dev-ros/tf/tf-1.12.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -36,4 +36,3 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2/metadata.xml
+++ b/dev-ros/tf2/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/tf2/tf2-0.6.2.ebuild
+++ b/dev-ros/tf2/tf2-0.6.2.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/console_bridge:=
+	dev-ros/rostime
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/roscpp )
+"
--- a/dev-ros/tf2_bullet/Manifest
+++ b/dev-ros/tf2_bullet/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2_bullet/metadata.xml
+++ b/dev-ros/tf2_bullet/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild
+++ b/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 bullet support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	sci-physics/bullet
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/tf2_eigen/Manifest
+++ b/dev-ros/tf2_eigen/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild
+++ b/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 eigen support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-ros/tf2
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND} dev-ros/cmake_modules"
--- a/dev-ros/tf2_geometry_msgs/Manifest
+++ b/dev-ros/tf2_geometry_msgs/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2_geometry_msgs/metadata.xml
+++ b/dev-ros/tf2_geometry_msgs/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.2.ebuild
+++ b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.2.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	sci-libs/orocos_kdl
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/tf2_kdl/Manifest
+++ b/dev-ros/tf2_kdl/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2_kdl/metadata.xml
+++ b/dev-ros/tf2_kdl/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild
+++ b/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="KDL binding for tf2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	sci-libs/orocos_kdl:=
+	dev-ros/tf2_msgs[${PYTHON_USEDEP}]
+	dev-ros/cmake_modules
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)"
--- a/dev-ros/tf2_msgs/Manifest
+++ b/dev-ros/tf2_msgs/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2_msgs/metadata.xml
+++ b/dev-ros/tf2_msgs/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/tf2_msgs/tf2_msgs-0.6.2.ebuild
+++ b/dev-ros/tf2_msgs/tf2_msgs-0.6.2.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/dev-ros/tf2_py/Manifest
+++ b/dev-ros/tf2_py/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2_py/metadata.xml
+++ b/dev-ros/tf2_py/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/tf2_py/tf2_py-0.6.2.ebuild
+++ b/dev-ros/tf2_py/tf2_py-0.6.2.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 python bindings"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/tf2_ros/Manifest
+++ b/dev-ros/tf2_ros/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2_ros/metadata.xml
+++ b/dev-ros/tf2_ros/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild
+++ b/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/rosgraph
+	dev-libs/boost:=[threads]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_py[${PYTHON_USEDEP}]
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
--- a/dev-ros/tf2_sensor_msgs/Manifest
+++ b/dev-ros/tf2_sensor_msgs/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2_sensor_msgs/metadata.xml
+++ b/dev-ros/tf2_sensor_msgs/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.2.ebuild
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.2.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+	dev-ros/cmake_modules"
--- a/dev-ros/tf2_tools/Manifest
+++ b/dev-ros/tf2_tools/Manifest
@ -1 +1,2 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
--- a/dev-ros/tf2_tools/metadata.xml
+++ b/dev-ros/tf2_tools/metadata.xml
@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild
+++ b/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 tools"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2_py[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/tf_conversions/Manifest
+++ b/dev-ros/tf_conversions/Manifest
@ -1 +1,2 @@
 DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
+DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
--- a/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
+++ b/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/kdl_conversions
+	dev-ros/tf[${PYTHON_USEDEP}]
+	sci-libs/orocos_kdl:=
+	dev-cpp/eigen:3
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@ -15,10 +15,10 @@
 if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then
 _KDE5_FUNCTIONS_ECLASS=1

-inherit toolchain-funcs versionator
+inherit toolchain-funcs

 case ${EAPI} in
-	6) ;;
+	6) inherit eapi7-ver ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac

@ -34,30 +34,29 @@ export KDE_BUILD_TYPE

 case ${CATEGORY} in
 	kde-frameworks)
-		[[ ${PV} = 5.45* ]] && : ${QT_MINIMAL:=5.9.4}
+		[[ ${PV} = 5.43* ]] && : ${QT_MINIMAL:=5.7.1}
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.1}
-		if [[ ${KDE_BUILD_TYPE} = live ]]; then
-			: ${QT_MINIMAL:=5.9.1}
+		[[ ${PV} = 5.11.5* ]] && : ${QT_MINIMAL:=5.7.1}
+		[[ ${PV} = 5.12.5* ]] && : ${QT_MINIMAL:=5.9.1}
+		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
+			: ${QT_MINIMAL:=5.10.1}
 		fi
 		;;
 	kde-apps)
+		[[ ${PV} = 17.12.3* ]] && : ${QT_MINIMAL:=5.9.1}
 		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=5.44.0}
 		fi
-		if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then
-			: ${QT_MINIMAL:=5.9.1}
-		fi
 		;;
 esac

 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Qt to require. This affects add_qt_dep.
-: ${QT_MINIMAL:=5.7.1}
+: ${QT_MINIMAL:=5.9.4}

 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
@ -186,7 +185,7 @@ add_frameworks_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-frameworks ]]; then
-		version=$(get_version_component_range 1-2)
+		version=$(ver_cut 1-2)
 	elif [[ -z ${3} ]] ; then
 		version=${FRAMEWORKS_MINIMAL}
 	fi
@ -218,7 +217,7 @@ add_plasma_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-plasma ]]; then
-		version=$(get_version_component_range 1-3)
+		version=$(ver_cut 1-3)
 	elif [[ -z ${3} ]] ; then
 		version=${PLASMA_MINIMAL}
 	fi
@ -250,7 +249,7 @@ add_kdeapps_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-apps ]]; then
-		version=$(get_version_component_range 1-3)
+		version=$(ver_cut 1-3)
 	elif [[ -z ${3} ]] ; then
 		version=${KDE_APPS_MINIMAL}
 	fi
@ -281,7 +280,7 @@ add_qt_dep() {
 	local slot=${4}

 	if [[ -z ${version} ]]; then
-		if [[ ${1} = qtwebkit && ${QT_MINIMAL} = 5.9* ]]; then
+		if [[ ${1} = qtwebkit && $(ver_cut 2 ${QT_MINIMAL}) -ge 9 ]]; then
 			version=5.9.1 # no more upstream release, need bug #624404
 		else
 			version=${QT_MINIMAL}
@ -303,9 +302,9 @@ add_qt_dep() {
 # If no version is specified, ${PV} is used.
 get_kde_version() {
 	local ver=${1:-${PV}}
-	local major=$(get_major_version ${ver})
-	local minor=$(get_version_component_range 2 ${ver})
-	local micro=$(get_version_component_range 3 ${ver})
+	local major=$(ver_cut 1 ${ver})
+	local minor=$(ver_cut 2 ${ver})
+	local micro=$(ver_cut 3 ${ver})
 	if [[ ${ver} == 9999 ]]; then
 		echo live
 	else
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@ -31,7 +31,11 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}

-inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg
+inherit cmake-utils flag-o-matic gnome2-utils kde5-functions virtualx xdg
+
+case ${EAPI} in
+	6) inherit eapi7-ver eutils ;;
+esac

 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in
@ -180,7 +184,7 @@ case ${KDE_SUBSLOT} in
 			kde-frameworks | \
 			kde-plasma | \
 			kde-apps)
-				SLOT+="/$(get_version_component_range 1-2)"
+				SLOT+="/$(ver_cut 1-2)"
 				;;
 			*)
 				SLOT+="/${PV}"
@ -338,7 +342,7 @@ _calculate_src_uri() {
 		kde-frameworks)
 			SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
 		kde-plasma)
-			local plasmapv=$(get_version_component_range 1-3)
+			local plasmapv=$(ver_cut 1-3)

 			case ${PV} in
 				5.?.[6-9]? | 5.??.[6-9]? )
@ -407,11 +411,11 @@ _calculate_live_repo() {
 			fi

 			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
-				EGIT_BRANCH="Applications/$(get_version_component_range 1-2)"
+				EGIT_BRANCH="Applications/$(ver_cut 1-2)"
 			fi

 			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
-				EGIT_BRANCH="Plasma/$(get_version_component_range 1-2)"
+				EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 			fi

 			EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@ -505,7 +505,7 @@ toolchain-binutils_pkg_postrm() {
 		choice=${choice//$'\n'/ }
 		choice=${choice/* }
 		if [[ -z ${choice} ]] ; then
-			env -i ROOT="${ROOT}" binutils-config -u ${CTARGET}
+			binutils-config -u ${CTARGET}
 		else
 			binutils-config ${choice}
 		fi
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
--- a/games-util/springlobby/Manifest
+++ b/games-util/springlobby/Manifest
@ -0,0 +1 @@
+DIST springlobby-0.264.tar.bz2 2626180 BLAKE2B 01ff51703c3c10c1aaeb342d2644012a6037b1271ba7e36ab7663cde7646d1c9c6bd823fe65c91a8a9e754bbcf1000ce486eeab2d1641c64fad08773c491f9a6 SHA512 f8024a98be7d6ea755c4380494415813084aadb6dcf72ed0aaeba0ddf9fbaf992ccd5455713c807c0d6feb7db606068be62d4bb2cfcb4697f0406a2ec4f404eb
--- a/games-util/springlobby/metadata.xml
+++ b/games-util/springlobby/metadata.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+The official lobby client for SpringRTS community games: Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
+	</longdescription>
+	<longdescription lang="fr">
+Le client officiel du lobby pour les jeux de la communauté SpringRTS : Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
+	</longdescription>
+	<maintainer type="person">
+		<email>totocoq@yahoo.fr</email>
+		<name>Thomas Coquelin</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>fedja@protonmail.ch</email>
+		<name>Fedja Beader</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">springlobby/springlobby</remote-id>
+		<bugs-to>https://github.com/springlobby/springlobby/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
--- a/games-util/springlobby/springlobby-0.264.ebuild
+++ b/games-util/springlobby/springlobby-0.264.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+inherit cmake-utils gnome2-utils wxwidgets
+
+DESCRIPTION="The official lobby client for SpringRTS community games"
+HOMEPAGE="https://springlobby.info"
+SRC_URI="https://www.springlobby.info/tarballs/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +libnotify +nls +sound"
+
+RDEPEND="
+	>=dev-libs/boost-1.35:=
+	dev-libs/openssl:=
+	sound? ( media-libs/alure
+		media-libs/openal
+	)
+	net-misc/curl
+	sys-libs/zlib[minizip]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	libnotify? ( x11-libs/libnotify )
+"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	setup-wxwidgets
+	local mycmakeargs=(
+		-DOPTION_NOTIFY=$(usex libnotify)
+		-DOPTION_SOUND=$(usex sound)
+		-DOPTION_TRANSLATION_SUPPORT=$(usex nls)
+		-DAUX_VERSION="(Gentoo,${ARCH})"
+		)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@ -1,2 +1,2 @@
 DIST attica-5.43.0.tar.xz 60480 BLAKE2B dd6ebebd56d83a494099b7c6f91b1de3b92752a536a01007aed399a22a3d6e60a31c7807475cd76658f0d0ad069467b826c80b2d6ffe0d717db512aa67567627 SHA512 1584c7f121c4e5092e1f694d0ebed1ac2b31a3a7ce5ee9330ee00852a470266011d3e076da3174b3f37207aad93dd2070fcee9384e466afe202d8e5175fb81e1
-DIST attica-5.45.0.tar.xz 60476 BLAKE2B 9a3328e099e72eb6cceed33d5f65f44495c0880add05781c784d0e62fb273a67b03282471f591de05095dd00f7c284dce3ce66fb3ec8faade7366043b05f3a60 SHA512 a810bf4535fe7a012c63c27542e6fd5a58486118ffd3bb10be9aebbf2ef4f122a5141af45c051f50492bd872daa81f575447860b78eff4a26c646a2adc62b110
+DIST attica-5.46.0.tar.xz 60576 BLAKE2B d1061c616a881d96ed9b19ad797161370e4a35da6bd487046e480db928f0e8aa66375e2ca36792526d48930d486ff0af301763c0021a6b3dbd62228acaddee4e SHA512 cd5036c5475f3efc502002c4d18f7bddb322095dbc6faaf99958cf76ea6a3e95cb39b3ceaf7d6a5a38b5e6eefd2708463c8023a877e3f96b83642780d942fa98
--- a/kde-frameworks/attica/attica-5.46.0.ebuild
+++ b/kde-frameworks/attica/attica-5.46.0.ebuild
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@ -1,2 +1,2 @@
 DIST baloo-5.43.0.tar.xz 207280 BLAKE2B 3ab5b9045e5784ad7cc3ee1c65d29cde410eeb73c81d81d42328986b577603f36f09206a1df5f4bdedd5ac2804fb73c951950124a8ea6eb068fde86ca5c19cb9 SHA512 918d615adc07ee71414eabe15cd18f3cfee264c206cbef32f6807cff2eac701a58ae7eebb087e618e9bc7741ad8409514af8361e216ff68b07b65dd0da0a802a
-DIST baloo-5.45.0.tar.xz 218632 BLAKE2B 3316b868bd83e3f1246fe059af8e04bf31d78b0f9c20202a251a901c7a5b781c4339e3e905bbd8279c5f8dbc0e7ec5dba058343f72111547284ee2fa27f3f1c3 SHA512 d4106d118b133c3719575d43467cdc8fb78311959a87147b98d8c3db947a05fd1bcd2a7f27521494cf989ca5fe79c2a66b0337676a960e36a7c02b4f8f076403
+DIST baloo-5.46.0.tar.xz 227572 BLAKE2B 22dd0f44bdf89ab99b6218fe4bbc48f7a39d3490bef3f4a9544ac7de27ed93d793ab49d15f10a017cd61d9a90a065b02ae315cea9753fb4a206517c2fed34ea8 SHA512 b47a2da7b53aac66fd624955bd222b3dfa2cdb220f80b10abc19a396f69463c38e0a2cb8200700255e2393b3645b2035a19225f27097940ccded5486afb4c96c
--- a/kde-frameworks/baloo/baloo-5.46.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.46.0.ebuild
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@ -1,2 +1,2 @@
 DIST bluez-qt-5.43.0.tar.xz 74944 BLAKE2B abd1efa02801b8a2cf90a28224a340c4ce58911cebfd90a5285b19db7812b755049ae6dcaa41e4a86133e64ba5d0cbde4c7317ef49a86cd114b742296f0d5c1b SHA512 0c1105f167ddcbc0f398a8f48b68c45f7f36520abf400dbe01ded84151e6553f24cbc4a660db8999fc4c16b018873ec2b0a4c4b21e01dfb3851f64e7a6806cbd
-DIST bluez-qt-5.45.0.tar.xz 74920 BLAKE2B 3a438a417657dedc91e00885293d012734f66cd038101fdcb479c4820a6acd00b2d5639df957f1e99db44dbffffa216f2943a39d86caee542516f185c48512f9 SHA512 19935772cffe5b3925924e3663463c90152143feda733411ce4568d672a3563e611a084b0e731f8cff421d866b5efae52767b7834336a5e132fddc4630ad0fd6
+DIST bluez-qt-5.46.0.tar.xz 74724 BLAKE2B e087b68b4a6355c88d8da746951a145d206132bbf804bbf80077712861d3bd54c98584cf07c73076c3fcdf1b01806a13b8cfd7ed10d343069ed9b0099bbf94b0 SHA512 7bd95dbf0f1481ff5099646feae46d4d8e6a19acc3d1002dc3033943537d6b760711583f990a8fe94d8ce719a7431b6027e3aa24af66e0254f549331a54716b1
--- a/kde-frameworks/bluez-qt/bluez-qt-5.46.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.46.0.ebuild
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@ -1,2 +1,2 @@
 DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
-DIST breeze-icons-5.45.0.tar.xz 1535656 BLAKE2B 7f956cfa9c0e16f4dfacac4b8765064e0761b798f519fd72bfa331cfee22dd0757769bbfd9c9b9c806fad31cb784560acad4e005644762d28f2f80aa2d8db779 SHA512 da2dae391508baa696412ddd83ae32deb98941cebcc5fc1d6f3ed63b1886223d0a753f02ee052b2b82c4faabfde124b7409784ac3ff50528131e6ab080ca82fb
+DIST breeze-icons-5.46.0.tar.xz 1543996 BLAKE2B 634622e86a0931aed43aa18fda5ec502f9e9ee3d6443de327cf70b25078ec267080f619511221921a083d162bdb4578cc5e05413fc362829293fde9df33942fa SHA512 ff17523e154692ebc90d21b04758b051e80b5df9cad8ae82baabfaec906d99b9efcb0bfc36d5ce38e5a55698f8284ff73f67c24df9e4b5c35d484e18db9647dc
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.46.0.ebuild
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@ -1,2 +1,2 @@
 DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
-DIST breeze-icons-5.45.0.tar.xz 1535656 BLAKE2B 7f956cfa9c0e16f4dfacac4b8765064e0761b798f519fd72bfa331cfee22dd0757769bbfd9c9b9c806fad31cb784560acad4e005644762d28f2f80aa2d8db779 SHA512 da2dae391508baa696412ddd83ae32deb98941cebcc5fc1d6f3ed63b1886223d0a753f02ee052b2b82c4faabfde124b7409784ac3ff50528131e6ab080ca82fb
+DIST breeze-icons-5.46.0.tar.xz 1543996 BLAKE2B 634622e86a0931aed43aa18fda5ec502f9e9ee3d6443de327cf70b25078ec267080f619511221921a083d162bdb4578cc5e05413fc362829293fde9df33942fa SHA512 ff17523e154692ebc90d21b04758b051e80b5df9cad8ae82baabfaec906d99b9efcb0bfc36d5ce38e5a55698f8284ff73f67c24df9e4b5c35d484e18db9647dc
--- a/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.46.0.ebuild
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@ -1,2 +1,2 @@
 DIST extra-cmake-modules-5.43.0.tar.xz 314064 BLAKE2B b1866e66c2d12d450aada3f5dca86bf1638906cb3f4a2aa36dea43d3d0b2edde5cba85caa6ca7e0f6bd007733db16f88c2108103b588d637f1001f711037561b SHA512 fcdd96ad0db73f75708fdc97bbc74e28ef271a5dc27d8730f57efaf9e451ed5aaa51d20831c3cf20c82d377d50d51ba4abbfd09cdfbf02998396f907f6fa9cc5
-DIST extra-cmake-modules-5.45.0.tar.xz 315512 BLAKE2B 00686fe841d5385890dd52550cfbe3fbad1b9b1a5284515eec55ee82ffc533a542e36ed8936fd0095df0a11cd164e3b3efacd2dcb456703bb9dc112b551fd02f SHA512 d33e22ab08e16c3d8de3f7fc26fbc36a6940fb2d4387cf2b0ce4443fbc34e6dbbdfe2019bc31fc3b0005c582ef487ce97c02f3e7e2361f43676092ef846e9b68
+DIST extra-cmake-modules-5.46.0.tar.xz 317056 BLAKE2B c67e5a4d207cb5fd3f7ff7d0e2dd16c5a0a44c562c0a9c0b7eac3a54930ae59b6fd8b36d7a464e7d03950c44c101befc57825f8ee2f23b35e3f7ddc792d5267e SHA512 6431ad8e5230bbc0a5e1199037102014c376a682d711211b257359c35c8a3aaddb6128277721ca40cedf43fcca77312a2754f306487a1b3dbea728d643f0ad3a
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@ -1,2 +1,2 @@
 DIST frameworkintegration-5.43.0.tar.xz 1753176 BLAKE2B bb25f629cf5f7c27f452a958dff06b3cb099c84e5e45188cc99dd1cea125814a995db7b8f0356a3c4712d56038e7c319c453db116add146d4894617db7ee2b72 SHA512 f313fc3c0e16f877312f0c8e64e28c9368ef93fdafde1d6d3fa4f972290643139cdeb6a7376b57596042e4aaae0a87c9c9dad68ae895cb227d709a58ecbe7960
-DIST frameworkintegration-5.45.0.tar.xz 1753200 BLAKE2B f2027dc14fb0c11a33e2c01150f2fa2882f91d6f746b730c5a232deab00018d6bc1a77994a3d311b6034daa35ae392a719a36a6656a3a62f3038f776f671d95d SHA512 b8e01bd6d04c1f931a33b77275f6ea13c34d65e0669b6c1b61b87d75310246bcd643ff43d38d7fb7b91946b583a4b481a4cf9d9aef5235f985a986b422493e93
+DIST frameworkintegration-5.46.0.tar.xz 1753332 BLAKE2B 8ad4b5009096bcbf63a9b4874a353b84733aeadf577fc175ff17265aacda73ef4be543526ce6977756aba1758e56ebf65a3d66d98246ff3424a1540dcc906522 SHA512 34325df3f56d9e659237cb81bae755e2c4dd5b256d7878bcb3b1d3fdf15c749c5b8e2b590d27f93b6d5d31db73e826f63f988ac8c9544801ccd0591117653e12
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST springlobby-0.264.tar.bz2 2626180 BLAKE2B 01ff51703c3c10c1aaeb342d2644012a6037b1271ba7e36ab7663cde7646d1c9c6bd823fe65c91a8a9e754bbcf1000ce486eeab2d1641c64fad08773c491f9a6 SHA512 f8024a98be7d6ea755c4380494415813084aadb6dcf72ed0aaeba0ddf9fbaf992ccd5455713c807c0d6feb7db606068be62d4bb2cfcb4697f0406a2ec4f404eb`