From df67d7a2a65bddddf064943dd32973d71e1053a2 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 30 Jun 2021 19:39:59 +0100 Subject: games-strategy/knights-demo: add missing libcrypt compat dependency Signed-off-by: Sam James --- .../knights-demo/knights-demo-1.32-r2.ebuild | 68 -------------------- .../knights-demo/knights-demo-1.32-r3.ebuild | 72 ++++++++++++++++++++++ 2 files changed, 72 insertions(+), 68 deletions(-) delete mode 100644 games-strategy/knights-demo/knights-demo-1.32-r2.ebuild create mode 100644 games-strategy/knights-demo/knights-demo-1.32-r3.ebuild (limited to 'games-strategy') diff --git a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild deleted file mode 100644 index 0fab85fe334d..000000000000 --- a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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" -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(-)] - >=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(-)] -" - -# 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} || die - unpack ./data-temp/data.tar.gz - rm -rf data-temp lgp_* setup* || die -} - -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} -} diff --git a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild new file mode 100644 index 000000000000..30df2b2f322b --- /dev/null +++ b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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" +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(-)] + >=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(-)] + || ( + sys-libs/glibc[crypt(+)] + sys-libs/libxcrypt[compat] + ) +" + +# 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} || die + unpack ./data-temp/data.tar.gz + rm -rf data-temp lgp_* setup* || die +} + +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} +} -- cgit v1.2.3-65-gdbad