version bump, remove old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

5 files changed, 61 insertions, 66 deletions

diff --git a/games-strategy/hedgewars/ChangeLog b/games-strategy/hedgewars/ChangeLog
index ba1305554b01..b60e8a4773aa 100644
--- a/games-strategy/hedgewars/ChangeLog
+++ b/games-strategy/hedgewars/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/hedgewars
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.56 2013/12/24 12:48:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.57 2013/12/25 17:52:05 hasufell Exp $
+
+*hedgewars-0.9.20 (25 Dec 2013)
+
+  25 Dec 2013; Julian Ospald <hasufell@gentoo.org> -hedgewars-0.9.18-r1.ebuild,
+  -files/hedgewars-0.9.18-cflags.patch, -files/hedgewars-0.9.18-cmake.patch,
+  +hedgewars-0.9.20.ebuild, +files/hedgewars-0.9.20-paths.patch:
+  version bump, remove old
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> hedgewars-0.9.19.3.ebuild:
   Stable for x86, wrt bug #490650
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.18-cflags.patch b/games-strategy/hedgewars/files/hedgewars-0.9.18-cflags.patch
deleted file mode 100644
index d7d0cdec97e8..000000000000
--- a/games-strategy/hedgewars/files/hedgewars-0.9.18-cflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Nov  1 21:16:18 UTC 2012
-Subject: build system
-
-respect flags
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -158,12 +158,8 @@
- 
- 
- #set default flags values for all projects
--set(CMAKE_C_FLAGS "-pipe ${CMAKE_C_FLAGS}")
--set(CMAKE_C_FLAGS_RELEASE "-w -Os -fomit-frame-pointer ${CMAKE_C_FLAGS_RELEASE}")
--set(CMAKE_C_FLAGS_DEBUG "-Wall -O0 -g -DDEBUG ${CMAKE_C_FLAGS_DEBUG}")
--set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
--set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
--set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
-+set(CMAKE_C_FLAGS_DEBUG "-Wall -DDEBUG ${CMAKE_C_FLAGS_DEBUG}")
-+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -DDEBUG ${CMAKE_CXX_FLAGS_DEBUG}")
- 
- #parse additional parameters
- if(FPFLAGS OR GHFLAGS)
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch b/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch
deleted file mode 100644
index 4851b42ac5dd..000000000000
--- a/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Nov  1 21:52:40 UTC 2012
-Subject: build system
-
-fix parallel make
-
---- hedgewars/CMakeLists.txt
-+++ hedgewars/CMakeLists.txt
-@@ -193,7 +193,7 @@
- 
- #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6
- if(fpc_version LESS "020600")
--    add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
-+	add_custom_target(ENGINECLEAN COMMAND $(MAKE) "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
- endif()
- 
- 
-@@ -265,4 +265,6 @@
-     add_dependencies(${engine_output_name} ENGINECLEAN)
- endif()
- 
-+add_dependencies(${engine_output_name} avwrapper)
-+
- install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.20-paths.patch b/games-strategy/hedgewars/files/hedgewars-0.9.20-paths.patch
new file mode 100644
index 000000000000..2c87c5fe500c
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.20-paths.patch
@@ -0,0 +1,27 @@
+From b13a712224a5fa80e427f3ff46dbb4ae600097c4 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Wed, 25 Dec 2013 18:29:30 +0100
+Subject: [PATCH] BUILD: make binary/libdir destinations modifiable
+
+---
+ cmake_modules/paths.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake_modules/paths.cmake b/cmake_modules/paths.cmake
+index ddf2623..aefe67a 100644
+--- a/cmake_modules/paths.cmake
++++ b/cmake_modules/paths.cmake
+@@ -14,8 +14,8 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${LIBRARY_OUTPUT_PATH})
+ 
+ #resource paths
+ if(UNIX AND NOT APPLE)
+-    set(target_binary_install_dir "bin")
+-    set(target_library_install_dir "lib")
++    set(target_binary_install_dir "bin" CACHE PATH "install dest for binaries")
++    set(target_library_install_dir "lib" CACHE PATH "install dest for libs")
+ 
+     string(SUBSTRING "${DATA_INSTALL_DIR}" 0 1 sharepath_start)
+     if (NOT (${sharepath_start} MATCHES "/"))
+-- 
+1.8.5.2
+
diff --git a/games-strategy/hedgewars/hedgewars-0.9.18-r1.ebuild b/games-strategy/hedgewars/hedgewars-0.9.20.ebuild
index 7dea5a62f1f3..92f65aa6595a 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.18-r1.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.20.ebuild
@@ -1,32 +1,39 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.18-r1.ebuild,v 1.6 2013/03/02 21:22:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.20.ebuild,v 1.1 2013/12/25 17:52:05 hasufell Exp $
 
-EAPI=2
+# TODO: when physfs-2.1.0 hits the tree, set
+# -DPHYSFS_SYSTEM=ON
+
+EAPI=5
 CMAKE_BUILD_TYPE=Release
 inherit cmake-utils eutils games
 
-MY_P=${PN}-src-${PV}-3
-DESCRIPTION="Free Worms-like turn based strategy game"
+MY_P=${PN}-src-${PV}
+DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
 HOMEPAGE="http://hedgewars.org/"
 SRC_URI="http://download.gna.org/hedgewars/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 Apache-2.0 FDL-1.3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 QA_FLAGS_IGNORED=${GAMES_BINDIR}/hwengine # pascal sucks
 QA_PRESTRIPPED=${GAMES_BINDIR}/hwengine # pascal sucks
 
-RDEPEND="dev-qt/qtgui:4
+RDEPEND="
+	dev-lang/lua
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
 	media-libs/freeglut
-	virtual/ffmpeg
+	media-libs/libpng:0
 	media-libs/libsdl[audio,opengl,video]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-net
-	dev-lang/lua"
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	virtual/ffmpeg"
 DEPEND="${RDEPEND}
 	>=dev-lang/fpc-2.4"
 RDEPEND="${RDEPEND}
@@ -35,19 +42,20 @@ RDEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-src-${PV}
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-cmake.patch
+	epatch "${FILESDIR}"/${P}-paths.patch
 }
 
 src_configure() {
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELEASE='' \
-		-DCMAKE_CXX_FLAGS_RELEASE='' \
+	local mycmakeargs=(
+		-DMINIMAL_FLAGS=ON
 		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DDATA_INSTALL_DIR="${GAMES_DATADIR}"
+		-DDATA_INSTALL_DIR="${GAMES_DATADIR}/${PN}"
+		-Dtarget_binary_install_dir="${GAMES_BINDIR}"
+		-Dtarget_library_install_dir="$(games_get_libdir)"
 		-DNOSERVER=TRUE
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE )
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DPHYSFS_SYSTEM=OFF
+	)
 	cmake-utils_src_configure
 }