[gentoo-commits] repo/gentoo:master commit in: games-strategy/julius/, games-strategy/julius/files/

[gentoo-commits] repo/gentoo:master commit in: games-strategy/julius/, games-strategy/julius/files/

[James Le Cuirot]

commit:     7404cd9230a8feee90ce53d4779e656bb4477e4a
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 11:57:25 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 11:57:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7404cd92

games-strategy/julius: Rename binary without breaking desktop file

Closes: https://bugs.gentoo.org/770121
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../julius/files/julius-1.4.1-rename.patch         | 26 ++++++++++++++++++++++
 games-strategy/julius/julius-1.4.1.ebuild          | 17 +++++++-------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/games-strategy/julius/files/julius-1.4.1-rename.patch b/games-strategy/julius/files/julius-1.4.1-rename.patch
new file mode 100644
index 00000000000..cf6b6d53aad
--- /dev/null
+++ b/games-strategy/julius/files/julius-1.4.1-rename.patch
@@ -0,0 +1,26 @@
+Avoid conflict with app-accessibility/julius.
+
+diff --color -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2020-06-01 14:53:28.000000000 +0100
++++ b/CMakeLists.txt	2021-02-14 11:51:30.364704957 +0000
+@@ -27,7 +27,7 @@
+     endif()
+ endif()
+ 
+-set(SHORT_NAME julius)
++set(SHORT_NAME julius-game)
+ project(${SHORT_NAME} C)
+ 
+ if (VITA_BUILD)
+diff --color -Naur a/res/julius.desktop b/res/julius.desktop
+--- a/res/julius.desktop	2020-06-01 14:53:28.000000000 +0100
++++ b/res/julius.desktop	2021-02-14 11:51:45.518122772 +0000
+@@ -2,7 +2,7 @@
+ [Desktop Entry]
+ Type=Application
+ Version=1.0
+-Exec=julius
++Exec=julius-game
+ Icon=com.github.bvschaik.julius
+ Name=Julius
+ GenericName=Roman city management game

diff --git a/games-strategy/julius/julius-1.4.1.ebuild b/games-strategy/julius/julius-1.4.1.ebuild
index bffe7ad8478..dc3f63777c1 100644
--- a/games-strategy/julius/julius-1.4.1.ebuild
+++ b/games-strategy/julius/julius-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake xdg
+inherit xdg cmake
 
 DESCRIPTION="Feature-faithful open source re-implementation of Caesar III"
 HOMEPAGE="https://github.com/bvschaik/julius"
@@ -18,19 +18,18 @@ DEPEND="
 	media-libs/libsdl2[joystick,video,sound]
 	media-libs/sdl2-mixer
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 
-src_prepare() {
-	cmake_src_prepare
-	xdg_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-rename.patch
+)
 
 src_install() {
 	insinto /etc/profile.d
 	doins "${FILESDIR}"/90julius.sh
 	cmake_src_install
-	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() {

[gentoo-commits] repo/gentoo:master commit in: games-strategy/julius/, games-strategy/julius/files/

[Ionen Wolkens]

commit:     0d416d67f7bb8da223a5861d56a5e19eede338b5
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Jul 19 21:44:35 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 16:58:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d416d67

games-strategy/julius: version bump 1.6.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
Closes: https://github.com/gentoo/gentoo/pull/21720
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/julius/Manifest            |  1 +
 games-strategy/julius/files/README.gentoo |  7 +++++
 games-strategy/julius/julius-1.6.0.ebuild | 44 +++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest
index 1e31cd76e50..34cd813e85f 100644
--- a/games-strategy/julius/Manifest
+++ b/games-strategy/julius/Manifest
@@ -1 +1,2 @@
 DIST julius-1.4.1.tar.gz 8592785 BLAKE2B 8eb91522fccdee33600b02de766727beb19f138c0f695eb92aaa77ea2f25ec293906d0c75d31d42159097a12317ba38b22c01e7edf722670f51fe56d625d9ae7 SHA512 8488cee4a229299fd771f7ebddf076888b2e11458b2edbb6058b29b1f7e79d372ec2f913df3afacd8191551ba692a900508e64661ead1029916e28f356f79f7b
+DIST julius-1.6.0.tar.gz 6884324 BLAKE2B 142f05b8f7165e59678fc56fcdf9e2c00aea880540e16fedc627ed40afb4ce96511d99f0cd99f99997d8d66f776e6d847cc66256fafde771345948ba097b940e SHA512 c21256b9f126011b0961411209d354e713e6de44a30c190a7de5e0a702636961ad0775beb171b17767ec70e334e6101f9c1ad26df6860b4f4d59d74510083905

diff --git a/games-strategy/julius/files/README.gentoo b/games-strategy/julius/files/README.gentoo
new file mode 100644
index 00000000000..1f086719687
--- /dev/null
+++ b/games-strategy/julius/files/README.gentoo
@@ -0,0 +1,7 @@
+Julius requires you to download the original Caesar 3 resources.
+
+You need to obtain these files from a vendor of the proprietary software.
+You will then need to copy the 'app' directory into '~/.local/share/julius/app'.
+One way to obtain this directory is to download the GOG Caesar 3 edition.
+You can then produce this directory by installing app-arch/innoextract and running:
+    innoextract -m setup_caesar3_2.0.0.9.exe

diff --git a/games-strategy/julius/julius-1.6.0.ebuild b/games-strategy/julius/julius-1.6.0.ebuild
new file mode 100644
index 00000000000..31fae63d429
--- /dev/null
+++ b/games-strategy/julius/julius-1.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake readme.gentoo-r1
+
+DESCRIPTION="Feature-faithful open source re-implementation of Caesar III"
+HOMEPAGE="https://github.com/bvschaik/julius"
+SRC_URI="https://github.com/bvschaik/julius/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+DEPEND="
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,video,sound]
+	media-libs/sdl2-mixer
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-rename.patch
+)
+
+src_install() {
+	cmake_src_install
+	dodir /usr/libexec
+	mv "${ED}/usr/bin/julius-game"  "${ED}/usr/libexec/julius-game" ||
+		die "Failed to rename executable (required to set default resources location)."
+	newbin - julius-game <<-EOF
+		#!/usr/bin/env sh
+		exec "${EPREFIX}/usr/libexec/julius-game" "\${1:-\${HOME}/.local/share/julius/app}"
+	EOF
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}