8 files changed, 16 insertions, 134 deletions
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 2027965cadfa..b87ad3fe0c00 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index 83dbbe3940fb..dcec0d57e0b7 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -1,9 +1,4 @@
-AUX cegui-0.6.2b-dups.patch 660 BLAKE2B 8e2525f8098238ceda088a4a52c743e1a86c731581e54b4a96881ff7875232ec7aedae456e787f9536dec2c97d52bc619d90470efbb8484b549867bbb2cb6cea SHA512 4f73e930c0476a895687845789ccd59f53986242c61662b87d5b165df43f763dafc97c79f5b590fa5f1cc459c571d4f77843fec893efde1237d4f2e50a2a239b
-AUX cegui-0.6.2b-gcc43.patch 241 BLAKE2B 42d591bd88117627694ec28485fd1bc42bbabdaf04f5d9f66a55ef75aae7f97fd6573e47bb78851795e83dc61bfe96a849b5a9bc27411fbea0595f98f97816da SHA512 1f0eed0154d9b4383b3e8e60ba75de6a873ff5aafe320a1cf85efb775997d53416febdd3e15b2626f533fc1d25569f615e32d1b243e539db92ee4e466e4c6ff3
-AUX cegui-0.6.2b-gcc46.patch 296 BLAKE2B 995ef2ccb5dd7140b9fcd0346120f5149464e589f5633849c903d9c3a46f8f044017a2f2f79c0b86258d7d62d42f7fac6e9ccab1740bd106cc6e131e125dab32 SHA512 64d0620dca217c3175813e037775c7202a4efcfa15e7190cbef93bdb52380e2ca6cf8e475664c659ac0b44feaa2b3ccade14aafccb870d6a5a51009a518e8b41
-DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 BLAKE2B d8638de6c13a6ae645c90345fad84dfd6a333d4e8047ccf67359e92b834da46d19612fce87eb0a071f35e4697eb9f2caf795e339f27d27a21b38b32eb5ffb101 SHA512 56ded923f21f18d837d71425e06fe8675a2efa979edde461a9e4e558c213cbb79ff8eeb576211da6ade56526ccdd9644a7a45b3619058615388e3882f96b9fb4
-DIST CEGUI-0.6.2b.tar.gz 2628081 BLAKE2B 0f6d8e50e67dd849624a9c90fd050b0befe4f6a90a446a72d91ece853d291a99221d11f7dc891874958421d129c4d9f1059dccb276b37be050bfc8f5ca35528a SHA512 52ed7e7a97024138af957815a396dda74b650e7c53542d2d48c5eb95335bec270abca3685c49b05078f4338079334df6bfbcec75e9b7eb21ee40bdbff5f57b20
+AUX cegui-0.8.7-icu-59.patch 444 BLAKE2B 7ba31c1a856638be317c0d3166159bea14be9f3ccc79e8b361907e9ba1bf7c07a77ba5cf76a49f33d7ceca8d6aedf659f7bdd2826cc1eec3b72352a8a0ed6d7e SHA512 6a8838e8a6ddfb5b73bb765470185530a81ffeaec9d090e1038d317aca800a987b08d3a82744c0b77266d2f351ae2668bada741b26ac303be052071f9daf3408
 DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56
-EBUILD cegui-0.6.2b.ebuild 2241 BLAKE2B f1fd131203e1e899d31eb413aafa59bb8b67a7694039dc76311c304d2e86fed55a1fd225812ffed6b02425ae7f684043c9e3a1ed4e3a802917738f7ccff5a020 SHA512 b0b9cfafada47cebb000723c6e1d03696157972ee4b0ead98be72e440da643462d88e408209d7ca310c3ef4a84c101bf781667febe0a06ba607f377a6f61f79d
-EBUILD cegui-0.8.7.ebuild 3177 BLAKE2B eca32a620a3cb0f328a6168342012279148cf1a1f8671018476d328ce59612467a91e7234c363d672ed3316894d1b0d35376bed2729358506d96c4ab48c0f2a2 SHA512 32b9e5496adfa3b20ebb69e794b98caed0fef3e73aed9b182b8aa2d2ae01e0ddad3d18dc1c9f28abf4f3e02fdde3f40b53c8ee17dff7ee963a98b7184e8963a7
+EBUILD cegui-0.8.7.ebuild 3222 BLAKE2B 8313bb7d2c46f774fb4106f0c3fe52e73bce957d7168a772d9621f82e3cbb83335e061a53e65a1704076e07a28685ab62417d9c41a8533dcfb93ccf851082e22 SHA512 6ee93d44cfe059b5db49a34669daf1741e7e847ad01def67c9afcb5162a079cc4fe0d8907e5e0d3815f3ac16cc3c6719bb5224085aad58beef55f71f2d07e496
 MISC metadata.xml 803 BLAKE2B da9534a051925be6cd6d285ce3335c65ba799481840f95aadedb2f81f7a06e05253e8949bf77e7626635437bc5ad5b91af11d6aa452f3524669efdd6216b3bd6 SHA512 47d0eeed54ab5b192051b976a5e1a9790c9e0321753cdc8da73fda4131ac30e40fb57f418418ea7b2bbb30041f76def1a79803d699962488ea4dc1dad50c4996
diff --git a/dev-games/cegui/cegui-0.6.2b.ebuild b/dev-games/cegui/cegui-0.6.2b.ebuild
deleted file mode 100644
index 0913935294eb..000000000000
--- a/dev-games/cegui/cegui-0.6.2b.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=CEGUI-${PV%b}
-DESCRIPTION="Crazy Eddie's GUI System"
-HOMEPAGE="http://www.cegui.org.uk/"
-SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}b.tar.gz
-	doc? ( mirror://sourceforge/crayzedsgui/${MY_P}-DOCS.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug devil directfb doc examples expat irrlicht lua opengl xerces-c xml"
-
-RDEPEND="dev-libs/libpcre
-	media-libs/freetype:2
-	devil? ( media-libs/devil )
-	directfb? ( dev-libs/DirectFB )
-	expat? ( dev-libs/expat )
-	irrlicht? ( dev-games/irrlicht )
-	lua? (
-		dev-lang/lua:0
-		dev-lua/toluapp
-	)
-	opengl? (
-		virtual/opengl
-		media-libs/freeglut
-		media-libs/glew:=
-	)
-	xerces-c? ( dev-libs/xerces-c )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-dups.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
-	sed -i \
-		-e 's/ILvoid/void/g' \
-		ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp || die
-	if use examples ; then
-		cp -r Samples Samples.clean || die
-		rm -f $(find Samples.clean -name 'Makefile*') || die
-		rm -rf Samples.clean/bin || die
-	fi
-	eautoreconf #220040
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable devil) \
-		$(use_enable directfb directfb-renderer) \
-		$(use_enable examples samples) \
-		$(use_enable expat) \
-		$(use_enable irrlicht irrlicht-renderer) \
-		$(use_enable lua external-toluapp) \
-		$(use_enable lua lua-module) \
-		$(use_enable lua toluacegui) \
-		$(use_enable opengl external-glew) \
-		$(use_enable opengl opengl-renderer) \
-		$(use_enable xerces-c) \
-		$(use_enable xml libxml) \
-		--enable-static \
-		--enable-tga \
-		--enable-tinyxml \
-		--disable-corona \
-		--disable-dependency-tracking \
-		--disable-external-tinyxml \
-		--disable-freeimage \
-		--disable-samples \
-		--disable-silly \
-		--without-gtk2 \
-		--without-ogre-renderer
-}
-
-src_install() {
-	default
-	if use doc ; then
-		dohtml -r documentation/api_reference
-		dodoc documentation/*.pdf
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/Samples
-		doins -r Samples.clean/*
-	fi
-}
diff --git a/dev-games/cegui/cegui-0.8.7.ebuild b/dev-games/cegui/cegui-0.8.7.ebuild
index 95a092f74924..179c88599c41 100644
--- a/dev-games/cegui/cegui-0.8.7.ebuild
+++ b/dev-games/cegui/cegui-0.8.7.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
@@ -56,6 +56,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	opengl? ( media-libs/glm )"
 
+PATCHES=( "${FILESDIR}"/${P}-icu-59.patch )
+
 src_configure() {
 	# http://www.cegui.org.uk/mantis/view.php?id=991
 	append-ldflags $(no-as-needed)
diff --git a/dev-games/cegui/files/cegui-0.6.2b-dups.patch b/dev-games/cegui/files/cegui-0.6.2b-dups.patch
deleted file mode 100644
index a4d80c4347dc..000000000000
--- a/dev-games/cegui/files/cegui-0.6.2b-dups.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur _orig_CEGUI-0.6.2/include/elements/Makefile.am CEGUI-0.6.2/include/elements/Makefile.am
---- _orig_CEGUI-0.6.2/include/elements/Makefile.am	2008-01-02 15:26:05.000000000 +0100
-+++ CEGUI-0.6.2/include/elements/Makefile.am	2010-07-11 13:12:16.786338068 +0200
-@@ -21,8 +21,6 @@
-                      CEGUIItemListBaseProperties.h \
-                      CEGUIItemListbox.h \
-                      CEGUIItemListboxProperties.h \
--                     CEGUIListHeader.h \
--                     CEGUIListHeaderProperties.h \
-                      CEGUIListbox.h \
-                      CEGUIListboxItem.h \
-                      CEGUIListboxProperties.h \
diff --git a/dev-games/cegui/files/cegui-0.6.2b-gcc43.patch b/dev-games/cegui/files/cegui-0.6.2b-gcc43.patch
deleted file mode 100644
index 09695626ceff..000000000000
--- a/dev-games/cegui/files/cegui-0.6.2b-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- RendererModules/directfbRenderer/directfb-renderer.h
-+++ RendererModules/directfbRenderer/directfb-renderer.h
-@@ -28,6 +28,7 @@
- #include "CEGUIBase.h"
- #include <directfb.h>
- 
-+#include <algorithm>
- #include <vector>
- #include <list>
- 
diff --git a/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch b/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
deleted file mode 100644
index 88f8fccfc206..000000000000
--- a/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cegui/include/CEGUIString.h.old	2011-04-27 14:33:25.862856070 +0200
-+++ cegui/include/CEGUIString.h	2011-04-27 14:33:49.780351908 +0200
-@@ -34,6 +34,7 @@
- #include <string>
- #include <string.h>
- #include <stdexcept>
-+#include <cstddef>
- 
- // Start of CEGUI namespace section
- namespace CEGUI
diff --git a/dev-games/cegui/files/cegui-0.8.7-icu-59.patch b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
new file mode 100644
index 000000000000..e64dfc97ab59
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,7 +72,7 @@
+ 
+ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+ elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
+     set (CMAKE_C_STANDARD_REQUIRED TRUE)
+     set (CMAKE_C_STANDARD "99")