From 463397cf1e064185110fe57c568d73f99a06f5d1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 17 Feb 2021 10:35:54 +0000
Subject: gentoo resync : 17.02.2021

---
 games-strategy/julius/Manifest                     |  3 ++-
 .../julius/files/julius-1.4.1-rename.patch         | 26 ++++++++++++++++++++++
 games-strategy/julius/julius-1.4.1.ebuild          | 17 +++++++-------
 3 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 games-strategy/julius/files/julius-1.4.1-rename.patch

(limited to 'games-strategy/julius')

diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest
index 9d461747d7c7..4b572d86f3db 100644
--- a/games-strategy/julius/Manifest
+++ b/games-strategy/julius/Manifest
@@ -1,4 +1,5 @@
 AUX 90julius.sh 72 BLAKE2B d07d935037fa998174fffd1c786ffe2dab8d6af4eb9b71f0c30e1ad2e528ddda09232c4009573935f64eccf3c99b23041441579b99110a96f31a003b7db87ba6 SHA512 39ad3849f341a0817623cd3daf3d0ce255784c33538a9b1f9e25fa6655c59e8c3f56cc2f4bca23692e64118c78900c8dede656e9a1af5a043904b02fdf0e84dc
+AUX julius-1.4.1-rename.patch 718 BLAKE2B 00a4cfb23cb4586a7a1a4069d1ba3db7edab0f6cfeaf3f5efc396a7c2be4e94923272a6d82585173f8d2569d84c97ca2046682e85d638d9c473b22577c693840 SHA512 0401429f24c5cb3285bef68b1fa2b489ec32d7fa13d20448e8f06231b23d137ed9edeb6fcc693cbcc6f891a38dcd3fb34c519fe9ff41b5f35c8b7dec52847c12
 DIST julius-1.4.1.tar.gz 8592785 BLAKE2B 8eb91522fccdee33600b02de766727beb19f138c0f695eb92aaa77ea2f25ec293906d0c75d31d42159097a12317ba38b22c01e7edf722670f51fe56d625d9ae7 SHA512 8488cee4a229299fd771f7ebddf076888b2e11458b2edbb6058b29b1f7e79d372ec2f913df3afacd8191551ba692a900508e64661ead1029916e28f356f79f7b
-EBUILD julius-1.4.1.ebuild 1457 BLAKE2B d7ed69d09ed8720e99472e704f9244a571e94b224666335724a219454575426cb107dd0dd291d147fff52e53bc9a0c24f0b52b3fdbe812ed9ed691514c06a7cd SHA512 ff027e9e7503ef84c2fef0a90486670ecd94139fa96b9e6aa1f9d8f394e278773e40981e339072422b5740f21f89f2d80043d2e6eb1f585f2c8de15588c235e9
+EBUILD julius-1.4.1.ebuild 1306 BLAKE2B 160cb72243abb56855a255f66441746552e3ffddc1bea2f12f214e43ec5a63b8668324f139b6f30c618ef1d5fbc66b0d23bea51929864146c700aeda66fa43c3 SHA512 ba54aa83edab78734f68b10a98da1ec708e6bd2af2e29cca65ee8b95bf493e95cec6bfb7c2013006e4e3fa7ee0e0456ef6a0768e97e28f7e3ebfd5b2020c96e8
 MISC metadata.xml 970 BLAKE2B 520aa602d0f8ac7f53320be45ce6ed36d05262dd5f8bcadd763a2e7c32d0e19030b0ce6b670f7ef6cd4b811a25692123da70460f6d9c7f9a9692095b5524ef37 SHA512 de3723c1436aefb2e5dbad6c286cdf586ad67b2449dd140a00af22096c9779886ae6882193a41b6700af778c6f8e7e74aaff4aad1be2419c3f0e357a89828d38
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 000000000000..cf6b6d53aadd
--- /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 bffe7ad84787..dc3f63777c18 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() {
-- 
cgit v1.2.3