diff --git a/games-strategy/augustus/ChangeLog b/games-strategy/augustus/ChangeLog index 0cff616..3f64038 100644 --- a/games-strategy/augustus/ChangeLog +++ b/games-strategy/augustus/ChangeLog @@ -1,8 +1,6 @@ - 21 Oct 2020; augustus-1.4.1a.ebuild: - games-strategy/augustus: updated elog +*augustus-9999 (16 Mar 2021) -*augustus-1.4.1a (21 Oct 2020) - - 21 Oct 2020; +augustus-1.4.1a.ebuild, - +files/90augustus.sh, +metadata.xml: - games-strategy/augustus: new package + 16 Mar 2021; +augustus-9999.ebuild, + +files/augustus-2.0.1-uncapped.patch, -ChangeLog, -Manifest, + -augustus-1.4.1a.ebuild, metadata.xml: + games-strategy/augustus: live ebuild with proper system-wide dirs diff --git a/games-strategy/augustus/Manifest b/games-strategy/augustus/Manifest deleted file mode 100644 index 008dbcf..0000000 --- a/games-strategy/augustus/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST augustus-1.4.1a.tar.gz 8613703 SHA256 ab0f75357b07b9183d3f09a92c759f8c7016bc8ac24a3d45b0b42a63dd9b4a42 SHA512 9534b6afe87178cdd1592d4647413a094a35d4b2962048b3813ae9ec4951bf4476a899c65365fddf8436971b68c0ddd099ca902a3ee6af4360b6fb71291b6cf2 WHIRLPOOL ad456e7ad1e96bf032b89d5d5932a1361c314a2feac1e316a774fe8c5b6bbe949268535c5d77ea2705a33867fcec91d23d9f3ca8b2bdd9e5a6c89ba6319c9dbd diff --git a/games-strategy/augustus/augustus-1.4.1a.ebuild b/games-strategy/augustus/augustus-9999.ebuild similarity index 59% rename from games-strategy/augustus/augustus-1.4.1a.ebuild rename to games-strategy/augustus/augustus-9999.ebuild index 7868185..5c8406d 100644 --- a/games-strategy/augustus/augustus-1.4.1a.ebuild +++ b/games-strategy/augustus/augustus-9999.ebuild @@ -1,38 +1,43 @@ -# 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 +inherit cmake git-r3 xdg DESCRIPTION="Feature-enhanced open source re-implementation of Caesar III" HOMEPAGE="https://github.com/Keriew/augustus" -SRC_URI="https://github.com/Keriew/augustus/archive/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/Keriew/augustus.git" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~arm64" +IUSE="uncapped" DEPEND=" - media-libs/libpng - media-libs/libsdl2 + media-libs/libpng:0= + media-libs/libsdl2[joystick,video,sound] media-libs/sdl2-mixer " -RDEPEND="" +RDEPEND="${DEPEND}" -src_test() { - sed -i -e "s: && cd \.\. && \./coverage.sh::" runtests.sh || die - ./runtests.sh || die "test phase failed" +src_prepare() { + use uncapped && eapply "${FILESDIR}"/${PN}-2.0.1-uncapped.patch + cmake_src_prepare + xdg_src_prepare } src_install() { insinto /etc/profile.d doins "${FILESDIR}"/90augustus.sh cmake_src_install + mv "${ED}"/usr/bin/augustus "${ED}"/usr/bin/augustus-game || + die "Failed to rename executable (required as per conflict with sci-biology/augustus)" } pkg_postinst() { + xdg_pkg_postinst + ewarn "Augustus requires you to download the original Caesar 3 resources." ewarn ewarn "You need to obtain these files from a vendor of the proprietary software." @@ -42,5 +47,5 @@ pkg_postinst() { ewarn " innoextract -m setup_caesar3_2.0.0.9.exe" ewarn ewarn "Lastly, run 'source /etc/profile' to refresh your environment and be able" - ewarn "to start the game directly by running 'augustus' in the command line." + ewarn "to start the game directly by running 'augustus-game' in the command line." } diff --git a/games-strategy/augustus/files/augustus-2.0.1-uncapped.patch b/games-strategy/augustus/files/augustus-2.0.1-uncapped.patch new file mode 100644 index 0000000..8a9c380 --- /dev/null +++ b/games-strategy/augustus/files/augustus-2.0.1-uncapped.patch @@ -0,0 +1,50 @@ +From 1d3a24d74bbea85198c2c5d739a16dcc139af18b Mon Sep 17 00:00:00 2001 +From: Horea Christian +Date: Sat, 26 Dec 2020 12:59:15 -0500 +Subject: [PATCH] Limiting grand temple number to 6. + +--- + src/building/construction.c | 2 +- + src/building/construction_building.c | 2 +- + src/widget/city_building_ghost.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/building/construction.c b/src/building/construction.c +index d1ae9e9d4..eba378cdd 100644 +--- a/src/building/construction.c ++++ b/src/building/construction.c +@@ -595,7 +595,7 @@ void building_construction_update(int x, int y, int grid_offset) + !(type == BUILDING_DISTRIBUTION_CENTER_UNUSED && city_buildings_has_distribution_center()) && + !(type == BUILDING_MESS_HALL && city_buildings_has_mess_hall()) && + !building_monument_has_monument(type) && +- !(building_monument_is_grand_temple(type) && building_monument_count_grand_temples() >= 2)) { ++ !(building_monument_is_grand_temple(type) && building_monument_count_grand_temples() >= 6)) { + int size = building_properties_for_type(type)->size; + mark_construction(x, y, size, TERRAIN_ALL, 0); + } +diff --git a/src/building/construction_building.c b/src/building/construction_building.c +index ed0d401c0..69e47f900 100644 +--- a/src/building/construction_building.c ++++ b/src/building/construction_building.c +@@ -749,7 +749,7 @@ int building_construction_place_building(building_type type, int x, int y) + return 0; + } + +- if (building_monument_is_grand_temple(type) && building_monument_count_grand_temples() >= 2) { ++ if (building_monument_is_grand_temple(type) && building_monument_count_grand_temples() >= 6) { + city_warning_show(WARNING_MAX_GRAND_TEMPLES); + return 0; + } +diff --git a/src/widget/city_building_ghost.c b/src/widget/city_building_ghost.c +index 8fe9a30bf..c07bac64f 100644 +--- a/src/widget/city_building_ghost.c ++++ b/src/widget/city_building_ghost.c +@@ -303,7 +303,7 @@ static int is_fully_blocked(int map_x, int map_y, building_type type, int buildi + if (building_monument_has_monument(type)) { + return 1; + } +- if (building_monument_is_grand_temple(type) && building_monument_count_grand_temples() >= 2) { ++ if (building_monument_is_grand_temple(type) && building_monument_count_grand_temples() >= 6) { + return 1; + } + if (city_finance_out_of_money()) { diff --git a/games-strategy/augustus/metadata.xml b/games-strategy/augustus/metadata.xml index 717ccdf..c678c7a 100644 --- a/games-strategy/augustus/metadata.xml +++ b/games-strategy/augustus/metadata.xml @@ -14,4 +14,7 @@ Keriew/augustus + + Uncap grand temple count +