commit: cb676f5138887ccb0794000b68ed2b773a8c6b3c
Author: Tim Sviridov <Lt.Infiltrator <AT> gmail <DOT> com>
AuthorDate: Wed Sep 10 09:03:45 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Sep 10 09:04:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cb676f51
Revert "games-strategy/7k-ambition: Fix gettext dependency version"
Gentoo does not have gettext 0.23 as stable yet.
This reverts commits 26f12f8d86a66a947e272ae1c0929e536d28d1ca and
059a7910e05fb767c5c92692d92285ec6ff1bf49.
Signed-off-by: Tim Sviridov <Lt.Infiltrator <AT> gmail.com>
.../7k-ambition/7k-ambition-3.2.5-r1.ebuild | 79 ----------------------
games-strategy/7k-ambition/7k-ambition-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 80 deletions(-)
diff --git a/games-strategy/7k-ambition/7k-ambition-3.2.5-r1.ebuild
b/games-strategy/7k-ambition/7k-ambition-3.2.5-r1.ebuild
deleted file mode 100644
index 38fc05bbf7..0000000000
--- a/games-strategy/7k-ambition/7k-ambition-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop toolchain-funcs xdg
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/seven-kingdoms-ambition/code"
- EGIT_BRANCH="next"
-else
-
SRC_URI="https://github.com/Infiltrator/${PN}/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Seven Kingdoms: Ambition"
-HOMEPAGE="https://seven-kingdoms-ambition.sourceforge.io/"
-SRC_URI+="
https://sourceforge.net/projects/seven-kingdoms-ambition/files/${PN}.png/download
-> ${PN}.png
- music? ( https://www.7kfans.com/downloads/7kaa-music-2.15.tar.bz2 )
-"
-
-LICENSE="GPL-2
- music? ( 7k-music )"
-SLOT="0"
-IUSE="+nls +multiplayer +music"
-RESTRICT="music? ( bindist ) mirror"
-
-DEPEND="
- dev-libs/boost:=
- nls? ( >=sys-devel/gettext-0.23 )
- multiplayer? (
- net-libs/enet:1.3=
- net-misc/curl:=
- )
- media-libs/libsdl2[X,video]
- media-libs/openal:=
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- if [[ ${PV} == *9999* ]]; then
- git-r3_src_unpack
- fi
-
- default
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable nls)
- $(use_enable multiplayer)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- if use music ; then
- insinto "usr/share/${PN}/"
- doins -r "${WORKDIR}/7kaa-music/MUSIC"
-
- dodoc "${WORKDIR}/7kaa-music/README-Music.txt"
"${WORKDIR}/7kaa-music/COPYING-Music.txt"
- fi
-
- doicon "${DISTDIR}/${PN}.png"
-
- make_desktop_entry ${PN} "Seven Kingdoms: Ambition"
/usr/share/pixmaps/${PN}.png Game
-}
diff --git a/games-strategy/7k-ambition/7k-ambition-9999.ebuild
b/games-strategy/7k-ambition/7k-ambition-9999.ebuild
index 38fc05bbf7..dd3b6c6a98 100644
--- a/games-strategy/7k-ambition/7k-ambition-9999.ebuild
+++ b/games-strategy/7k-ambition/7k-ambition-9999.ebuild
@@ -28,7 +28,7 @@ RESTRICT="music? ( bindist ) mirror"
DEPEND="
dev-libs/boost:=
- nls? ( >=sys-devel/gettext-0.23 )
+ nls? ( <=sys-devel/gettext-0.22.5-r2 )
multiplayer? (
net-libs/enet:1.3=
net-misc/curl:=