From e52e9d9cbf833b576eaff96ecc830be9d0399eb7 Mon Sep 17 00:00:00 2001
From: Daniel Robbins <drobbins@funtoo.org>
Date: Sun, 26 Aug 2018 13:27:40 +0000
Subject: [PATCH] updates

merged:

  flora: 12c509cc54c54010dba6675b55819d11dbe59228
  faustoo: 83434b2e31da59cbb31b77dc8365b39649ee1a66
  fusion809: b25b658265e78de7b6b3fa50a08675d32fc1fc1f
  gentoo-staging: d2da2335a1bdb1614576a7576b6b557a2ce1042e
  kit-fixups: eddf5cfd899b5723ed4871ffdfcc2e5028a531b2
---
 games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild | 5 ++---
 games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild            | 2 +-
 games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild    | 5 ++---
 metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1    | 6 +++---
 metadata/md5-cache/games-fps/duke3d-data-1.0-r4            | 4 ++--
 metadata/md5-cache/games-strategy/liquidwar6-0.4.3681-r1   | 6 +++---
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
index 519b304f6..56747f703 100644
--- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
+++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,13 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# Drop the libtool dep once libltdl goes stable.
 RDEPEND="virtual/opengl
 	x11-libs/libSM
 	media-libs/libsdl[joystick,opengl,video,X]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
-	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )"
+	dev-libs/libltdl:0"
 DEPEND="${RDEPEND}
 	x11-libs/libXt"
 
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
index 100efef98..417791365 100644
--- a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
@@ -18,7 +18,7 @@ IUSE="gog"
 REQUIRED_USE="^^ ( cdinstall gog )"
 RESTRICT="mirror bindist gog? ( fetch )"
 
-RDEPEND="|| ( games-fps/eduke32 games-fps/duke3d )"
+RDEPEND="games-fps/eduke32"
 DEPEND="gog? ( app-arch/unzip )"
 
 S=${WORKDIR}
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
index c5881059e..cd8f2f062 100644
--- a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
+++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
 
 # yes, cunit is rdep
-# Drop the libtool dep once libltdl goes stable.
 RDEPEND="dev-db/sqlite:3
 	dev-libs/expat
 	dev-scheme/guile:12
@@ -30,7 +29,7 @@ RDEPEND="dev-db/sqlite:3
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-ttf
 	net-misc/curl
-	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+	dev-libs/libltdl:0
 	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg:0
diff --git a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1 b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
index 8d4b20ce3..70dec9029 100644
--- a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
+++ b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) x11-libs/libXt >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] dev-libs/libltdl:0 x11-libs/libXt >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=SDL OpenGL pinball game
 EAPI=5
 HOMEPAGE=http://pinball.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) games-misc/games-envd
+RDEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] dev-libs/libltdl:0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pinball/pinball-0.3.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	5762a63b406bb5064ee0c6060a8f07e3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	5ac2a138d0b33354b764d84f9e835db8	eutils	1fb064d93b3ffd05c2fb19ef430a4aa1	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=528076a65f4023116cc782ed062c965a
+_md5_=4b737ae2804b21f5d8f2092b66ebb9ca
diff --git a/metadata/md5-cache/games-fps/duke3d-data-1.0-r4 b/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
index 40b206325..02ee37c9d 100644
--- a/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
+++ b/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
@@ -7,10 +7,10 @@ IUSE=gog cdinstall
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=DUKE3D gog? ( GOG-EULA )
 PROPERTIES=cdinstall? ( interactive )
-RDEPEND=|| ( games-fps/eduke32 games-fps/duke3d )
+RDEPEND=games-fps/eduke32
 REQUIRED_USE=^^ ( cdinstall gog )
 RESTRICT=mirror bindist gog? ( fetch )
 SLOT=0
 SRC_URI=gog? ( gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh )
 _eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	5ac2a138d0b33354b764d84f9e835db8	eutils	1fb064d93b3ffd05c2fb19ef430a4aa1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=f56b9dcb10364968216f459776019a0b
+_md5_=03ac9e49ee50bc951c7afe36819ff043
diff --git a/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681-r1 b/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681-r1
index a39e78183..201a31c33 100644
--- a/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681-r1
+++ b/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile:12 dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) dev-lang/perl nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile:12 dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl dev-libs/libltdl:0 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) dev-lang/perl nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Unique multiplayer wargame between liquids
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/liquidwar6/
 IUSE=doc gles2 gtk libcaca +maps nls +ogg openmp readline test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile:12 dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) games-misc/games-envd
+RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile:12 dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl dev-libs/libltdl:0 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-0.4.3681.tar.gz maps? ( http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-extra-maps-0.4.3681.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	5762a63b406bb5064ee0c6060a8f07e3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	5ac2a138d0b33354b764d84f9e835db8	eutils	1fb064d93b3ffd05c2fb19ef430a4aa1	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9fe6bf574519c5cb06ed930c4c6dcb20
+_md5_=cb6f623e1ce5bab72560afa91fec234a