public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/instead/
@ 2021-06-20 13:07 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-06-20 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a44e5678701fe059823fadfd3dbeb20a7e724b7e
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Sun Jun 20 10:29:53 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 10:30:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a44e5678

games-engines/instead: new package

Bug: https://bugs.gentoo.org/285086
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>

 games-engines/instead/Manifest             |   1 +
 games-engines/instead/instead-3.3.4.ebuild | 114 +++++++++++++++++++++++++++++
 games-engines/instead/instead-9999.ebuild  | 114 +++++++++++++++++++++++++++++
 games-engines/instead/metadata.xml         |  17 +++++
 4 files changed, 246 insertions(+)

diff --git a/games-engines/instead/Manifest b/games-engines/instead/Manifest
new file mode 100644
index 000000000..8d23cbc61
--- /dev/null
+++ b/games-engines/instead/Manifest
@@ -0,0 +1 @@
+DIST instead-3.3.4.tar.gz 3602698 BLAKE2B a374e650f459132635b148fbcb820c791506120dd2d512b8f599659119a2670f4e50e50a50e318aec2e0b4150aa9c102f2f00e0e679a0d87e0122af19dbbdb66 SHA512 9601921cbe3b1ad5e03d125cd4f296069c2a8080deaf2f607706f4677398d9f39c82efd1bc00aaf53efa49c0e700be6fc7f3a4f8c20760e62030ca2881098090

diff --git a/games-engines/instead/instead-3.3.4.ebuild b/games-engines/instead/instead-3.3.4.ebuild
new file mode 100644
index 000000000..fe95e0f11
--- /dev/null
+++ b/games-engines/instead/instead-3.3.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs de en es fr it nl pt ru uk"
+PLOCALE_BACKUP="en"
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit cmake lua-single l10n
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/instead-hub/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/instead-hub/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="INSTEAD text-based quest game engine"
+HOMEPAGE="https://instead.hugeping.ru/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc +iconv +sdl2"
+# 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}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	${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}
+	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/sdl!VER!-ttf[harfbuzz]
+#	)
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/lang" "" ".ini"
+
+	rm_loc() { rm "lang/$1.ini" || die; }
+	l10n_for_each_disabled_locale_do rm_loc
+
+	# The docs dir contains some code to build pdf out of the Markdown docs, but it requires some
+	# weird util called multimarkdown, so we will just install the md's themselfs.
+	if use doc; then
+		EXTRA_DOCS=()
+		for l in $(l10n_get_locales) ${PLOCALE_BACKUP}; do
+			for d in "docs/modules-$l.md" "docs/stead3-$l.md"; do
+				if [[ -f "$d" ]]; then
+					EXTRA_DOCS=( "${EXTRA_DOCS[@]}" "$d" )
+				fi
+			done
+		done
+
+		DOCS=( "${DOCS[@]}" "${EXTRA_DOCS[@]}" )
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GTK2=OFF
+		-DWITH_GTK3=ON
+		-DWITH_LUAJIT="$(usex lua_single_target_luajit)"
+		-DWITH_ICONV="$(usex iconv)"
+		-DWITH_SDL2="$(usex sdl2)"
+	)
+#		-DWITH_HARFBUZZ="$(usex harfbuzz)"
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "The instead package contains only a game engine. The actual"
+	elog "games have to be installed separately. To install a game"
+	elog "download an archive and extract it to ~/.instead/games or"
+	elog "to ${EPREFIX}/usr/share/instead/games."
+	elog ""
+	elog "A collection of various games can be found at:"
+	elog "  https://instead.itch.io/"
+	elog "  http://instead-games.ru/"
+	elog ""
+	elog "Also there are some third-party tools to manage download"
+	elog "and installation of games like insteadman3:"
+	elog "  https://jhekasoft.github.io/insteadman"
+
+}

diff --git a/games-engines/instead/instead-9999.ebuild b/games-engines/instead/instead-9999.ebuild
new file mode 100644
index 000000000..fe95e0f11
--- /dev/null
+++ b/games-engines/instead/instead-9999.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs de en es fr it nl pt ru uk"
+PLOCALE_BACKUP="en"
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit cmake lua-single l10n
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/instead-hub/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/instead-hub/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="INSTEAD text-based quest game engine"
+HOMEPAGE="https://instead.hugeping.ru/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc +iconv +sdl2"
+# 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}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	${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}
+	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/sdl!VER!-ttf[harfbuzz]
+#	)
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/lang" "" ".ini"
+
+	rm_loc() { rm "lang/$1.ini" || die; }
+	l10n_for_each_disabled_locale_do rm_loc
+
+	# The docs dir contains some code to build pdf out of the Markdown docs, but it requires some
+	# weird util called multimarkdown, so we will just install the md's themselfs.
+	if use doc; then
+		EXTRA_DOCS=()
+		for l in $(l10n_get_locales) ${PLOCALE_BACKUP}; do
+			for d in "docs/modules-$l.md" "docs/stead3-$l.md"; do
+				if [[ -f "$d" ]]; then
+					EXTRA_DOCS=( "${EXTRA_DOCS[@]}" "$d" )
+				fi
+			done
+		done
+
+		DOCS=( "${DOCS[@]}" "${EXTRA_DOCS[@]}" )
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GTK2=OFF
+		-DWITH_GTK3=ON
+		-DWITH_LUAJIT="$(usex lua_single_target_luajit)"
+		-DWITH_ICONV="$(usex iconv)"
+		-DWITH_SDL2="$(usex sdl2)"
+	)
+#		-DWITH_HARFBUZZ="$(usex harfbuzz)"
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "The instead package contains only a game engine. The actual"
+	elog "games have to be installed separately. To install a game"
+	elog "download an archive and extract it to ~/.instead/games or"
+	elog "to ${EPREFIX}/usr/share/instead/games."
+	elog ""
+	elog "A collection of various games can be found at:"
+	elog "  https://instead.itch.io/"
+	elog "  http://instead-games.ru/"
+	elog ""
+	elog "Also there are some third-party tools to manage download"
+	elog "and installation of games like insteadman3:"
+	elog "  https://jhekasoft.github.io/insteadman"
+
+}

diff --git a/games-engines/instead/metadata.xml b/games-engines/instead/metadata.xml
new file mode 100644
index 000000000..158ba64fb
--- /dev/null
+++ b/games-engines/instead/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fatzer2@gmail.com</email>
+		<name>Alexander Golubev</name>
+	</maintainer>
+	<use>
+		<flag name="doc">Include some additional documentation on how to create games for the instead engine</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 &amp; click or text-based adventures.</longdescription>
+	<longdescription lang="ru">INSTEAD это инструмент для создания и запуска текстографические игр. Жанр конкретных игр может отличаться и находится на стыке интерактивной литературы, визуальных новелл, а также классических point  &amp; click и тескстовых квестов.</longdescription>
+	<upstream>
+		<remote-id type="github">instead-hub/instead</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/instead/
@ 2021-06-20 13:07 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-06-20 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     04f2daa7cb0522e11edfc9bfefb45a39f51174b8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 13:06:55 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 13:06:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=04f2daa7

games-engines/instead: remove trailing whitespace

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 games-engines/instead/instead-3.3.4.ebuild | 2 +-
 games-engines/instead/instead-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-engines/instead/instead-3.3.4.ebuild b/games-engines/instead/instead-3.3.4.ebuild
index fe95e0f11..f25d0ad53 100644
--- a/games-engines/instead/instead-3.3.4.ebuild
+++ b/games-engines/instead/instead-3.3.4.ebuild
@@ -51,7 +51,7 @@ COMMON_DEPEND="
 	iconv? ( >=virtual/libiconv-0-r1 )
 "
 # harfbuzz? (
-# 		media-libs/harfbuzz 
+# 		media-libs/harfbuzz
 #   	media-libs/sdl!VER!-ttf[harfbuzz]
 #	)
 

diff --git a/games-engines/instead/instead-9999.ebuild b/games-engines/instead/instead-9999.ebuild
index fe95e0f11..f25d0ad53 100644
--- a/games-engines/instead/instead-9999.ebuild
+++ b/games-engines/instead/instead-9999.ebuild
@@ -51,7 +51,7 @@ COMMON_DEPEND="
 	iconv? ( >=virtual/libiconv-0-r1 )
 "
 # harfbuzz? (
-# 		media-libs/harfbuzz 
+# 		media-libs/harfbuzz
 #   	media-libs/sdl!VER!-ttf[harfbuzz]
 #	)
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-engines/instead/
@ 2021-08-12 12:32 Florian Schmaus
  2021-08-12 12:33 ` [gentoo-commits] repo/proj/guru:master " Florian Schmaus
  0 siblings, 1 reply; 5+ messages in thread
From: Florian Schmaus @ 2021-08-12 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ea03cb3a1545a841ced2af3467318e5d18c43047
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 12 12:31:38 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 12:31:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea03cb3a

games-engines/instead: migrate to plocale eclass

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 games-engines/instead/instead-3.3.5.ebuild | 8 ++++----
 games-engines/instead/instead-9999.ebuild  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/games-engines/instead/instead-3.3.5.ebuild b/games-engines/instead/instead-3.3.5.ebuild
index f25d0ad53..fd8a67314 100644
--- a/games-engines/instead/instead-3.3.5.ebuild
+++ b/games-engines/instead/instead-3.3.5.ebuild
@@ -7,7 +7,7 @@ PLOCALES="cs de en es fr it nl pt ru uk"
 PLOCALE_BACKUP="en"
 LUA_COMPAT=( lua5-1 luajit )
 
-inherit cmake lua-single l10n
+inherit cmake lua-single plocale
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/instead-hub/${PN}.git"
@@ -61,16 +61,16 @@ DEPEND="${COMMON_DEPEND}"
 DOCS=( AUTHORS ChangeLog README.md )
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/lang" "" ".ini"
+	plocale_find_changes "${S}/lang" "" ".ini"
 
 	rm_loc() { rm "lang/$1.ini" || die; }
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 
 	# The docs dir contains some code to build pdf out of the Markdown docs, but it requires some
 	# weird util called multimarkdown, so we will just install the md's themselfs.
 	if use doc; then
 		EXTRA_DOCS=()
-		for l in $(l10n_get_locales) ${PLOCALE_BACKUP}; do
+		for l in $(plocale_get_locales) ${PLOCALE_BACKUP}; do
 			for d in "docs/modules-$l.md" "docs/stead3-$l.md"; do
 				if [[ -f "$d" ]]; then
 					EXTRA_DOCS=( "${EXTRA_DOCS[@]}" "$d" )

diff --git a/games-engines/instead/instead-9999.ebuild b/games-engines/instead/instead-9999.ebuild
index f25d0ad53..fd8a67314 100644
--- a/games-engines/instead/instead-9999.ebuild
+++ b/games-engines/instead/instead-9999.ebuild
@@ -7,7 +7,7 @@ PLOCALES="cs de en es fr it nl pt ru uk"
 PLOCALE_BACKUP="en"
 LUA_COMPAT=( lua5-1 luajit )
 
-inherit cmake lua-single l10n
+inherit cmake lua-single plocale
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/instead-hub/${PN}.git"
@@ -61,16 +61,16 @@ DEPEND="${COMMON_DEPEND}"
 DOCS=( AUTHORS ChangeLog README.md )
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/lang" "" ".ini"
+	plocale_find_changes "${S}/lang" "" ".ini"
 
 	rm_loc() { rm "lang/$1.ini" || die; }
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 
 	# The docs dir contains some code to build pdf out of the Markdown docs, but it requires some
 	# weird util called multimarkdown, so we will just install the md's themselfs.
 	if use doc; then
 		EXTRA_DOCS=()
-		for l in $(l10n_get_locales) ${PLOCALE_BACKUP}; do
+		for l in $(plocale_get_locales) ${PLOCALE_BACKUP}; do
 			for d in "docs/modules-$l.md" "docs/stead3-$l.md"; do
 				if [[ -f "$d" ]]; then
 					EXTRA_DOCS=( "${EXTRA_DOCS[@]}" "$d" )


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/instead/
  2021-08-12 12:32 [gentoo-commits] repo/proj/guru:dev commit in: games-engines/instead/ Florian Schmaus
@ 2021-08-12 12:33 ` Florian Schmaus
  0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2021-08-12 12:33 UTC (permalink / raw
  To: gentoo-commits

commit:     ea03cb3a1545a841ced2af3467318e5d18c43047
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 12 12:31:38 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 12:31:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea03cb3a

games-engines/instead: migrate to plocale eclass

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 games-engines/instead/instead-3.3.5.ebuild | 8 ++++----
 games-engines/instead/instead-9999.ebuild  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/games-engines/instead/instead-3.3.5.ebuild b/games-engines/instead/instead-3.3.5.ebuild
index f25d0ad53..fd8a67314 100644
--- a/games-engines/instead/instead-3.3.5.ebuild
+++ b/games-engines/instead/instead-3.3.5.ebuild
@@ -7,7 +7,7 @@ PLOCALES="cs de en es fr it nl pt ru uk"
 PLOCALE_BACKUP="en"
 LUA_COMPAT=( lua5-1 luajit )
 
-inherit cmake lua-single l10n
+inherit cmake lua-single plocale
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/instead-hub/${PN}.git"
@@ -61,16 +61,16 @@ DEPEND="${COMMON_DEPEND}"
 DOCS=( AUTHORS ChangeLog README.md )
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/lang" "" ".ini"
+	plocale_find_changes "${S}/lang" "" ".ini"
 
 	rm_loc() { rm "lang/$1.ini" || die; }
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 
 	# The docs dir contains some code to build pdf out of the Markdown docs, but it requires some
 	# weird util called multimarkdown, so we will just install the md's themselfs.
 	if use doc; then
 		EXTRA_DOCS=()
-		for l in $(l10n_get_locales) ${PLOCALE_BACKUP}; do
+		for l in $(plocale_get_locales) ${PLOCALE_BACKUP}; do
 			for d in "docs/modules-$l.md" "docs/stead3-$l.md"; do
 				if [[ -f "$d" ]]; then
 					EXTRA_DOCS=( "${EXTRA_DOCS[@]}" "$d" )

diff --git a/games-engines/instead/instead-9999.ebuild b/games-engines/instead/instead-9999.ebuild
index f25d0ad53..fd8a67314 100644
--- a/games-engines/instead/instead-9999.ebuild
+++ b/games-engines/instead/instead-9999.ebuild
@@ -7,7 +7,7 @@ PLOCALES="cs de en es fr it nl pt ru uk"
 PLOCALE_BACKUP="en"
 LUA_COMPAT=( lua5-1 luajit )
 
-inherit cmake lua-single l10n
+inherit cmake lua-single plocale
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/instead-hub/${PN}.git"
@@ -61,16 +61,16 @@ DEPEND="${COMMON_DEPEND}"
 DOCS=( AUTHORS ChangeLog README.md )
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/lang" "" ".ini"
+	plocale_find_changes "${S}/lang" "" ".ini"
 
 	rm_loc() { rm "lang/$1.ini" || die; }
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 
 	# The docs dir contains some code to build pdf out of the Markdown docs, but it requires some
 	# weird util called multimarkdown, so we will just install the md's themselfs.
 	if use doc; then
 		EXTRA_DOCS=()
-		for l in $(l10n_get_locales) ${PLOCALE_BACKUP}; do
+		for l in $(plocale_get_locales) ${PLOCALE_BACKUP}; do
 			for d in "docs/modules-$l.md" "docs/stead3-$l.md"; do
 				if [[ -f "$d" ]]; then
 					EXTRA_DOCS=( "${EXTRA_DOCS[@]}" "$d" )


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-engines/instead/
@ 2024-11-09 16:30 Viorel Munteanu
  0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2024-11-09 16:30 UTC (permalink / raw
  To: gentoo-commits

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 &amp; click or text-based adventures.</longdescription>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-11-09 16:30 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-12 12:32 [gentoo-commits] repo/proj/guru:dev commit in: games-engines/instead/ Florian Schmaus
2021-08-12 12:33 ` [gentoo-commits] repo/proj/guru:master " Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2024-11-09 16:30 Viorel Munteanu
2021-06-20 13:07 Andrew Ammerlaan
2021-06-20 13:07 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox