diff --git a/srcpkgs/cegui-data b/srcpkgs/cegui-data
deleted file mode 120000
index db9a547274f..00000000000
--- a/srcpkgs/cegui-data
+++ /dev/null
@@ -1 +0,0 @@
-cegui
\ No newline at end of file
diff --git a/srcpkgs/cegui-sample b/srcpkgs/cegui-sample
deleted file mode 120000
index db9a547274f..00000000000
--- a/srcpkgs/cegui-sample
+++ /dev/null
@@ -1 +0,0 @@
-cegui
\ No newline at end of file
diff --git a/srcpkgs/cegui/files/FindOpenGLES.cmake b/srcpkgs/cegui/files/FindOpenGLES.cmake
new file mode 100644
index 00000000000..eeeafd1c641
--- /dev/null
+++ b/srcpkgs/cegui/files/FindOpenGLES.cmake
@@ -0,0 +1,51 @@
+#.rst:
+# FindOpenGLES
+# ------------
+# Finds the OpenGLES2 library
+#
+# This will define the following variables::
+#
+# OPENGLES_FOUND - system has OpenGLES
+# OPENGLES_INCLUDE_DIRS - the OpenGLES include directory
+# OPENGLES_LIBRARIES - the OpenGLES libraries
+# OPENGLES_DEFINITIONS - the OpenGLES definitions
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_OPENGLES glesv2 QUIET)
+endif()
+
+if(NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded)
+  find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h
+                                 PATHS ${PC_OPENGLES_INCLUDEDIR})
+  find_library(OPENGLES_gl_LIBRARY NAMES GLESv2
+                                   PATHS ${PC_OPENGLES_LIBDIR})
+else()
+  find_library(OPENGLES_gl_LIBRARY NAMES OpenGLES
+                                   PATHS ${CMAKE_OSX_SYSROOT}/System/Library
+                                   PATH_SUFFIXES Frameworks
+                                   NO_DEFAULT_PATH)
+  set(OPENGLES_INCLUDE_DIR ${OPENGLES_gl_LIBRARY}/Headers)
+endif()
+
+find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OpenGLES
+                                  REQUIRED_VARS OPENGLES_gl_LIBRARY OPENGLES_INCLUDE_DIR)
+
+find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h
+                                PATHS ${PC_OPENGLES_INCLUDEDIR})
+
+if(OPENGLES_FOUND)
+  set(OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY})
+  if(OPENGLES3_INCLUDE_DIR)
+    set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR} ${OPENGLES3_INCLUDE_DIR})
+    set(OPENGLES_DEFINITIONS HAS_GLES=3)
+    mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES3_INCLUDE_DIR OPENGLES_gl_LIBRARY)
+  else()
+    set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR})
+    set(OPENGLES_DEFINITIONS HAS_GLES=2)
+    mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY)
+  endif()
+endif()
+
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index 78f0c103ba7..d2cbcc26a82 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,41 +1,47 @@
 # Template file for 'cegui'
 pkgname=cegui
 version=0.8.7.20190225
-revision=2
+revision=3
 _githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
 wrksrc="${pkgname}-${_githash}"
 build_style=cmake
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND \
+ -DCEGUI_BUILD_RENDERER_OPENGL=ON \
+ -DCEGUI_SAMPLES_ENABLED=OFF"
 make_build_args="all html"
 hostmakedepends="graphviz doxygen dejavu-fonts-ttf gd glm perl pkg-config"
-makedepends="MesaLib-devel SDL2-devel SDL2_image-devel libxml2-devel boost-devel
- devil-devel glfw-devel ois-devel silly-devel fribidi-devel lua53-devel minizip-devel
+makedepends="libglvnd-devel SDL2-devel SDL2_image-devel libxml2-devel boost-devel
+ devil-devel glfw-devel glm ois-devel silly-devel fribidi-devel lua53-devel minizip-devel
  $(vopt_if irrlicht irrlicht-devel)
  $(vopt_if ogre libogre-devel)
  $(vopt_if python python-devel)
  $(vopt_if gtk gtk+-devel)"
-depends="${pkgname}-data"
 short_desc="Crazy Eddie's Graphical User Interface"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MIT"
 homepage="http://cegui.org.uk/"
 distfiles="https://github.com/cegui/cegui/archive/${_githash}.tar.gz"
 checksum=70156257313b81d068d6592887157dd16b91d7bc0dfdcba02a96ed371d329e64
+replaces="cegui-data cegui-sample"
 
 build_options="gtk irrlicht ogre python"
 desc_option_gtk="Enable support for GTK2"
 desc_option_irrlicht="Enable support for Irrlicht"
 desc_option_ogre="Enable support for Ogre"
-build_options_default="gtk irrlicht"
+build_options_default="gtk python"
 
 if [ -z "$CROSS_BUILD" ]; then
-	# XXX: boost-python is not available when cross building
-	build_options_default+=" python"
+	# irrlicht interface fails to cross compile
+	build_options_default+=" irrlicht"
 fi
 
 # Silence log output
 CXXFLAGS="-Wno-unused-parameter -Wno-deprecated-copy"
 
 pre_configure() {
+	# Use a FindOpenGLES.cmake which works
+	cp -p ${FILESDIR}/FindOpenGLES.cmake cmake
+
 	# Use /usr/lib instead of /usr/lib64 or /usr/lib32
 	sed -i ${wrksrc}/CMakeLists.txt \
 		-e "s;lib64;lib;g" \
@@ -45,7 +51,7 @@ pre_configure() {
 	sed -i -e "s/-std=c++03//" CMakeLists.txt
 }
 post_install() {
-	local _ver2=0.8
+	local _ver2=${version%.*.*}
 	vlicense COPYING
 	ln -srv ${DESTDIR}/usr/lib/{cegui-${_ver2},}/libCEGUICoreWindowRendererSet.so
 	ln -srv ${DESTDIR}/usr/lib/{cegui-${_ver2},}/libCEGUISILLYImageCodec.so
@@ -53,31 +59,13 @@ post_install() {
 	ln -srv ${DESTDIR}/usr/lib/{cegui-${_ver2},}/libCEGUIExpatParser.so
 	ln -srv ${DESTDIR}/usr/lib/{cegui-${_ver2},}/libCEGUILibXMLParser.so
 }
-cegui-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/cegui-${version%%.*}
-	}
-}
 cegui-doc_package() {
 	short_desc+=" - documentation"
-	archs=noarch
 	pkg_install() {
 		vmkdir usr/share/doc/${sourcepkg}
 		vcopy ${wrksrc}/build/doc/doxygen/html usr/share/doc/${sourcepkg}
 	}
 }
-cegui-sample_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - example"
-	pkg_install() {
-		vmove usr/bin
-		vmove "usr/lib/cegui-0.8/libCEGUI*Demo.so"
-		vmove "usr/lib/cegui-0.8/libCEGUI*Demo6.so"
-		vmove "usr/lib/cegui-0.8/libCEGUI*Minesweeper.so"
-	}
-}
 cegui-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"