commit: 7ba65dc3d4dd3dee54f48a493e2196f17be179d1
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Sat Nov 9 14:00:08 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 14:00:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7ba65dc3
games-engines/instead: add 3.5.2 drop 3.3.5
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>
games-engines/instead/Manifest | 2 +-
.../{instead-3.3.5.ebuild => instead-3.5.2.ebuild} | 31 +++++++++-------------
games-engines/instead/instead-9999.ebuild | 31 +++++++++-------------
games-engines/instead/metadata.xml | 1 +
4 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/games-engines/instead/Manifest b/games-engines/instead/Manifest
index addf566b8..ed36fb57a 100644
--- a/games-engines/instead/Manifest
+++ b/games-engines/instead/Manifest
@@ -1,2 +1,2 @@
-DIST instead-3.3.5.tar.gz 3603530 BLAKE2B
3be93facf3f456ebdd81dc5f251177e50a3ba745107c5183c8032bc5c3b914d3843beed82fbb62950873517714d19f7412543ced5ef2c72b942580ac77ee2e5b
SHA512
4db126b6eb84f79ba3651b8b4664ebc5c66baec8e1ae3bbaa9626993ac221104250f84d2e65dacb9403f13ad3c60f36eda63fbbd84e0199b2ae8c5009a2c8ae6
DIST instead-3.4.1.tar.gz 3605352 BLAKE2B
de1597ece93f603d6937c19be5a8cd08a69ca5c45f987bf74654909a3dd2ae75b2fb7d6114eec79b3fce2ed24172924eed160e6d42892ae44695e6f4ed67f2dc
SHA512
0eb552f6d535a8d28ee6f986b14c7c21482223854fa0eaf12247fee6e3a5bd8eb3e0c3650e8f269b105ff155f68c36fcf73c280c9ee58e6d0193d7612fc86e4b
+DIST instead-3.5.2.tar.gz 3667002 BLAKE2B
a079bb7d7228c6e5934d5d913b33e841a64bf03b8fd2141ededcfcdc643d9d0f1420b09afd4cf83bfbac05f2c26f2d0fee0b4a056970b8e0d9fc67e66be2217d
SHA512
b9373aba876e5b5a80045e4477e31d891c0b224ef258d7cb8e8d0cf6495b80df5f67b6026f63eafa2580198197b566b801c5d48d616bfd8ae194341496e0bc7a
diff --git a/games-engines/instead/instead-3.3.5.ebuild
b/games-engines/instead/instead-3.5.2.ebuild
similarity index 81%
rename from games-engines/instead/instead-3.3.5.ebuild
rename to games-engines/instead/instead-3.5.2.ebuild
index fd8a67314..e8e175fc7 100644
--- a/games-engines/instead/instead-3.3.5.ebuild
+++ b/games-engines/instead/instead-3.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PLOCALES="cs de en es fr it nl pt ru uk"
PLOCALE_BACKUP="en"
@@ -22,9 +22,8 @@ HOMEPAGE="https://instead.hugeping.ru/";
LICENSE="MIT"
SLOT="0"
-IUSE="doc +iconv +sdl2"
+IUSE="doc +iconv +harfbuzz"
# gtk3 is forced since gtk2 already near its end-of-life
-# harfbuzz support requres features from SDL2_ttf version which is not yet
released (>2.0.15)
REQUIRED_USE="
${LUA_REQUIRED_USE}
@@ -35,25 +34,20 @@ BDEPEND="
${LUA_DEPS}
"
-SDL_DEPS="
- media-libs/libsdl!VER![sound,video]
- media-libs/sdl!VER!-mixer
- media-libs/sdl!VER!-image
- media-libs/sdl!VER!-ttf
-"
-
COMMON_DEPEND="
${LUA_DEPS}
+ media-libs/libsdl2[sound,video]
+ media-libs/sdl2-image
+ media-libs/sdl2-mixer
+ media-libs/sdl2-ttf
sys-libs/zlib
x11-libs/gtk+:3
- sdl2? ( ${SDL_DEPS//!VER!/2} )
- !sdl2? ( ${SDL_DEPS//!VER!/} )
iconv? ( >=virtual/libiconv-0-r1 )
+ harfbuzz? (
+ media-libs/harfbuzz
+ media-libs/sdl2-ttf[harfbuzz]
+ )
"
-# harfbuzz? (
-# media-libs/harfbuzz
-# media-libs/sdl!VER!-ttf[harfbuzz]
-# )
RDEPEND="${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}"
@@ -90,9 +84,8 @@ src_configure() {
-DWITH_GTK3=ON
-DWITH_LUAJIT="$(usex lua_single_target_luajit)"
-DWITH_ICONV="$(usex iconv)"
- -DWITH_SDL2="$(usex sdl2)"
+ -DWITH_HARFBUZZ="$(usex harfbuzz)"
)
-# -DWITH_HARFBUZZ="$(usex harfbuzz)"
cmake_src_configure
}
diff --git a/games-engines/instead/instead-9999.ebuild
b/games-engines/instead/instead-9999.ebuild
index fd8a67314..e8e175fc7 100644
--- a/games-engines/instead/instead-9999.ebuild
+++ b/games-engines/instead/instead-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PLOCALES="cs de en es fr it nl pt ru uk"
PLOCALE_BACKUP="en"
@@ -22,9 +22,8 @@ HOMEPAGE="https://instead.hugeping.ru/";
LICENSE="MIT"
SLOT="0"
-IUSE="doc +iconv +sdl2"
+IUSE="doc +iconv +harfbuzz"
# gtk3 is forced since gtk2 already near its end-of-life
-# harfbuzz support requres features from SDL2_ttf version which is not yet
released (>2.0.15)
REQUIRED_USE="
${LUA_REQUIRED_USE}
@@ -35,25 +34,20 @@ BDEPEND="
${LUA_DEPS}
"
-SDL_DEPS="
- media-libs/libsdl!VER![sound,video]
- media-libs/sdl!VER!-mixer
- media-libs/sdl!VER!-image
- media-libs/sdl!VER!-ttf
-"
-
COMMON_DEPEND="
${LUA_DEPS}
+ media-libs/libsdl2[sound,video]
+ media-libs/sdl2-image
+ media-libs/sdl2-mixer
+ media-libs/sdl2-ttf
sys-libs/zlib
x11-libs/gtk+:3
- sdl2? ( ${SDL_DEPS//!VER!/2} )
- !sdl2? ( ${SDL_DEPS//!VER!/} )
iconv? ( >=virtual/libiconv-0-r1 )
+ harfbuzz? (
+ media-libs/harfbuzz
+ media-libs/sdl2-ttf[harfbuzz]
+ )
"
-# harfbuzz? (
-# media-libs/harfbuzz
-# media-libs/sdl!VER!-ttf[harfbuzz]
-# )
RDEPEND="${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}"
@@ -90,9 +84,8 @@ src_configure() {
-DWITH_GTK3=ON
-DWITH_LUAJIT="$(usex lua_single_target_luajit)"
-DWITH_ICONV="$(usex iconv)"
- -DWITH_SDL2="$(usex sdl2)"
+ -DWITH_HARFBUZZ="$(usex harfbuzz)"
)
-# -DWITH_HARFBUZZ="$(usex harfbuzz)"
cmake_src_configure
}
diff --git a/games-engines/instead/metadata.xml
b/games-engines/instead/metadata.xml
index 5a569e5a4..913f271e0 100644
--- a/games-engines/instead/metadata.xml
+++ b/games-engines/instead/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="doc">Include some additional documentation on how
to create games for the instead engine</flag>
+ <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for
better support of RTL languages</flag>
<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
</use>
<longdescription lang="en">INSTEAD is a tool to make and run
textographic games. The exact look and feel of such games may vary from
interactive fiction and visual novels to classic point & click or
text-based adventures.</longdescription>
