* [gentoo-commits] repo/gentoo:master commit in: games-strategy/knights-demo/
@ 2018-05-02 19:28 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2018-05-02 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 8f96cefc4a1544be952c5009dbf969ba327abab0
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed May 2 17:54:35 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed May 2 19:27:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f96cefc
games-strategy/knights-demo: Drop old
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../knights-demo/knights-demo-1.32-r1.ebuild | 49 ----------------------
1 file changed, 49 deletions(-)
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r1.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r1.ebuild
deleted file mode 100644
index b9d0fc04f43..00000000000
--- a/games-strategy/knights-demo/knights-demo-1.32-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-DESCRIPTION="Anglo-Saxon medieval army battles and resource management"
-HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=knights"
-# Unversioned upstream filename
-SRC_URI="mirror://gentoo/${P}.run"
-
-LICENSE="knights-demo"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="sys-libs/glibc
- >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
- >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
- >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
- >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
- >=x11-libs/libXi-1.7.2[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack_makeself ${P}.run
- mv -f data{,-temp}
- unpack ./data-temp/data.tar.gz
- rm -rf data-temp lgp_* setup*
-}
-
-src_install() {
- local dir=${GAMES_PREFIX_OPT}/${PN}
-
- exeinto "${dir}"
- doexe bin/Linux/x86/${PN}{,.dynamic}
-
- insinto "${dir}"
- doins -r data
- doins EULA icon.xpm README{,.licenses}
-
- # We don't support the dynamic version, even though we install it.
- games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
- newicon icon.xpm ${PN}.xpm
- make_desktop_entry ${PN} "Knights and Merchants (Demo)" ${PN}
- prepgamesdirs
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-strategy/knights-demo/
@ 2018-05-02 19:28 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2018-05-02 19:28 UTC (permalink / raw
To: gentoo-commits
commit: ddbb4e5b4011bd489929cb631af98827df6764d8
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed May 2 17:54:00 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed May 2 19:27:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddbb4e5b
games-strategy/knights-demo: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../knights-demo/knights-demo-1.32-r2.ebuild | 49 ++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
new file mode 100644
index 00000000000..d314a019ee7
--- /dev/null
+++ b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils unpacker
+
+DESCRIPTION="Anglo-Saxon medieval army battles and resource management"
+HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=knights"
+# Unversioned upstream filename
+SRC_URI="mirror://gentoo/${P}.run"
+
+LICENSE="knights-demo"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND="
+ sys-libs/glibc
+ >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+ >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+ >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+ >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+"
+S="${WORKDIR}"
+
+src_unpack() {
+ unpack_makeself ${P}.run
+ mv -f data{,-temp}
+ unpack ./data-temp/data.tar.gz
+ rm -rf data-temp lgp_* setup*
+}
+
+src_install() {
+ local dir=/opt/${PN}
+
+ exeinto "${dir}"
+ doexe bin/Linux/x86/${PN}{,.dynamic}
+
+ insinto "${dir}"
+ doins -r data
+ doins EULA icon.xpm README{,.licenses}
+
+ # We don't support the dynamic version, even though we install it.
+ make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+ newicon icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} "Knights and Merchants (Demo)" ${PN}
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-strategy/knights-demo/
@ 2021-04-10 13:31 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-04-10 13:31 UTC (permalink / raw
To: gentoo-commits
commit: 131a8dee44f60292b93a83334c9f9c43d086de21
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 13:00:53 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 13:30:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131a8dee
games-strategy/knights-demo: EAPI 7, silence QA warnings for unused file
All the SONAME warnings were for a binary we don't really support. We install
it for some reason and I don't really want to meddle with it in case it
_somehow_ works for somebody.
Closes: https://bugs.gentoo.org/739366
Closes: https://bugs.gentoo.org/739372
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../knights-demo/knights-demo-1.32-r2.ebuild | 33 +++++++++++++++++-----
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
index d314a019ee7..0fab85fe334 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
@@ -1,20 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils unpacker
+EAPI=7
+
+inherit desktop unpacker wrapper
DESCRIPTION="Anglo-Saxon medieval army battles and resource management"
HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=knights"
# Unversioned upstream filename
SRC_URI="mirror://gentoo/${P}.run"
+S="${WORKDIR}"
LICENSE="knights-demo"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RESTRICT="strip"
+# Deps for the .dynamic binary which we don't support but install anyway
+# TODO: wants gtk-1.2?!
+# TODO: wants libgrapple?
+DYNAMIC_DEPS="
+ dev-libs/glib
+ media-libs/libogg
+ media-libs/libsdl
+ media-libs/libvorbis
+ media-libs/sdl-mixer
+ media-libs/smpeg
+ sys-libs/zlib
+"
RDEPEND="
sys-libs/glibc
>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
@@ -23,13 +36,19 @@ RDEPEND="
>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
"
-S="${WORKDIR}"
+
+# RDEPEND+=" ${DYNAMIC_DEPS}"
+
+QA_FLAGS_IGNORED="
+ opt/knights-demo/knights-demo.dynamic
+ opt/knights-demo/knights-demo
+"
src_unpack() {
unpack_makeself ${P}.run
- mv -f data{,-temp}
+ mv -f data{,-temp} || die
unpack ./data-temp/data.tar.gz
- rm -rf data-temp lgp_* setup*
+ rm -rf data-temp lgp_* setup* || die
}
src_install() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-strategy/knights-demo/
@ 2021-06-30 18:40 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-06-30 18:40 UTC (permalink / raw
To: gentoo-commits
commit: df67d7a2a65bddddf064943dd32973d71e1053a2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 18:39:59 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 18:39:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df67d7a2
games-strategy/knights-demo: add missing libcrypt compat dependency
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{knights-demo-1.32-r2.ebuild => knights-demo-1.32-r3.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
similarity index 96%
rename from games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
rename to games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
index 0fab85fe334..30df2b2f322 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
@@ -35,6 +35,10 @@ RDEPEND="
>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+ || (
+ sys-libs/glibc[crypt(+)]
+ sys-libs/libxcrypt[compat]
+ )
"
# RDEPEND+=" ${DYNAMIC_DEPS}"
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-strategy/knights-demo/
@ 2021-11-19 17:45 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-11-19 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 5b77fd1bbef0fc017b2d8a077a90d88f94c3a325
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 17:43:47 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 17:44:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b77fd1b
games-strategy/knights-demo: flip libxcrypt[compat] dep order
Help Portage resolve dependencies a bit easier.
Bug: https://bugs.gentoo.org/814335
Bug: https://bugs.gentoo.org/822849
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-strategy/knights-demo/knights-demo-1.32-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
index 30df2b2f322b..d329b09274d5 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
@@ -36,8 +36,8 @@ RDEPEND="
>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
|| (
- sys-libs/glibc[crypt(+)]
sys-libs/libxcrypt[compat]
+ sys-libs/glibc[crypt(+)]
)
"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/knights-demo/
@ 2024-01-23 20:26 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2024-01-23 20:26 UTC (permalink / raw
To: gentoo-commits
commit: 362c836d0b36c25dc29510597b0c8b08568d90b1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 20:22:00 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 20:26:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362c836d
games-strategy/knights-demo: Update glibc dependency
All glibc versions where missing crypt useflag indicated hard-enabled are gone.
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../{knights-demo-1.32-r3.ebuild => knights-demo-1.32-r4.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r4.ebuild
similarity index 96%
rename from games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
rename to games-strategy/knights-demo/knights-demo-1.32-r4.ebuild
index 361d5eb8d117..e20308c14608 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,7 +37,7 @@ RDEPEND="
>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
|| (
sys-libs/libxcrypt[compat]
- sys-libs/glibc[crypt(+)]
+ sys-libs/glibc[crypt(-)]
)
"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-23 20:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-02 19:28 [gentoo-commits] repo/gentoo:master commit in: games-strategy/knights-demo/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2018-05-02 19:28 Pacho Ramos
2021-04-10 13:31 Sam James
2021-06-30 18:40 Sam James
2021-11-19 17:45 Sam James
2024-01-23 20:26 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox