gentoo resync : 09.03.2018

17 files changed, 72 insertions, 159 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index bc3ce37a0ba2..981c0128001d 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 5aa32728afc9..94db7b08278b 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,13 +1,9 @@
 AUX free42-2.0.10-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
 AUX free42-2.0.10-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
-AUX free42-2.0.15-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
-AUX free42-2.0.15-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
-AUX free42-2.0.6-fix-build-intel-lib.patch 690 BLAKE2B 0d8de8c32f92c01174e420e0dc74880bd3c3316c36dc947f84803a8f61ad491a0de9d27fa45ed7c72992b4e22c5e204bce27d47ec976048c4eff655d14312839 SHA512 624cf0af83f02b3a43231739de3d84e76cbdfe49becd219c9211cbc8ba7fc7d3474fc465edbf7e707f1474844e109d5d30361c7e15e3799db48bf0dda068d5ed
-AUX free42-2.0.6-fix-makefile.patch 1742 BLAKE2B 239bbb40c70a3627cf08859397bace5ecd6bbd215cc06f6d82862b908169af4851002fbb3cb7059aa553c3b7da266e5b0b2a1dede891a4f085822a2e731a9399 SHA512 d3add6369d6f2b5d4690355d93cfff903866f24aeed7d73246a79b4ba7b2551fec4ec61cf2d8c80d089194bf39f0c3a1faa4c6d1829f81b6c636b8f5d132b2bd
+AUX free42-2.0.17-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
+AUX free42-2.0.17-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
 DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a SHA512 4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d
-DIST free42-nologo-2.0.15.tgz 7389800 BLAKE2B f78a925459f7eea3347d5394cdde47cd7318770895ea0c375b14c5855ff9d08db86c72324122c15792db8e457fa6bfb8039a911de240e23269bf87def58381cf SHA512 533528b651b408156fb069e4969f35a1d365be84a7fc63d0d40a35ace75592dd88cc20def3dff2de4b7a7e3eeaeab99bb89ad333135be90dab13b52ac6af804b
-DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d
+DIST free42-nologo-2.0.17.tgz 7389996 BLAKE2B cc7c7bbe43eafc190fe0ce8921e032c2042290fe54a3153ba7568dae315de1356a9ee7f8ded4528788c677537138a5bd5556ad79dbd67ab8e41dd881a258312e SHA512 f73bfb2984fa4301c04d905fde6723583a57a1f663e012f965037067a7259961c0134fecb456118ec4b45956f7c8ccc16f0ec1db62e4cc705dc74ea563225872
 EBUILD free42-2.0.10.ebuild 1042 BLAKE2B 7019cd43b5bf6029a900fa386aa6300185a279d6b746d36211413da76107309f425257273b70db78f89349adf37a2b14f31369059d3562e8ab6f015ae6b2c34b SHA512 2556155fff2e04f13be2561dc46b1dd4f8f860a5d29c5062635c767c8a163eac795a736e4f948134faeaab88f6d7b7574e52b8242bbd1ffd0dd3f3f84235ec01
-EBUILD free42-2.0.15.ebuild 1044 BLAKE2B c4c0605c674b6168c07d5696eab9186f1fa4734e87b9a3ce0ccb7deb0a35320050b2221d6293d39e95f2863ea680fb945a2cb4fe9cc9825335c9e5825113f86c SHA512 56023c7c1d1d87ca4fdecfc8b28512373bce0e59fdf1d264c2b2e981a7ac1471bd8c3e48cfda94ae7d2971fa01920485cb2d755a3dc6a51607202541160da0bc
-EBUILD free42-2.0.6.ebuild 1043 BLAKE2B b36c46e0cbc518ff8b016e78850a8f50694d82e79f0105af11d3a550ab6edabd8d49f64f089c286b95edd4609e0daa99feacf90a8304525275fd08b88a9ede92 SHA512 fd74b7b6fc40bf7e72e6af0cbc5e376dc08d2b687c751f899dad78a62783463d23b917a27ab663d5c94dc063b8910d5e3f992b7d0847b0434db15f70ce68c900
+EBUILD free42-2.0.17.ebuild 1044 BLAKE2B c4c0605c674b6168c07d5696eab9186f1fa4734e87b9a3ce0ccb7deb0a35320050b2221d6293d39e95f2863ea680fb945a2cb4fe9cc9825335c9e5825113f86c SHA512 56023c7c1d1d87ca4fdecfc8b28512373bce0e59fdf1d264c2b2e981a7ac1471bd8c3e48cfda94ae7d2971fa01920485cb2d755a3dc6a51607202541160da0bc
 MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb
diff --git a/app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch
index a321b1d714b8..a321b1d714b8 100644
--- a/app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch
+++ b/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch
diff --git a/app-emulation/free42/files/free42-2.0.15-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch
index 7642316920f4..7642316920f4 100644
--- a/app-emulation/free42/files/free42-2.0.15-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch
diff --git a/app-emulation/free42/files/free42-2.0.6-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.6-fix-build-intel-lib.patch
deleted file mode 100644
index 6464714a001d..000000000000
--- a/app-emulation/free42/files/free42-2.0.6-fix-build-intel-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
---- a/gtk/build-intel-lib.sh	2017-04-01 20:02:45.000000000 +0200
-+++ b/gtk/build-intel-lib.sh	2017-04-04 13:55:43.719038089 +0200
-@@ -4,7 +4,7 @@
- cd IntelRDFPMathLib20U1
- patch -p0 <../intel-lib-linux.patch
- cd LIBRARY
--make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
-+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
- mv libbid.a ../../gcc111libbid.a
- cd ../..
- ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
diff --git a/app-emulation/free42/files/free42-2.0.6-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.6-fix-makefile.patch
deleted file mode 100644
index d64efb21a6d9..000000000000
--- a/app-emulation/free42/files/free42-2.0.6-fix-makefile.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nuar a/gtk/Makefile b/gtk/Makefile
---- a/gtk/Makefile	2017-04-01 20:02:45.000000000 +0200
-+++ b/gtk/Makefile	2017-04-04 13:59:04.969034463 +0200
-@@ -15,11 +15,11 @@
- # along with this program; if not, see http://www.gnu.org/licenses/.
- ###############################################################################
- 
--CFLAGS = -MMD \
-+CFLAGS := -MMD \
- 	 -Wall \
- 	 -Wno-parentheses \
- 	 -Wno-write-strings \
--	 -g \
-+	 -Wno-error=narrowing \
- 	 -I/usr/X11R6/include \
- 	 $(shell pkg-config --cflags gtk+-2.0) \
- 	 -DVERSION="\"$(shell cat ../VERSION)\"" \
-@@ -27,21 +27,25 @@
- 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
- 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
- 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
--	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
-+	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
-+	 ${CFLAGS}
- 
--CXXFLAGS = $(CFLAGS) \
-+CXXFLAGS := $(CFLAGS) \
- 	 -fno-exceptions \
- 	 -fno-rtti \
--	 -D_WCHAR_T_DEFINED
-+	 -D_WCHAR_T_DEFINED \
-+	 ${CXXFLAGS}
- 
--LDFLAGS = -L/usr/X11R6/lib
--LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
-+MYLDFLAGS = -L/usr/X11R6/lib
-+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
- 
- ifeq "$(shell uname -s)" "Linux"
--LDFLAGS += -Wl,--hash-style=both
-+MYLDFLAGS += -Wl,--hash-style=both
- LIBS += -lpthread
- endif
- 
-+MYLDFLAGS += ${LDFLAGS}
-+
- SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
- 	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
- 	core_commands3.cc core_commands4.cc core_commands5.cc \
-@@ -83,7 +87,7 @@
- endif
- 
- $(EXE): $(OBJS)
--	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
-+	$(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
- 
- $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
- 
diff --git a/app-emulation/free42/free42-2.0.15.ebuild b/app-emulation/free42/free42-2.0.17.ebuild
index ce44a72c5aed..ce44a72c5aed 100644
--- a/app-emulation/free42/free42-2.0.15.ebuild
+++ b/app-emulation/free42/free42-2.0.17.ebuild
diff --git a/app-emulation/free42/free42-2.0.6.ebuild b/app-emulation/free42/free42-2.0.6.ebuild
deleted file mode 100644
index e46232096899..000000000000
--- a/app-emulation/free42/free42-2.0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="http://thomasokken.com/free42/"
-SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa"
-
-DEPEND="dev-libs/atk
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXmu"
-
-S="${WORKDIR}/${MY_PV}"
-
-src_prepare() {
-	default
-	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
-		"${S}/gtk/shell_main.cc" || die
-	epatch "${FILESDIR}"/${P}-fix-makefile.patch
-	epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
-}
-
-src_install() {
-	dodoc CREDITS HISTORY README TODO
-	dobin gtk/free42dec
-}
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index 83b7e0e8c40a..0e4c8550616e 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,5 +1,5 @@
-DIST fuse-1.4.0.tar.gz 1652821 BLAKE2B b7d8c5cd8c5fb13e077029eeee6283c9d2a114057c83e29bacc1d99933b338011ce255b5df34b6039bcf03410af46bf586cb6d6ec038d53b8e83bad2308d2ed1 SHA512 e5d0e65820f54d0ac0447d50aa89ea4ba3e6bb717e270ae813c640a9b36fe015c68f194edacb5cbe8899ee7893c30cab4493ed297919e962e722e9d3e1f72001
 DIST fuse-1.5.0.tar.gz 1619748 BLAKE2B 6ffbea1c7a6572f2cdd3d293a438f6e37da2eadf299396358bed2e65db3aa9720333b62b28b4f0064ec5434c99a6a0b790737230f8ec0c01f96e50f594305bd1 SHA512 c13fdef6b23377e7d2b53e7f5b2db01447d12eafc0b9114fd8b83cd5058964a655a720810ab7dc6a6e1a1d9a33ffc787b5e46bf54df1259f4ba0ff78c3189421
-EBUILD fuse-1.4.0.ebuild 1507 BLAKE2B db532c1f3e39fda1363069297ad6a78a570affef437d7ad208411f413c32e25884f29e6be80b6d684c8db57bfdf78def7f4a6d82bf76f46cfd836a80c7623bbc SHA512 e2ad4dc8e36405cd791d631897f2da902f2e90550383d06572d027f1e21d6193036b82367290329e60a8c570a0999158cedef60cf22d80195998f77a0b1e190b
+DIST fuse-1.5.1.tar.gz 1623081 BLAKE2B 4b6cf747d15bc2d33a0baba88254a08187e8a615564236835da19d32f9afb312d5a5c90ac07a88d904019626b153546ecd8cd09b88fa16731af94ea54cd0e346 SHA512 d5f5b8a0e61f298a955450de208b29f8ab4fc0133c5c58e596f36f3834c088c946e19d7437dd1a6e73a89d32dcaf6ca9ce0fed8ec310c37aa6a6568be482abe4
 EBUILD fuse-1.5.0.ebuild 1507 BLAKE2B fe247d5184e1a7e62824e04e09befd94294a673405cdbc0e0ece8e04f55d8aa52299050ff866ecace56d6f606fc884803a21f6628974c6d4962d69a61414925d SHA512 46c71560082e570e34eeb6d04ff6c2352e2f0cc8a2564879ef7737de7678cd075463524e5b2ba6d136d975a1391ff0ebc07f8f646716330751df560ce56db5f9
+EBUILD fuse-1.5.1.ebuild 1492 BLAKE2B d96f93cb03f97bda03e8d6e5fc7641befc064ece6d18a43cf9c0c00641db04ddc19883d0e995eee0b2e5a227fd9f89f0658d1fe4b42882472a296953523642ce SHA512 153e8cc20469ba0c19dfd1bd9935349c6ea285c56def18fc90cc08c34fa377e7208ec5e694891ff0dc5798836d7952aa11a09620ba4dafbc5696f22b876a5c8b
 MISC metadata.xml 463 BLAKE2B 6d6d3856e855523101aec81d8643c3b21dfe9748c34953fcaa478e60ace0122ac3f307c2f21bd41e952a953b37488f3649c57e12549520e1b3fe9985c9f6c1f7 SHA512 dce77f13c89a1e08aeba516eef1c8ca0a6fcf43167ed309971181ff133f221a50a73f6588ce4556e3cfadf62df8f00eb4c8d001acb5062909d7cb9bfcf3f6a80
diff --git a/app-emulation/fuse/fuse-1.4.0.ebuild b/app-emulation/fuse/fuse-1.5.1.ebuild
index 818bbdff2bea..4b8b2fa01d8e 100644
--- a/app-emulation/fuse/fuse-1.4.0.ebuild
+++ b/app-emulation/fuse/fuse-1.5.1.ebuild
@@ -15,7 +15,7 @@ IUSE="alsa ao fbcon gpm gtk joystick memlimit png sdl svga X xml"
 # Only one UI back-end can be enabled at a time
 REQUIRED_USE="^^ ( X fbcon gtk sdl svga )"
 
-RDEPEND=">=app-emulation/libspectrum-1.4.0
+RDEPEND=">=app-emulation/libspectrum-1.4.1
 	dev-libs/glib:2
 	alsa? ( media-libs/alsa-lib )
 	ao? ( media-libs/libao )
@@ -36,29 +36,29 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README THANKS )
 
 src_configure() {
-	local guiflag
+	local myconf=(
+		--without-win32
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with gpm)
+		$(use_with joystick)
+		$(use_enable joystick ui-joystick)
+		$(use_enable memlimit smallmem)
+		$(use_with png)
+		$(use_with xml libxml2)
+	)
 
 	if use gtk; then
-		guiflag=""
+		:
 	elif use sdl; then
-		guiflag="--with-sdl"
+		myconf+=("--with-sdl")
 	elif use X; then
-		guiflag="--without-gtk"
+		myconf+=("--without-gtk")
 	elif use svga; then
-		guiflag="--with-svgalib"
+		myconf+=("--with-svgalib")
 	elif use fbcon; then
-		guiflag="--with-fb"
+		myconf+=("--with-fb")
 	fi
 
-	econf \
-		--without-win32 \
-		${guiflag} \
-		$(use_with alsa) \
-		$(use_with ao libao) \
-		$(use_with gpm) \
-		$(use_with joystick) \
-		$(use_enable joystick ui-joystick) \
-		$(use_enable memlimit smallmem) \
-		$(use_with png) \
-		$(use_with xml libxml2)
+	econf "${myconf[@]}"
 }
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index 7fec496a9185..a7f27060c2a3 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,5 +1,7 @@
+DIST kompose-1.10.0.tar.gz 5232838 BLAKE2B 145938e68ede3f956cf0a2c08066ec49257527357c1c032d265b39fc00f4c07da26fcc90f1e8999a755345715332dfb5f6df82f15e817c8460f2c9038ebbc1a5 SHA512 578348c5907344b47bac17b9d6a9d8c4ba5cce9fbe72ad3b65af60dcfb985bd39ee2973308dbfa45d4bd78467fa330621c16624cc7d92287b943ac02d0ae3e45
 DIST kompose-1.8.0.tar.gz 5230179 BLAKE2B 47f2770eb527bb3b40e1734f9e5173ce4de55ef55460f624dcb22374d94d4a4ae650d82db6508dd0e441535c03da8a0f61d7600425e44604b580ecff493ba987 SHA512 4e618f9e9adc65abd2be503dd28b6d7761945a99788e910cc072d04b6088e953152f9354fe168fe7bf22252f698b957e2cc23440d242bed62c4b7415dc513e33
 DIST kompose-1.9.0.tar.gz 5229558 BLAKE2B 41c168dea0311ea4663b4056ec10a0a446f0c714a0d32cb6e75d4cb680335acb31d164d390fbde487856c268fb671a7d2e4238de2a542fd54e64e9c3ce693d41 SHA512 72d575bb79fea88de54740ed7a4809b68781b3473431c2c11213a32b9ff3dc9340ef49ea8009ff6f7f16dce8f36565a91b8c28ab45bc860d53075f42f3fde66b
+EBUILD kompose-1.10.0.ebuild 889 BLAKE2B 2585d8d8f56f0e83512947d0808ce46bb61541d30bc426a661567730cba76bebc8e25d2222320aa889945ed18935230e41ad041106496b9d2a7ad8afea09dea7 SHA512 adb04fe9f1f4375e08bfe42c701714f59d37dbe32dd956856744d12abca9c60209241f91e4669fa14842596582fa0a3bf078500ee464ee1a475e94f328fcfb74
 EBUILD kompose-1.8.0.ebuild 889 BLAKE2B 60e02b868aec4525aee7666909754fca33ac499f6f31148a67d6790f472ca4e033d1f7738b8a2af5bcefdc5d553c41aec56d546afdacb288f55d06eb917ea31a SHA512 86ab3ebd33ab93727adbf2018c0d6e65b49c7fc94295a55c15e3e1e002cef71af60b13de8e9c70f4efe5f4d4550852c3e024316f206d8b2b00861e4a3e77d028
 EBUILD kompose-1.9.0.ebuild 889 BLAKE2B 8e3ea67eb81683c57f537fa266b924e9622c591274277fc0574fe1f97eb834959cbca8eda861c1edc2bd848677f48739ab07e49cd2ec6d0ea9014e776aba7559 SHA512 5a112105fa803089f3f76dcd11db8d4a5f69b82dca857d99642b7e6d9ee6c2f52334c2c996542a1e1d9235a493b6fe5132efe2248ad55c3f80436d2a2e70bdd4
 MISC metadata.xml 328 BLAKE2B ad1e8cb1083ed13de1f3f341fdbe9bba7ba3ab4364c8c36c9e3b63f63688da6926fc6bebc9f72aada52dfac1a4834b11cb27eee04aaaae484192b8ed74214aa6 SHA512 e2091ec84a909ad6c2453bd832817461e39b7c355c28bd99c19d9e85dc4a621606c34066f596a68585c3762b6b156455ca012495c5c336b9ba929d163b923042
diff --git a/app-emulation/kompose/kompose-1.10.0.ebuild b/app-emulation/kompose/kompose-1.10.0.ebuild
new file mode 100644
index 000000000000..1ea7f4cafd75
--- /dev/null
+++ b/app-emulation/kompose/kompose-1.10.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/kubernetes/kompose"
+EGIT_COMMIT="v${PV}"
+KOMPOSE_COMMIT="8bb0907"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Tool to move from docker-compose to Kubernetes"
+HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+RESTRICT="test"
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_KOMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index c2bde5478579..6c5d56a1e849 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -14,8 +14,8 @@ DIST VirtualBox-5.2.6.tar.bz2 118530572 BLAKE2B 19d32a9252e9594a4c09828bc2bc739c
 DIST VirtualBox-5.2.8.tar.bz2 118500065 BLAKE2B 64d0cc0f928d224332f59e7966ee1bed8adcf097d27c577b6ecea5cbf203e170e38acca9f2371d6d7aa11f63b73e705b43a0516ccbe5993171f928406b8a3876 SHA512 49a3bd1c60d2c4cbd3799ece5fbfe15d9b6a00c5af9692478a1365a8eb4975228410e17dba24a388c0cf5387cb79fb7492feb4e6b2f531bc17322c3d61de7887
 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
 DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b
-EBUILD virtualbox-5.1.32.ebuild 13927 BLAKE2B cdadc8c398f855ce9773e445c564dea60b3c88e299fd32499ce701419362ee7baa295cec9c29fa20eedb887e975d7e586e833c1cb65a5f0b3570e8a2664eafa8 SHA512 c8885403b6f3ea6eb8385efa4fcd995d9cdf4292c61b0e1edb6e65c82d4399468f2fe7b64d6a24068018f5a9b66c7c36a092a43382494ed132a6bf160e0f60d7
-EBUILD virtualbox-5.1.34.ebuild 13727 BLAKE2B 98edeb61127894338ee622737b3c06afbf98dbc1f99792e7936eee3bd43cfff801420acbb774621eccdd2c6fec58e2e2048c784d5fa6988cc2bf33292f030578 SHA512 45d93eb33647c4e41ef107249596d4053abe70fd49caecd4e6318db67a90838d7691a6c976df0e91ff64c555ef97d56589a587701a8181c3c0f59ee5dd76fbc2
-EBUILD virtualbox-5.2.6.ebuild 13918 BLAKE2B 0746133fba41693e2e207b9191d85f1e4d8693294108635d56b963e460faa05b144ed8647faf7081a4bd4afd7d4fb4a43729b5a2fdbbbb0d08433d785c9875ec SHA512 61007576f8bda9bfe340f8319f34e7c3e6392b2705dea91e2ef5b42bbaa7ef3c77d0e005f11356c72ff5937241e5d8768a15ac6586a82c96c38c6259e0461f6a
-EBUILD virtualbox-5.2.8.ebuild 13716 BLAKE2B 9214525fb5f4ef93e866e6ad81e6c52934535ce42b5c83492044974136a932fcca60fcbe043aef20a47a5fc9c2f3c26ad71ff4346d5fc6eba25c47b64b2cfb34 SHA512 2d13c4b650fa5b2d5b87c7036c8f92d5cecc507e5b4c6c093155361a8d30f6bd4a35dc0b9c2aa8cbc9dfee91b2b7f17bbe1142465bc0b885a90b3dffc39d7bda
+EBUILD virtualbox-5.1.32.ebuild 13944 BLAKE2B 4c0da01774ca4fae3b3ecffdf6739282d268ddcf8b916173c946d1a4977f00dfa012dedeb818f6cfdd28197bd6410bb0cfeb14a5e752643d0c90110b90293b27 SHA512 2e8dc871197657b8783d032188a598e09366850ed6aba92d118f6e5789e443ccecf366c4dd160eaa189cb06919076ec73c1bdbb3045b50a2a7ca0c5e318fc61c
+EBUILD virtualbox-5.1.34.ebuild 13744 BLAKE2B 106f8f073d45142839343e6f8332cd4c2989096195e7437f34985a3ace51813a36a4b6cbbfeedaad1cc4c4e449d78baeade80291332a69419be7113e93c65675 SHA512 5530ec6aee0f7a9bc83c978a03ca4b63b18e7ed2e58f95bb481f959d666b7c75543604b00dd6912801a9c6d84ec26dd6427e69edfdb08e19018cf0e0a4162ad8
+EBUILD virtualbox-5.2.6.ebuild 13935 BLAKE2B 497dec1a702f7789ab816dbb1cdec0761f03d01c56e34fe0ef66c1829c19a6235126d11d90c9b18df3407f73477c51c50af9fbe6d7533e1ffa31a8bdac88a4b3 SHA512 eea3c9e165fe2621e262d7506ff790fffe39c77cf485b678838ff38780ae2bcfa082c961eee4768622b5a2ecd2432e8211e38751223a58797f2d63efc62f4b4f
+EBUILD virtualbox-5.2.8.ebuild 13733 BLAKE2B a9633503cbe5c2ca2f981e31282a900c99501d8b4bde8803c75e7ee55d9cd1d00a966751e859c8bacfb7f5e0e9d5efc7d7c20c3fd53259f992c6bd284d5b5eb1 SHA512 509b0dc881655571fd977ee7f6c764d4163f684db1518e510b9fb89567e6f94bcdde9e815971b4de97d8aded6fd4c17f74a6a2efaa77a74966f68951a68ec907
 MISC metadata.xml 886 BLAKE2B b8d7691c820ac4d8b0aa2033037a9229ebf68ba005b5c870e6d14dee4fbb9b5c0992904223caeb869fc265d48c57cd7f486d628cc4018cc018e8e32999175df3 SHA512 954d38fbbf08cce200af437ee3a0167bd39b4554c53b93d8f8961ac16e21a173fe4c4271fa8bf0ce2e354437c066e0ab4133131b03dac6ffcc2c92564584d081
diff --git a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
index e45e584a3a8f..de534c5671c7 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
@@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 			x11-libs/libXinerama
 		)
 	)
-	java? ( >=virtual/jre-1.6:= )
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
@@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsextra
 	)
 	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
+	java? ( >=virtual/jdk-1.6 )
 	pam? ( sys-libs/pam )
 	pax_kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so
diff --git a/app-emulation/virtualbox/virtualbox-5.1.34.ebuild b/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
index e933a7f1041a..c23a8f3802a6 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
@@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 			x11-libs/libXinerama
 		)
 	)
-	java? ( >=virtual/jre-1.6:= )
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
@@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsextra
 	)
 	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
+	java? ( >=virtual/jdk-1.6 )
 	pam? ( sys-libs/pam )
 	pax_kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so
diff --git a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
index b1b10dbd4119..e6601c30c85b 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
@@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 			x11-libs/libXinerama
 		)
 	)
-	java? ( >=virtual/jre-1.6:= )
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
@@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsextra
 	)
 	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
+	java? ( >=virtual/jdk-1.6 )
 	pam? ( sys-libs/pam )
 	pax_kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so
diff --git a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild b/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
index 608ae644b8f1..40b4975b1e8c 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
@@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 			x11-libs/libXinerama
 		)
 	)
-	java? ( >=virtual/jre-1.6:= )
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
@@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsextra
 	)
 	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jre-1.6:= )
+	java? ( >=virtual/jdk-1.6 )
 	pam? ( sys-libs/pam )
 	pax_kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so