version bump - bug #312847 with submissions from Michał Górny, Axel Dyks and Rafał Mużyło

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 132 insertions, 2 deletions

diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index e1c76de5eafb..335848cc0506 100644
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/widelands
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.25 2010/10/16 19:03:20 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.26 2010/11/20 10:08:09 mr_bones_ Exp $
+
+*widelands-0.15 (20 Nov 2010)
+
+  20 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +widelands-0.15.ebuild, +files/widelands-0.15-build.patch:
+  version bump - bug #312847 with submissions from Michał Górny, Axel Dyks
+  and Rafał Mużyło
 
   16 Oct 2010; Tupone Alfredo <tupone@gentoo.org> widelands-0.0.14.ebuild:
   Respect LDFLAGS. Bug #334961 by flameeyes@gentoo.org
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 2dc28127b55a..6aeb5e9873cc 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,6 +1,9 @@
 AUX widelands-0.0.14-build.patch 545 RMD160 5c59bdf264d1a7e4f0a6e980826530c846546f1f SHA1 29a6da13d455e47c25de3516f16b29294994bd8d SHA256 43ade110de1d6eb5c166d78c207f1d522e506f39c267a9979b262f2b4987549f
 AUX widelands-0.0.14-gcc45.patch 1620 RMD160 df16bf17fd8826ebf212c65b11655af5fe18e373 SHA1 827b3c6b4e212d4ea90a1184e950c94a41925933 SHA256 293382401d7ba7a8584cba4a64923e331daa0a766f0a1d8fa085b8aaac07a3cb
+AUX widelands-0.15-build.patch 1839 RMD160 baedf2f0e20815fdafd8c256a1d339bf32170f21 SHA1 71544823e8c75784db9fa4dcb875fe03f4c1cab8 SHA256 002afd51479536cf796cbab60515ff133bc6fb31d9e9322f966e6217dfdcdd1d
 DIST Widelands-Build14-src.7z 63758110 RMD160 a9cbda7021ab5c2200a84d75d6759e35606159b9 SHA1 405ac86ec47da830d750e4ebdea1e0e0534852b2 SHA256 553632c32edde73c1aac9db6d1f113ddd260b745b65bd5340c01c0e115966939
+DIST widelands-build15-src.tar.bz2 107471022 RMD160 23dd238978cf97cea2abcb2b8178b090d790cf77 SHA1 dfa3c1bf701dec55cefb5b10f278da037c9288ea SHA256 99cfc86318e74a9abfe85493bf0a072d7ac99d9a3cdaa44922e9a5e027d1be03
 EBUILD widelands-0.0.14.ebuild 1758 RMD160 c666f5a9315e5ea08b8c42881e1e969e45260299 SHA1 89a0f823f30bef4a31fc2e1dbd89628a6a7aec34 SHA256 48db8f71d7e7f14c77e4d5ac4c443457c66da7eb8df9d0d23f1922b75dff6c9a
-MISC ChangeLog 4351 RMD160 d7954117816234cf910a5dc079d7dd2b37c9a176 SHA1 0d9be5307ef2d917ede5bdb40dc7240d18698436 SHA256 63e1c002832c5200cc6a113b4bd0444e2e7771d51c6062b8a15cfda94504cdf5
+EBUILD widelands-0.15.ebuild 1557 RMD160 e7d30e0daecece5b4debca755289792caf60b0fa SHA1 122e1552bf8299e329a33de1031362821c7d1373 SHA256 b16c7e2e9f01ab949a2cdc427d4d31ed0ea2c35d9eec51522c633d890e7511f5
+MISC ChangeLog 4601 RMD160 b1df91dd436be70afd885bbe6489f2baf12060c7 SHA1 e3769ee7dffc9b2c700f69d8e272e6d8c14ad40c SHA256 2dcb1f37053b69ce91b2a89f2795e33c203358365361d67ad0b1891fd27c75c1
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/widelands/files/widelands-0.15-build.patch b/games-strategy/widelands/files/widelands-0.15-build.patch
new file mode 100644
index 000000000000..846d4b132998
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.15-build.patch
@@ -0,0 +1,55 @@
+--- CMakeLists.txt.old	2010-04-13 17:15:39.000000000 +0200
++++ CMakeLists.txt	2010-04-13 19:11:45.000000000 +0200
+@@ -106,6 +106,7 @@
+ set (BUILD_SHARED_LIBS OFF)
+ set (Boost_USE_STATIC_LIBS   ON)
+ set (Boost_USE_MULTITHREADED ON)
++set (Boost_ADDITIONAL_VERSIONS "1.42" "1.42.0")
+ find_package(Boost 1.35.0 REQUIRED)
+ include_directories(${Boost_INCLUDE_DIR})
+ target_link_libraries(widelands ${Boost_LIBRARIES})
+@@ -345,7 +346,7 @@
+     worlds
+     pics
+   DESTINATION ${WLBUILD_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug;Release;Gentoo
+   COMPONENT CoreDataFiles
+   PATTERN "*.svn*" EXCLUDE
+   PATTERN "SCons*" EXCLUDE
+@@ -380,7 +381,7 @@
+   set (WL_CREATE_SYMLINK_COMMAND "create_symlink")
+ endif (WIN32)
+ 
+-if (${CMAKE_BUILD_TYPE} STREQUAL Release)
++if (${CMAKE_BUILD_TYPE} STREQUAL Gentoo)
+   add_custom_target (
+     lang ALL
+     COMMAND cmake -E echo "Preparing directory po"
+@@ -399,7 +400,7 @@
+     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/buildlocale.py
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+   )
+-else (${CMAKE_BUILD_TYPE} STREQUAL Release)
++else (${CMAKE_BUILD_TYPE} STREQUAL Gentoo)
+   add_custom_target (
+     lang
+     COMMAND cmake -E echo "Preparing directory po"
+@@ -423,7 +424,7 @@
+     COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/locale
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+   )
+-endif (${CMAKE_BUILD_TYPE} STREQUAL Release)
++endif (${CMAKE_BUILD_TYPE} STREQUAL Gentoo)
+ 
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES locale)
+ 
+@@ -431,7 +432,7 @@
+   DIRECTORY
+     ${CMAKE_CURRENT_BINARY_DIR}/locale/
+   DESTINATION ${WLBUILD_INSTALL_LOCALEDIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug;Release;Gentoo
+   COMPONENT CoreLanguageFiles
+   PATTERN "*.svn*" EXCLUDE
+   PATTERN "SCons*" EXCLUDE
diff --git a/games-strategy/widelands/widelands-0.15.ebuild b/games-strategy/widelands/widelands-0.15.ebuild
new file mode 100644
index 000000000000..fc70cf949639
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.15.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.15.ebuild,v 1.1 2010/11/20 10:08:09 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils versionator cmake-utils games
+
+MY_PV=build$(get_version_component_range 2)
+MY_P=${PN}-${MY_PV}-src
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/"
+SRC_URI="http://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-games/ggz-client-libs
+	dev-lang/lua
+	media-libs/jpeg
+	media-libs/libpng:0
+	media-libs/libsdl[video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-gfx
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	media-libs/tiff"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+
+	sed -i \
+		-e 's:__ppc__:__PPC__:' src/s2map.cc \
+		|| die "sed s2map.cc failed"
+}
+
+src_configure() {
+	mycmakeargs+=(
+		'-DWL_VERSION_STANDARD=true'
+		"-DCMAKE_INSTALL_PREFIX=${GAMES_DATADIR}/${PN}"
+		"-DWL_INSTALL_PREFIX=${GAMES_PREFIX}"
+		"-DWL_INSTALL_DATADIR=${GAMES_DATADIR}/${PN}"
+		"-DWL_INSTALL_LOCALEDIR=locale"
+		"-DWL_INSTALL_BINDIR=${GAMES_BINDIR}"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile -j1
+}
+
+src_install() {
+	cmake-utils_src_install
+	newicon pics/wl-ico-128.png ${PN}.png || die
+	make_desktop_entry ${PN} Widelands
+	dodoc ChangeLog CREDITS
+	prepgamesdirs
+}