summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-09-09 14:19:08 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-09-09 14:19:08 +0000
commitbf4fb652c42b799117761732cb7cf24431e72261 (patch)
treed2d6462d649c5a8994bc538bfc576e2af46cb30a /games-action
parentBump EAPI (diff)
downloadgentoo-2-bf4fb652c42b799117761732cb7cf24431e72261.tar.gz
gentoo-2-bf4fb652c42b799117761732cb7cf24431e72261.tar.bz2
gentoo-2-bf4fb652c42b799117761732cb7cf24431e72261.zip
rm old
(Portage version: 2.2.12-r1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'games-action')
-rw-r--r--games-action/minetest/ChangeLog13
-rw-r--r--games-action/minetest/files/minetest-0.4.7-as-needed.patch36
-rw-r--r--games-action/minetest/files/minetest-0.4.7-jthread-option-and-pkgconfig.patch83
-rw-r--r--games-action/minetest/files/minetest-0.4.7-lua-luajit-option.patch49
-rw-r--r--games-action/minetest/files/minetest-0.4.7-shared-irrlicht.patch23
-rw-r--r--games-action/minetest/files/minetest-0.4.8-as-needed.patch35
-rw-r--r--games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch56
-rw-r--r--games-action/minetest/files/minetest-0.4.8-opengles.patch163
-rw-r--r--games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch23
-rw-r--r--games-action/minetest/minetest-0.4.7.ebuild144
-rw-r--r--games-action/minetest/minetest-0.4.8.ebuild146
11 files changed, 12 insertions, 759 deletions
diff --git a/games-action/minetest/ChangeLog b/games-action/minetest/ChangeLog
index cd6815114d03..6de27ab5aaed 100644
--- a/games-action/minetest/ChangeLog
+++ b/games-action/minetest/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for games-action/minetest
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/ChangeLog,v 1.11 2014/07/07 13:35:56 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/ChangeLog,v 1.12 2014/09/09 14:19:07 hasufell Exp $
+
+ 09 Sep 2014; Julian Ospald <hasufell@gentoo.org> -minetest-0.4.7.ebuild,
+ -minetest-0.4.8.ebuild, -files/minetest-0.4.7-as-needed.patch,
+ -files/minetest-0.4.7-jthread-option-and-pkgconfig.patch,
+ -files/minetest-0.4.7-lua-luajit-option.patch,
+ -files/minetest-0.4.7-shared-irrlicht.patch,
+ -files/minetest-0.4.8-as-needed.patch,
+ -files/minetest-0.4.8-lua-luajit-option.patch,
+ -files/minetest-0.4.8-opengles.patch,
+ -files/minetest-0.4.8-shared-irrlicht.patch:
+ rm old
*minetest-0.4.10 (07 Jul 2014)
diff --git a/games-action/minetest/files/minetest-0.4.7-as-needed.patch b/games-action/minetest/files/minetest-0.4.7-as-needed.patch
deleted file mode 100644
index efe2cfc526bc..000000000000
--- a/games-action/minetest/files/minetest-0.4.7-as-needed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit e886e5adba69870bcb00a0aaaa3f3157fe1843be
-Author: hasufell <julian.ospald@googlemail.com>
-Date: Sat Jun 8 14:51:56 2013 +0200
-
- CMAKE: fix linking order
-
- this also fixes linking with as-needed wrt
- https://github.com/minetest/minetest/issues/617
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f4586e7..9f24536 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -391,19 +391,19 @@
- target_link_libraries(
- ${PROJECT_NAME}
- ${ZLIB_LIBRARIES}
-- ${IRRLICHT_LIBRARY}
-+ ${X11_LIBRARIES}
- ${OPENGL_LIBRARIES}
-+ ${OPENGLES2_LIBRARIES}
- ${JPEG_LIBRARIES}
- ${BZIP2_LIBRARIES}
- ${PNG_LIBRARIES}
-- ${X11_LIBRARIES}
-+ ${IRRLICHT_LIBRARY}
- ${GETTEXT_LIBRARY}
- ${SOUND_LIBRARIES}
- ${JTHREAD_LIBRARY}
- ${SQLITE3_LIBRARY}
- ${LUA_LIBRARY}
- ${JSON_LIBRARY}
-- ${OPENGLES2_LIBRARIES}
- ${PLATFORM_LIBS}
- ${CLIENT_PLATFORM_LIBS}
- )
diff --git a/games-action/minetest/files/minetest-0.4.7-jthread-option-and-pkgconfig.patch b/games-action/minetest/files/minetest-0.4.7-jthread-option-and-pkgconfig.patch
deleted file mode 100644
index 854b0ee937bc..000000000000
--- a/games-action/minetest/files/minetest-0.4.7-jthread-option-and-pkgconfig.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-commit c0a7c530f213cb947cc703c39f2d7a4d9d008daf
-Author: hasufell <julian.ospald@googlemail.com>
-Date: Sat Jun 8 13:40:12 2013 +0200
-
- CMAKE: add option to use system JThread and use pkg-config
-
-diff --git a/cmake/Modules/FindJthread.cmake b/cmake/Modules/FindJthread.cmake
-index 302a3c2..70d6e92 100644
---- a/cmake/Modules/FindJthread.cmake
-+++ b/cmake/Modules/FindJthread.cmake
-@@ -1,16 +1,41 @@
- # Look for jthread, use our own if not found
-
--FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h)
-
--FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
-+option(WITH_SYSTEM_JTHREAD "Use systm JThread copy" OFF)
-
--IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
-- SET( JTHREAD_FOUND TRUE )
--ENDIF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
-+IF(WITH_SYSTEM_JTHREAD)
-+ IF(UNIX)
-+ # try to use pkgconfig file first
-+ FIND_PACKAGE(PkgConfig QUIET)
-+ pkg_check_modules(_PC_JTHREAD jthread)
-+ IF(_PC_JTHREAD_FOUND)
-+ SET(JTHREAD_FOUND TRUE)
-+ # use CFLAGS/LDFLAGS instead of INCLUDE_DIR/LIBRARY
-+ # because we want the full dependencies
-+ SET(JTHREAD_CFLAGS ${_PC_JTHREAD_CFLAGS})
-+ SET(JTHREAD_LDFLAGS ${_PC_JTHREAD_LDFLAGS})
-+ ENDIF(_PC_JTHREAD_FOUND)
-+ ENDIF(UNIX)
-+
-+ # fall back to cmake macros
-+ IF(NOT JTHREAD_FOUND)
-+ FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h PATHS /usr/include/jthread)
-+ FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
-+
-+ IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
-+ SET( JTHREAD_FOUND TRUE )
-+ ENDIF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
-+ ENDIF(NOT JTHREAD_FOUND)
-+ENDIf(WITH_SYSTEM_JTHREAD)
-
- IF(JTHREAD_FOUND)
-- MESSAGE(STATUS "Found system jthread header file in ${JTHREAD_INCLUDE_DIR}")
-- MESSAGE(STATUS "Found system jthread library ${JTHREAD_LIBRARY}")
-+ IF(_PC_JTHREAD_FOUND)
-+ MESSAGE(STATUS "Found system jthread: ${_PC_JTHREAD_VERSION}")
-+ ELSE(_PC_JTHREAD_FOUND)
-+ MESSAGE(STATUS "Found system jthread header file in ${JTHREAD_INCLUDE_DIR}")
-+ MESSAGE(STATUS "Found system jthread library ${JTHREAD_LIBRARY}")
-+ ENDIF(_PC_JTHREAD_FOUND)
-+# fall back to bundled jthread
- ELSE(JTHREAD_FOUND)
- SET(JTHREAD_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jthread)
- SET(JTHREAD_LIBRARY jthread)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3d7e815..f4586e7 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -420,6 +420,9 @@ if(BUILD_CLIENT)
- ${CGUITTFONT_LIBRARY}
- )
- endif(USE_FREETYPE)
-+ set_target_properties(${PROJECT_NAME}
-+ PROPERTIES COMPILE_FLAGS "${JTHREAD_CFLAGS}"
-+ LINK_FLAGS "${JTHREAD_LDFLAGS}")
- endif(BUILD_CLIENT)
-
- if(BUILD_SERVER)
-@@ -440,6 +443,9 @@ if(BUILD_SERVER)
- ${CURL_LIBRARY}
- )
- endif(USE_CURL)
-+ set_target_properties(${PROJECT_NAME}server
-+ PROPERTIES COMPILE_FLAGS "${JTHREAD_CFLAGS}"
-+ LINK_FLAGS "${JTHREAD_LDFLAGS}")
- endif(BUILD_SERVER)
-
-
diff --git a/games-action/minetest/files/minetest-0.4.7-lua-luajit-option.patch b/games-action/minetest/files/minetest-0.4.7-lua-luajit-option.patch
deleted file mode 100644
index 3d41be979c5a..000000000000
--- a/games-action/minetest/files/minetest-0.4.7-lua-luajit-option.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 054055b5115af6046dc9b4396b7911221a3b765c
-Author: hasufell <julian.ospald@googlemail.com>
-Date: Sat Jun 8 13:32:21 2013 +0200
-
- CMAKE: add option to choose between system luajit/lua
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 51ed278..3d7e815 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -180,19 +180,28 @@ if(USE_FREETYPE)
- set(CGUITTFONT_LIBRARY cguittfont)
- endif(USE_FREETYPE)
-
--
--find_library(LUA_LIBRARY luajit
-- NAMES luajit-5.1)
--find_path(LUA_INCLUDE_DIR luajit.h
-- NAMES luajit.h
-- PATH_SUFFIXES luajit-2.0)
--message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
--message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
-+option(USE_LUAJIT "Use luajit instead of lua" OFF)
-+
-+if(USE_LUAJIT)
-+ find_library(LUA_LIBRARY luajit
-+ NAMES libluajit-5.1.so luajit-5.1)
-+ find_path(LUA_INCLUDE_DIR luajit.h
-+ NAMES luajit.h
-+ PATH_SUFFIXES luajit-2.0)
-+ message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
-+ message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
-+else(USE_LUAJIT)
-+ find_package(Lua51)
-+endif(USE_LUAJIT)
-
- if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-- message (STATUS "LuaJIT found.")
-+ if(USE_LUAJIT)
-+ message (STATUS "LuaJIT found.")
-+ else(USE_LUAJIT)
-+ message (STATUS "Lua51 found.")
-+ endif(USE_LUAJIT)
- else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-- message (STATUS "LuaJIT not found, using bundled Lua.")
-+ message (STATUS "LuaJIT/Lua51 not found, using bundled Lua.")
- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
- set(LUA_LIBRARY "lua")
- add_subdirectory(lua)
diff --git a/games-action/minetest/files/minetest-0.4.7-shared-irrlicht.patch b/games-action/minetest/files/minetest-0.4.7-shared-irrlicht.patch
deleted file mode 100644
index b552c0937039..000000000000
--- a/games-action/minetest/files/minetest-0.4.7-shared-irrlicht.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
-Author: hasufell <julian.ospald@googlemail.com>
-Date: Sat Jun 8 13:40:30 2013 +0200
-
- CMAKE: use shared lib from Irrlicht
-
-diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
-index bd00422..4632993 100644
---- a/cmake/Modules/FindIrrlicht.cmake
-+++ b/cmake/Modules/FindIrrlicht.cmake
-@@ -50,10 +50,11 @@ else()
- /usr/include/irrlicht
- )
-
-- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
-+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
- PATHS
- /usr/local/lib
- /usr/lib
-+ /usr/lib64
- )
- endif()
-
diff --git a/games-action/minetest/files/minetest-0.4.8-as-needed.patch b/games-action/minetest/files/minetest-0.4.8-as-needed.patch
deleted file mode 100644
index 803ea0284827..000000000000
--- a/games-action/minetest/files/minetest-0.4.8-as-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd
-Author: hasufell <hasufell@gentoo.org>
-Date: Mon Nov 25 00:28:55 2013 +0100
-
- CMAKE: fix linking order
-
- this also fixes linking with as-needed wrt
- https://github.com/minetest/minetest/issues/617
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a1fee7a..a72bd4a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -427,18 +427,18 @@ if(BUILD_CLIENT)
- target_link_libraries(
- ${PROJECT_NAME}
- ${ZLIB_LIBRARIES}
-- ${IRRLICHT_LIBRARY}
-+ ${X11_LIBRARIES}
- ${OPENGL_LIBRARIES}
-+ ${OPENGLES2_LIBRARIES}
- ${JPEG_LIBRARIES}
- ${BZIP2_LIBRARIES}
- ${PNG_LIBRARIES}
-- ${X11_LIBRARIES}
-+ ${IRRLICHT_LIBRARY}
- ${GETTEXT_LIBRARY}
- ${SOUND_LIBRARIES}
- ${SQLITE3_LIBRARY}
- ${LUA_LIBRARY}
- ${JSON_LIBRARY}
-- ${OPENGLES2_LIBRARIES}
- ${PLATFORM_LIBS}
- ${CLIENT_PLATFORM_LIBS}
- )
diff --git a/games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch b/games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch
deleted file mode 100644
index 9badeaeb24ec..000000000000
--- a/games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit d8dbda3636a91eba52c97450b58f767d5a4a376e
-Author: hasufell <hasufell@gentoo.org>
-Date: Mon Nov 25 00:25:55 2013 +0100
-
- add USE_LUAJIT option
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a30dc98..a1fee7a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -179,24 +179,29 @@ if(USE_FREETYPE)
- endif(USE_FREETYPE)
-
-
--find_library(LUA_LIBRARY luajit
-- NAMES luajit-5.1)
--find_path(LUA_INCLUDE_DIR luajit.h
-- NAMES luajit.h
-- PATH_SUFFIXES luajit-2.0)
--message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
--message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
-+option(USE_LUAJIT "Use luajit instead of lua" OFF)
-
- set(USE_LUAJIT 0)
--if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-- message (STATUS "LuaJIT found.")
-- set(USE_LUAJIT 1)
--else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-- message (STATUS "LuaJIT not found, using bundled Lua.")
-- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
-- set(LUA_LIBRARY "lua")
-- add_subdirectory(lua)
--endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-+if(USE_LUAJIT)
-+ find_library(LUA_LIBRARY luajit
-+ NAMES luajit-5.1)
-+ find_path(LUA_INCLUDE_DIR luajit.h
-+ NAMES luajit.h
-+ PATH_SUFFIXES luajit-2.0)
-+ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-+ message (STATUS "LuaJIT found")
-+ set(USE_LUAJIT 1)
-+ else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-+ message (FATAL_ERROR "LuaJIT not found!")
-+ endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-+else(USE_LUAJIT)
-+ find_package(Lua51)
-+ if(LUA51_FOUND)
-+ message (STATUS "Lua51 found")
-+ else(LUA51_FOUND)
-+ message (FATAL_ERROR "Lua51 not found!")
-+ endif(LUA51_FOUND)
-+endif(USE_LUAJIT)
-
- mark_as_advanced(LUA_LIBRARY)
- mark_as_advanced(LUA_INCLUDE_DIR)
diff --git a/games-action/minetest/files/minetest-0.4.8-opengles.patch b/games-action/minetest/files/minetest-0.4.8-opengles.patch
deleted file mode 100644
index eebfe280f967..000000000000
--- a/games-action/minetest/files/minetest-0.4.8-opengles.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Nov 29 19:34:37 UTC 2013
-
-This patch is currently not needed in this form, because gentoo irrlicht
-does not yet have gles2 support. However this will be needed
-once it does, so we can add a gles2 useflag.
-
-Also fixes
-https://bugs.gentoo.org/show_bug.cgi?id=492804
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -7,6 +7,7 @@
- mark_as_advanced(JSON_INCLUDE_DIR JSON_LIBRARY)
-
- option(ENABLE_CURL "Enable cURL support for fetching media" 1)
-+option(ENABLE_GLES2 "Enable GLES2 support with irrlicht" 0)
-
- if (NOT ENABLE_CURL)
- mark_as_advanced(CLEAR CURL_LIBRARY CURL_INCLUDE_DIR)
-@@ -170,7 +171,10 @@
-
- find_package(Sqlite3 REQUIRED)
- find_package(Json REQUIRED)
--find_package(OpenGLES2)
-+if(ENABLE_GLES2 AND BUILD_CLIENT)
-+ find_package(OpenGLES2 REQUIRED)
-+ add_definitions( -DWITH_GLES2 )
-+endif(ENABLE_GLES2 AND BUILD_CLIENT)
-
- if(USE_FREETYPE)
- find_package(Freetype REQUIRED)
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -1331,10 +1331,12 @@
- else if(driverstring == "ogles1")
- driverType = video::EDT_OGLES1;
- #endif
-+#ifdef WITH_GLES2
- #ifdef _IRR_COMPILE_WITH_OGLES2_
- else if(driverstring == "ogles2")
- driverType = video::EDT_OGLES2;
- #endif
-+#endif
- else
- {
- errorstream<<"WARNING: Invalid video_driver specified; defaulting "
---- a/cmake/Modules/FindOpenGLES2.cmake
-+++ b/cmake/Modules/FindOpenGLES2.cmake
-@@ -19,6 +19,7 @@
- # win32, apple, android NOT TESED
- # linux tested and works
-
-+
- IF (WIN32)
- IF (CYGWIN)
-
-@@ -47,51 +48,57 @@
-
- ELSE(APPLE)
-
-- FIND_PATH(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
-- /usr/openwin/share/include
-- /opt/graphics/OpenGL/include /usr/X11R6/include
-- /usr/include
-- )
--
-- FIND_LIBRARY(OPENGLES2_gl_LIBRARY
-- NAMES GLESv2
-- PATHS /opt/graphics/OpenGL/lib
-+ # prefer pkg-config
-+ INCLUDE(FindPkgConfig)
-+ IF (PKG_CONFIG_FOUND)
-+ pkg_check_modules(OPENGLES2 QUIET glesv2 egl)
-+ ELSE (PKG_CONFIG_FOUND)
-+ FIND_PATH(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
-+ /usr/openwin/share/include
-+ /opt/graphics/OpenGL/include /usr/X11R6/include
-+ /usr/include
-+ )
-+
-+ FIND_LIBRARY(OPENGLES2_gl_LIBRARY
-+ NAMES GLESv2
-+ PATHS /opt/graphics/OpenGL/lib
- /usr/openwin/lib
- /usr/shlib /usr/X11R6/lib
- /usr/lib
-- )
-+ )
-
-- IF (NOT BUILD_ANDROID)
-- FIND_PATH(EGL_INCLUDE_DIR EGL/egl.h
-- /usr/openwin/share/include
-- /opt/graphics/OpenGL/include /usr/X11R6/include
-- /usr/include
-- )
--
-- FIND_LIBRARY(EGL_egl_LIBRARY
-- NAMES EGL
-- PATHS /opt/graphics/OpenGL/lib
-- /usr/openwin/lib
-- /usr/shlib /usr/X11R6/lib
-- /usr/lib
-- )
--
-- # On Unix OpenGL most certainly always requires X11.
-- # Feel free to tighten up these conditions if you don't
-- # think this is always true.
-- # It's not true on OSX.
--
-- IF (OPENGLES2_gl_LIBRARY)
-- IF(NOT X11_FOUND)
-- INCLUDE(FindX11)
-- ENDIF(NOT X11_FOUND)
-- IF (X11_FOUND)
-- IF (NOT APPLE)
-- SET (OPENGLES2_LIBRARIES ${X11_LIBRARIES})
-- ENDIF (NOT APPLE)
-- ENDIF (X11_FOUND)
-- ENDIF (OPENGLES2_gl_LIBRARY)
-- ENDIF ()
-+ IF (NOT BUILD_ANDROID)
-+ FIND_PATH(EGL_INCLUDE_DIR EGL/egl.h
-+ /usr/openwin/share/include
-+ /opt/graphics/OpenGL/include /usr/X11R6/include
-+ /usr/include
-+ )
-+
-+ FIND_LIBRARY(EGL_egl_LIBRARY
-+ NAMES EGL
-+ PATHS /opt/graphics/OpenGL/lib
-+ /usr/openwin/lib
-+ /usr/shlib /usr/X11R6/lib
-+ /usr/lib
-+ )
-+
-+ # On Unix OpenGL most certainly always requires X11.
-+ # Feel free to tighten up these conditions if you don't
-+ # think this is always true.
-+ # It's not true on OSX.
-+
-+ IF (OPENGLES2_gl_LIBRARY)
-+ IF(NOT X11_FOUND)
-+ INCLUDE(FindX11)
-+ ENDIF(NOT X11_FOUND)
-+ IF (X11_FOUND)
-+ IF (NOT APPLE)
-+ SET (OPENGLES2_LIBRARIES ${X11_LIBRARIES})
-+ ENDIF (NOT APPLE)
-+ ENDIF (X11_FOUND)
-+ ENDIF (OPENGLES2_gl_LIBRARY)
-+ ENDIF (NOT BUILD_ANDROID)
-+ ENDIF (PKG_CONFIG_FOUND)
-
- ENDIF(APPLE)
- ENDIF (WIN32)
-@@ -126,5 +133,5 @@
- IF(OPENGLES2_FOUND)
- MESSAGE(STATUS "Found system opengles2 library ${OPENGLES2_LIBRARIES}")
- ELSE ()
-- SET(OPENGLES2_LIBRARIES "")
-+ MESSAGE(FATAL_ERROR "OpenGLES2 not found!")
- ENDIF ()
diff --git a/games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch b/games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch
deleted file mode 100644
index b552c0937039..000000000000
--- a/games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
-Author: hasufell <julian.ospald@googlemail.com>
-Date: Sat Jun 8 13:40:30 2013 +0200
-
- CMAKE: use shared lib from Irrlicht
-
-diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
-index bd00422..4632993 100644
---- a/cmake/Modules/FindIrrlicht.cmake
-+++ b/cmake/Modules/FindIrrlicht.cmake
-@@ -50,10 +50,11 @@ else()
- /usr/include/irrlicht
- )
-
-- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
-+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
- PATHS
- /usr/local/lib
- /usr/lib
-+ /usr/lib64
- )
- endif()
-
diff --git a/games-action/minetest/minetest-0.4.7.ebuild b/games-action/minetest/minetest-0.4.7.ebuild
deleted file mode 100644
index 607c2ded3a29..000000000000
--- a/games-action/minetest/minetest-0.4.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.7.ebuild,v 1.4 2013/10/27 10:34:39 hasufell Exp $
-
-EAPI=5
-inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
-
-DESCRIPTION="An InfiniMiner/Minecraft inspired game"
-HOMEPAGE="http://minetest.net/"
-SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+curl dedicated luajit nls +server +sound +truetype"
-
-RDEPEND="dev-db/sqlite:3
- >=dev-games/irrlicht-1.8-r2
- sys-libs/zlib
- curl? ( net-misc/curl )
- !dedicated? (
- app-arch/bzip2
- media-libs/libpng:0
- virtual/jpeg
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm
- sound? (
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- )
- truetype? ( media-libs/freetype:2 )
- )
- luajit? ( dev-lang/luajit:2 )
- !luajit? ( >=dev-lang/lua-5.1.4 )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- games_pkg_setup
-
- if use server || use dedicated ; then
- enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP}
- fi
-}
-
-src_unpack() {
- vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-lua-luajit-option.patch \
- "${FILESDIR}"/${P}-jthread-option-and-pkgconfig.patch \
- "${FILESDIR}"/${P}-shared-irrlicht.patch \
- "${FILESDIR}"/${P}-as-needed.patch
-
- # correct gettext behavior
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *) ; do
- if ! has ${i} ${LINGUAS} ; then
- rm -r po/${i} || die
- fi
- done
- fi
-
- # jthread is modified
- # json is modified
- rm -r src/{lua,sqlite} || die
-
- # set paths
- sed \
- -e "s#@BINDIR@#${GAMES_BINDIR}#g" \
- -e "s#@GROUP@#${GAMES_GROUP}#g" \
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DRUN_IN_PLACE=0
- -DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}"
- -DCUSTOM_BINDIR="${GAMES_BINDIR}"
- -DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
- -DCUSTOM_LOCALEDIR="/usr/share/locale"
- $(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
- $(cmake-utils_use_enable nls GETTEXT)
- $(cmake-utils_use_enable curl CURL)
- $(cmake-utils_use_use luajit LUAJIT)
- $(cmake-utils_use_enable truetype FREETYPE)
- $(cmake-utils_use_enable sound SOUND)
- -DWITH_SYSTEM_JTHREAD=OFF
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server || use dedicated ; then
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server
- newconfd "${T}"/minetestserver.confd minetest-server
- fi
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-
- if ! use dedicated ; then
- elog
- elog "optional dependencies:"
- elog " games-action/minetest_game (official mod)"
- elog " games-action/minetest_common (official mod)"
- elog " games-action/minetest_build (official mod)"
- elog " games-action/minetest_survival (official mod)"
- elog
- fi
-
- if use server || use dedicated ; then
- elog
- elog "Configure your server via /etc/conf.d/minetest-server"
- elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
- elog "Default logfile is ~/minetest-server.log"
- elog
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-action/minetest/minetest-0.4.8.ebuild b/games-action/minetest/minetest-0.4.8.ebuild
deleted file mode 100644
index 164f326958af..000000000000
--- a/games-action/minetest/minetest-0.4.8.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.8.ebuild,v 1.2 2013/11/29 20:41:48 hasufell Exp $
-
-EAPI=5
-inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
-
-DESCRIPTION="An InfiniMiner/Minecraft inspired game"
-HOMEPAGE="http://minetest.net/"
-SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl dedicated leveldb luajit nls +server +sound +truetype"
-
-RDEPEND="dev-db/sqlite:3
- >=dev-games/irrlicht-1.8-r2
- sys-libs/zlib
- curl? ( net-misc/curl )
- !dedicated? (
- app-arch/bzip2
- media-libs/libpng:0
- virtual/jpeg
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm
- sound? (
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- )
- truetype? ( media-libs/freetype:2 )
- )
- leveldb? ( dev-libs/leveldb )
- luajit? ( dev-lang/luajit:2 )
- !luajit? ( >=dev-lang/lua-5.1.4[deprecated] )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- games_pkg_setup
-
- if use server || use dedicated ; then
- enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP}
- fi
-}
-
-src_unpack() {
- vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-lua-luajit-option.patch \
- "${FILESDIR}"/${P}-shared-irrlicht.patch \
- "${FILESDIR}"/${P}-as-needed.patch \
- "${FILESDIR}"/${P}-opengles.patch
-
- # correct gettext behavior
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *) ; do
- if ! has ${i} ${LINGUAS} ; then
- rm -r po/${i} || die
- fi
- done
- fi
-
- # jthread is modified
- # json is modified
- rm -r src/{lua,sqlite} || die
-
- # set paths
- sed \
- -e "s#@BINDIR@#${GAMES_BINDIR}#g" \
- -e "s#@GROUP@#${GAMES_GROUP}#g" \
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_GLES2=0
- -DRUN_IN_PLACE=0
- -DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}"
- -DCUSTOM_BINDIR="${GAMES_BINDIR}"
- -DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
- -DCUSTOM_LOCALEDIR="/usr/share/locale"
- $(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
- $(cmake-utils_use_enable nls GETTEXT)
- $(cmake-utils_use_enable curl CURL)
- $(cmake-utils_use_use luajit LUAJIT)
- $(cmake-utils_use_enable truetype FREETYPE)
- $(cmake-utils_use_enable sound SOUND)
- $(cmake-utils_use_enable leveldb LEVELDB)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server || use dedicated ; then
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server
- newconfd "${T}"/minetestserver.confd minetest-server
- fi
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-
- if ! use dedicated ; then
- elog
- elog "optional dependencies:"
- elog " games-action/minetest_game (official mod)"
- elog " games-action/minetest_common (official mod)"
- elog " games-action/minetest_build (official mod)"
- elog " games-action/minetest_survival (official mod)"
- elog
- fi
-
- if use server || use dedicated ; then
- elog
- elog "Configure your server via /etc/conf.d/minetest-server"
- elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
- elog "Default logfile is ~/minetest-server.log"
- elog
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}