version bump

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

5 files changed, 240 insertions, 17 deletions

diff --git a/games-action/openclonk/ChangeLog b/games-action/openclonk/ChangeLog
index 5a4b5a049a85..d472a882d44b 100644
--- a/games-action/openclonk/ChangeLog
+++ b/games-action/openclonk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-action/openclonk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/ChangeLog,v 1.17 2014/07/04 19:29:48 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/ChangeLog,v 1.18 2014/10/10 19:18:22 hasufell Exp $
+
+*openclonk-5.5.1 (10 Oct 2014)
+
+  10 Oct 2014; Julian Ospald <hasufell@gentoo.org> +openclonk-5.5.1.ebuild,
+  +files/openclonk-5.5.1-paths.patch,
+  +files/openclonk-5.5.1-tinyxml-shared.patch:
+  version bump
 
   04 Jul 2014; Julian Ospald <hasufell@gentoo.org> openclonk-5.3.3-r1.ebuild:
   stable wrt #503930
diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest
index 53e6d5877ff4..fbcbc80dc5f1 100644
--- a/games-action/openclonk/Manifest
+++ b/games-action/openclonk/Manifest
@@ -2,29 +2,33 @@
 Hash: SHA256
 
 AUX openclonk-5.3.3-xrandr-primary-output.patch 1119 SHA256 d312008f038a6aca9281c3de1c45806b5104e0107ed6ba8455a7125cb0784233 SHA512 d075bcb847899508245f074178ae420681099e92711db236aec4fee5b9a64c24a701f84cc71955eeff1b6e2eb18ed39d2ac48ef3ee4bf4aff5d45f99a95d565e WHIRLPOOL 9a129f0c6091949e5eee0eb77362429c4fcb123a3c55c80de0b6f063cca125b06f2d0cfd5a0b29d9b959cd70e58b4339635d4de6ba322fc8655416f9bfdc4376
+AUX openclonk-5.5.1-paths.patch 2569 SHA256 271a3d42c6393fea5beee7c236ac0d0546f698933556bd6bea8171edad9dbd62 SHA512 1facd9960c926b2a00f4c6e27d9c96b3bc731c4f65004ca85af47697d3d54949ec64c6972cf4e478eedc59b21f5a10b4b6ab61e2e48ea425fea6ab32e61611d0 WHIRLPOOL d333e53948c776aafb5507e49cb22ebf3bb01d40d8545c8c17781ab2af44ff57dbd36e933753b29a1d1076dc8e6b3c38c4d6637300899cef2ea7f926f5c78675
+AUX openclonk-5.5.1-tinyxml-shared.patch 650 SHA256 88423d09b8ccafd2f8ad9ef8a1faaab02fef8ff6ff577b071adfd45d1af2c4b7 SHA512 106e3f63eebf55a55af7591da5cfe4278a16a438e97b9288188d735c31efe709bb03f83047d49f109839f7e56cc036d7a479eda513cb8e70dd3cb91006844ade WHIRLPOOL 798902abebd55fd436a560ebd1a405f7bf1c95c1116fb052d8eaf7853bfb73f2cdfd53910a920348e01e2f337cb27fcfebb31ca2093f0e37162d5d0de92310c0
 AUX openclonk-wrapper-script.sh 229 SHA256 96fbef61769c0b4950dfde6d35648f9f5b2d9261c4b99687cfc02c24635ed939 SHA512 d31a2ffa6dbb014cfe3761d5a8b52b33f6b658cda317d0f7fc91ad8cc869fd93c486f9808da9ebe03e75255b7b2fedc2ef6c4f6372f1dce0575771ae9471a8a3 WHIRLPOOL 5395e432dab01140abcedcbf49573094bf13269b15fc7a1758a6c00258e1246560c1f50ae658fe27ef2cf579633debb4ed8efcd64d028bc9be2e2fb9603112d0
 DIST openclonk-5.3.3.tar.xz 46516448 SHA256 e6352a695ccb1f7905b2e3014b229e25a9660e82f2a96696521862efaa163abe SHA512 2351b2ec8d3931a05c7f8a4c7ca9ef0285535b1a15da0b02de9046139806211ed64fe3b08a56c3d1712aad07e0a6eea0074ff47d9dbaa874605a788f4c3ab100 WHIRLPOOL 6cc87894b2ab03de35c42fcd3e617f82b66ac06ccdb2ad167a67a0d14ad22fecc048d2d3f2504a5c96efe94103830bcf2f0deaa7a535bea66fb115f12aab4e82
+DIST openclonk-5.5.1-src.tar.bz2 65383438 SHA256 c038d6dc2ef9a3d7966b18ba6147b9dd136f353dfaa5796455f9917b79255743 SHA512 eb111a1f19e2373e6999850dddafa9a5653694904f470690ef39300e4cc3105f0394637e7dbea0a4cff9d91dd30b04f9037252eb0e8830966696f01f6424b977 WHIRLPOOL 990e90ff0daf9aa9dc4826ff621f0647089a68b5ba7d798a4d6cd5ef5d9ec78a666ae897241a6d556f90110f6739206fb09ebc2bc6c9558df65ee67dba0ea8af
 DIST openclonk.png 8487 SHA256 93ff9f479e166f30f1c1042c32624b7e54b4d917813a4f46cce57e39a1f30233 SHA512 3bd2bb20167349130d767719f6732d9682ec32a09f5e8c13fe6245648185eee28edfe564ae64bdc5539c19de701f321887c7fa71e8d1f1f640e0ec6b933544de WHIRLPOOL 190876380614e82092a0d825612cec9dbd0294aec1caf9fe00a137d75525736d87e56507851f61292b736601c1124aac1d1724e94cd0846fa60f5fcab714ef13
 EBUILD openclonk-5.3.3-r1.ebuild 2387 SHA256 b94bd7a8c29c63d1b4c1fba71516ea118bdfa98861a7f6bd2f5a88756d472727 SHA512 38c685b25652c8112c003ef6e19c5b59b970fa689d538fe4fe553211f8d7adb3934a82edbc62db92370a3c2f7d78879db64be7b529c036ba5ca4517323e26d59 WHIRLPOOL f012b189d59027c8cee7f4cb84ecfd74faf935e8e7fea460fd57897e1dbbb3cc0052de8d2df86cacc4abbe5b9a2a61c48bd2dd2d19f0ccb9bcd20245bde88526
 EBUILD openclonk-5.3.3.ebuild 2323 SHA256 7c09d1a5e17bf56608f5583df677b954c4ecaa1836bf93552d52015694b769b9 SHA512 0445e8eaae5622c0ada8e8ca0282cdb9b30541021be8bce429025cdb5443c87678fbfc64b694a96d36ff9833cde0b0a5cf4cba288cc127143d039612628bfd6a WHIRLPOOL 1236da7bfbe7224d61252f128116c31fca748050216834f80d7a90bbdc72feb0670fc69bdaa1f9e1311b06eee5c67ca39ad753051d2aa29ea2cacd087a757235
-MISC ChangeLog 2442 SHA256 a57493e1b562b0de985a5fa47a3f84638e02e45176788816a6493ba3f4bcafc2 SHA512 57bd966696462b76c164b760971932ff2c12ad5f67bd30c3e585d34a8f760ad9477a8ef6f9609f4cf5cddc8704e62fb21f5de6d7cb1040cf1b84e7bf99e348bc WHIRLPOOL f1d8596167873d08d024c434afdd011791a4a89b42660553155ae5924d56f0c5d114a27d3b011060f2c4cfb0cbf72ecac0e8e167477164d289e5d5ce5aa3061c
+EBUILD openclonk-5.5.1.ebuild 2560 SHA256 7b2af462bbbaea40d2007b93de6bc3bdefe42f1b4ab5f0f7adc166696390dc48 SHA512 08c2b353c6c368a4686bc23e96a326f2ec3375f4e67a078cd33c5c561157ab3ea4ef52b669b43e184e840fa6b4577d502991da4a0067c2966d558a9dd7eb3802 WHIRLPOOL 4f8e1e275ca07b24216bb015c1af32b437fabf9362d7caa2ef068b3331772387be2d8b65fadde61ffb0edadead89ae4f5890c978bb807c5f29f1801851c475a5
+MISC ChangeLog 2651 SHA256 28b3223dfe7bcb82350732f2bcf81e3c47a1166610a9a30f87d2b5f5b70f991e SHA512 fadafcf7a972bab25268b4d3b196304c7c8e042d3a733dd0a2cdf0f63fe4bebab2849050826ff6075658abff2b2e79db6b945ff30192e03e94e0b40d7caa0142 WHIRLPOOL a021998fc76a6e40317bffbac62288c4601058a321b901f81d5f6c96085cf1844eb6dd2aab082625d45fd1fc051117e3d7a09714a0c28768474765b79086c54f
 MISC metadata.xml 1089 SHA256 d1d9811cfc3649763d90d459c42c68b2c8bcf08c419e03de8b1616263628ab90 SHA512 3a212632f94dfd01128b9c27ea782ab7f499857346d468de7d375eca0f0dd8c7319d03e64c80bb66b6c24836146bae6d305cbc618b6cc8b9fc1c7a2dc369b8c8 WHIRLPOOL 08a4b45f9b3463df0dbbfbdcbade30492697d5102272a9e758536ed1c24f2ea5113fa91271dfd2050ef5cbcdd2768e3b49fb45c4b3e0a5a1a11100710d5d1923
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTtwCvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUODEBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgpigP/2iX4tCp7cJvQEX1gPXQ54Ab
-xVcy/HJ/yy/GS96Larml99eAUVM97jzSBxyD9dqJ9HfzmisEWqNS3vBpeWgDTjuZ
-kdzLb1yW67iO/vvF/DT3dxSQZb+o3MJdAauoHk7o+RauzVAKfV+xj1lGV0KpEkyY
-4lEYL9VYjYOOunlu2uZZydGZRYE7jgzQHW7E9JeqxbCPWROJoSp+imWkQ++KKQyP
-TlEMPylbHcwXgYXvzuVh/H4DAkg+XPcYK+v/6q0OpwcwaGMbThJ80tlBgjApr3N/
-SDtRiY/ydFHi8QEJ20BZ6BdXCXnPhKBGVN1xblsEbn/DDZxwxcejkA+t7p6UyKH/
-kmH04PJ+Bb13SVM0BtQc49eYX9EpXLvrEjmzben8cdsH75bNnI02BV4+vrRwUKea
-Ru7WFIPbq46EymPHAIWVjc7r67u2lfFHgXLV8T3GwWXIZBdA2S9EXxNvBNSRwZC1
-BIFZr3vssYEs5Piyu91o2ufLTu4rUHWCabX4XGVLJZGRyhIabcfC/UgZC6saJMyU
-HGlgas0OfD3vO1/c4YdAjc2gnyflqmKcQ/CgDSfasP9B3nZ8HNI89IGz1GX+pamD
-66PTqBbz7m4pYlNSCYJ0DlwgnWEVY7nXaiCbcGWrtdyxCV9CTPfiZ+DO+bhqsqHD
-7O3AqFVjW3QcJ1bveJ56
-=c4d/
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg5lMP/RGU8eyci4XCRplq2F3+Ipgl
+iQvWRw1EjjI3jKOFH0DtLl+qSfWcnfVJt6POZERzC8QYMz+jcL4i0IY40bBLpkez
+vz9/mJB0nfM7YaGDWtD00XRR7EqAPMdOh90Ja3WpGaNhjNBdkil82aR9qoZg5WFC
+OsccvgIKxo8XZ6TaXteK8O8kYc5niCizX4qukBlv4C818E+vBlaHIP8tA9KeC8ys
+nTAt8mWv7QCAQVH5PEDeAvuJVnNqtBUcORB+SUpWBAnv2xy9s6pvoe4gS6MFW01X
+LCB7KSjG3FKKX7/gGlUBuo8NdzzBojeum6w+l/P8wKjE/1CkmqtfJ/XylD79ng/F
+zpMmQ7o1cnibubKm6EOCQtKPz4LV1L2mUkdn33lbUxrMCy4xPteIuLh4cfL0XMeQ
+OWb3ucLUBbyU90O41WBIk90tJ5o/kAS3ljU7tCXrUa+SYOdskfTGhEdwxkYXhMwE
+hzt7pXAEIn+0MPC1EbXbCFcaR7sofn01k4hyBlmvGAkFUI+yT/8X/XdnjSClBs+j
+MVm4+Wd2oKkhbdnAZOL1eKVG3LhctroH138nRA5viis561Rix+aOdTY6HaUIoaRW
+DMtfRINl7xZlAJ3z6IFLRd7gC62sW//HJRmknFMootvng8n2UIBdNjiV2+YbXqWw
+HghVMTJISY7Uay63V8a6
+=54OE
 -----END PGP SIGNATURE-----
diff --git a/games-action/openclonk/files/openclonk-5.5.1-paths.patch b/games-action/openclonk/files/openclonk-5.5.1-paths.patch
new file mode 100644
index 000000000000..02776e21ed69
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-5.5.1-paths.patch
@@ -0,0 +1,67 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Feb  6 19:58:45 UTC 2014
+Subject: make paths modifiable
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,6 +35,16 @@
+ 	set(${_var} "${_string}" PARENT_SCOPE)
+ endfunction()
+ 
++
++############################################################################
++# User selectable paths
++############################################################################
++set(INSTALL_BINDIR "bin/" CACHE PATH "Binary install destination")
++set(INSTALL_GAMES_BINDIR "games/bin" CACHE PATH "Games binary install destination")
++set(INSTALL_DATAROOTDIR "share/" CACHE PATH "Data root install destination")
++set(INSTALL_DATADIR "${INSTALL_DATAROOTDIR}" CACHE PATH "Data install destination")
++
++
+ ############################################################################
+ # User selectable options
+ ############################################################################
+@@ -1170,10 +1180,16 @@
+ # Assemble compiler flags
+ ############################################################################
+ if(UNIX)
++	if(NOT IS_ABSOLUTE "${INSTALL_DATADIR}")
++		set(ABSOLUTE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_DATADIR}")
++	else()
++		set(ABSOLUTE_INSTALL_DATADIR "${INSTALL_DATADIR}")
++	endif()
++
+ 	# Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached,
+ 	# and when the path is changed both the old and new definition appears
+ 	# in the list of flags.
+-	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"")
++	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${ABSOLUTE_INSTALL_DATADIR}/openclonk\"")
+ endif()
+ if(OC_CXX_FLAGS)
+ 	list(REMOVE_DUPLICATES OC_CXX_FLAGS)
+@@ -1474,20 +1490,20 @@
+ 			DEPENDS c4group
+ 			VERBATIM
+ 		)
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk)
++		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION "${INSTALL_DATADIR}/openclonk")
+ 	endif()
+ endforeach()
+ 
+ if (NOT APPLE)
+ 	add_custom_target(groups DEPENDS ${OC_C4GROUPS})
+ 	add_dependencies(data groups)
+-	
++
+ 	# Install new files
+-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION share/applications)
++	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications")
+ 
+ 	# Install binaries
+-	install(TARGETS openclonk DESTINATION games)
+-	install(TARGETS c4group DESTINATION bin)
++	install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}")
++	install(TARGETS c4group DESTINATION "${INSTALL_BINDIR}")
+ else()
+ 	install(TARGETS openclonk
+ 		BUNDLE DESTINATION .
diff --git a/games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch b/games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch
new file mode 100644
index 000000000000..a55943fc3135
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch
@@ -0,0 +1,25 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Feb  6 19:58:45 UTC 2014
+Subject: use shared tinyxml
+
+--- a/CMakeLists.txt.old.new
++++ b/CMakeLists.txt
+@@ -1292,7 +1292,6 @@
+ CHECK_INCLUDE_FILE_CXX(getopt.h HAVE_GETOPT_H)
+ 
+ # TinyXML
+-add_subdirectory(thirdparty/tinyxml)
+ target_link_libraries(openclonk tinyxml)
+ 
+ if(WIN32)
+--- a/src/lib/StdMeshLoaderXml.cpp
++++ b/src/lib/StdMeshLoaderXml.cpp
+@@ -19,7 +19,7 @@
+ #include "C4Include.h"
+ #include "StdMesh.h"
+ #include "StdMeshLoader.h"
+-#include <tinyxml/tinyxml.h>
++#include <tinyxml.h>
+ 
+ // Helper class to load things from an XML file with error checking
+ class StdMeshLoader::StdMeshXML
diff --git a/games-action/openclonk/openclonk-5.5.1.ebuild b/games-action/openclonk/openclonk-5.5.1.ebuild
new file mode 100644
index 000000000000..7f3bb2f97309
--- /dev/null
+++ b/games-action/openclonk/openclonk-5.5.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.5.1.ebuild,v 1.1 2014/10/10 19:18:22 hasufell Exp $
+
+# FIXME: does not compile with gtk+3
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils eutils gnome2-utils python-any-r1 games
+
+MY_P=${PN}-release-${PV}-src
+
+DESCRIPTION="A free multiplayer action game where you control clonks"
+HOMEPAGE="http://openclonk.org/"
+SRC_URI="http://www.openclonk.org/builds/release/${PV}/openclonk-${PV}-src.tar.bz2
+	http://${PN}.org/homepage/icon.png -> ${PN}.png"
+
+LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated doc"
+
+RDEPEND="
+	>=dev-libs/boost-1.40
+	dev-libs/tinyxml
+	net-libs/libupnp
+	media-libs/libpng:0
+	sys-libs/zlib
+	!dedicated? (
+		dev-libs/glib:2
+		media-libs/freealut
+		media-libs/freetype:2
+		media-libs/glew
+		media-libs/libsdl[X,opengl,sound,video]
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/sdl-mixer[mp3,vorbis,wav]
+		virtual/jpeg
+		virtual/opengl
+		virtual/glu
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libXrandr
+		x11-libs/libX11
+	)
+	dedicated? ( sys-libs/readline:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		${PYTHON_DEPS}
+		dev-libs/libxml2[python]
+		sys-devel/gettext
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tinyxml-shared.patch
+	"${FILESDIR}"/${P}-paths.patch
+)
+S=${WORKDIR}/${PN}-release-${PV}-src
+
+pkg_setup() {
+	games_pkg_setup
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	rm -r thirdparty/tinyxml || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex dedicated \
+			"-DUSE_CONSOLE=ON -DUSE_X11=OFF -DUSE_GTK=OFF -DUSE_GTK3=OFF" \
+			"-DUSE_CONSOLE=OFF -DUSE_X11=ON -DUSE_GTK=ON -DUSE_GTK3=OFF")
+		-DWITH_AUTOMATIC_UPDATE=OFF
+		-DINSTALL_GAMES_BINDIR="${GAMES_BINDIR}"
+		-DINSTALL_DATADIR="${GAMES_DATADIR}"
+		-DUSE_STATIC_BOOST=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		emake -C docs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use dedicated; then
+		mv "${ED%/}${GAMES_BINDIR}/openclonk" "${ED%/}${GAMES_BINDIR}/clonk" || die
+		newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN}
+		doicon -s 64 "${DISTDIR}"/${PN}.png
+		make_desktop_entry ${PN}
+	fi
+	use doc && dohtml -r docs/online/*
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}