[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2024-04-18 Thread Pacho Ramos 
commit: 0c71eb49d5095fb3b3e5580b3a0fcdaa415e4cd5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Apr 18 17:07:02 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Apr 18 17:12:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c71eb49

games-strategy/megaglest: use wxGTK 3.2

I added the patches long time ago but, in the final committed version, I
forgot to update the wxGTK version.

Signed-off-by: Pacho Ramos  gentoo.org>

 .../megaglest/megaglest-3.13.0-r2.ebuild   | 173 +
 1 file changed, 173 insertions(+)

diff --git a/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild 
b/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild
new file mode 100644
index ..a14ee88e3c35
--- /dev/null
+++ b/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 2010-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Todo: google-breakpad?
+
+EAPI=8
+
+# src_install() currently requires this
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+LUA_COMPAT=( lua5-{1..4} )
+
+# Only needed by certain features
+VIRTUALX_REQUIRED="manual"
+
+WX_GTK_VER="3.2-gtk3"
+inherit cmake desktop flag-o-matic lua-single readme.gentoo-r1 virtualx 
wxwidgets xdg-utils
+
+DESCRIPTION="Cross-platform 3D realtime strategy game"
+HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source;
+SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz
+   https://github.com/MegaGlest/megaglest-source/commit/789e1cdf.patch -> 
${P}-789e1cdf.patch
+   https://github.com/MegaGlest/megaglest-source/commit/5801b1fa.patch -> 
${P}-5801b1fa.patch
+   https://github.com/MegaGlest/megaglest-source/commit/412b37d0.patch -> 
${P}-412b37d0.patch
+   https://github.com/MegaGlest/megaglest-source/commit/e09ba53c.patch -> 
${P}-e09ba53c.patch
+   https://github.com/MegaGlest/megaglest-source/commit/fbd0cfb1.patch -> 
${P}-fbd0cfb1.patch
+"
+
+LICENSE="GPL-3 BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 
cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+   ${LUA_DEPS}
+   dev-libs/libxml2
+   dev-libs/xerces-c[icu]
+   media-libs/fontconfig
+   media-libs/freetype
+   media-libs/ftgl
+   media-libs/glew:=
+   net-libs/libircclient
+   media-libs/libpng:0
+   media-libs/libsdl2[X,sound,joystick,opengl,video]
+   media-libs/libvorbis
+   media-libs/openal
+   net-libs/gnutls:=
+   net-libs/miniupnpc:=
+   net-misc/curl
+   sys-libs/zlib
+   virtual/opengl
+   virtual/glu
+   virtual/jpeg:0=
+   x11-libs/libX11
+   x11-libs/libXext
+   editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+   fribidi? ( dev-libs/fribidi )
+   model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+   videos? ( media-video/vlc )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+   ${COMMON_DEPEND}
+   ~games-strategy/${PN}-data-${PV}
+"
+
+BDEPEND="sys-apps/help2man
+   virtual/pkgconfig
+   editor? ( ${VIRTUALX_DEPEND} )
+   model-viewer? ( ${VIRTUALX_DEPEND} )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.11.1-cmake-lua.patch"
+
+   # From Fedora and Arch
+   "${FILESDIR}/${P}-underlink.patch"
+   "${FILESDIR}/${P}-fix-lua-version-ordering.patch"
+   "${FILESDIR}/${P}-multiple-definitions.patch"
+   "${FILESDIR}/${P}-GLEW_ERROR_NO_GLX_DISPLAY.patch"
+   "${FILESDIR}/${P}-help2man.patch"
+
+   # Fix build with wxWidgets 3.2
+   "${DISTDIR}/${P}-789e1cdf.patch"
+   "${DISTDIR}/${P}-5801b1fa.patch"
+   "${DISTDIR}/${P}-412b37d0.patch"
+   "${DISTDIR}/${P}-e09ba53c.patch"
+   "${FILESDIR}/${P}-fbd0cfb1.patch"
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="DO NOT directly edit glest.ini and glestkeys.ini but rather 
glestuser.ini
+and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride
+values in these files.
+
+If you have an older graphics card which only supports OpenGL 1.2, and the
+game crashes when you try to play, try starting with 'megaglest --disable-vbo'
+Some graphics cards may require setting Max Lights to 1.
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if use editor || use model-viewer ; then
+   setup-wxwidgets
+   fi
+}
+
+src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/926143
+   # https://github.com/MegaGlest/megaglest-source/issues/275
+   filter-lto
+
+   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=(
+   -DWANT_GIT_STAMP=OFF
+

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2024-04-18 Thread Pacho Ramos 
commit: 6915279510acf4322f0ab7a0c843c476e2294acc
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Apr 18 17:10:04 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Apr 18 17:12:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69152795

games-strategy/megaglest: Update deprecated dependency.

Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/megaglest/megaglest-3.13.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild 
b/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild
index a14ee88e3c35..f5fd5ca2f90c 100644
--- a/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild
+++ b/games-strategy/megaglest/megaglest-3.13.0-r2.ebuild
@@ -52,7 +52,7 @@ COMMON_DEPEND="
sys-libs/zlib
virtual/opengl
virtual/glu
-   virtual/jpeg:0=
+   media-libs/libjpeg-turbo:0=
x11-libs/libX11
x11-libs/libXext
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2024-03-21 Thread Sam James 
commit: 7cb6fe35cfba26df82753ba440d657a2e6676a85
Author: Eli Schwartz  gmail  com>
AuthorDate: Fri Mar 22 02:36:54 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 22 05:31:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb6fe35

games-strategy/megaglest: mark as LTO-unsafe

Closes: https://bugs.gentoo.org/926143
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 games-strategy/megaglest/megaglest-3.13.0-r1.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild 
b/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild
index cc03ed6ad423..26f172483f1e 100644
--- a/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild
@@ -14,7 +14,7 @@ LUA_COMPAT=( lua5-{1..4} )
 VIRTUALX_REQUIRED="manual"
 
 WX_GTK_VER="3.0-gtk3"
-inherit cmake desktop lua-single readme.gentoo-r1 virtualx wxwidgets xdg-utils
+inherit cmake desktop flag-o-matic lua-single readme.gentoo-r1 virtualx 
wxwidgets xdg-utils
 
 DESCRIPTION="Cross-platform 3D realtime strategy game"
 HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source;
@@ -108,6 +108,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/926143
+   # https://github.com/MegaGlest/megaglest-source/issues/275
+   filter-lto
+
if use cpu_flags_x86_sse3; then
SSE=3
elif use cpu_flags_x86_sse2; then

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2024-03-21 Thread Sam James 
commit: 953d07d1cb1ce319320ec961c56a2e5f470e6441
Author: Eli Schwartz  gmail  com>
AuthorDate: Fri Mar 22 02:31:27 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 22 05:31:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953d07d1

games-strategy/megaglest: drop the data files to a runtime-only dep

When using --buildpkgonly, it is unnecessary to merge the data files as
a prerequisite.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 games-strategy/megaglest/megaglest-3.13.0-r1.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild 
b/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild
index abc3ccab6973..cc03ed6ad423 100644
--- a/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2023 Gentoo Authors
+# Copyright 2010-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Todo: google-breakpad?
@@ -33,9 +33,8 @@ IUSE="debug +editor fribidi cpu_flags_x86_sse 
cpu_flags_x86_sse2 cpu_flags_x86_s
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-RDEPEND="
+COMMON_DEPEND="
${LUA_DEPS}
-   ~games-strategy/${PN}-data-${PV}
dev-libs/libxml2
dev-libs/xerces-c[icu]
media-libs/fontconfig
@@ -61,7 +60,11 @@ RDEPEND="
model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
videos? ( media-video/vlc )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+   ${COMMON_DEPEND}
+   ~games-strategy/${PN}-data-${PV}
+"
 
 BDEPEND="sys-apps/help2man
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/, games-strategy/megaglest/files/

2023-11-24 Thread Pacho Ramos 
commit: b90fe51277e6621a2e5c247c0a0df812b500b205
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Nov 24 13:24:19 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Nov 24 13:24:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b90fe512

games-strategy/megaglest: update EAPI 7 -> 8

Closes: https://bugs.gentoo.org/810499
Closes: https://bugs.gentoo.org/831908
Closes: https://bugs.gentoo.org/833791
Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/megaglest/Manifest  |   5 +
 ...egaglest-3.13.0-GLEW_ERROR_NO_GLX_DISPLAY.patch |  12 ++
 .../files/megaglest-3.13.0-fbd0cfb1.patch  |  75 ++
 ...megaglest-3.13.0-fix-lua-version-ordering.patch |  12 ++
 .../files/megaglest-3.13.0-help2man.patch  |  12 ++
 .../megaglest-3.13.0-multiple-definitions.patch|  46 ++
 .../files/megaglest-3.13.0-underlink.patch |  12 ++
 .../megaglest/megaglest-3.13.0-r1.ebuild   | 165 +
 8 files changed, 339 insertions(+)

diff --git a/games-strategy/megaglest/Manifest 
b/games-strategy/megaglest/Manifest
index 93e25e85b0b7..2e49657c50e6 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1 +1,6 @@
+DIST megaglest-3.13.0-412b37d0.patch 779 BLAKE2B 
317743191d54eb4d57d96ce5793cfc059e9f82f2e9ca9c2bba197909e40b2574b05aab47e5ba07b8181eb705e9668b7673a8c88468c3120b4d3ff3e22ae55b24
 SHA512 
3ececb0b9f4e704bbf6e072c8b12c02a86b27b8289843afd6d1ea5342fae25a347b342c8204873a5954f5cb9dbed6af7d6ea9c9d3f1ac1de46152a23fde4b828
+DIST megaglest-3.13.0-5801b1fa.patch 5691 BLAKE2B 
3f0b01ed1bce432c6d5f7d882d6e846475015919f1a0c1f1c740582accc3b957d73edda3a3dfc488706424041b5fe1141ce9a911500baab599cea9505a2958e2
 SHA512 
93c4a9e829c5eb9d1924f423c62a3213421121cd14781e1c80f4fb1a0ffdcbb492bae12e7b0ef0f8e3018c4da886d02b2ac122e05738901edfdb16a5b653e824
+DIST megaglest-3.13.0-789e1cdf.patch 1543 BLAKE2B 
f75ce901683b6a9f9578ec6987101f10e9c5f3e5295aab4e3ccbe0ca37a8136d70f775654321d67614c31bec96312bc3ea334ed97e599ec73825771bb657045d
 SHA512 
6ee86999341bb12dbc6db8c3f532c052400ab685d0c3ec3e286682eba30fd075623073dbb2427155f255f0555b42c3884ac8405f07ab2429e6809e1a5dbd5aa0
+DIST megaglest-3.13.0-e09ba53c.patch 3485 BLAKE2B 
fa0c94b88726f239957b3fb950c6be2be18e564bbf2cfbc809a069961edae0023d69d629cdaab73ca31bb731fbf0dbbd2103a8b84c3f857f423d08addacde706
 SHA512 
4785ff6c1967aaacd8e674cdd6f3a2ecd038cd1951a2337899f5d9654376c7549360f65ed36bc9f0e108f6fff809486f38a6f641afc694b248c6a47b1b1f1ebb
+DIST megaglest-3.13.0-fbd0cfb1.patch 1820 BLAKE2B 
b3a1bf7ca1b51d948b354e4b9cd2d675dadac7b9f072e11032f117479c5199d1f7cfd87146da46a40387bfeaef8433144e37410aa8c92865048744ae31ffd730
 SHA512 
960fe1be66eb1737e9292c5956c09902e6761ed8de56d864950268e3e8a5184f59b7cf3521629aeb460842f4423699526d5dd71fa0494c7ac2899cab117e7f45
 DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 
9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153
 SHA512 
5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c

diff --git 
a/games-strategy/megaglest/files/megaglest-3.13.0-GLEW_ERROR_NO_GLX_DISPLAY.patch
 
b/games-strategy/megaglest/files/megaglest-3.13.0-GLEW_ERROR_NO_GLX_DISPLAY.patch
new file mode 100644
index ..7855baa2273f
--- /dev/null
+++ 
b/games-strategy/megaglest/files/megaglest-3.13.0-GLEW_ERROR_NO_GLX_DISPLAY.patch
@@ -0,0 +1,12 @@
+diff -up 
megaglest-source-3.13.0/source/shared_lib/sources/platform/sdl/gl_wrap.cpp.ignore-GLEW_ERROR_NO_GLX_DISPLAY
 megaglest-source-3.13.0/source/shared_lib/sources/platform/sdl/gl_wrap.cpp
+--- 
megaglest-source-3.13.0/source/shared_lib/sources/platform/sdl/gl_wrap.cpp.ignore-GLEW_ERROR_NO_GLX_DISPLAY
2022-10-17 09:47:51.084267697 -0400
 megaglest-source-3.13.0/source/shared_lib/sources/platform/sdl/gl_wrap.cpp 
2022-10-17 09:48:35.079555790 -0400
+@@ -301,7 +301,7 @@ void PlatformContextGl::init(int colorBi
+ 
+   if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d] 
AFTER glewInit call err = 
%d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,err);
+ 
+-  if (GLEW_OK != err) {
++  if (GLEW_OK != err && GLEW_ERROR_NO_GLX_DISPLAY != err) {
+   if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In 
[%s::%s 
%d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
+ 
+   fprintf(stderr, "Error [main]: glewInit failed: %s\n", 
glewGetErrorString(err));

diff --git a/games-strategy/megaglest/files/megaglest-3.13.0-fbd0cfb1.patch 
b/games-strategy/megaglest/files/megaglest-3.13.0-fbd0cfb1.patch
new file mode 100644
index ..6f2eb91847e2
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.13.0-fbd0cfb1.patch
@@ -0,0 +1,75 @@
+From fbd0cfb17ed759d24aeb577a602b0d97f7895cc2 Mon Sep 17

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest-data/

2023-02-07 Thread Andreas Sturmlechner 
commit: c22f52d2edb750df26579c20e17c1c22cbfb2ca3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb  7 16:45:17 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb  7 17:25:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22f52d2

games-strategy/megaglest-data: drop 3.11.1-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-strategy/megaglest-data/Manifest |  1 -
 .../megaglest-data/megaglest-data-3.11.1-r1.ebuild | 25 --
 2 files changed, 26 deletions(-)

diff --git a/games-strategy/megaglest-data/Manifest 
b/games-strategy/megaglest-data/Manifest
index c8ded569f740..a99cfb22bd1d 100644
--- a/games-strategy/megaglest-data/Manifest
+++ b/games-strategy/megaglest-data/Manifest
@@ -1,2 +1 @@
-DIST megaglest-data-3.11.1.tar.xz 283383936 BLAKE2B 
d3c3d6c99f8b5f1360ecf72f69b47ce1ee1777019bdd8c2c0cfad8128a0ca07906a906be031526bcd255c5db3565bf4225a1170fdbcfc76819f65055d4d69c79
 SHA512 
a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357
 DIST megaglest-data-3.13.0.tar.xz 291190184 BLAKE2B 
369dfb2f9a0271c686b77b4368043717b57e5863f8918afe3cc429c630ed79173c025ad0c5bad1e94949f4caf841b0e3c6706491a8534b829568c7d89ba97383
 SHA512 
ac6a6dd85ec2e45d3107549199251b504f128b8fc254b683c7d9c0841b86cd4c32cd45c9d3cbddc3f989bd965d61ef5a0dca9212431876c00a13f8398ff45f4c

diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1-r1.ebuild 
b/games-strategy/megaglest-data/megaglest-data-3.11.1-r1.ebuild
deleted file mode 100644
index 152c98954194..
--- a/games-strategy/megaglest-data/megaglest-data-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="megaglest"
-DESCRIPTION="Data files for the cross-platform 3D realtime strategy game 
MegaGlest"
-HOMEPAGE="http://www.megaglest.org/;
-SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz;
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-   use doc && HTML_DOCS+=( docs/glest_factions/ )
-   cmake_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/, games-strategy/megaglest/files/

2023-02-07 Thread Andreas Sturmlechner 
commit: 0649bf4dc103bcf12ea8ef606ea70a72c7ebe89e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb  7 16:44:58 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb  7 17:25:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0649bf4d

games-strategy/megaglest: drop 3.11.1-r100

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-strategy/megaglest/Manifest  |   1 -
 .../megaglest/files/megaglest-3.11.1-cmake.patch   |  28 
 ...megaglest-3.11.1-miniupnpc-api-version-16.patch |  17 ---
 .../files/megaglest-3.11.1-miniupnpc.patch |  21 ---
 .../files/megaglest-3.11.1-static-build.patch  |  63 -
 .../megaglest/megaglest-3.11.1-r100.ebuild | 153 -
 6 files changed, 283 deletions(-)

diff --git a/games-strategy/megaglest/Manifest 
b/games-strategy/megaglest/Manifest
index eba04831a2e6..93e25e85b0b7 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1,2 +1 @@
-DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 
01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30
 SHA512 
9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225
 DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 
9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153
 SHA512 
5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c

diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch 
b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
deleted file mode 100644
index 527671246e98..
--- a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka 
-Date: Wed, 13 May 2015 04:22:45 +1000
-Subject: [PATCH] Fix build with >=cmake-3.2.
-
-The FindOpenGL module no longer pulls in X11 libraries.

- source/shared_lib/CMakeLists.txt | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/source/shared_lib/CMakeLists.txt 
b/source/shared_lib/CMakeLists.txt
-index 3da563e..e5a06fc 100644
 a/source/shared_lib/CMakeLists.txt
-+++ b/source/shared_lib/CMakeLists.txt
-@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR 
BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
-   SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
-   ENDIF()
- 
-+IF(UNIX)
-+  FIND_PACKAGE(X11 REQUIRED)
-+  SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
-+ENDIF()
- 
- IF(WANT_XERCES)
-   FIND_PACKAGE(XercesC REQUIRED)
--- 
-2.3.6
-

diff --git 
a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
 
b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
deleted file mode 100644
index b0275156bda1..
--- 
a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/MegaGlest/megaglest-source/commit/a85d12aed1983eb69d630b431b81ae656d83b3ac
-
 a/source/shared_lib/sources/platform/posix/socket.cpp
-+++ b/source/shared_lib/sources/platform/posix/socket.cpp
-@@ -2610,8 +2610,10 @@
-   if(SystemFlags::VERBOSE_MODE_ENABLED) 
printf("UPnP device found: %s %s\n", dev->descURL, dev->st);
- 
-   //printf("UPnP device found: [%s] [%s] lanaddr 
[%s]\n", dev->descURL, dev->st,lanaddr);
--#if (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 9) || 
(!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
--  char *descXML = (char 
*)miniwget_getaddr(dev->descURL, , lanaddr, (sizeof(lanaddr) / 
sizeof(lanaddr[0])),0);
-+#if (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 16)
-+  char *descXML = (char 
*)miniwget_getaddr(dev->descURL, , lanaddr, (sizeof(lanaddr) / 
sizeof(lanaddr[0])), 0, NULL);
-+#elif (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 9) || 
(!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
-+char *descXML = (char *)miniwget_getaddr(dev->descURL, 
, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])), 0);
- #else
-   char *descXML = (char 
*)miniwget_getaddr(dev->descURL, , lanaddr, (sizeof(lanaddr) / 
sizeof(lanaddr[0])));
- #endif

diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch 
b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
deleted file mode 100644
index 112e734c6efb..
---

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/files/

2022-10-30 Thread David Seifert 
commit: 63ed4f5f4277aac7ddc7629405151115b612e3e7
Author: David Seifert  gentoo  org>
AuthorDate: Sun Oct 30 11:12:45 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Oct 30 11:12:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ed4f5f

games-strategy/megaglest: [QA] use git-format-patch style patches

Signed-off-by: David Seifert  gentoo.org>

 .../megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
 
b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
index a793c122b210..b0275156bda1 100644
--- 
a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
+++ 
b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
@@ -1,7 +1,7 @@
 
https://github.com/MegaGlest/megaglest-source/commit/a85d12aed1983eb69d630b431b81ae656d83b3ac
 
 /source/shared_lib/sources/platform/posix/socket.cpp
-+++ /source/shared_lib/sources/platform/posix/socket.cpp
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
 b/source/shared_lib/sources/platform/posix/socket.cpp
 @@ -2610,8 +2610,10 @@
if(SystemFlags::VERBOSE_MODE_ENABLED) 
printf("UPnP device found: %s %s\n", dev->descURL, dev->st);

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest-data/

2021-08-02 Thread Ionen Wolkens 
commit: 1a3cf1e2183fa0a7e09b47749129a9d9c8ebdd64
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug  2 09:34:02 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug  2 10:28:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a3cf1e2

games-strategy/megaglest-data: fix metainfo path, tidy

Closes: https://bugs.gentoo.org/806142
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../megaglest-data/megaglest-data-3.13.0.ebuild | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild 
b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
index 9a1f00300e1..d3e8912a573 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
@@ -2,31 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit cmake
 
-MY_PN="megaglest"
 DESCRIPTION="Data files for the cross-platform 3D realtime strategy game 
MegaGlest"
 HOMEPAGE="https://www.megaglest.org/;
-SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz;
+SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/${P}.tar.xz;
+S="${WORKDIR}/megaglest-${PV}"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc"
 
-DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_configure() {
-   # See bug https://bugs.gentoo.org/709450.
local mycmakeargs=(
-   -DMEGAGLEST_APPDATA_INSTALL_PATH=/usr/metainfo
+   
-DMEGAGLEST_APPDATA_INSTALL_PATH="${EPREFIX}"/usr/share/metainfo #709450
)
+
cmake_src_configure
 }
 
 src_install() {
-   use doc && HTML_DOCS="docs/glest_factions/"
+   local DOCS=( docs/{AUTHORS.data,CHANGELOG,README}.txt )
+   use doc && local HTML_DOCS=( docs/glest_factions )
+
cmake_src_install
 }

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2021-04-25 Thread Sam James 
commit: ce39fa182653617e0a05f0724a680e5ceca27f42
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 21:05:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 21:05:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce39fa18

games-strategy/megaglest: Keyword 3.13.0 arm64, #774351

Signed-off-by: Sam James  gentoo.org>

 games-strategy/megaglest/megaglest-3.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/megaglest/megaglest-3.13.0.ebuild 
b/games-strategy/megaglest/megaglest-3.13.0.ebuild
index 212ab76aac3..1a07d154d99 100644
--- a/games-strategy/megaglest/megaglest-3.13.0.ebuild
+++ b/games-strategy/megaglest/megaglest-3.13.0.ebuild
@@ -22,7 +22,7 @@ 
SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/m
 
 LICENSE="GPL-3 BitstreamVera"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 
cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest-data/

2021-04-25 Thread Sam James 
commit: 3b263c4ba262eb4cc885c4724a5ae5a310815c8e
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 21:05:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 21:05:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b263c4b

games-strategy/megaglest-data: Keyword 3.13.0 arm64, #774351

Signed-off-by: Sam James  gentoo.org>

 games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild 
b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
index b96462b4fb9..9a1f00300e1 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/meg
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc"
 
 DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2021-04-05 Thread David Seifert 
commit: 9a0982aeb18c625ba594534e73c2762c67e8db83
Author: David Seifert  gentoo  org>
AuthorDate: Mon Apr  5 22:26:19 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Apr  5 22:26:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a0982ae

games-strategy/megaglest: Set WX_GTK_VER before inherit

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 games-strategy/megaglest/megaglest-3.11.1-r100.ebuild | 6 +++---
 games-strategy/megaglest/megaglest-3.13.0.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
index d19c6ffd579..353d0ce3f9b 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
@@ -14,6 +14,7 @@ LUA_COMPAT=( lua5-{1..2} )
 # Only needed by certain features
 VIRTUALX_REQUIRED="manual"
 
+WX_GTK_VER="3.0"
 inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
 
 DESCRIPTION="Cross-platform 3D realtime strategy game"
@@ -43,9 +44,9 @@ RDEPEND="${LUA_DEPS}
virtual/glu
x11-libs/libX11
x11-libs/libXext
-   editor? ( x11-libs/wxGTK:3.0[X,opengl] )
+   editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
fribidi? ( dev-libs/fribidi )
-   model-viewer? ( x11-libs/wxGTK:3.0[X] )
+   model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
dev-libs/xerces-c[icu]
media-libs/ftgl
media-libs/glew:=
@@ -73,7 +74,6 @@ src_prepare() {
cmake_src_prepare
 
if use editor || use model-viewer ; then
-   WX_GTK_VER="3.0"
setup-wxwidgets
fi
 }

diff --git a/games-strategy/megaglest/megaglest-3.13.0.ebuild 
b/games-strategy/megaglest/megaglest-3.13.0.ebuild
index 9b8867d2938..212ab76aac3 100644
--- a/games-strategy/megaglest/megaglest-3.13.0.ebuild
+++ b/games-strategy/megaglest/megaglest-3.13.0.ebuild
@@ -13,6 +13,7 @@ LUA_COMPAT=( lua5-{1..2} )
 # Only needed by certain features
 VIRTUALX_REQUIRED="manual"
 
+WX_GTK_VER="3.0-gtk3"
 inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
 
 DESCRIPTION="Cross-platform 3D realtime strategy game"
@@ -49,9 +50,9 @@ RDEPEND="
virtual/jpeg:0=
x11-libs/libX11
x11-libs/libXext
-   editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] )
+   editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
fribidi? ( dev-libs/fribidi )
-   model-viewer? ( x11-libs/wxGTK:3.0-gtk3[X] )
+   model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
videos? ( media-video/vlc )
 "
 DEPEND="${RDEPEND}"
@@ -69,7 +70,6 @@ src_prepare() {
cmake_src_prepare
 
if use editor || use model-viewer ; then
-   WX_GTK_VER="3.0"
setup-wxwidgets
fi
 }

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2021-01-16 Thread Sam James 
commit: 874cad11760a1190e3a7b9de411f5018eb43113d
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 17 07:38:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 17 07:49:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874cad11

games-strategy/megaglest: drop static

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 .../megaglest/megaglest-3.11.1-r100.ebuild | 39 --
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
index 796b7822f5e..d19c6ffd579 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # google-breakpad
@@ -23,7 +23,7 @@ 
SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/m
 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"
+IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 
cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
@@ -46,29 +46,16 @@ RDEPEND="${LUA_DEPS}
editor? ( x11-libs/wxGTK:3.0[X,opengl] )
fribidi? ( dev-libs/fribidi )
model-viewer? ( x11-libs/wxGTK:3.0[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:0
-   )
+   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:0
videos? ( media-video/vlc )"
-DEPEND="${RDEPEND}
-   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:0[static-libs]
-   )"
+DEPEND="${RDEPEND}"
 BDEPEND="sys-apps/help2man
virtual/pkgconfig
editor? ( ${VIRTUALX_DEPEND} )
@@ -110,10 +97,10 @@ src_configure() {
-DFORCE_LUA_VERSION="$(lua_get_version)"
-DMAX_SSE_LEVEL_DESIRED="${SSE}"
-DUSE_FTGL=ON
-   -DWANT_STATIC_LIBS=$(usex static)
+   -DWANT_STATIC_LIBS=OFF
-DWANT_STREFLOP=$(usex streflop)
-DWITH_VLC=$(usex videos)
-   -DwxWidgets_USE_STATIC=$(usex static)
+   -DwxWidgets_USE_STATIC=OFF
-DwxWidgets_USE_UNICODE=$(usex unicode)
-DwxWidgets_USE_UNIVERSAL=$(usex wxuniversal)

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2021-01-16 Thread Sam James 
commit: b84711c48c464f400ea607b84fff0b5931b91ea6
Author: Nils Freydank  posteo  de>
AuthorDate: Thu Jan 14 16:40:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 17 04:34:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b84711c4

games-strategy/megaglest: Bump to 3.13.0 and drop USE="static"

This bump is based on the efforts of marecki and polynomial-c - special thanks!

Thanks-To: Marek Szuba  gentoo.org>
Thanks-To: Lars Wendler  gentoo.org>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Nils Freydank  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/19061
Signed-off-by: Sam James  gentoo.org>

 games-strategy/megaglest/Manifest|   1 +
 games-strategy/megaglest/megaglest-3.13.0.ebuild | 144 +++
 2 files changed, 145 insertions(+)

diff --git a/games-strategy/megaglest/Manifest 
b/games-strategy/megaglest/Manifest
index f32e43070ea..eba04831a2e 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1 +1,2 @@
 DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 
01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30
 SHA512 
9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225
+DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 
9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153
 SHA512 
5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c

diff --git a/games-strategy/megaglest/megaglest-3.13.0.ebuild 
b/games-strategy/megaglest/megaglest-3.13.0.ebuild
new file mode 100644
index 000..b0bbfd5aec6
--- /dev/null
+++ b/games-strategy/megaglest/megaglest-3.13.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2010-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Todo: google-breakpad?
+
+EAPI=7
+
+# src_install() currently requires this
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+LUA_COMPAT=( lua5-{1..2} )
+
+# Only needed by certain features
+VIRTUALX_REQUIRED="manual"
+
+inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
+
+DESCRIPTION="Cross-platform 3D realtime strategy game"
+HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source;
+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 +streflop +tools +unicode wxuniversal +model-viewer videos"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+   ${LUA_DEPS}
+   ~games-strategy/${PN}-data-${PV}
+   dev-libs/libxml2
+   dev-libs/xerces-c[icu]
+   media-libs/fontconfig
+   media-libs/freetype
+   media-libs/ftgl
+   media-libs/glew:0=
+   net-libs/libircclient
+   media-libs/libpng:0
+   media-libs/libsdl[X,sound,joystick,opengl,video]
+   media-libs/libvorbis
+   media-libs/openal
+   net-libs/gnutls
+   net-libs/miniupnpc
+   net-misc/curl
+   sys-libs/zlib
+   virtual/opengl
+   virtual/glu
+   virtual/jpeg:0
+   x11-libs/libX11
+   x11-libs/libXext
+   editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] )
+   fribidi? ( dev-libs/fribidi )
+   model-viewer? ( x11-libs/wxGTK:3.0-gtk3[X] )
+   videos? ( media-video/vlc )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="sys-apps/help2man
+   virtual/pkgconfig
+   editor? ( ${VIRTUALX_DEPEND} )
+   model-viewer? ( ${VIRTUALX_DEPEND} )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.11.1-cmake-lua.patch"
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   if use editor || use model-viewer ; then
+   WX_GTK_VER="3.0"
+   setup-wxwidgets
+   fi
+}
+
+src_configure() {
+   # See https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+   append-cflags -fcommon
+
+   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=(
+   -DWANT_USE_FriBiDi="$(usex fribidi)"
+   -DBUILD_MEGAGLEST_MAP_EDITOR="$(usex editor)"
+   -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS="$(usex tools)"
+   -DBUILD_MEGAGLEST_MODEL_VIEWER="$(usex model-viewer)"
+   -DWANT_USE_VLC="$(usex videos)"
+   -DFORCE_LUA_VERSION="$(lua_get_version)"
+   -DFORCE_MAX_SSE_LEVEL="${SSE}"
+   -DWANT_USE_FTGL=ON
+   -DWANT_STATIC_LIBS=OFF
+

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2021-01-16 Thread Sam James 
commit: 5de23db822b8342275db15623f2cad609f82483d
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 17 04:32:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 17 04:34:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de23db8

games-strategy/megaglest: update dependencies

* SDL 2
* Missing subslot deps

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 games-strategy/megaglest/megaglest-3.13.0.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-strategy/megaglest/megaglest-3.13.0.ebuild 
b/games-strategy/megaglest/megaglest-3.13.0.ebuild
index b0bbfd5aec6..9b8867d2938 100644
--- a/games-strategy/megaglest/megaglest-3.13.0.ebuild
+++ b/games-strategy/megaglest/megaglest-3.13.0.ebuild
@@ -34,19 +34,19 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/ftgl
-   media-libs/glew:0=
+   media-libs/glew:=
net-libs/libircclient
media-libs/libpng:0
-   media-libs/libsdl[X,sound,joystick,opengl,video]
+   media-libs/libsdl2[X,sound,joystick,opengl,video]
media-libs/libvorbis
media-libs/openal
-   net-libs/gnutls
-   net-libs/miniupnpc
+   net-libs/gnutls:=
+   net-libs/miniupnpc:=
net-misc/curl
sys-libs/zlib
virtual/opengl
virtual/glu
-   virtual/jpeg:0
+   virtual/jpeg:0=
x11-libs/libX11
x11-libs/libXext
editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] )

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest-data/

2021-01-16 Thread Sam James 
commit: 259b6ae7fb5218399a999441ad7d3e9563ed8494
Author: Nils Freydank  posteo  de>
AuthorDate: Thu Jan 14 16:39:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 17 04:34:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259b6ae7

games-strategy/megaglest-data: Bump to 3.13.0

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Nils Freydank  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 games-strategy/megaglest-data/Manifest |  1 +
 ...-3.11.1.ebuild => megaglest-data-3.13.0.ebuild} | 28 +++---
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/games-strategy/megaglest-data/Manifest 
b/games-strategy/megaglest-data/Manifest
index d0d907962af..c8ded569f74 100644
--- a/games-strategy/megaglest-data/Manifest
+++ b/games-strategy/megaglest-data/Manifest
@@ -1 +1,2 @@
 DIST megaglest-data-3.11.1.tar.xz 283383936 BLAKE2B 
d3c3d6c99f8b5f1360ecf72f69b47ce1ee1777019bdd8c2c0cfad8128a0ca07906a906be031526bcd255c5db3565bf4225a1170fdbcfc76819f65055d4d69c79
 SHA512 
a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357
+DIST megaglest-data-3.13.0.tar.xz 291190184 BLAKE2B 
369dfb2f9a0271c686b77b4368043717b57e5863f8918afe3cc429c630ed79173c025ad0c5bad1e94949f4caf841b0e3c6706491a8534b829568c7d89ba97383
 SHA512 
ac6a6dd85ec2e45d3107549199251b504f128b8fc254b683c7d9c0841b86cd4c32cd45c9d3cbddc3f989bd965d61ef5a0dca9212431876c00a13f8398ff45f4c

diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild 
b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
similarity index 53%
rename from games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
rename to games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
index c10fa689e22..b96462b4fb9 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils games
+EAPI=7
+inherit cmake
 
 MY_PN="megaglest"
 DESCRIPTION="Data files for the cross-platform 3D realtime strategy game 
MegaGlest"
-HOMEPAGE="http://www.megaglest.org/;
+HOMEPAGE="https://www.megaglest.org/;
 
SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz;
 
 LICENSE="CC-BY-SA-3.0"
@@ -16,27 +16,17 @@ IUSE="doc"
 
 DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
 
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-   cmake-utils_src_prepare
-}
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_configure() {
+   # See bug https://bugs.gentoo.org/709450.
local mycmakeargs=(
-   -DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
-   -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${MY_PN}"
-   -DMEGAGLEST_ICON_INSTALL_PATH="/usr/share/pixmaps"
+   -DMEGAGLEST_APPDATA_INSTALL_PATH=/usr/metainfo
)
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
+   cmake_src_configure
 }
 
 src_install() {
use doc && HTML_DOCS="docs/glest_factions/"
-   cmake-utils_src_install
-   prepgamesdirs
+   cmake_src_install
 }

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2021-01-16 Thread Sam James 
commit: 17764a210caee03be1f3f4f96abde1b949d3b33d
Author: Nils Freydank  posteo  de>
AuthorDate: Thu Jan 14 16:40:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 17 04:34:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17764a21

games-strategy/megaglest: Drop old EAPI="5" version

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Nils Freydank  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 .../megaglest/megaglest-3.11.1-r1.ebuild   | 167 -
 1 file changed, 167 deletions(-)

diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
deleted file mode 100644
index 86e78fb0535..000
--- a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2010-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# 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="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source;
-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"
-
-# Newer versions of megaglest-data install directly into /usr
-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:3.0[X,opengl] )
-   fribidi? ( dev-libs/fribidi )
-   model-viewer? ( x11-libs/wxGTK:3.0[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:0
-   )
-   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:0[static-libs]
-   )"
-
-src_prepare() {
-   if use editor || use model-viewer ; then
-   WX_GTK_VER="3.0"
-   need-wxwidgets unicode
-   fi
-
-   epatch "${FILESDIR}"/${P}-static-build.patch \
-   "${FILESDIR}"/${P}-cmake.patch \
-   "${FILESDIR}"/${P}-miniupnpc.patch \
-   "${FILESDIR}"/${P}-miniupnpc-api-version-16.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" "")
-   )

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2020-12-23 Thread Marek Szuba 
commit: 9779b52e313a262749f46dbb6522623218c26a38
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Dec 23 12:21:51 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Dec 23 14:52:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9779b52e

games-strategy/megaglest-3.11.1-r1: stick with older megaglest-data

Must use the one still installing data files into /usr/games.

Signed-off-by: Marek Szuba  gentoo.org>

 games-strategy/megaglest/megaglest-3.11.1-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
index ca99c5450f1..86e78fb0535 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
@@ -17,8 +17,10 @@ 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"
 
+# Newer versions of megaglest-data install directly into /usr
 RDEPEND="
~games-strategy/${PN}-data-${PV}
+   =dev-lang/lua-5.1:0
dev-libs/libxml2
media-libs/fontconfig

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/files/, profiles/, games-strategy/megaglest/

2020-12-23 Thread Marek Szuba 
commit: 00faca18e3b5d8a30bc3550195038f8a6b681b10
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Dec 23 14:49:17 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Dec 23 14:52:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00faca18

games-strategy/megaglest: migrate to EAPI-7 and lua-single.eclass

Lua migration: simple enough, needed the usual version-override patch.
Upstream build scripts only use Lua up to and including 5.2, have
confirmed that building against 5.3 fails.

EAPI migration: don't talk to me about the old version of this ebuild.
EVER.

Closes: https://bugs.gentoo.org/752717
Signed-off-by: Marek Szuba  gentoo.org>

 .../files/megaglest-3.11.1-cmake-lua.patch |  25 
 .../megaglest/megaglest-3.11.1-r100.ebuild | 166 +
 profiles/package.mask  |   1 +
 3 files changed, 192 insertions(+)

diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-cmake-lua.patch 
b/games-strategy/megaglest/files/megaglest-3.11.1-cmake-lua.patch
new file mode 100644
index 000..c8d30e3d096
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-cmake-lua.patch
@@ -0,0 +1,25 @@
+Use the standard FindLua.cmake instead of the modified bundled FindLUA.cmake,
+and force the use of an exact Lua version.
+
+--- a/source/glest_game/CMakeLists.txt
 b/source/glest_game/CMakeLists.txt
+@@ -64,7 +64,7 @@
+   ENDIF()
+   ENDIF()
+ 
+-  FIND_PACKAGE(LUA REQUIRED)
++  FIND_PACKAGE(Lua ${FORCE_LUA_VERSION} EXACT REQUIRED)
+   INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
+   IF(UNIX)
+   SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUA_LIBRARIES})
+--- a/source/shared_lib/CMakeLists.txt
 b/source/shared_lib/CMakeLists.txt
+@@ -132,7 +132,7 @@
+   SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENAL_LIBRARY})
+   ENDIF()
+ 
+-FIND_PACKAGE(LUA REQUIRED)
++FIND_PACKAGE(Lua ${FORCE_LUA_VERSION} EXACT REQUIRED)
+ INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
+ IF(UNIX)
+   SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUA_LIBRARIES} 
${CMAKE_DL_LIBS})

diff --git a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
new file mode 100644
index 000..796b7822f5e
--- /dev/null
+++ b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
@@ -0,0 +1,166 @@
+# Copyright 2010-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# google-breakpad
+# TODO: fribidi, libvorbis static
+
+EAPI=7
+
+# src_install() currently requires this
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+LUA_COMPAT=( lua5-{1..2} )
+
+# Only needed by certain features
+VIRTUALX_REQUIRED="manual"
+
+inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
+
+DESCRIPTION="Cross-platform 3D realtime strategy game"
+HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source;
+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"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# Older versions of megaglest-data install into /usr/games
+RDEPEND="${LUA_DEPS}
+   ~games-strategy/${PN}-data-${PV}
+   >=games-strategy/${PN}-data-3.11.1-r1
+   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:3.0[X,opengl] )
+   fribidi? ( dev-libs/fribidi )
+   model-viewer? ( x11-libs/wxGTK:3.0[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:0
+   )
+   videos? ( media-video/vlc )"
+DEPEND="${RDEPEND}
+   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:0[static-libs]
+   )"
+BDEPEND="sys-apps/help2man
+   virtual/pkgconfig
+   editor? ( ${VIRTUALX_DEPEND} )
+   model-viewer? ( ${VIRTUALX_DEPEND} )"
+
+PATCHES=(
+

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest-data/

2020-12-23 Thread Marek Szuba 
commit: d82c3cfbf857635eb7140cd0b4d191e8531b3c74
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Dec 23 12:16:30 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Dec 23 14:52:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d82c3cfb

games-strategy/megaglest-data: bump to EAPI-7

Part of the migration of the game itself to lua-single.eclass. Note that
since the files are now installed into /usr/share rather than /usr/games
as per the current policy regarding game install locations and ownership,
mixing EAPI-5 and EAPI-7 Megaglest ebuilds will badly break things.

Bug: https://bugs.gentoo.org/752717
Signed-off-by: Marek Szuba  gentoo.org>

 .../megaglest-data/megaglest-data-3.11.1-r1.ebuild | 25 ++
 1 file changed, 25 insertions(+)

diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1-r1.ebuild 
b/games-strategy/megaglest-data/megaglest-data-3.11.1-r1.ebuild
new file mode 100644
index 000..152c9895419
--- /dev/null
+++ b/games-strategy/megaglest-data/megaglest-data-3.11.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="megaglest"
+DESCRIPTION="Data files for the cross-platform 3D realtime strategy game 
MegaGlest"
+HOMEPAGE="http://www.megaglest.org/;
+SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz;
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_install() {
+   use doc && HTML_DOCS+=( docs/glest_factions/ )
+   cmake_src_install
+}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2018-08-11 Thread Andreas Sturmlechner 
commit: ea62506e91726ea61a997b578c57008fb81b30b6
Author: Francesco Turco  fastmail  fm>
AuthorDate: Fri Aug 10 21:30:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 11 08:22:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea62506e

games-strategy/megaglest: update links to changelog and bug tracker

 games-strategy/megaglest/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/megaglest/metadata.xml 
b/games-strategy/megaglest/metadata.xml
index 192243d3ba3..36e65bdb8a1 100644
--- a/games-strategy/megaglest/metadata.xml
+++ b/games-strategy/megaglest/metadata.xml
@@ -6,9 +6,9 @@
Gentoo Games Project


-   
http://megaglest.svn.sourceforge.net/viewvc/megaglest/trunk/docs/CHANGELOG.txt?revision=3397
+   
https://github.com/MegaGlest/megaglest-source/blob/develop/docs/CHANGELOG.txt
http://glest.wikia.com/wiki/MG
-   
https://sourceforge.net/tracker/?group_id=300350atid=1266776
+   
https://github.com/MegaGlest/megaglest-source/issues
MegaGlest/megaglest-source

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest-data/

2017-10-15 Thread David Seifert 
commit: fbd29564350ffdfaba2cf3386d0744ebd6e6be22
Author: David Seifert  gentoo  org>
AuthorDate: Sun Oct 15 23:57:04 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 16 00:08:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbd29564

games-strategy/megaglest-data: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild 
b/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
index 78413a49228..961bbe9ace1 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,10 @@ DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt 
docs/README.txt )
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
+src_prepare() {
+   cmake-utils_src_prepare
+}
+
 src_configure() {
local mycmakeargs=(
-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest-data/, games-strategy/megaglest-data/files/

2015-11-30 Thread Michael Sterrett 
commit: 99567ef785fa6f353111b30ecb6d4eaeae684797
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Dec  1 06:18:54 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Dec  1 06:19:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99567ef7

old

Package-Manager: portage-2.2.20.1

 games-strategy/megaglest-data/Manifest |   1 -
 .../files/megaglest-data-3.7.1-dutch.patch | 166 -
 .../megaglest-data/megaglest-data-3.9.1.ebuild |  44 --
 3 files changed, 211 deletions(-)

diff --git a/games-strategy/megaglest-data/Manifest 
b/games-strategy/megaglest-data/Manifest
index 0b9b5dc..2e87bce 100644
--- a/games-strategy/megaglest-data/Manifest
+++ b/games-strategy/megaglest-data/Manifest
@@ -1,2 +1 @@
 DIST megaglest-data-3.11.1.tar.xz 283383936 SHA256 
5f1f6ad9f89a929122a26e1c1cabc887b75c09f4a84720d9ce5aa6aa0fc9cbe8 SHA512 
a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357
 WHIRLPOOL 
bec2417a1884d5f6ded736981714eaf3a79ebf015163958b55396373bbb0e6ae6548bf9e30b4615aa9fbca1b9a779e1f8afd6086a48204561ddb361d98588771
-DIST megaglest-data-3.9.1.tar.xz 269431988 SHA256 
2ec0d6442ea2fc3bda5b412e41d97252b3f065dc09d7cda96cebbeff8eceb4d3 SHA512 
e174bde6e86c7e73d81d1ab3cfb147850ee1afa33f3b65f27aa4fbff2d3fcb031b41f6d46e822a14b8065b347c6eaa0ba6d5101d461ea5dd639f4c28e2d94112
 WHIRLPOOL 
c4aebeeb6ef36e47b9e9937de5187d4e9cae1182412456fed79aa892636c6b03a9672b76057135ffe15644215a49b3f84013ce3b1760e86b979f45f17dc0dbef

diff --git 
a/games-strategy/megaglest-data/files/megaglest-data-3.7.1-dutch.patch 
b/games-strategy/megaglest-data/files/megaglest-data-3.7.1-dutch.patch
deleted file mode 100644
index 86ae556..000
--- a/games-strategy/megaglest-data/files/megaglest-data-3.7.1-dutch.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-http://sourceforge.net/tracker/?func=detail=3590533_id=300350=1266776
-http://glest.org/glest_board/index.php?topic=8725.0
 data/lang/dutch.lng
-+++ data/lang/dutch.lng
-@@ -15,7 +15,7 @@
- AffectedUnitsFromAll=Betroffen Eenheden van Allen
- AffectedUnitsFromFoe=Betroffen Eenheden van Vijand
- AffectedUnitsFromTeam=Betroffen Eenheden van Team
--AffectedUnitsFromYourFaction=Getroffen eenheden in je Stam
-+AffectedUnitsFromYourFaction=Getroffen eenheden in je Groepering
- AI=KI
- AISwitchTeamAcceptPercent=KI procent
- AlreadyUpgraded=Al opgewaardeerd
-@@ -32,7 +32,7 @@
- AttackSpeed=Aanvalssnelheid
- AttackStopped=Aanval afgebroken
- AttackStrenght=Schade
--Audio=Audio
-+Audio=Geluid
- AutoConfig=Auto-configuratie
- AutoRefreshRate=Automatische ververssnelheid
- AvailableServers=Beschikbare servers
-@@ -77,7 +77,7 @@
- Cpu=CPU
- CpuEasy=CPU (Gemakkelijk)
- CpuMega=CPU (Moeilijk)
--CpuUltra=CPU (Bizar moeilijk)
-+CpuUltra=CPU (Extreem)
- CreateNewTeam=Creëer Nieuw Team
- CustomGame=Aangepast spel
- DataNotSynchedTitle=De volgende data komt niet overeen:
-@@ -99,7 +99,7 @@
- DataMissingTechtreeSuccessDownload=Speler %s heeft de techtree %s SUCCESSVOL 
gedownload.
- DataMissingTechtreeFailDownload=Speler %s's download van techtree [%s] is 
GEFAALD. (cURL-versie: [%s])
- Deaths=Doden
--Defaults=Standaardinstellingen
-+Defaults=Standaard
- Defeat=Verslagen
- Deleting=Verwijderen
- Difficulty=Moeilijkheidsgraad
-@@ -142,7 +142,7 @@
- ExitGame?=Spel verlaten?
- ExitGameServer?=Spel verlaten?\n(dit zal het spel voor\nandere spelers 
stopzetten.)
- Explored=Verkend
--Faction=Stam
-+Faction=Groepering
- FallbackCpuMultiplier=KI veranderde vermenigvuldiger
- Fast=snel
- FieldAir=Lucht
-@@ -190,7 +190,7 @@
- InvalidOrder=Commando is ongeldig
- InvalidPosition=Positie is ongeldig
- IRCPeopleOnline=IRC-gebruikers online:
--Keyboardsetup=Toetsenbordinstellingen
-+Keyboardsetup=Toetsenbord Instellen
- KeyboardsetupTest=Toetsenbord-test
- Kills=Slachtoffers gemaakt
- JoinGame=LAN-spel
-@@ -219,21 +219,21 @@
- LoadGameDeletingFile=Poging tot verwijderen bestand: '%s'
- LoadGameLoadingFile=Poging tot laden bestand: '%s'
- SavedGameBadVersion=Opgeslagen spel versie komt niet overeen met de 
applicatie versie: [%s] --> [%s]
--LoadSavedGameInfo=Kaart: %s\nTileset: %s\nTech: %s\nScenario: %s\n# Spelers: 
%d\nStam: %s
-+LoadSavedGameInfo=Kaart: %s\nTileset: %s\nTech: %s\nScenario: %s\n# Spelers: 
%d\nGroepering: %s
- LoadedSpeed=Laadsnelheid
- Loading=Laden...
- LocalTime=Lokaal:
- LogScreenCoreDataLoading=Elementaire gegevens
- LogScreenGameLoading=Spel
--LogScreenGameLoadingCreatingAIFaction=Creëer KI voor Stam %d
-+LogScreenGameLoadingCreatingAIFaction=Creëer KI voor Groepering %d
- LogScreenGameLoadingCreatingRainParticles=Maak regen deeltjes systeem
- LogScreenGameLoadingCreatingSnowParticles=Maak sneeuw deeltjes systeem
- LogScreenGameLoadingInitRenderer=Initialiseer weergave
- LogScreenGameLoadingWaitForNetworkPlayers=Wacht op netwerk spelers
--LogScreenGameLoadingStartingMusic=Starten van stam muziek
-+LogScreenGameLoadingStartingMusic=Starten

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/files/, games-strategy/megaglest/

2015-11-30 Thread Michael Sterrett 
commit: 514dc17ffeba7bcfdfc91dfb365f01daf44ef5b9
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Dec  1 06:19:31 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Dec  1 06:19:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514dc17f

old

Package-Manager: portage-2.2.20.1

 games-strategy/megaglest/Manifest  |   1 -
 .../megaglest/files/megaglest-3.9.1-cmake.patch|  46 --
 .../files/megaglest-3.9.1-static-build.patch   |  63 
 games-strategy/megaglest/megaglest-3.9.1-r1.ebuild | 165 -
 4 files changed, 275 deletions(-)

diff --git a/games-strategy/megaglest/Manifest 
b/games-strategy/megaglest/Manifest
index b5cf59e..8651604 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1,2 +1 @@
 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

diff --git a/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch 
b/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch
deleted file mode 100644
index c780146..000
--- a/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Julian Ospald 
-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()
- 
-From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka 
-Date: Wed, 13 May 2015 04:22:45 +1000
-Subject: [PATCH] Fix build with >=cmake-3.2.
-
-The FindOpenGL module no longer pulls in X11 libraries.

- source/shared_lib/CMakeLists.txt | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/source/shared_lib/CMakeLists.txt 
b/source/shared_lib/CMakeLists.txt
-index 3da563e..e5a06fc 100644
 a/source/shared_lib/CMakeLists.txt
-+++ b/source/shared_lib/CMakeLists.txt
-@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR 
BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
-   SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
-   ENDIF()
- 
-+IF(UNIX)
-+  FIND_PACKAGE(X11 REQUIRED)
-+  SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
-+ENDIF()
- 
- IF(WANT_XERCES)
-   FIND_PACKAGE(XercesC REQUIRED)
--- 
-2.3.6
-

diff --git a/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch 
b/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch
deleted file mode 100644
index 2586a56..000
--- a/games-strategy/megaglest/files/megaglest-3.9.1-static-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a
-Author: hasufell 
-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

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2015-11-11 Thread Agostino Sarubbo 
commit: d160136085fdba26f803a426d97745ad1759b192
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 11 09:11:46 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 11 09:11:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1601360

games-strategy/megaglest: x86 stable wrt bug #564812

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 games-strategy/megaglest/megaglest-3.11.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
index 214ea19..d75e017 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/m
 
 LICENSE="GPL-3 BitstreamVera"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+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="

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2015-11-09 Thread Agostino Sarubbo 
commit: 501a0690bcbbb9b97607d2c0ac784515041e2180
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Nov  9 10:30:10 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Nov  9 10:30:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=501a0690

games-strategy/megaglest: amd64 stable wrt bug #564812

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 games-strategy/megaglest/megaglest-3.11.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
index 0a54a79..214ea19 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/m
 
 LICENSE="GPL-3 BitstreamVera"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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="

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2015-11-03 Thread Michael Sterrett 
commit: dd8558332becd69ffcacc82b6119ddea5f611fa9
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Nov  3 16:27:04 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Nov  3 16:27:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd855833

rev bump to move wxGTK slot (bug #563952)

Package-Manager: portage-2.2.20.1

 .../{megaglest-3.11.1.ebuild => megaglest-3.11.1-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-strategy/megaglest/megaglest-3.11.1.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
similarity index 97%
rename from games-strategy/megaglest/megaglest-3.11.1.ebuild
rename to games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
index a050264..0a54a79 100644
--- a/games-strategy/megaglest/megaglest-3.11.1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
@@ -33,9 +33,9 @@ RDEPEND="
virtual/glu
x11-libs/libX11
x11-libs/libXext
-   editor? ( x11-libs/wxGTK:2.8[X,opengl] )
+   editor? ( x11-libs/wxGTK:3.0[X,opengl] )
fribidi? ( dev-libs/fribidi )
-   model-viewer? ( x11-libs/wxGTK:2.8[X] )
+   model-viewer? ( x11-libs/wxGTK:3.0[X] )
!static? (
dev-libs/xerces-c[icu]
media-libs/ftgl
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
if use editor || use model-viewer ; then
-   WX_GTK_VER="2.8"
+   WX_GTK_VER="3.0"
need-wxwidgets unicode
fi

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/files/, games-strategy/megaglest/

2015-10-04 Thread Michael Sterrett 
commit: ca000adb5b3ed930e21f729a57f8ad0f0715280d
Author: Michael Sterrett  gentoo  org>
AuthorDate: Mon Oct  5 00:44:52 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Mon Oct  5 00:47:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca000adb

add patch from Sander Sweers to support building against newer miniupnpc (bug 
#562046)

Package-Manager: portage-2.2.20.1

 .../files/megaglest-3.11.1-miniupnpc.patch  | 21 +
 games-strategy/megaglest/megaglest-3.11.1.ebuild|  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch 
b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
new file mode 100644
index 000..112e734
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
@@ -0,0 +1,21 @@
+diff --git a/source/shared_lib/sources/platform/posix/socket.cpp 
b/source/shared_lib/sources/platform/posix/socket.cpp
+index a5d4b92..cb8ceb4 100644
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
 b/source/shared_lib/sources/platform/posix/socket.cpp
+@@ -2563,9 +2563,15 @@ int UPNP_Tools::upnp_init(void *param) {
+   const char *upnp_minissdpdsock = NULL;
+   int upnp_sameport = 0;
+   int upnp_ipv6 = 0;
++  unsigned char upnp_ttl = 2;
+   int upnp_error = 0;
+ 
+-#ifndef MINIUPNPC_VERSION_PRE1_6
++#if (MINIUPNPC_API_VERSION >= 14)
++  devlist = upnpDiscover(upnp_delay, upnp_multicastif, 
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, _error);
++
++  
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) 
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned 
upnp_error = %d.\n",upnp_error);
++  if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover 
returned upnp_error = %d.\n",upnp_error);
++#elif (MINIUPNPC_API_VERSION >= 8)
+   devlist = upnpDiscover(upnp_delay, upnp_multicastif, 
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, _error);
+ 
+   
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) 
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned 
upnp_error = %d.\n",upnp_error);

diff --git a/games-strategy/megaglest/megaglest-3.11.1.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1.ebuild
index 7776e56..3c74a8d 100644
--- a/games-strategy/megaglest/megaglest-3.11.1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1.ebuild
@@ -71,7 +71,8 @@ src_prepare() {
fi
 
epatch "${FILESDIR}"/${P}-static-build.patch \
-   "${FILESDIR}"/${P}-cmake.patch
+   "${FILESDIR}"/${P}-cmake.patch \
+   "${FILESDIR}"/${P}-miniupnpc.patch
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/

2015-10-04 Thread Michael Sterrett 
commit: 453d7043e683558978470e20d45a36a21f975ac4
Author: Michael Sterrett  gentoo  org>
AuthorDate: Mon Oct  5 00:47:09 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Mon Oct  5 00:47:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453d7043

work around parallel make issues - bug #561380

Package-Manager: portage-2.2.20.1

 games-strategy/megaglest/megaglest-3.11.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-strategy/megaglest/megaglest-3.11.1.ebuild 
b/games-strategy/megaglest/megaglest-3.11.1.ebuild
index 3c74a8d..a050264 100644
--- a/games-strategy/megaglest/megaglest-3.11.1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1.ebuild
@@ -116,7 +116,9 @@ src_configure() {
 
 src_compile() {
if use editor || use model-viewer; then
-   VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
+   # work around parallel make issues - bug #561380
+   MAKEOPTS="-j1 ${MAKEOPTS}" \
+   VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
else
cmake-utils_src_compile
fi