games-action/openlierox: Apply compilation patch (bug #359655)

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 149 insertions, 13 deletions

diff --git a/games-action/openlierox/ChangeLog b/games-action/openlierox/ChangeLog
index 9da42d45858b..b811bf1576e8 100644
--- a/games-action/openlierox/ChangeLog
+++ b/games-action/openlierox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/openlierox
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/ChangeLog,v 1.5 2010/03/09 12:34:56 abcd Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/ChangeLog,v 1.6 2011/03/22 17:55:15 sping Exp $
+
+*openlierox-0.58_rc1-r1 (22 Mar 2011)
+
+  22 Mar 2011; Sebastian Pipping <sping@gentoo.org>
+  +openlierox-0.58_rc1-r1.ebuild, +files/openlierox-0.58_rc1-icu.patch:
+  Apply compilation patch by upstream (Gentoo bug #359655)
 
   09 Mar 2010; Jonathan Callen <abcd@gentoo.org>
   openlierox-0.58_beta9-r1.ebuild, openlierox-0.58_rc1.ebuild:
diff --git a/games-action/openlierox/Manifest b/games-action/openlierox/Manifest
index b18342002a78..a70e8fe54df0 100644
--- a/games-action/openlierox/Manifest
+++ b/games-action/openlierox/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openlierox-0.58-beta9-joystick-cmake.patch 1115 RMD160 7e207e8e1585026e895c405bb5f982a53489f104 SHA1 e27790e6bdbcee21b91f4f1b9078bcdbf0a32e81 SHA256 0eab9a526d997584ecb917897c72f66b6458029ba6160b274564d167f8adea65
 AUX openlierox-0.58-beta9-joystick-cpp.patch 5234 RMD160 96c1726c6e8cdf95ae435255ea5b0df1e0aa4d31 SHA1 6ad6f69ff81bf91c78f39b1a3fb70e97c8e1cdce SHA256 08de10ecd9dac7d0d22369294ac563668c9a0aad45ce3b36be42826f1d007cd9
+AUX openlierox-0.58_rc1-icu.patch 2491 RMD160 87e5a5f3e99e9c221c15620490e46eaeaf8bdb37 SHA1 2b2ed4933ea9b06689b3028c1c5e6010389aebc2 SHA256 0a88eb57357eb6c1f3e1f20792b0504a2a11da680b8cd46a76990c37cd06c139
 DIST OpenLieroX_0.58_beta9.src.tar.bz2 82815579 RMD160 1fa481b01e116a190128f68c979c40c2c280df09 SHA1 63363009c56536e205892c02bc641550e81564a1 SHA256 9f272f530e2a2648c53272e0c835092615d9bc9f14f5e733b2d0935a0edfc014
 DIST OpenLieroX_0.58_rc1.src.tar.bz2 99189771 RMD160 aa1e306bfcc9d082a88e572ccb7770985275e7a1 SHA1 b41a35bc2a9a8c4d49911f48e45ea2396263669b SHA256 0471c54e9d994b1bddc550eac146f6d07ae9be3c95bdcfb254ed2993df99e9cc
 EBUILD openlierox-0.58_beta9-r1.ebuild 1938 RMD160 1834e4a9ee962617223219ad8f832dbe050c8f35 SHA1 7596635b3932717ead65cf9eb23b1a1c02cbaf76 SHA256 abebe3c23fdc2efdd6544dcfc51628b497dd47da25134c9d398d5563aca18a14
+EBUILD openlierox-0.58_rc1-r1.ebuild 1859 RMD160 dec60c25fc8c70111af99966722e5c6c8101feb5 SHA1 4bd4bb6cc09a21af7b235944578c7b20f47be066 SHA256 c4ed9b2f3d7d9e1906d242220e52372c433747d0ec18e7b5e63841afe139b267
 EBUILD openlierox-0.58_rc1.ebuild 1799 RMD160 a0ac5c4ca4ad5f559b758c0657d8efc251edf75e SHA1 e6ebe30391d71f33bb735b4ce4fb3d0e0b1f99d6 SHA256 a6a98924bd961671513561ec4b5a452f97da20cfc1a4d5d25ddcb4df5b5b3de5
-MISC ChangeLog 1177 RMD160 bf5ecf574c0499d546c5bd98b06802cb3d38dd8c SHA1 2cd3fe8771f4826a84562ee5258b8c9a3c48b750 SHA256 dffec981c8852d5f4cf3333f3f2adec82f159445a9c8a5689c90043520214d41
+MISC ChangeLog 1401 RMD160 398cafcfe0b8fedc917cad87d1a393b22da5e044 SHA1 ba133fa535714ea387466b362fb9edea895b83df SHA256 3e19ed52ffe7a7fcbb03c0e3ef5c21a3d78f5d8dc4d83163eb7c16ca01768d69
 MISC metadata.xml 335 RMD160 7e8053c7d62145463dbff50e6d06eef77039a1da SHA1 39be11e5af990bdd1a1d70347bc4815e1fcfe3b2 SHA256 17e6687a622dc2faf6d29b8fc05d2298f7a3bbaf717b8f867c322d88c0ebb11f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkv+slgACgkQdz7hIScOURG0+wCePyYOFlTiFAsc+++LQGDlKkez
-QlcAoMd/oVAoqJHuz5uupla/jWVxw8LZ
-=2XNW
------END PGP SIGNATURE-----
diff --git a/games-action/openlierox/files/openlierox-0.58_rc1-icu.patch b/games-action/openlierox/files/openlierox-0.58_rc1-icu.patch
new file mode 100644
index 000000000000..32817c035c7d
--- /dev/null
+++ b/games-action/openlierox/files/openlierox-0.58_rc1-icu.patch
@@ -0,0 +1,67 @@
+From f30e2447944c5131b9c9502ca8054f847d1a9c0f Mon Sep 17 00:00:00 2001
+From: Albert Zeyer <albert.zeyer@rwth-aachen.de>
+Date: Tue, 22 Mar 2011 14:42:15 +0100
+Subject: [PATCH] rename UnicodeString to Unicode32String
+
+Seems that ICU (unicode/unistr.h) polutes the global namespace and uses this name. See http://bugs.gentoo.org/show_bug.cgi?id=359655 .
+---
+ include/Unicode.h      |    6 +++---
+ src/common/Unicode.cpp |    8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/include/Unicode.h b/include/Unicode.h
+index a523b46..5b976ab 100644
+--- a/include/Unicode.h
++++ b/include/Unicode.h
+@@ -15,7 +15,7 @@
+ #include <string>
+ 
+ typedef Uint32 UnicodeChar;
+-typedef std::basic_string<UnicodeChar> UnicodeString;
++typedef std::basic_string<UnicodeChar> Unicode32String;
+ #ifdef WIN32
+ typedef wchar_t Utf16Char;
+ typedef std::wstring Utf16String;
+@@ -158,8 +158,8 @@ char UnicodeCharToAsciiChar(UnicodeChar c);
+ std::string RemoveSpecialChars(const std::string &Utf8String);
+ std::string Utf16ToUtf8(const Utf16String& str);
+ Utf16String Utf8ToUtf16(const std::string& str);
+-std::string UnicodeToUtf8(const UnicodeString& str);
+-UnicodeString Utf8ToUnicode(const std::string& str);
++std::string UnicodeToUtf8(const Unicode32String& str);
++Unicode32String Utf8ToUnicode(const std::string& str);
+ std::string UnicodeToAscii(const std::string& utf8str);
+ std::string ISO88591ToUtf8(const std::string& isostr);
+ #ifdef WIN32
+diff --git a/src/common/Unicode.cpp b/src/common/Unicode.cpp
+index 5956289..5a58c30 100644
+--- a/src/common/Unicode.cpp
++++ b/src/common/Unicode.cpp
+@@ -1055,10 +1055,10 @@ Utf16String Utf8ToUtf16(const std::string& str)
+ 
+ //////////////////
+ // Convert a Unicode string to UTF8
+-std::string UnicodeToUtf8(const UnicodeString& str)
++std::string UnicodeToUtf8(const Unicode32String& str)
+ {
+ 	std::string result;
+-	for (UnicodeString::const_iterator i = str.begin(); i != str.end(); i++)  {
++	for (Unicode32String::const_iterator i = str.begin(); i != str.end(); i++)  {
+ 		result += GetUtf8FromUnicode(*i);
+ 	}
+ 
+@@ -1067,9 +1067,9 @@ std::string UnicodeToUtf8(const UnicodeString& str)
+ 
+ //////////////////
+ // Convert a UTF8 string to Unicode
+-UnicodeString Utf8ToUnicode(const std::string& str)
++Unicode32String Utf8ToUnicode(const std::string& str)
+ {
+-	UnicodeString result;
++	Unicode32String result;
+ 	for (std::string::const_iterator it = str.begin(); it != str.end();)
+ 		result += GetNextUnicodeFromUtf8(it, str.end());
+ 
+-- 
+1.7.3.4
+
diff --git a/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild b/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild
new file mode 100644
index 000000000000..17ba70143df8
--- /dev/null
+++ b/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild,v 1.1 2011/03/22 17:55:15 sping Exp $
+
+EAPI="2"
+
+inherit cmake-utils eutils games
+
+MY_PN="OpenLieroX"
+MY_P="${MY_PN}_${PV}"
+DESCRIPTION="Real-time excessive Worms-clone"
+HOMEPAGE="http://openlierox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openlierox/${MY_P}.src.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X breakpad debug joystick"
+
+RDEPEND="media-libs/sdl-mixer
+	media-libs/sdl-image
+	media-libs/gd[png]
+	dev-libs/libxml2
+	dev-libs/libzip
+	net-misc/curl
+	joystick? ( media-libs/libsdl[joystick] )
+	!joystick? ( media-libs/libsdl )
+	X? ( x11-libs/libX11
+		media-libs/libsdl[X] )
+	!X? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-icu.patch
+}
+
+src_configure() {
+	local mycmakeargs="
+		$(cmake-utils_use debug DEBUG)
+		$(cmake-utils_use X X11)
+		-D BREAKPAD=$(use breakpad && echo "Yes" || echo "No")
+		-D DISABLE_JOYSTICK=$(use joystick && echo "No" || echo "Yes")
+		-D SYSTEM_DATA_DIR=${GAMES_DATADIR}
+		-D VERSION=${PV}"
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	# NOTE: App uses case-insensitive file-handling
+	insinto "${GAMES_DATADIR}"/${PN}/
+	doins -r share/gamedir/* || die "doins failed"
+
+	dodoc doc/{README,ChangeLog,Development,TODO} || die "dodoc failed"
+	insinto /usr/share/doc/"${PF}"
+	doins -r doc/original_lx_docs || die "doins failed"
+
+	doicon share/OpenLieroX.* || die "doicon failed"
+	make_desktop_entry openlierox OpenLieroX OpenLieroX \
+			"Game;ActionGame;ArcadeGame;" || die "make_desktop_entry failed"
+
+	dogamesbin "${CMAKE_BUILD_DIR}"/bin/openlierox || die "dogamesbin failed"
+
+	prepgamesdirs
+}