version bump

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

5 files changed, 255 insertions, 24 deletions

diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog
index bda6b7bcf51e..40218a0a4299 100644
--- a/games-strategy/megaglest/ChangeLog
+++ b/games-strategy/megaglest/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/megaglest
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.26 2015/01/28 21:59:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.27 2015/05/10 04:30:53 mr_bones_ Exp $
+
+*megaglest-3.11.1 (10 May 2015)
+
+  10 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/megaglest-3.11.1-cmake.patch,
+  +files/megaglest-3.11.1-static-build.patch, +megaglest-3.11.1.ebuild:
+  version bump
 
   28 Jan 2015; Michał Górny <mgorny@gentoo.org> megaglest-3.9.1-r1.ebuild:
   Switch to CPU_FLAGS_X86.
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index 6d78da16c386..ae576f93fcc6 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1,28 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX megaglest-3.11.1-cmake.patch 800 SHA256 2d773202f24a25bedf0369a5000de5a5d024cebad21685f62fac532c07b31c98 SHA512 063ff67139ec702c100b93a488daa6cf6b34909860fdbb964c242c7464876947ba45dd9dfee084f8f37dcc2c16dc8bb80842cbf497e36810745df5a29d73d7da WHIRLPOOL fbc198abc48a6d09d1247d8fd7bed084acf9b9d60e74ea3a4e90d19390ed09eeb9820861ec3096dce9943c850216addd195b91bf9231de4419f256fa758124da
+AUX megaglest-3.11.1-static-build.patch 1939 SHA256 c34102f40497240a659540bbf4926e9b8ac02aec2e6202b94eb10e923a224e5f SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5 WHIRLPOOL f6df24ade01171ab5095b3b6b8034c92183fbc5df64154e393d20c2a2ebf87c5dd8736684402103d945c544c3c0009f7865d485ede205fcb0f2c439e868ca09c
 AUX megaglest-3.9.1-cmake.patch 800 SHA256 2d773202f24a25bedf0369a5000de5a5d024cebad21685f62fac532c07b31c98 SHA512 063ff67139ec702c100b93a488daa6cf6b34909860fdbb964c242c7464876947ba45dd9dfee084f8f37dcc2c16dc8bb80842cbf497e36810745df5a29d73d7da WHIRLPOOL fbc198abc48a6d09d1247d8fd7bed084acf9b9d60e74ea3a4e90d19390ed09eeb9820861ec3096dce9943c850216addd195b91bf9231de4419f256fa758124da
 AUX megaglest-3.9.1-static-build.patch 1939 SHA256 c34102f40497240a659540bbf4926e9b8ac02aec2e6202b94eb10e923a224e5f SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5 WHIRLPOOL f6df24ade01171ab5095b3b6b8034c92183fbc5df64154e393d20c2a2ebf87c5dd8736684402103d945c544c3c0009f7865d485ede205fcb0f2c439e868ca09c
+DIST megaglest-source-3.11.1.tar.xz 2863180 SHA256 94e28a9628f3593ce337ce663f258a125176b11128f16afb8c947f2763930841 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225 WHIRLPOOL 7a6b0908da7c6164f3baa71ea10c1f09fca86581b9da4930c3a0aa70e2c25d582349772d45ec8edee91ded2cbe1e68ee66e8756d1d23205c5d751eae135758b0
 DIST megaglest-source-3.9.1.tar.xz 2957360 SHA256 e62314b8108ba3c80706aa896f4fed5992a8ea8d82a410e09fbb242c4bf54edc SHA512 2a3d402aa68a1b1ee326bf49b6b6dee5ed561623b541ab47c1545596fa9c77f805245b66bd8457ecd82625a3f1d4868269a4a3888a54245c73d9cb6babbace70 WHIRLPOOL 59ad629c66633b2f320c7c80eef627f4326cbacb0cc48169c33b6783bfc26d1a8baef1773f0d05a1bc589ec5ae6bbedbb1f394c34616b166faa6e7f9630a22e5
+EBUILD megaglest-3.11.1.ebuild 4470 SHA256 b8f84e31ca7d4b6bfead69cfc9a59185fa23901b6035db0ddab24d58070e143d SHA512 ce2a102b1fc88d7eac89a74c165c6c04f9f9b328cdfe661bd48ac3982f13574d36708b99ab6f506b20828b3a5c5d5cb91696e391f1ed12c996dd3e5856d28c9d WHIRLPOOL dd316dc15f1c657aec343829cb20eb36430f6f5d786aa3218c311d5848f8e60c6cea36f99e616e9bdd4e54827269c85143066dd3a4f98577e4f17affb075ab2d
 EBUILD megaglest-3.9.1-r1.ebuild 4594 SHA256 f69260e3b2db6449cb6e91523b9c96bf61b681b46f1b1443c01890e93aacdd9e SHA512 ffe9b431ecd7b04bae6552a2fcca7b508c87e1617f2258690b705189a4ce91f0dedd9678f2fb543e9317bc8556a0c65098a05365335cb1787b197559cfecbef8 WHIRLPOOL ca3a5c251c485074db63e9953222ba4b74e29f6248f41df89b900fa20a2e3d1e36fc7cceb8dcd95837fca1a7f969ed26c0629b55ad2e91d7a3628d4e89bee0f2
-MISC ChangeLog 5061 SHA256 532620c1a85770229fd236851af95943a8896b207f34058bf70e18c38b2d0a27 SHA512 da6ebb710a8c73d27f622cfe248ca15eaeeb2e4f9a73b5b09590d65e1da099f39488c9fd563416cc2088ef98cf31dc31340399367344b41a3e908582aaba666d WHIRLPOOL 9bb55b7948587efed7127bc12d6caef25c0ac5e3e8108ad28451bd2c4fad3d31ca79bb103a2785fbad4437221638a0dc85f3df7f997f0b83cc63802e577e26e9
+MISC ChangeLog 5279 SHA256 c9ef8417b159cc870427c29d2d89f1e2fcd6f35b4abf6b02ed9f79a699626797 SHA512 10e803749f48746d7407899b0a7d17df03765dff7793c5746f1388ec93635ffe5a77f72507f5c51c2769d2d2fc1d3099e5e4721c2e3c68457a8da4d778ac8650 WHIRLPOOL 77f1da7308163ecf928401891a96865edce816c4c6854707b5bbe4668c7cdc4c2fda0f72c04ccd7dca321c6b265dff401f03804b8db38f4f9475837d0d2f741c
 MISC metadata.xml 1508 SHA256 b48e1ebe66f512e94842536838ff7a5c2de67c47f45bbc86bcd07032e6451e16 SHA512 d76111a570d1681c89f6376915bf0f455f301a7ec9cd7afec4b7308bd9b33fc0d4e44da0c07d7e1a1b237286fd9d36c766fd8083e2aefaf27bf224d1285f846d WHIRLPOOL c3ceac103e3c0e626a25b5ba8dadba1360bd5d05c24af127140d030094d75de250fe9f161556769004326ce76cd98ac4d526cf8c0a21980b2babd69f9065aca9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJUyVvLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOYSYP/2BMLnPb8+V4dpCc3F2neNwe
-4qQYPJCBbibp4UdSpIr9pf66kFkG+bIcHMEwThJLIj4f2W5WohN7tMQCvAK5+IoC
-As7ZyxTsdAi9icH9c5pd8jWPF+rjNZEbdmqqNWBWbuAELvC7WVyNYMA2tLjW34k1
-FZFUXBBfdp8OqlAMK6vPQudTZ4evTYaT6JwJoD7Vd7UBR0xhFWsw5tGMbcjwfgW4
-3MIyCgTCCPfiat5BDshpDZi4dE7mhn+HqTyJGKmTi7d8rv2sEI/bAzbUwbjAskaJ
-59s13SLJNG4r4nxXgoFwC7H+3xhHrlJ4LF8eOstC/ALzyBZOm3UvV5WCyV3FP11s
-fHi707muYvkwZWQNTxPN6Vwdj+ZAEXC75zaV4c+wSHsZIR2xttmD6mez7QzC//Fs
-hKnjR1vatR5cDe6SgaSkpa95vC1AXIus58cJJtH6rfMcIUzOMqgXCM0lYAMt5r5h
-8RTYaLroqni3wxvOnR16+8bX0Iihlu27U3tMdhQlWOEFleRUUf6WrpTW4W98v0Il
-ed7WeN/TwXJwTaJEfu2B2YqmnrHtJg26RRyPbLKKB9Ai0LROPZzAYkR0q7GyLmaa
-5RQj4wO0Cgw7vwTtFWYEguWO4oe3Six1IXK2WZbntWN9RU0yxu2p5X5RoWookHwk
-RLznWesjE4f7z7DvIAfc
-=NLpJ
------END PGP SIGNATURE-----
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
new file mode 100644
index 000000000000..1c04ea28262e
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
@@ -0,0 +1,18 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Jan 27 00:46:56 UTC 2014
+Subject: fix installation
+
+--- megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt
++++ megaglest-source-3.9.1.tar.xz/source/glest_game/CMakeLists.txt
+@@ -310,9 +310,9 @@
+ 		          "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
+ 		          "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
+ 		          "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
+-		          "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
++		          "${PROJECT_SOURCE_DIR}/editor.ico"
+ 		          "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
+-		          "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
++		          "${PROJECT_SOURCE_DIR}/g3dviewer.ico"
+ 		          DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+ 	        ELSE()
+ 
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
new file mode 100644
index 000000000000..2586a561956b
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
@@ -0,0 +1,63 @@
+commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a
+Author: hasufell <hasufell@gentoo.org>
+Date:   Mon Nov 18 21:54:54 2013 +0100
+
+    fix static build
+
+diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake
+index 2a026cc..8ca8a23 100644
+--- a/mk/cmake/Modules/FindOGG.cmake
++++ b/mk/cmake/Modules/FindOGG.cmake
+@@ -19,11 +19,11 @@
+ 
+ FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h)
+ 
+-#IF (OGG_STATIC AND NOT OGG_LIBRARY)
+-#	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg)
+-#ELSE()
+-	FIND_LIBRARY(OGG_LIBRARY NAMES ogg)
+-#ENDIF()
++IF (OGG_STATIC AND NOT OGG_LIBRARY)
++	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a)
++ELSE()
++	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so)
++ENDIF()
+ 
+ #IF (OGG_STATIC AND NOT VORBIS_LIBRARY)
+ #	FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis)
+--- a/mk/cmake/Modules/FindXercesC.cmake
++++ b/mk/cmake/Modules/FindXercesC.cmake
+@@ -83,6 +83,9 @@
+ 	 /usr/lib
+ 	 /usr/local/lib
+ 	)
++	
++	FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a)
++	FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a)
+ 
+ 	IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
+                 MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]")
+@@ -90,7 +93,7 @@
+ 
+ 		IF(UNIX AND NOT APPLE)
+ 			#SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata")
+-			SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}")
++			SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY}  ${ICUDATA_LIBRARY}")
+ 		ENDIF()
+ 	ENDIF()
+ ENDIF()
+--- a/mk/cmake/Modules/FindFriBiDi.cmake
++++ b/mk/cmake/Modules/FindFriBiDi.cmake
+@@ -28,9 +28,9 @@
+ SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
+ 
+ OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
+-IF(WANT_STATIC_LIBS)
+-	SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
+-ENDIF()
++#IF(WANT_STATIC_LIBS)
++#	SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
++#ENDIF()
+ 
+ MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...")
+ 
diff --git a/games-strategy/megaglest/megaglest-3.11.1.ebuild b/games-strategy/megaglest/megaglest-3.11.1.ebuild
new file mode 100644
index 000000000000..91cb47ff70ea
--- /dev/null
+++ b/games-strategy/megaglest/megaglest-3.11.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.11.1.ebuild,v 1.1 2015/05/10 04:30:53 mr_bones_ Exp $
+
+# google-breakpad
+# TODO: fribidi, libvorbis static
+
+EAPI=5
+VIRTUALX_REQUIRED="manual"
+inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games
+
+DESCRIPTION="Cross-platform 3D realtime strategy game"
+HOMEPAGE="http://www.megaglest.org/"
+SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
+
+LICENSE="GPL-3 BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
+
+RDEPEND="
+	~games-strategy/${PN}-data-${PV}
+	>=dev-lang/lua-5.1:0
+	dev-libs/libxml2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libsdl[X,sound,joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/gnutls
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	editor? ( x11-libs/wxGTK:2.8[X,opengl] )
+	fribidi? ( dev-libs/fribidi )
+	model-viewer? ( x11-libs/wxGTK:2.8[X] )
+	!static? (
+		dev-libs/xerces-c[icu]
+		media-libs/ftgl
+		media-libs/glew
+		media-libs/libpng:0
+		net-libs/libircclient
+		>=net-libs/miniupnpc-1.8
+		net-misc/curl
+		virtual/jpeg
+		)
+	videos? ( media-video/vlc )"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	virtual/pkgconfig
+	editor? ( ${VIRTUALX_DEPEND} )
+	model-viewer? ( ${VIRTUALX_DEPEND} )
+	static? (
+		dev-libs/icu[static-libs]
+		dev-libs/xerces-c[icu,static-libs]
+		media-libs/ftgl[static-libs]
+		media-libs/glew[static-libs]
+		media-libs/libpng:0[static-libs]
+		net-libs/libircclient[static-libs]
+		net-libs/miniupnpc[static-libs]
+		net-misc/curl[static-libs]
+		virtual/jpeg[static-libs]
+	)"
+
+src_prepare() {
+	if use editor || use model-viewer ; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+	fi
+
+	epatch "${FILESDIR}"/${P}-static-build.patch
+}
+
+src_configure() {
+	if use cpu_flags_x86_sse3; then
+		SSE=3
+	elif use cpu_flags_x86_sse2; then
+		SSE=2
+	elif use cpu_flags_x86_sse; then
+		SSE=1
+	else
+		SSE=0
+	fi
+
+	local mycmakeargs=(
+		$(cmake-utils_use_enable fribidi FRIBIDI)
+		$(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR)
+		$(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS)
+		$(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER)
+		$(cmake-utils_use_with videos VLC)
+		-DMAX_SSE_LEVEL_DESIRED="${SSE}"
+		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
+		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
+		# icons are used at runtime, wrong default location share/pixmaps
+		-DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
+		-DUSE_FTGL=ON
+		$(cmake-utils_use_want static STATIC_LIBS)
+		$(cmake-utils_use_want streflop STREFLOP)
+		-DWANT_SVN_STAMP=off
+		$(cmake-utils_use static wxWidgets_USE_STATIC)
+		$(cmake-utils_use unicode wxWidgets_USE_UNICODE)
+		$(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL)
+
+		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
+	)
+
+	# support CMAKE_BUILD_TYPE=Gentoo
+	append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"'
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	if use editor || use model-viewer; then
+		VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
+	else
+		cmake-utils_src_compile
+	fi
+}
+
+src_install() {
+	# rebuilds some targets randomly without fast option
+	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
+
+	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
+	doicon -s 48 ${PN}.png
+
+	use editor &&
+		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
+	use model-viewer &&
+		make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	einfo
+	elog 'Note about Configuration:'
+	elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini'
+	elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride'
+	elog 'values in these files.'
+	elog
+	elog 'If you have an older graphics card which only supports OpenGL 1.2, and the'
+	elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"'
+	elog 'Some graphics cards may require setting Max Lights to 1.'
+	einfo
+
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}