From 04947a0cd32b494636ff84ede4b3c63e575446ab Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Tue, 5 May 2020 15:50:36 -0400 Subject: [PATCH] games-strategy/julius: using standard cmake functions and renaming the executable in order to mitigate collision with app-accessibility/julius Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Horea Christian --- games-strategy/julius/ChangeLog | 4 ++++ games-strategy/julius/files/90julius.sh | 2 +- games-strategy/julius/julius-1.3.1.ebuild | 12 ++++-------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/games-strategy/julius/ChangeLog b/games-strategy/julius/ChangeLog index ea46627..fca221c 100644 --- a/games-strategy/julius/ChangeLog +++ b/games-strategy/julius/ChangeLog @@ -1,3 +1,7 @@ + 05 May 2020; files/90julius.sh, julius-1.3.1.ebuild: + games-strategy/julius: using standard cmake functions and renaming the + executable in order to mitigate collision with app-accessibility/julius + 04 May 2020; julius-1.3.1.ebuild: games-strategy/julius: updated post-install instructions diff --git a/games-strategy/julius/files/90julius.sh b/games-strategy/julius/files/90julius.sh index 67e5096..e88111f 100644 --- a/games-strategy/julius/files/90julius.sh +++ b/games-strategy/julius/files/90julius.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -alias julius='julius ~/.cache/julius/app' +alias julius-game='julius-game ~/.cache/julius/app' diff --git a/games-strategy/julius/julius-1.3.1.ebuild b/games-strategy/julius/julius-1.3.1.ebuild index fd42359..1230047 100644 --- a/games-strategy/julius/julius-1.3.1.ebuild +++ b/games-strategy/julius/julius-1.3.1.ebuild @@ -21,22 +21,18 @@ DEPEND=" " RDEPEND="" -src_compile() { - mkdir build - pushd build > /dev/null - cmake .. && emake - popd > /dev/null -} - src_test() { sed -i -e "s: && cd \.\. && \./coverage.sh::" runtests.sh || die ./runtests.sh || die "test phase failed" } src_install() { - dobin build/julius insinto /etc/profile.d doins "${FILESDIR}"/90julius.sh + cmake-utils_src_install + newbin "${BUILD_DIR}"/julius Julius + mv "${ED}"/usr/bin/julius "${ED}"/usr/bin/julius-game || + die "Failed to rename executable (required as per conflict with app-accessibility/julius)" } pkg_postinst() {