[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2024-05-05 Thread Ionen Wolkens
commit: baa52b0691fe34b51a3e09b5a03e2df68236dc2a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun May  5 17:10:49 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun May  5 23:37:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa52b06

games-arcade/commandergenius: enable py3.12 + tidy

Still needs the bump that would remove python altogether,
but I don't have the game data to run it and would rather
not handle it. Adding 3.12 is also pretty tentative.

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

 .../commandergenius/commandergenius-2.4.0-r1.ebuild| 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild 
b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
index 82eb3b850b7e..5d2aabf22c41 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # note: version >=2.5.0 switches from python to lua
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake flag-o-matic python-single-r1 xdg
 
-MY_P="Commander-Genius-v${PV}"
+MY_P=Commander-Genius-v${PV}
 
 DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
 HOMEPAGE="https://clonekeenplus.sourceforge.io/";
 
SRC_URI="https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v${PV}/${MY_P}.tar.bz2";
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -29,10 +29,12 @@ RDEPEND="
sys-libs/zlib[minizip]
downloader? ( net-misc/curl )
opengl? ( virtual/opengl )
-   python? ( ${PYTHON_DEPS} )"
+   python? ( ${PYTHON_DEPS} )
+"
 DEPEND="
${RDEPEND}
-   dev-libs/boost"
+   dev-libs/boost
+"
 BDEPEND="python? ( ${PYTHON_DEPS} )"
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/

2023-04-18 Thread Sam James
commit: b62f4a1dcac81842a89a24c6ba6347d80ea78b6b
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 19 03:22:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 19 03:22:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62f4a1d

games-arcade/commandergenius: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/898756
Signed-off-by: Sam James  gentoo.org>

 .../commandergenius-2.4.0-r1.ebuild|  1 +
 .../files/commandergenius-2.4.0-gcc13.patch| 23 ++
 2 files changed, 24 insertions(+)

diff --git a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild 
b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
index f263f3a77456..82eb3b850b7e 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="python? ( ${PYTHON_DEPS} )"
 PATCHES=(
"${FILESDIR}"/${PN}-2.3.1-build.patch
"${FILESDIR}"/${PN}-2.3.1-paths.patch
+   "${FILESDIR}"/${P}-gcc13.patch
 )
 
 pkg_setup() {

diff --git 
a/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch 
b/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch
new file mode 100644
index ..866905c251b8
--- /dev/null
+++ b/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch
@@ -0,0 +1,23 @@
+https://gitlab.com/Dringgstein/Commander-Genius/-/commit/f9fb2808acfca598fe6e6963c84fe9afe5bcd89e
+
+From f9fb2808acfca598fe6e6963c84fe9afe5bcd89e Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt 
+Date: Tue, 28 Mar 2023 10:56:06 +0200
+Subject: [PATCH] build: resolve compile error with gcc-13
+
+GsKit/base/utils/Unicode.h:16:9: error: 'uint32_t' does not name a type
+GsKit/base/utils/Unicode.h:17:27: error: 'UnicodeChar' was not declared in 
this scope
+GsKit/base/utils/Unicode.h:17:38: error: template argument 1 is invalid
+...
+--- a/GsKit/base/utils/Unicode.h
 b/GsKit/base/utils/Unicode.h
+@@ -11,6 +11,7 @@
+ #ifndef __UNICODE_H__
+ #define __UNICODE_H__
+ 
++#include 
+ #include 
+ 
+ typedef uint32_t UnicodeChar;
+-- 
+GitLab



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2023-02-25 Thread Ionen Wolkens
commit: 646df5c2d8bb035184b8d01273356ad5600c7e13
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Feb 25 09:41:14 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb 25 10:19:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646df5c2

games-arcade/commandergenius: EAPI7->8, enable py3.11, filter-lto

Still needs a bump, but that will need closer looking into and
ideally someone more familiar with this and having the game files.

wrt python, support for 3.11 falls back on users given it's used
for their own scripts (later versions replace python by lua).
Albeit may already have been using 3.11 or 3.12 given cmake wasn't
told which interpreter library to link with before.

Just a lazy fix wrt bug #858530 to do at same time as revbump,
haven't looked closer.

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

 4.0.ebuild => commandergenius-2.4.0-r1.ebuild} | 53 +++---
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild 
b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
similarity index 63%
rename from games-arcade/commandergenius/commandergenius-2.4.0.ebuild
rename to games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
index 976c50c53abb..f263f3a77456 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+# note: version >=2.5.0 switches from python to lua
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic python-single-r1 xdg
 
-inherit python-single-r1 xdg cmake
+MY_P="Commander-Genius-v${PV}"
 
-MY_PN="Commander-Genius"
-MY_P="${MY_PN}-v${PV}"
 DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="https://clonekeenplus.sourceforge.io";
-SRC_URI="https://gitlab.com/Dringgstein/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.bz2";
+HOMEPAGE="https://clonekeenplus.sourceforge.io/";
+SRC_URI="https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v${PV}/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,50 +29,48 @@ RDEPEND="
sys-libs/zlib[minizip]
downloader? ( net-misc/curl )
opengl? ( virtual/opengl )
-   python? ( ${PYTHON_DEPS} )
-"
-
+   python? ( ${PYTHON_DEPS} )"
 DEPEND="
${RDEPEND}
-   dev-libs/boost
-"
-
-BDEPEND="virtual/pkgconfig"
+   dev-libs/boost"
+BDEPEND="python? ( ${PYTHON_DEPS} )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.3.1-build.patch
"${FILESDIR}"/${PN}-2.3.1-paths.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
-SHAREDIR="/usr/share"
-GAMESDIR="${SHAREDIR}/${PN}/games"
-DOCS=()
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+}
 
 src_configure() {
+   filter-lto #858530
+
local mycmakeargs=(
-   -DAPPDIR="${EPREFIX}/usr/bin"
-   -DGAMES_SHAREDIR="${EPREFIX}${SHAREDIR}"
-   -DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   -DAPPDIR="${EPREFIX}"/usr/bin
+   -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+   -DGAMES_SHAREDIR="${EPREFIX}"/usr/share
-DDOWNLOADER=$(usex downloader)
-DUSE_OPENGL=$(usex opengl)
-DUSE_PYTHON3=$(usex python)
-   -DUSE_SDL2=ON
-   -DUSE_SDL_TTF=ON # Crashes when disabled.
+   -DUSE_SDL2=yes
+   -DUSE_SDL_TTF=yes # crashes when disabled
+   $(usev python -DPython3_EXECUTABLE="${PYTHON}")
)
 
cmake_src_configure
 }
 
 src_install() {
+   local DOCS=() # skip .in template file, can drop this on bump
cmake_src_install
 
-   # The normal executable name is weird.
+   # default executable name is weird
dosym CGeniusExe /usr/bin/${PN}
 
-   # Game data can be manually installed here.
-   keepdir "${GAMESDIR}"
+   # game data can be manually installed here
+   keepdir /usr/share/${PN}/games
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2022-08-03 Thread James Le Cuirot
commit: 995f94b94b397cb90e8b4e2da7495865c83ee58c
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Aug  3 17:57:24 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Aug  3 21:42:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=995f94b9

games-arcade/commandergenius: use HTTPS

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Signed-off-by: James Le Cuirot  gentoo.org>

 games-arcade/commandergenius/commandergenius-2.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild 
b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
index afd31367e2ad..9fa6b9659725 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit python-single-r1 xdg cmake
 MY_PN="Commander-Genius"
 MY_P="${MY_PN}-v${PV}"
 DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="http://clonekeenplus.sourceforge.net";
+HOMEPAGE="https://clonekeenplus.sourceforge.io";
 
SRC_URI="https://gitlab.com/Dringgstein/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.bz2";
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2021-05-23 Thread Sergei Trofimovich
commit: 9195a79df9075a9e02df71da0a154e0a2b9796fc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 23 10:25:44 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 23 10:27:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9195a79d

games-arcade/commandergenius: allow python-3.9 and python-3.10

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

 games-arcade/commandergenius/commandergenius-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild 
b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
index 53cd288ac27..afd31367e2a 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit python-single-r1 xdg cmake
 



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2021-04-24 Thread David Seifert
commit: 62e6324b624fc266d1996e8c96c46e267ac63e80
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Apr 24 22:02:27 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Apr 24 22:02:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e6324b

games-arcade/commandergenius: remove unused eclass

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: David Seifert  gentoo.org>

 games-arcade/commandergenius/commandergenius-2.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild 
b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
index 9baded9ec4a..53cd288ac27 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit desktop python-single-r1 xdg cmake
+inherit python-single-r1 xdg cmake
 
 MY_PN="Commander-Genius"
 MY_P="${MY_PN}-v${PV}"



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2020-03-30 Thread James Le Cuirot
commit: 63d904d5f9801328fbcc70c62c4482141d3fda81
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Mar 30 22:38:03 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Mar 30 22:38:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d904d5

games-arcade/commandergenius: Version bump to 2.4.0

Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-arcade/commandergenius/Manifest  |  1 +
 .../commandergenius/commandergenius-2.4.0.ebuild   | 91 ++
 2 files changed, 92 insertions(+)

diff --git a/games-arcade/commandergenius/Manifest 
b/games-arcade/commandergenius/Manifest
index ca4a0d63c69..67267068a0c 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1 +1,2 @@
 DIST Commander-Genius-v2.3.3.tar.bz2 63885924 BLAKE2B 
a072f922bac6f76e615bbb602c1b5ac4fca634a90bdead461d666da0d70ad5ddd6865504c84a09905bb313728b840df973ae006d120ae01d8c8f8a7bd4a10abe
 SHA512 
f64f24b01cd0921570f633913c8a3b1b50537596b2c46377862a913e36c74934521c1c55fca676b78674c669d475d9c2c2c09ac4a22ebdad1826508e6b9598b6
+DIST Commander-Genius-v2.4.0.tar.bz2 62351265 BLAKE2B 
0a3338bee2e494f415ce5072978f050766fff16e5df5e7b27824fb4d4c699d2e5a690924f339189325383bee273cbfa5424f43aa9dc87ae4abf63c7cbf1ea6cd
 SHA512 
76eda96fade00d164d3ea5b95acadfb28a3b24864a5ce3f2c9317837a1027cd8d0282a474b8d25bacc26008a26a6adc5062ee655f9abd350d44db58aa70d3b3b

diff --git a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild 
b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
new file mode 100644
index 000..9baded9ec4a
--- /dev/null
+++ b/games-arcade/commandergenius/commandergenius-2.4.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit desktop python-single-r1 xdg cmake
+
+MY_PN="Commander-Genius"
+MY_P="${MY_PN}-v${PV}"
+DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
+HOMEPAGE="http://clonekeenplus.sourceforge.net";
+SRC_URI="https://gitlab.com/Dringgstein/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+downloader opengl +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="mirror" # contains keen files, but we do not install them
+
+RDEPEND="
+   media-libs/libsdl2[opengl?,video]
+   media-libs/sdl2-image
+   media-libs/sdl2-mixer[vorbis]
+   media-libs/sdl2-ttf
+   sys-libs/zlib[minizip]
+   downloader? ( net-misc/curl )
+   opengl? ( virtual/opengl )
+   python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="
+   ${RDEPEND}
+   dev-libs/boost
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.3.1-build.patch
+   "${FILESDIR}"/${PN}-2.3.1-paths.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+SHAREDIR="/usr/share"
+GAMESDIR="${SHAREDIR}/${PN}/games"
+DOCS=()
+
+src_configure() {
+   local mycmakeargs=(
+   -DAPPDIR="${EPREFIX}/usr/bin"
+   -DGAMES_SHAREDIR="${EPREFIX}${SHAREDIR}"
+   -DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   -DDOWNLOADER=$(usex downloader)
+   -DUSE_OPENGL=$(usex opengl)
+   -DUSE_PYTHON3=$(usex python)
+   -DUSE_SDL2=ON
+   -DUSE_SDL_TTF=ON # Crashes when disabled.
+   )
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   # The normal executable name is weird.
+   dosym CGeniusExe /usr/bin/${PN}
+
+   # Game data can be manually installed here.
+   keepdir "${GAMESDIR}"
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   elog "Run ${PN} to start the game. It will search for game data"
+   elog "in ~/.CommanderGenius/games and ${EPREFIX}${GAMESDIR}."
+   elog "You can also specify paths in cgenius.cfg or pass paths as an"
+   elog "argument."
+   elog
+   use downloader && elog "Data for some games can be downloaded from the 
menu."
+   elog
+   elog "Check your settings in ~/.CommanderGenius/cgenius.cfg after you 
have"
+   elog "started the game for the first time."
+   elog
+   use opengl && elog "You may also want to set \"OpenGL = true\"."
+}



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/

2020-03-30 Thread James Le Cuirot
commit: 85c3414f25e0944e041379d55eb8507a1196f89b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Mar 30 22:38:46 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Mar 30 22:38:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c3414f

games-arcade/commandergenius: Drop old 2.3.3

Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-arcade/commandergenius/Manifest  |  1 -
 .../commandergenius/commandergenius-2.3.3.ebuild   | 92 -
 .../files/commandergenius-2.3.1-desktop.patch  | 52 
 .../files/commandergenius-2.3.1-minizip.patch  | 93 --
 4 files changed, 238 deletions(-)

diff --git a/games-arcade/commandergenius/Manifest 
b/games-arcade/commandergenius/Manifest
index 67267068a0c..8161b076039 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1,2 +1 @@
-DIST Commander-Genius-v2.3.3.tar.bz2 63885924 BLAKE2B 
a072f922bac6f76e615bbb602c1b5ac4fca634a90bdead461d666da0d70ad5ddd6865504c84a09905bb313728b840df973ae006d120ae01d8c8f8a7bd4a10abe
 SHA512 
f64f24b01cd0921570f633913c8a3b1b50537596b2c46377862a913e36c74934521c1c55fca676b78674c669d475d9c2c2c09ac4a22ebdad1826508e6b9598b6
 DIST Commander-Genius-v2.4.0.tar.bz2 62351265 BLAKE2B 
0a3338bee2e494f415ce5072978f050766fff16e5df5e7b27824fb4d4c699d2e5a690924f339189325383bee273cbfa5424f43aa9dc87ae4abf63c7cbf1ea6cd
 SHA512 
76eda96fade00d164d3ea5b95acadfb28a3b24864a5ce3f2c9317837a1027cd8d0282a474b8d25bacc26008a26a6adc5062ee655f9abd350d44db58aa70d3b3b

diff --git a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild 
b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
deleted file mode 100644
index 9a139cff2fa..000
--- a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake desktop python-single-r1 xdg-utils
-
-MY_PN="Commander-Genius"
-MY_P="${MY_PN}-v${PV}"
-DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="http://clonekeenplus.sourceforge.net";
-SRC_URI="https://gitlab.com/Dringgstein/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+downloader opengl +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="mirror" # contains keen files, but we do not install them
-
-RDEPEND="media-libs/libsdl2[opengl?,video]
-   media-libs/sdl2-image
-   media-libs/sdl2-mixer[vorbis]
-   sys-libs/zlib[minizip]
-   downloader? ( net-misc/curl )
-   opengl? ( virtual/opengl )
-   python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-   dev-libs/boost"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.3.1-minizip.patch
-   "${FILESDIR}"/${PN}-2.3.1-desktop.patch
-   "${FILESDIR}"/${PN}-2.3.1-build.patch
-   "${FILESDIR}"/${PN}-2.3.1-paths.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-SHAREDIR="/usr/share"
-GAMESDIR="${SHAREDIR}/${PN}/games"
-DOCS=()
-
-src_configure() {
-   local mycmakeargs=(
-   -DAPPDIR="${EPREFIX}/usr/bin"
-   -DGAMES_SHAREDIR="${EPREFIX}${SHAREDIR}"
-   -DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-   -DDOWNLOADER=$(usex downloader)
-   -DOPENGL=$(usex opengl)
-   -DUSE_PYTHON3=$(usex python)
-   -DUSE_SDL2=ON
-   -DBUILD_SHARED_LIBS=OFF
-   )
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   # The normal executable name is weird.
-   dosym CGeniusExe /usr/bin/${PN}
-
-   # Game data can be manually installed here.
-   keepdir "${GAMESDIR}"
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-
-   elog "Run ${PN} to start the game. It will search for game data"
-   elog "in ~/.CommanderGenius/games and ${EPREFIX}${GAMESDIR}."
-   elog "You can also specify paths in cgenius.cfg or pass paths as an"
-   elog "argument."
-   elog
-   use downloader && elog "Data for some games can be downloaded from the 
menu."
-   elog
-   elog "Check your settings in ~/.CommanderGenius/cgenius.cfg after you 
have"
-   elog "started the game for the first time."
-   elog
-   use opengl && elog "You may also want to set \"OpenGL = true\"."
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-}

diff --git 
a/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch 
b/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch
deleted file mode 100644
index 4d2c246e5b7..000
--- a/games-arcade/commandergenius/files/commandergenius-2.3.1-desktop.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 84243052d0b9409b4d5b28e751e598287b00bab9 Mon Sep 17 00:00:00 2001
-From: Jame

[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2019-08-02 Thread James Le Cuirot
commit: e6aff8e3a5963a885378be3dc46194239a2819e4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Aug  2 21:11:55 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Aug  2 21:42:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6aff8e3

games-arcade/commandergenius: Add missing REQUIRED_USE

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: James Le Cuirot  gentoo.org>

 games-arcade/commandergenius/commandergenius-2.3.3.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild 
b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
index 4c3fc02b572..e2625339eed 100644
--- a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
@@ -17,6 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+downloader opengl +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="mirror" # contains keen files, but we do not install them
 
 RDEPEND="media-libs/libsdl2[opengl?,video]



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/

2019-04-14 Thread James Le Cuirot
commit: 34f929fa2a9bba8d1029c1b407a2ee65660abfdd
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Apr 14 13:24:03 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Apr 14 13:26:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f929fa

games-arcade/commandergenius: Version bump to 2.3.3

The path handling still seems a bit buggy but it more or less works
with the included patch.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-arcade/commandergenius/Manifest  |  1 +
 .../commandergenius/commandergenius-2.3.3.ebuild   | 91 +
 .../files/commandergenius-2.3.1-build.patch| 12 +++
 .../files/commandergenius-2.3.1-desktop.patch  | 52 
 .../files/commandergenius-2.3.1-minizip.patch  | 93 ++
 .../files/commandergenius-2.3.1-paths.patch| 11 +++
 games-arcade/commandergenius/metadata.xml  |  3 +-
 7 files changed, 262 insertions(+), 1 deletion(-)

diff --git a/games-arcade/commandergenius/Manifest 
b/games-arcade/commandergenius/Manifest
index 77859bf4c17..dcd67035647 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1 +1,2 @@
+DIST Commander-Genius-v2.3.3.tar.bz2 63885924 BLAKE2B 
a072f922bac6f76e615bbb602c1b5ac4fca634a90bdead461d666da0d70ad5ddd6865504c84a09905bb313728b840df973ae006d120ae01d8c8f8a7bd4a10abe
 SHA512 
f64f24b01cd0921570f633913c8a3b1b50537596b2c46377862a913e36c74934521c1c55fca676b78674c669d475d9c2c2c09ac4a22ebdad1826508e6b9598b6
 DIST commandergenius-1.8.3.tar.gz 71446309 BLAKE2B 
01f54e3deb4189e103d9ae23efadfe82363893b48e31d4b5b505f961191b5afe36440b67f0da55d59b6fceeadb15659503d3326975cb131f131b9a630ac35ae8
 SHA512 
821a356751629b7f3b122f52a31588f2174580fa6450699f8a03bcd78e305c649c7b36bb21dd2d222411c648b78c3bb02c11e9691e8cb2459380e6a70c2dbe2a

diff --git a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild 
b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
new file mode 100644
index 000..4c3fc02b572
--- /dev/null
+++ b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils desktop python-single-r1 xdg-utils
+
+MY_PN="Commander-Genius"
+MY_P="${MY_PN}-v${PV}"
+DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
+HOMEPAGE="http://clonekeenplus.sourceforge.net";
+SRC_URI="https://gitlab.com/Dringgstein/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+downloader opengl +python"
+RESTRICT="mirror" # contains keen files, but we do not install them
+
+RDEPEND="media-libs/libsdl2[opengl?,video]
+   media-libs/sdl2-image
+   media-libs/sdl2-mixer[vorbis]
+   sys-libs/zlib[minizip]
+   downloader? ( net-misc/curl )
+   opengl? ( virtual/opengl )
+   python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${RDEPEND}
+   dev-libs/boost"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.3.1-minizip.patch
+   "${FILESDIR}"/${PN}-2.3.1-desktop.patch
+   "${FILESDIR}"/${PN}-2.3.1-build.patch
+   "${FILESDIR}"/${PN}-2.3.1-paths.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+SHAREDIR="/usr/share"
+GAMESDIR="${SHAREDIR}/${PN}/games"
+DOCS=()
+
+src_configure() {
+   local mycmakeargs=(
+   -DAPPDIR="${EPREFIX}/usr/bin"
+   -DGAMES_SHAREDIR="${EPREFIX}${SHAREDIR}"
+   -DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+   -DDOWNLOADER=$(usex downloader)
+   -DOPENGL=$(usex opengl)
+   -DUSE_PYTHON3=$(usex python)
+   -DUSE_SDL2=ON
+   -DBUILD_SHARED_LIBS=OFF
+   )
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   # The normal executable name is weird.
+   dosym CGeniusExe /usr/bin/${PN}
+
+   # Game data can be manually installed here.
+   keepdir "${GAMESDIR}"
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+
+   elog "Run ${PN} to start the game. It will search for game data"
+   elog "in ~/.CommanderGenius/games and ${EPREFIX}${GAMESDIR}."
+   elog "You can also specify paths in cgenius.cfg or pass paths as an"
+   elog "argument."
+   elog
+   use downloader && elog "Data for some games can be downloaded from the 
menu."
+   elog
+   elog "Check your settings in ~/.CommanderGenius/cgenius.cfg after you 
have"
+   elog "started the game for the first time."
+   elog
+   use opengl && elog "You may also want to set \"OpenGL = true\"."
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+}

diff --git 
a/games-arcade/commandergenius/files/commandergenius-2.3.1-build.patch 
b/games-arcade/commandergenius/files/commandergenius-2.3.1-bu

[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/, games-arcade/commandergenius/files/

2019-04-14 Thread James Le Cuirot
commit: 25e8146fbb9bd3e6a4f2f058d17b7be5614405fc
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Apr 14 13:25:37 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Apr 14 13:26:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e8146f

games-arcade/commandergenius: Drop old 1.8.3

Closes: https://bugs.gentoo.org/640540
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-arcade/commandergenius/Manifest  |  1 -
 .../commandergenius/commandergenius-1.8.3.ebuild   | 80 --
 .../commandergenius/files/commandergenius-wrapper  | 18 -
 games-arcade/commandergenius/metadata.xml  |  4 --
 4 files changed, 103 deletions(-)

diff --git a/games-arcade/commandergenius/Manifest 
b/games-arcade/commandergenius/Manifest
index dcd67035647..ca4a0d63c69 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1,2 +1 @@
 DIST Commander-Genius-v2.3.3.tar.bz2 63885924 BLAKE2B 
a072f922bac6f76e615bbb602c1b5ac4fca634a90bdead461d666da0d70ad5ddd6865504c84a09905bb313728b840df973ae006d120ae01d8c8f8a7bd4a10abe
 SHA512 
f64f24b01cd0921570f633913c8a3b1b50537596b2c46377862a913e36c74934521c1c55fca676b78674c669d475d9c2c2c09ac4a22ebdad1826508e6b9598b6
-DIST commandergenius-1.8.3.tar.gz 71446309 BLAKE2B 
01f54e3deb4189e103d9ae23efadfe82363893b48e31d4b5b505f961191b5afe36440b67f0da55d59b6fceeadb15659503d3326975cb131f131b9a630ac35ae8
 SHA512 
821a356751629b7f3b122f52a31588f2174580fa6450699f8a03bcd78e305c649c7b36bb21dd2d222411c648b78c3bb02c11e9691e8cb2459380e6a70c2dbe2a

diff --git a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild 
b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
deleted file mode 100644
index 435c937ccf6..000
--- a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils eutils games
-
-MY_P=CGenius-${PV}-Release-Source
-DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="http://clonekeenplus.sourceforge.net";
-SRC_URI="https://github.com/gerstrong/Commander-Genius/archive/v${PV//./}release.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl tremor"
-RESTRICT="mirror" # contains keen files, but we do not install them
-
-RDEPEND="media-libs/libsdl2[X,opengl?,sound,video]
-   media-libs/sdl2-image
-   opengl? ( virtual/opengl )
-   tremor? ( media-libs/tremor )
-   !tremor? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-   dev-libs/boost
-   virtual/pkgconfig"
-
-S=${WORKDIR}/Commander-Genius-${PV//./}release
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   rm -rf vfsroot || die
-   sed -i -e '/INCLUDE(package.cmake)/d' CMakeLists.txt || die
-   cp version.h src/ || die # Workaround buggy neard package - bug #558160
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DAPPDIR="${GAMES_BINDIR}"
-   -DSHAREDIR="/usr/share"
-   -DGAMES_SHAREDIR="${GAMES_DATADIR}"
-   -DDOCDIR="/usr/share/doc/${PF}"
-   -DBUILD_TARGET="LINUX"
-   $(cmake-utils_use opengl OPENGL)
-   $(cmake-utils_use tremor TREMOR)
-   $(cmake-utils_use !tremor OGG)
-   -DUSE_SDL2=1
-   )
-
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-}
-
-src_install() {
-   cmake-utils_src_install
-   newicon src/CGLogo.png ${PN}.png
-   newgamesbin "${FILESDIR}"/commandergenius-wrapper commandergenius
-   if [[ -e "${ED}${GAMES_BINDIR}"/CGeniusExe ]] ; then
-   mv "${ED}${GAMES_BINDIR}"/CGeniusExe \
-   "${ED}${GAMES_BINDIR}"/CommanderGenius || die
-   fi
-
-   make_desktop_entry commandergenius
-   prepgamesdirs
-}
-
-pkg_postinst() {
-   games_pkg_postinst
-   elog "Check your settings in ~/.CommanderGenius/cgenius.cfg"
-   elog "after you have started the game for the first time."
-   use opengl && elog "You may also want to set \"OpenGL = true\""
-   elog
-   elog "Run the game via:"
-   elog "'commandergenius [path-to-keen-data]'"
-   elog "or add your keen data dir to the search paths in cgenius.cfg"
-}

diff --git a/games-arcade/commandergenius/files/commandergenius-wrapper 
b/games-arcade/commandergenius/files/commandergenius-wrapper
deleted file mode 100644
index 0fa5243a5df..000
--- a/games-arcade/commandergenius/files/commandergenius-wrapper
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# CommanderGenius by default searches pwd for keen data which can cause
-# massive load/lag depending on which dir you are currently in.
-# This wrapper cd's into ~/.CommanderGenius unless you pass a di

[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2018-01-03 Thread Alfredo Tupone
commit: 6d6d0accc6adb32f07131d223a9d9fbddd809160
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Wed Jan  3 22:04:06 2018 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Wed Jan  3 22:04:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d6d0acc

games-arcade/commandergenius: update Manifest

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 games-arcade/commandergenius/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/commandergenius/Manifest 
b/games-arcade/commandergenius/Manifest
index 7be21291827..77859bf4c17 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1 +1 @@
-DIST commandergenius-1.8.3.tar.gz 71446309 SHA256 
f3c79cc2e322dab408018ac3469cc3747acea14498bef64c13edcb522e73b966 SHA512 
821a356751629b7f3b122f52a31588f2174580fa6450699f8a03bcd78e305c649c7b36bb21dd2d222411c648b78c3bb02c11e9691e8cb2459380e6a70c2dbe2a
 WHIRLPOOL 
dae311c4b193ea50efe22557e3dd0bf4f1d179f1dc40f3e68a8d09758736212c68ad33a406ca0d7df60b48ccf67f3e9673967e21f4ceeb997d614667ba2124bc
+DIST commandergenius-1.8.3.tar.gz 71446309 BLAKE2B 
01f54e3deb4189e103d9ae23efadfe82363893b48e31d4b5b505f961191b5afe36440b67f0da55d59b6fceeadb15659503d3326975cb131f131b9a630ac35ae8
 SHA512 
821a356751629b7f3b122f52a31588f2174580fa6450699f8a03bcd78e305c649c7b36bb21dd2d222411c648b78c3bb02c11e9691e8cb2459380e6a70c2dbe2a



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2017-10-15 Thread David Seifert
commit: 7ac6d1bd69fe44ae75480fcb66f62bee213a2fa0
Author: David Seifert  gentoo  org>
AuthorDate: Sun Oct 15 23:40:59 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 16 00:07:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac6d1bd

games-arcade/commandergenius: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 games-arcade/commandergenius/commandergenius-1.8.3.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild 
b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
index 8968d8c1aa1..fffce71ab38 100644
--- a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
+++ b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/Commander-Genius-${PV//./}release
 
 src_prepare() {
+   cmake-utils_src_prepare
+
rm -rf vfsroot || die
sed -i -e '/INCLUDE(package.cmake)/d' CMakeLists.txt || die
cp version.h src/ || die # Workaround buggy neard package - bug #558160



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/, games-arcade/commandergenius/

2016-11-25 Thread Michael Palimaka
commit: 4c95fbad76c6c27c9759b69e8963eb1906f99b05
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Nov 25 19:16:44 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Nov 25 19:21:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c95fbad

games-arcade/commandergenius: remove old

Package-Manager: portage-2.3.2

 games-arcade/commandergenius/Manifest  |  1 -
 .../commandergenius/commandergenius-1.8.0.0.ebuild | 92 --
 .../files/commandergenius-1.8.0.0-install.patch| 20 -
 3 files changed, 113 deletions(-)

diff --git a/games-arcade/commandergenius/Manifest 
b/games-arcade/commandergenius/Manifest
index 40d9b0b..7be2129 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1,2 +1 @@
-DIST CGenius-1.8.0.0-Release-Source.tar.gz 22863637 SHA256 
131cbc12d711d1c168baf89f1f9e0e4e9560049c21f42399d913c09c619e6153 SHA512 
4e4dc91a5cfabfcace9db2fa85fe2d3dbe91396760cdf37372a12270782ac29906cbeb05b7e48bdf3a64eb042d3b7e209d3370f20ad8b8dfbc1d8c59a95abba9
 WHIRLPOOL 
e8c3068a956fc62ecbd6d134cc4d16e96249555463b41e4193cf6796229a5ecc3e02398914d34ac8cc481978d6df0107c70d6ace635f05e3ae742efd3150ee17
 DIST commandergenius-1.8.3.tar.gz 71446309 SHA256 
f3c79cc2e322dab408018ac3469cc3747acea14498bef64c13edcb522e73b966 SHA512 
821a356751629b7f3b122f52a31588f2174580fa6450699f8a03bcd78e305c649c7b36bb21dd2d222411c648b78c3bb02c11e9691e8cb2459380e6a70c2dbe2a
 WHIRLPOOL 
dae311c4b193ea50efe22557e3dd0bf4f1d179f1dc40f3e68a8d09758736212c68ad33a406ca0d7df60b48ccf67f3e9673967e21f4ceeb997d614667ba2124bc

diff --git a/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild 
b/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild
deleted file mode 100644
index 2e3466b..
--- a/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils eutils games
-
-MY_P=CGenius-${PV}-Release-Source
-DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="http://clonekeenplus.sourceforge.net";
-SRC_URI="mirror://sourceforge/clonekeenplus/CGenius/V${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="opengl tremor"
-RESTRICT="mirror" # contains keen files, but we do not install them
-
-RDEPEND="media-libs/libsdl2[X,opengl?,sound,video]
-   media-libs/sdl2-image
-   opengl? ( virtual/opengl )
-   tremor? ( media-libs/tremor )
-   !tremor? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-   dev-libs/boost
-   virtual/pkgconfig"
-
-S=${WORKDIR}/CGenius-${PV}-Release-Source
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-install.patch
-
-   rm -rf vfsroot || die
-
-   cat <<-EOF > version.h
-   #ifndef __CG__VERSION_H__
-   #define __CG__VERSION_H__
-
-   #define CGVERSION   "${PV}-Release"
-
-   #endif
-   EOF
-
-   sed -i \
-   -e '/INCLUDE(package.cmake)/d' \
-   CMakeLists.txt || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DAPPDIR="${GAMES_BINDIR}"
-   -DSHAREDIR="/usr/share"
-   -DGAMES_SHAREDIR="${GAMES_DATADIR}"
-   -DDOCDIR="/usr/share/doc/${PF}"
-   -DBUILD_TARGET="LINUX"
-   $(cmake-utils_use opengl OPENGL)
-   $(cmake-utils_use tremor TREMOR)
-   $(cmake-utils_use !tremor OGG)
-   -DUSE_SDL2=1
-   )
-
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-}
-
-src_install() {
-   cmake-utils_src_install
-   newicon CGLogo.png ${PN}.png
-   newgamesbin "${FILESDIR}"/commandergenius-wrapper commandergenius
-   if [[ -e "${ED}${GAMES_BINDIR}"/CGeniusExe ]] ; then
-   mv "${ED}${GAMES_BINDIR}"/CGeniusExe \
-   "${ED}${GAMES_BINDIR}"/CommanderGenius || die
-   fi
-
-   make_desktop_entry commandergenius
-   prepgamesdirs
-}
-
-pkg_postinst() {
-   games_pkg_postinst
-   elog "Check your settings in ~/.CommanderGenius/cgenius.cfg"
-   elog "after you have started the game for the first time."
-   use opengl && elog "You may also want to set \"OpenGL = true\""
-   elog
-   elog "Run the game via:"
-   elog "'commandergenius [path-to-keen-data]'"
-   elog "or add your keen data dir to the search paths in cgenius.cfg"
-}

diff --git 
a/games-arcade/commandergenius/files/commandergenius-1.8.0.0-install.patch 
b/games-arcade/commandergenius/files/commandergenius-1.8.0.0-install.patch
deleted file mode 100644
index ea502bd..
--- a/games-arcade/commandergenius/files/commandergenius-1.8.0.0-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 CGenius-1.8.0.0-Release-Source.orig/src/install.cmake
-+++ CGeniu

[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/files/

2016-11-25 Thread Michael Palimaka
commit: 517ba74b8ea96e4e7d1956793dd471ac10079068
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Nov 25 16:15:36 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Nov 25 19:21:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517ba74b

games-arcade/commandergenius: remove unused patch

 .../files/commandergenius-1.8.3-install.patch| 20 
 1 file changed, 20 deletions(-)

diff --git 
a/games-arcade/commandergenius/files/commandergenius-1.8.3-install.patch 
b/games-arcade/commandergenius/files/commandergenius-1.8.3-install.patch
deleted file mode 100644
index ea502bd..
--- a/games-arcade/commandergenius/files/commandergenius-1.8.3-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 CGenius-1.8.0.0-Release-Source.orig/src/install.cmake
-+++ CGenius-1.8.0.0-Release-Source/src/install.cmake
-@@ -22,7 +22,7 @@
- 
- # This will copy the resources files to the proper directory
- IF(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/vfsroot")
--  INSTALL(DIRECTORY vfsroot/ 
-+  INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}vfsroot/ 
-   DESTINATION ${DATADIR})
- ENDIF(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/vfsroot")
- 
-@@ -31,7 +31,7 @@
-   DESTINATION ${DOCDIR})
- 
- # This will copy the readme file. 
--INSTALL(FILES changelog.txt 
-+INSTALL(FILES ${CMAKE_SOURCE_DIR}/changelog.txt 
-   DESTINATION ${DOCDIR})
- 
- # Windows might not have those dlls so we ship them with the packages



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2016-06-06 Thread Agostino Sarubbo
commit: 779cc0e7c68a566043b243ed52b0b917a456
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun  6 14:30:34 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun  6 14:30:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=779cc444

games-arcade/commandergenius: amd64 stable wrt bug #583822

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-arcade/commandergenius/commandergenius-1.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild 
b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
index a553a0e..dcfac7b 100644
--- a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
+++ b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/gerstrong/Commander-Genius/archive/v${PV//./}release
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="opengl tremor"
 RESTRICT="mirror" # contains keen files, but we do not install them
 



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/

2016-04-22 Thread Michael Sterrett
commit: 2a0511c85768166a94b2121268c13fdb011bd482
Author: Michael Sterrett  gentoo  org>
AuthorDate: Fri Apr 22 19:27:46 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri Apr 22 19:28:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0511c8

games-arcade/commandergenius: Workaround buggy neard package - bug #558160

Package-Manager: portage-2.2.26

 games-arcade/commandergenius/commandergenius-1.8.3.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild 
b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
index f142c63..a553a0e 100644
--- a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
+++ b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
@@ -31,6 +31,7 @@ S=${WORKDIR}/Commander-Genius-${PV//./}release
 src_prepare() {
rm -rf vfsroot || die
sed -i -e '/INCLUDE(package.cmake)/d' CMakeLists.txt || die
+   cp version.h src/ || die # Workaround buggy neard package - bug #558160
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: games-arcade/commandergenius/, games-arcade/commandergenius/files/

2016-04-02 Thread Michael Sterrett
commit: 0b5eb31a535bda9216075fc379754d4ee520d348
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sat Apr  2 20:59:47 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sat Apr  2 21:00:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5eb31a

games-arcade/commandergenius: version bump

Package-Manager: portage-2.2.26

 games-arcade/commandergenius/Manifest  |  1 +
 .../commandergenius/commandergenius-1.8.3.ebuild   | 78 ++
 .../files/commandergenius-1.8.3-install.patch  | 20 ++
 3 files changed, 99 insertions(+)

diff --git a/games-arcade/commandergenius/Manifest 
b/games-arcade/commandergenius/Manifest
index b2b9fc0..40d9b0b 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1 +1,2 @@
 DIST CGenius-1.8.0.0-Release-Source.tar.gz 22863637 SHA256 
131cbc12d711d1c168baf89f1f9e0e4e9560049c21f42399d913c09c619e6153 SHA512 
4e4dc91a5cfabfcace9db2fa85fe2d3dbe91396760cdf37372a12270782ac29906cbeb05b7e48bdf3a64eb042d3b7e209d3370f20ad8b8dfbc1d8c59a95abba9
 WHIRLPOOL 
e8c3068a956fc62ecbd6d134cc4d16e96249555463b41e4193cf6796229a5ecc3e02398914d34ac8cc481978d6df0107c70d6ace635f05e3ae742efd3150ee17
+DIST commandergenius-1.8.3.tar.gz 71446309 SHA256 
f3c79cc2e322dab408018ac3469cc3747acea14498bef64c13edcb522e73b966 SHA512 
821a356751629b7f3b122f52a31588f2174580fa6450699f8a03bcd78e305c649c7b36bb21dd2d222411c648b78c3bb02c11e9691e8cb2459380e6a70c2dbe2a
 WHIRLPOOL 
dae311c4b193ea50efe22557e3dd0bf4f1d179f1dc40f3e68a8d09758736212c68ad33a406ca0d7df60b48ccf67f3e9673967e21f4ceeb997d614667ba2124bc

diff --git a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild 
b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
new file mode 100644
index 000..f142c63
--- /dev/null
+++ b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake-utils eutils games
+
+MY_P=CGenius-${PV}-Release-Source
+DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
+HOMEPAGE="http://clonekeenplus.sourceforge.net";
+SRC_URI="https://github.com/gerstrong/Commander-Genius/archive/v${PV//./}release.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl tremor"
+RESTRICT="mirror" # contains keen files, but we do not install them
+
+RDEPEND="media-libs/libsdl2[X,opengl?,sound,video]
+   media-libs/sdl2-image
+   opengl? ( virtual/opengl )
+   tremor? ( media-libs/tremor )
+   !tremor? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+   dev-libs/boost
+   virtual/pkgconfig"
+
+S=${WORKDIR}/Commander-Genius-${PV//./}release
+
+src_prepare() {
+   rm -rf vfsroot || die
+   sed -i -e '/INCLUDE(package.cmake)/d' CMakeLists.txt || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DAPPDIR="${GAMES_BINDIR}"
+   -DSHAREDIR="/usr/share"
+   -DGAMES_SHAREDIR="${GAMES_DATADIR}"
+   -DDOCDIR="/usr/share/doc/${PF}"
+   -DBUILD_TARGET="LINUX"
+   $(cmake-utils_use opengl OPENGL)
+   $(cmake-utils_use tremor TREMOR)
+   $(cmake-utils_use !tremor OGG)
+   -DUSE_SDL2=1
+   )
+
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+}
+
+src_install() {
+   cmake-utils_src_install
+   newicon src/CGLogo.png ${PN}.png
+   newgamesbin "${FILESDIR}"/commandergenius-wrapper commandergenius
+   if [[ -e "${ED}${GAMES_BINDIR}"/CGeniusExe ]] ; then
+   mv "${ED}${GAMES_BINDIR}"/CGeniusExe \
+   "${ED}${GAMES_BINDIR}"/CommanderGenius || die
+   fi
+
+   make_desktop_entry commandergenius
+   prepgamesdirs
+}
+
+pkg_postinst() {
+   games_pkg_postinst
+   elog "Check your settings in ~/.CommanderGenius/cgenius.cfg"
+   elog "after you have started the game for the first time."
+   use opengl && elog "You may also want to set \"OpenGL = true\""
+   elog
+   elog "Run the game via:"
+   elog "'commandergenius [path-to-keen-data]'"
+   elog "or add your keen data dir to the search paths in cgenius.cfg"
+}

diff --git 
a/games-arcade/commandergenius/files/commandergenius-1.8.3-install.patch 
b/games-arcade/commandergenius/files/commandergenius-1.8.3-install.patch
new file mode 100644
index 000..ea502bd
--- /dev/null
+++ b/games-arcade/commandergenius/files/commandergenius-1.8.3-install.patch
@@ -0,0 +1,20 @@
+--- CGenius-1.8.0.0-Release-Source.orig/src/install.cmake
 CGenius-1.8.0.0-Release-Source/src/install.cmake
+@@ -22,7 +22,7 @@
+ 
+ # This will copy the resources files to the proper directory
+ IF(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/vfsroot")
+-  INSTALL(DIRECTORY vfsroot/ 
++  INSTALL(DIRECTORY ${CMAKE_SO