gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

games-roguelike/stone-soup: use system dev-cpp/catch for tests

Browse Source 
... not the bundled one

Closes: https://bugs.gentoo.org/829950
Signed-off-by: Erik Mackdanz <stasibear@gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3
This commit is contained in:
Erik Mackdanz
2021-12-30 09:43:31 -06:00
parent 9d2d51f4db
commit 2aa8bfe8b2
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
View File

@@ -24,7 +24,7 @@ SRC_URI="
# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
KEYWORDS="amd64 x86"
IUSE="debug ncurses sound +tiles"
IUSE="debug ncurses sound test +tiles"
RDEPEND="
${LUA_DEPS}
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
sys-devel/flex
test? ( dev-cpp/catch:0 )
tiles? (
media-gfx/pngcrush
sys-libs/ncurses:0
@@ -90,6 +91,12 @@ src_prepare() {
sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
|| die "Couldn't append slot to executable name"
# Replace bundled catch2 package with system implementation
# https://bugs.gentoo.org/829950
if use test; then
cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"
fi
}
src_compile() {

9
games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
View File

@@ -24,7 +24,7 @@ SRC_URI="
# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
KEYWORDS="amd64 x86"
IUSE="debug ncurses sound +tiles"
IUSE="debug ncurses sound test +tiles"
RDEPEND="
${LUA_DEPS}
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
sys-devel/flex
test? ( dev-cpp/catch:0 )
tiles? (
media-gfx/pngcrush
sys-libs/ncurses:0
@@ -90,6 +91,12 @@ src_prepare() {
sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
|| die "Couldn't append slot to executable name"
# Replace bundled catch2 package with system implementation
# https://bugs.gentoo.org/829950
if use test; then
cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"
fi
}
src_compile() {

9
games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
View File

@@ -24,7 +24,7 @@ SRC_URI="
# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
KEYWORDS="amd64 x86"
IUSE="debug ncurses sound +tiles"
IUSE="debug ncurses sound test +tiles"
RDEPEND="
${LUA_DEPS}
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
sys-devel/flex
test? ( dev-cpp/catch:0 )
tiles? (
media-gfx/pngcrush
sys-libs/ncurses:0
@@ -90,6 +91,12 @@ src_prepare() {
sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
|| die "Couldn't append slot to executable name"
# Replace bundled catch2 package with system implementation
# https://bugs.gentoo.org/829950
if use test; then
cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"
fi
}
src_compile() {

9
games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
View File

@@ -38,7 +38,7 @@ fi
# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
KEYWORDS="~amd64 ~x86"
IUSE="debug ncurses sound +tiles"
IUSE="debug ncurses sound test +tiles"
S=${WORKDIR}/${MY_P}/source
RDEPEND="
@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
sys-devel/flex
test? ( dev-cpp/catch:0 )
tiles? (
media-gfx/pngcrush
sys-libs/ncurses:0
@@ -109,6 +110,12 @@ src_prepare() {
if ! [ -f "${S}/util/release_ver" ]; then
echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"
fi
# Replace bundled catch2 package with system implementation
# https://bugs.gentoo.org/829950
if use test; then
cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"
fi
}
src_compile() {