version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 312 insertions, 2 deletions

diff --git a/games-strategy/s25rttr/ChangeLog b/games-strategy/s25rttr/ChangeLog
index aa3d8994c15d..a33899486f6d 100644
--- a/games-strategy/s25rttr/ChangeLog
+++ b/games-strategy/s25rttr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/s25rttr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/s25rttr/ChangeLog,v 1.4 2013/11/05 15:41:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/s25rttr/ChangeLog,v 1.5 2013/12/23 13:45:08 hasufell Exp $
+
+*s25rttr-0.8.1 (23 Dec 2013)
+
+  23 Dec 2013; Julian Ospald <hasufell@gentoo.org>
+  +files/s25rttr-0.8.1-cmake.patch, +files/s25rttr-0.8.1-soundconverter.patch,
+  +s25rttr-0.8.1.ebuild:
+  version bump
 
   05 Nov 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   s25rttr-0.8.ebuild:
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 7a49316b1948..a0f8fc460aa3 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,6 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX s25rttr-0.8-cmake.patch 5747 SHA256 e5d16fe757b04d3b5683f10727254d78d8a45a87a6c4ee7c1a52664dcb5e87b0 SHA512 e4f50a82edfcb5384be636784b718bb070ac44cbaee5e336a449105d8aaf70ffbcaec9025ebcdf978be4147d8e477ad0112bd2913ebc73825201a62f5e2b3afc WHIRLPOOL fe4659aeb7676de3cb491b05cf3726b64ee30bfae1d3c1b943e211f5ca44980f1f9ea6582465ff9ef548374c2bae223ac065555b220b8fece614a0d4c13a4738
 AUX s25rttr-0.8-soundconverter.patch 763 SHA256 a3a490b4efb2182400fc9b07a67f66c939a2fe8a58983e85f4cd5125bfc2de37 SHA512 0f16e86057cb1574b8dd2303c49547ce855897683de3af52a437da9304c7bc821bcd3278dae6652fb8a0a358e64c1fa4c0eaec88323ab2dc5a0c56da3ce61afe WHIRLPOOL 3d427181fa8354f5b01e4ebfe8a3d445099163bd705094ee43a7d1b6dcb0f2a873d8262e1a23816ba089b4efa0189c0a3c8c8ad5e5b89595337de9d2aad98163
+AUX s25rttr-0.8.1-cmake.patch 5749 SHA256 d36d2a6d53b606690e79deba9ba8412834be0e69ed390008cd34c416d83965d0 SHA512 65ad53d8da6ee2c3cb7cc24cd423de599e7a4f678019abff6a00257fd7a6b3ab18efa90034fd2228f4166095848482eff7579370b7675c5909910c9ca64146de WHIRLPOOL 2e2c75b05366e3200c09002d10ef1db37c2238d2a71688515331974644626aeb494c5fbf7e464c506a4411d8576c183131bda2cd774c635fee4a9de213044463
+AUX s25rttr-0.8.1-soundconverter.patch 763 SHA256 a3a490b4efb2182400fc9b07a67f66c939a2fe8a58983e85f4cd5125bfc2de37 SHA512 0f16e86057cb1574b8dd2303c49547ce855897683de3af52a437da9304c7bc821bcd3278dae6652fb8a0a358e64c1fa4c0eaec88323ab2dc5a0c56da3ce61afe WHIRLPOOL 3d427181fa8354f5b01e4ebfe8a3d445099163bd705094ee43a7d1b6dcb0f2a873d8262e1a23816ba089b4efa0189c0a3c8c8ad5e5b89595337de9d2aad98163
+DIST s25rttr-0.8.1.tar.xz 39644940 SHA256 683282a1d7d0549bb3a9db64c14aea111fcef79212461a099a2fe2e3960263bf SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2 WHIRLPOOL 6558b6235b805489b8bc16b51175c7f46cc4d4887a088d79680826542b65f73f93bcd5801847b6284390a2f0ddbb112cfdb5decd1fb89a8c6ed585280f2f7de4
 DIST s25rttr-0.8.tar.xz 39648588 SHA256 dc800097196ddf23ef974d51e394f596d915675614a51ada50fb412bd075805f SHA512 1d707fc2aa4aff4266c5e6667d5f94a7e4c5d571b6aadc156d68c11b15b0d8ade85d33723364589c90a60b0760e5e0794c25210f4a28005a64ff18d383d2ff52 WHIRLPOOL f54fccb8739203d6a65ed07dfefa150dd138b4bb73632b7a7646ae3b3e5ea96d1ca697d87b39d11f0bc9426cef953681692d5dbf223da4f9434fc1914b228ba1
+EBUILD s25rttr-0.8.1.ebuild 2684 SHA256 e77501df39a56a886c3dff24c9d3b2c0ffd989b14f456f001b6a2af9d754df3f SHA512 f353603fe8780a17350ff7160fd6d1c5e747ae698fcdb5d3e858c59172c439083f2782e007d3dcd7ef12e685a3d4d0172959674e67b5d8da5a616c69c3ab5f76 WHIRLPOOL cd6a9b0ff3082f06a9c4693caa2f9f91dc573487aba6c7436244f07b5f6f3690a1e60111f0ed8b866d6f112cb2addfea0f4abc729c6e6e58c1cd4e7c09f115b2
 EBUILD s25rttr-0.8.ebuild 2623 SHA256 4f5cc8af7a016ebe43ed0ea9ef5e497c537ae2bf6518345c6a3a32c9e69999dc SHA512 d92425d53a3399f4801af46dbaf7951a3dfd76184ec282ea6ba92d3678b68a2154ee2b19da7556054d44c9beead792ab4990757434c889475114418bede463d6 WHIRLPOOL 6722522448f28ae1f5f88ac6d080eb2bf6a4015541c586b3cbd00fa5f9e1009d358e7c0a0000089ad604b07c3051d1cbb5f99394bfeb905b8e45963128a9037c
-MISC ChangeLog 784 SHA256 66167ed86c3418718460e8152769796ed619c7af157a56766d7e5e56e20113b5 SHA512 d723ecc96570f256991a4504409da9c882a75630bb4d8c221add78856220ed9dd2209616dcff5fba46277d36928f773c59cff97e07b68141643766bd998b6f45 WHIRLPOOL c572a24aee67c80135063ad88dd28d3ab1270f7aab4b896b7d521ad4edd1b59abed4f9812cea8685a20ad6537ddb54f93e968d61974b924cb398053fd63677be
+MISC ChangeLog 985 SHA256 89b7b4868ba51442948a28729c5e1058a3e701a97dc78b619c5fd41a46e658c0 SHA512 933b614541d3d01d018f7149f3d6e04f5e86976d3b31ec685d59e2901e17b16c6b950dccd00a7843ca130d147cd2e4306ecdd44c9060ad411ca4bc30fac62176 WHIRLPOOL 7cf19b286229b25d2147b8f9b1ba24a30ef4ab23c39d5cd212e5a333b608894a0a0bfb4eaeade56e1a59a053ae9e3c04b613cf14cea9d0d5a119dad686206471
 MISC metadata.xml 585 SHA256 1f556a546f9f2bd7fbb779cb0e887cc95a4c430e5c393d7facfff700280f4250 SHA512 c4ddee2c434f1b5c97c0e80b465e4a923844ed08f95019d15fefd27db532cd2132902d4dc77ca556ad95d22435e91d3c987577a27e33654c84578968aec5939d WHIRLPOOL 954ffb1e702b9fcd11d657302f5f605d1b0f88b7c3bf265738b47c234b6bc9effa1803922d9d686f26807c6f5d04bd8a6ac3a5103a9b52495de6b2336920d6b2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSuD5rAAoJEFpvPKfnPDWzcqYIAI376opClyU5hCZigsSuEAnP
++djVvx/tGiMdjFuPalxnULSsKoPkJWPgS1/jRb7vhLq+Q9D4tcf00OjUPTHGGmdY
+0vzAlqQKCOHIuveoSSpXOYhyT8k1mbYATZPDtghG1Hxa9Lzhzw2Za/G11d7OUUPv
+zsvoDeUcMJSyigflZq/H2xKIoVVNvB1u8d3VxrCffS3uNYahYzZmyOWeUfBm8dtX
+twRmxS5cxf8I/wrwIbCKrlxGz8AWqiMsrAqbpkrzypC5jpyf4MDthazdD3qxY8Jk
+UDUYVTsdOYNfBnivUDLA0G02zI/E9/We84uUJM3eJdivI553r0s1zHlvd1n7pho=
+=7piG
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
new file mode 100644
index 000000000000..3eef10e151ec
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
@@ -0,0 +1,160 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Oct  5 13:33:05 UTC 2012
+
+make build system gentoo-compatible
+provide options for SDL and GLFW video drivers
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -19,12 +19,19 @@
+ 
+ ################################################################################
+ 
+-INCLUDE(cmake/crosscompile.cmake)
+-
+ PROJECT(s25client)
+ 
+ ################################################################################
+ 
++# options
++OPTION(BUILD_GLFW_DRIVER "Build the GLFW video driver" 0)
++OPTION(BUILD_SDL_DRIVER "Build the sdl video driver" 1)
++IF (UNIX)
++	IF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
++		MESSAGE(FATAL_ERROR "No video driver selected! Either use SDL or GLFW.")
++	ENDIF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
++ENDIF (UNIX)
++
+ SET(PREFIX ${PREFIX} CACHE STRING "Path prefix")
+ SET(BINDIR ${BINDIR} CACHE STRING "Directory for the binaries")
+ SET(DATADIR ${DATADIR} CACHE STRING "Data directory")
+@@ -106,38 +113,6 @@
+ 			   build_paths.h)
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build_version.h.cmake"
+ 			   build_version.h)
+-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/preinstall.sh.cmake"
+-			   preinstall.sh @ONLY)
+-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/postinstall.sh.cmake"
+-			   postinstall.sh @ONLY)
+-
+-################################################################################
+-
+-ADD_SUBDIRECTORY(version)
+-
+-ADD_CUSTOM_TARGET(updateversion ALL
+-				  COMMAND "${CMAKE_BINARY_DIR}/version/src/version" "${CMAKE_SOURCE_DIR}"
+-				  DEPENDS version
+-				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+-)
+-
+-ADD_CUSTOM_TARGET(mrproper
+-				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/build/cleanup.sh"
+-				  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+-)
+-
+-ADD_CUSTOM_TARGET(create_nightly
+-				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "nightly" "${CMAKE_SOURCE_DIR}"
+-				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+-)
+-
+-ADD_CUSTOM_TARGET(create_stable
+-				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "stable" "${CMAKE_SOURCE_DIR}"
+-				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+-)
+-
+-# preinstall script
+-INSTALL(SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/preinstall.cmake")
+ 
+ ################################################################################
+ 
+@@ -148,7 +123,6 @@
+ ADD_SUBDIRECTORY(libutil)
+ ADD_SUBDIRECTORY(liblobby)
+ ADD_SUBDIRECTORY(s-c)
+-ADD_SUBDIRECTORY(s25update)
+ ADD_SUBDIRECTORY(src)
+ 
+ ################################################################################
+@@ -157,7 +131,6 @@
+ INSTALL(CODE "INCLUDE(driver/cmake_install.cmake)")
+ INSTALL(CODE "INCLUDE(libsiedler2/cmake_install.cmake)")
+ INSTALL(CODE "INCLUDE(s-c/cmake_install.cmake)")
+-INSTALL(CODE "INCLUDE(s25update/cmake_install.cmake)")
+ INSTALL(CODE "INCLUDE(src/cmake_install.cmake)")
+ 
+ # and then dont let him install anything
+--- driver/video/CMakeLists.txt
++++ driver/video/CMakeLists.txt
+@@ -3,7 +3,11 @@
+ #################################################################################
+ 
+ ADD_SUBDIRECTORY( WinAPI )
+-ADD_SUBDIRECTORY( GLFW )
+-ADD_SUBDIRECTORY( SDL )
++IF(BUILD_GLFW_DRIVER)
++	ADD_SUBDIRECTORY( GLFW )
++ENDIF(BUILD_GLFW_DRIVER)
++IF(BUILD_SDL_DRIVER)
++	ADD_SUBDIRECTORY( SDL )
++ENDIF(BUILD_SDL_DRIVER)
+ 
+ #################################################################################
+--- driver/video/SDL/src/CMakeLists.txt
++++ driver/video/SDL/src/CMakeLists.txt
+@@ -30,9 +30,9 @@
+ 	ADD_CUSTOM_COMMAND(TARGET videoSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
+ 	
+ 	INSTALL(TARGETS videoSDL 
+-		RUNTIME DESTINATION ${LIBDIR}/driver/video 
+-		LIBRARY DESTINATION ${LIBDIR}/driver/video
+-		ARCHIVE DESTINATION ${LIBDIR}/driver/video
++		RUNTIME DESTINATION ${LIBDIR} 
++		LIBRARY DESTINATION ${LIBDIR}
++		ARCHIVE DESTINATION ${LIBDIR}
+ 	)
+ ELSE (SDL_FOUND)
+ 	MESSAGE(WARNING ": SDL library not found: Not building SDL videodriver")
+--- driver/video/GLFW/src/CMakeLists.txt
++++ driver/video/GLFW/src/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ ### $Id: s25rttr-0.8.1-cmake.patch,v 1.1 2013/12/23 13:45:08 hasufell Exp $
+ #################################################################################
+ 
+-IF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
++IF ("${COMPILEFOR}" STREQUAL "linux" )
+ 	FIND_LIBRARY(GLFW_LIBRARY glfw) 
+ 	
+ 	IF (GLFW_LIBRARY)
+@@ -21,6 +21,6 @@
+ 	ELSE (GLFW_LIBRARY)
+ 		MESSAGE(WARNING ": GLFW library not found: Not building GLFW videodriver")
+ 	ENDIF (GLFW_LIBRARY)
+-ENDIF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
++ENDIF ("${COMPILEFOR}" STREQUAL "linux" )
+ 
+ #################################################################################
+--- driver/audio/SDL/src/CMakeLists.txt
++++ driver/audio/SDL/src/CMakeLists.txt
+@@ -34,9 +34,9 @@
+         ADD_CUSTOM_COMMAND(TARGET audioSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
+ 
+         INSTALL(TARGETS audioSDL 
+-            RUNTIME DESTINATION ${LIBDIR}/driver/audio 
+-            LIBRARY DESTINATION ${LIBDIR}/driver/audio
+-            ARCHIVE DESTINATION ${LIBDIR}/driver/audio
++            RUNTIME DESTINATION ${LIBDIR} 
++            LIBRARY DESTINATION ${LIBDIR}
++            ARCHIVE DESTINATION ${LIBDIR}
+         )
+     ELSE (SDLMIXER_FOUND)
+         MESSAGE(WARNING ": SDL_mixer library not found: Not building SDL audiodriver")
+--- build_paths.h.cmake
++++ build_paths.h.cmake
+@@ -41,6 +41,7 @@
+ 
+ //	set game directory (normal $(datadir)/s25rttr/S2)
+ //#define GAMEDIR DATADIR"/S2"
++#cmakedefine GAMEDIR "${GAMEDIR}"
+ 
+ //	set driver directory (normal $(libdir)/driver)
+ //#define DRIVERDIR LIBDIR"/driver"
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
new file mode 100644
index 000000000000..493d7cb404be
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
@@ -0,0 +1,17 @@
+From: hasufell <julian.ospald@googlemail.com>
+Date: Mon Apr 30 20:42:28 UTC 2012
+
+relocate executables sound-convert and s-c_resample which get installed
+into datadir by default
+
+--- libutil/src/files.h
++++ libutil/src/files.h
+@@ -140,7 +140,7 @@
+ 	/* 54 */RTTRDIR "",                               // unbenutzt
+ 	/* 55 */SETTINGSDIR "/LSTS/SOUND.LST",            // Die konvertierte sound.lst
+ 	/* 56 */RTTRDIR "/sound.scs",                     // Das konvertier-script
+-	/* 57 */RTTRDIR "",                               // Basispfad fürn Soundconverter
++	/* 57 */DRIVERDIR "",                             // Basispfad fürn Soundconverter
+ 	/* 58 */GAMEDIR "/DATA/MIS0BOBS.LST",
+ 	/* 59 */GAMEDIR "/DATA/MIS1BOBS.LST",
+ 	/* 60 */GAMEDIR "/DATA/MIS2BOBS.LST",
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
new file mode 100644
index 000000000000..7fc5626ab600
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/s25rttr/s25rttr-0.8.1.ebuild,v 1.1 2013/12/23 13:45:08 hasufell Exp $
+
+EAPI=5
+inherit eutils cmake-utils gnome2-utils games
+
+DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
+HOMEPAGE="http://www.siedler25.org/"
+# no upstream source tarball yet
+# https://bugs.launchpad.net/s25rttr/+bug/1069546
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug glfw"
+
+RDEPEND="app-arch/bzip2
+	media-libs/libsamplerate
+	media-libs/libsdl[X,audio,opengl,video]
+	media-libs/libsndfile
+	media-libs/sdl-mixer[vorbis]
+	net-libs/miniupnpc
+	virtual/libiconv
+	virtual/opengl
+	glfw? ( <media-libs/glfw-3 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cmake.patch \
+		"${FILESDIR}"/${P}-soundconverter.patch
+}
+
+src_configure() {
+	local arch
+	case ${ARCH} in
+		amd64)
+			arch="x86_64" ;;
+		x86)
+			arch="i386" ;;
+		*) die "Architecture ${ARCH} not yet supported" ;;
+	esac
+
+	local mycmakeargs=(
+		-DCOMPILEFOR="linux"
+		-DCOMPILEARCH="${arch}"
+		-DCMAKE_SKIP_RPATH=YES
+		-DPREFIX="${GAMES_PREFIX}"
+		-DBINDIR="${GAMES_BINDIR}"
+		-DDATADIR="${GAMES_DATADIR}"
+		-DLIBDIR="$(games_get_libdir)/${PN}"
+		-DDRIVERDIR="$(games_get_libdir)/${PN}"
+		-DGAMEDIR="~/.${PN}/S2"
+		$(cmake-utils_use_build glfw GLFW_DRIVER)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# work around some relative paths (CMAKE_IN_SOURCE_BUILD not supported)
+	ln -s "${CMAKE_USE_DIR}"/RTTR "${CMAKE_BUILD_DIR}"/RTTR || die
+
+	cmake-utils_src_compile
+
+	mv "${CMAKE_USE_DIR}"/RTTR/{sound-convert,s-c_resample} "${T}"/ || die
+}
+
+src_install() {
+	cd "${CMAKE_BUILD_DIR}" || die
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe "${T}"/{sound-convert,s-c_resample}
+	exeinto "$(games_get_libdir)"/${PN}/video
+	doexe driver/video/SDL/src/libvideoSDL.so
+	use glfw && doexe driver/video/GLFW/src/libvideoGLFW.so
+	exeinto "$(games_get_libdir)"/${PN}/audio
+	doexe driver/audio/SDL/src/libaudioSDL.so
+
+	insinto "${GAMES_DATADIR}"
+	doins -r "${CMAKE_USE_DIR}"/RTTR
+	dosym ./LSTS/splash.bmp "${GAMES_DATADIR}"/RTTR/splash.bmp
+
+	doicon -s 64 "${CMAKE_USE_DIR}"/debian/${PN}.png
+	dogamesbin src/s25client
+	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
+	dodoc RTTR/texte/{keyboardlayout.txt,readme.txt}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "Copy your Settlers2 game files into ~/.${PN}/S2"
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}