games-action/minetest: version bump, use system headers

7 files changed, 94 insertions, 23 deletions

diff --git a/games-action/minetest/ChangeLog b/games-action/minetest/ChangeLog
index c522c9e16..797a625f0 100644
--- a/games-action/minetest/ChangeLog
+++ b/games-action/minetest/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*minetest-0.4_pre20120408 (24 Apr 2012)
+
+  24 Apr 2012; hasufell <julian.ospald@googlemail.com>
+  -minetest-0.4_pre20120320.ebuild, +minetest-0.4_pre20120408.ebuild,
+  -files/minetest-0.4_pre20120320-cmake.patch,
+  -files/minetest-0.4_pre20120320-sharepath.patch,
+  +files/minetest-0.4_pre20120408-cmake.patch,
+  +files/minetest-0.4_pre20120408-jthread.patch,
+  +files/minetest-0.4_pre20120408-lua.patch,
+  +files/minetest-0.4_pre20120408-sharepath.patch:
+  version bump, use system headers
+
 *minetest-0.4_pre20120320 (03 Apr 2012)
 
   03 Apr 2012; hasufell <julian.ospald@googlemail.com>
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index a06af590d..fe2ed0929 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,6 +1,7 @@
-AUX minetest-0.4_pre20120320-cmake.patch 1018 RMD160 e882484be3a954d78ce52464613c188b9fe2b001 SHA1 c2caaf1b476777cbab0b0f1bb875a1706e5b93b5 SHA256 a6e4841a0e80d374e7de1b246a67c2f5a8e01c1c1314bc5cd6e159a868bdbe3e
-AUX minetest-0.4_pre20120320-sharepath.patch 847 RMD160 88829c0160eff6eb015946de3f4583f4c067fc58 SHA1 a7e532adee195351225149d98bc3595284593d52 SHA256 6b509da3fe716116e89000b9348535dcbde398df5a8592eebd411ad9d8527694
-DIST minetest-0.4_pre20120320.tar.gz 1968841 RMD160 dd3ca005c4ee7139960614fd7a2b2e4a31dcfe71 SHA1 d3ad5f7434bf92425fed975e2c659cc6f79e73ea SHA256 1c748e4b418d1333c8e7e5403ca48d863bb80451a688d2ac6859e3a1c31d9a17
-EBUILD minetest-0.4_pre20120320.ebuild 1135 RMD160 a07b86ed000aa70dbce758dd4225f0626cfa87fa SHA1 a3312483501b37aa4f2b278b39ab7958b962c57c SHA256 fc1ee9590bf7ac892641508624e24514f7f3cae9f374ffaf938defc54ffd5eb7
-MISC ChangeLog 412 RMD160 43d85647e115e6e2f8471de50b2b6171817de6e1 SHA1 e3ae6ebf654742cf74c91e111f997cc15696ebeb SHA256 65325223a6ee0330f610a1b0ebdbc9fdca1c7bb221d681a9a702766dfc0e9504
+AUX minetest-0.4_pre20120408-cmake.patch 1018 RMD160 e882484be3a954d78ce52464613c188b9fe2b001 SHA1 c2caaf1b476777cbab0b0f1bb875a1706e5b93b5 SHA256 a6e4841a0e80d374e7de1b246a67c2f5a8e01c1c1314bc5cd6e159a868bdbe3e
+AUX minetest-0.4_pre20120408-jthread.patch 542 RMD160 efd2bbc94eb63ba677ac0220c219cfd6a82c7914 SHA1 61a13450a07b90dab7717f474946e0f3412f887a SHA256 96edf9eeb389f7ecc2fb73e782b557ea7f7e3ccf24bad998080601cb92dafaf7
+AUX minetest-0.4_pre20120408-lua.patch 742 RMD160 70bdeb015a46b8da30551e9356c599d83be8d718 SHA1 87358b6b21f2cefd61e0fcd0bfb27f278356deca SHA256 716dbf527ea767c24767dbd40beb78f0442baac76ae6f9b01e74685d8aa75f8a
+AUX minetest-0.4_pre20120408-sharepath.patch 845 RMD160 cae00430fb929b52ed20bd98b1abc50d2b3741cd SHA1 ab234ee137af8ac1a0f594dc07275d6f65333793 SHA256 c11fee414de62269234a9284cb87b7f43d6b9b2d1b3d4e6a9264e6d0c70a0134
+EBUILD minetest-0.4_pre20120408.ebuild 1273 RMD160 74a8951c1c95c1c1ba0b9ad90611e9f9a2982bc1 SHA1 096c124f05b77b9dd21e2adddd04d9988d86d0e5 SHA256 3dc6ed1f3926c2949b395893683e4601319a99e1ba9798fb77f48172451e2b21
+MISC ChangeLog 904 RMD160 17449e01fd25838df6623f457ef6177b9fd009ef SHA1 fcd89ad7cf46bd37ff391eb7c8dbeca68b03859e SHA256 c39e513418e4a7b5ca2dc96359674d82327d527cabe5b93e381e9589330dd633
 MISC metadata.xml 1067 RMD160 de95c3440752579893031dfc078b07ed45b54709 SHA1 1f9751d126263c18edbb1df4276c60ea84788bef SHA256 d730d94d2e520dc4dd2e01f442706b941d7d607787a5755356094be7f1919947
diff --git a/games-action/minetest/files/minetest-0.4_pre20120320-cmake.patch b/games-action/minetest/files/minetest-0.4_pre20120408-cmake.patch
index 3ae3e7a98..3ae3e7a98 100644
--- a/games-action/minetest/files/minetest-0.4_pre20120320-cmake.patch
+++ b/games-action/minetest/files/minetest-0.4_pre20120408-cmake.patch
diff --git a/games-action/minetest/files/minetest-0.4_pre20120408-jthread.patch b/games-action/minetest/files/minetest-0.4_pre20120408-jthread.patch
new file mode 100644
index 000000000..f78430508
--- /dev/null
+++ b/games-action/minetest/files/minetest-0.4_pre20120408-jthread.patch
@@ -0,0 +1,18 @@
+From: hasufell <julian.ospald@googlemail.com>
+Date: Mon Apr 23 21:34:29 UTC 2012
+
+fix FIND_PATH to correctly find jthread
+
+--- cmake/Modules/FindJthread.cmake
++++ cmake/Modules/FindJthread.cmake
+@@ -1,8 +1,8 @@
+ # Look for jthread, use our own if not found
+ 
+-FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h)
++FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h PATHS /usr/include/jthread)
+ 
+-FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
++FIND_LIBRARY(JTHREAD_LIBRARY NAMES libjthread.a)
+ 
+ IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
+ 	SET( JTHREAD_FOUND TRUE )
diff --git a/games-action/minetest/files/minetest-0.4_pre20120408-lua.patch b/games-action/minetest/files/minetest-0.4_pre20120408-lua.patch
new file mode 100644
index 000000000..53a84178f
--- /dev/null
+++ b/games-action/minetest/files/minetest-0.4_pre20120408-lua.patch
@@ -0,0 +1,33 @@
+From: hasufell <julian.ospald@googlemail.com>
+Date: Mon Apr 23 21:34:29 UTC 2012
+
+use pkgconfig for lua detection
+
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -144,10 +144,8 @@
+ 
+ find_package(Jthread REQUIRED)
+ find_package(Sqlite3 REQUIRED)
+-
+-# TODO: Create proper find script for Lua
+-set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
+-set(LUA_LIBRARY "lua")
++find_package(Lua51 REQUIRED)
++
+ 
+ configure_file(
+ 	"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
+@@ -476,9 +474,9 @@
+ 	add_subdirectory(sqlite)
+ endif (SQLITE3_FOUND)
+ 
+-if (LUA_FOUND)
+-else (LUA_FOUND)
++if (LUA_LIBRARY AND LUA_INCLUDE_DIR)
++else (LUA_LIBRARY AND LUA_INCLUDE_DIR)
+ 	add_subdirectory(lua)
+-endif (LUA_FOUND)
++endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
+ 
+ #end
diff --git a/games-action/minetest/files/minetest-0.4_pre20120320-sharepath.patch b/games-action/minetest/files/minetest-0.4_pre20120408-sharepath.patch
index a3ba5c50c..41ca76a99 100644
--- a/games-action/minetest/files/minetest-0.4_pre20120320-sharepath.patch
+++ b/games-action/minetest/files/minetest-0.4_pre20120408-sharepath.patch
@@ -20,8 +20,8 @@ relative path
 @@ -4,6 +4,7 @@
  #define CMAKE_CONFIG_H
  
- #define PROJECT_NAME "@PROJECT_NAME@"
+ #define CMAKE_PROJECT_NAME "@PROJECT_NAME@"
 +#define SHAREDIR "@SHAREDIR@"
- #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
- #define VERSION_STRING "@VERSION_STRING@"
- #define USE_GETTEXT @USE_GETTEXT@
+ #define CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+ #define CMAKE_VERSION_STRING "@VERSION_STRING@"
+ #ifdef NDEBUG
diff --git a/games-action/minetest/minetest-0.4_pre20120320.ebuild b/games-action/minetest/minetest-0.4_pre20120408.ebuild
index 4a13a04c2..fad046caf 100644
--- a/games-action/minetest/minetest-0.4_pre20120320.ebuild
+++ b/games-action/minetest/minetest-0.4_pre20120408.ebuild
@@ -4,37 +4,44 @@
 
 EAPI=3
 
-inherit eutils cmake-utils games
+inherit eutils cmake-utils git-2 games
 
-DESCRIPTION="Building single/multiplayer game"
+DESCRIPTION="Building single/multiplayer game (engine)"
 HOMEPAGE="http://c55.me/minetest/"
-SRC_URI="https://github.com/celeron55/${PN}/tarball/${PV%_pre*}.dev-${PV#*_pre} ->
-	${PF}.tar.gz"
+EGIT_REPO_URI="git://github.com/celeron55/${PN}.git"
+EGIT_COMMIT="${PV%_pre*}.dev-${PV#*_pre}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="+client nls +server"
 
-DEPEND="app-arch/bzip2
+RDEPEND="app-arch/bzip2
 	dev-db/sqlite:3
-	>=dev-games/irrlicht-1.7
+	dev-lang/lua
 	>=dev-libs/jthread-1.2
-	media-libs/libpng
+	media-libs/libpng:0
+	media-libs/libvorbis
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXxf86vm
 	virtual/jpeg
 	virtual/opengl
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
+	nls? ( virtual/libintl )
+	"
+DEPEND="${RDEPEND}
+	>=dev-games/irrlicht-1.7
+	nls? ( sys-devel/gettext )
+	"
 
-S=${WORKDIR}/celeron55-${PN}-94f1ab4
+src_unpack() {
+	git-2_src_unpack
+}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-sharepath.patch
+	epatch "${FILESDIR}"/${P}-{cmake,jthread,lua,sharepath}.patch
+	rm -r src/{jthread,lua,sqlite} || die
 }
 
 src_configure() {
@@ -44,7 +51,7 @@ src_configure() {
 		-DBINDIR="${GAMES_BINDIR}"
 		$(cmake-utils_use_build client CLIENT)
 		$(cmake-utils_use_build server SERVER)
-		$(cmake-utils_use_use nls GETTEXT)
+		$(cmake-utils_use_enable nls GETTEXT)
 		)
 
 	cmake-utils_src_configure