gentoo resync : 28.07.2021

7 files changed, 54 insertions, 85 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 5bced2cb2ee9..3f9f61f3cc2a 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest
index 95b2cab73dcb..b02fde272d66 100644
--- a/games-strategy/julius/Manifest
+++ b/games-strategy/julius/Manifest
@@ -1,5 +1,8 @@
 AUX 90julius.sh 72 BLAKE2B d07d935037fa998174fffd1c786ffe2dab8d6af4eb9b71f0c30e1ad2e528ddda09232c4009573935f64eccf3c99b23041441579b99110a96f31a003b7db87ba6 SHA512 39ad3849f341a0817623cd3daf3d0ce255784c33538a9b1f9e25fa6655c59e8c3f56cc2f4bca23692e64118c78900c8dede656e9a1af5a043904b02fdf0e84dc
+AUX README.gentoo 424 BLAKE2B 22fd27d4a6cf675867d5d8e5dd0fdc5ff84f14a0dd37e2ad7454c6cfdf0445ff8dc0b3bd3f37cfd314b756ca27c8461b9ce1939d66f1724d6b06ddd2d0d274e2 SHA512 4c91297ed589bba1b9fc46e8705b927ab4010ebabd8d7ae4fc68afdb34b64e8ac1f64439fdc6214944eb8968c8f274c189da4869b9219279ddccfca267877cce
 AUX julius-1.4.1-rename.patch 718 BLAKE2B 00a4cfb23cb4586a7a1a4069d1ba3db7edab0f6cfeaf3f5efc396a7c2be4e94923272a6d82585173f8d2569d84c97ca2046682e85d638d9c473b22577c693840 SHA512 0401429f24c5cb3285bef68b1fa2b489ec32d7fa13d20448e8f06231b23d137ed9edeb6fcc693cbcc6f891a38dcd3fb34c519fe9ff41b5f35c8b7dec52847c12
 DIST julius-1.4.1.tar.gz 8592785 BLAKE2B 8eb91522fccdee33600b02de766727beb19f138c0f695eb92aaa77ea2f25ec293906d0c75d31d42159097a12317ba38b22c01e7edf722670f51fe56d625d9ae7 SHA512 8488cee4a229299fd771f7ebddf076888b2e11458b2edbb6058b29b1f7e79d372ec2f913df3afacd8191551ba692a900508e64661ead1029916e28f356f79f7b
+DIST julius-1.6.0.tar.gz 6884324 BLAKE2B 142f05b8f7165e59678fc56fcdf9e2c00aea880540e16fedc627ed40afb4ce96511d99f0cd99f99997d8d66f776e6d847cc66256fafde771345948ba097b940e SHA512 c21256b9f126011b0961411209d354e713e6de44a30c190a7de5e0a702636961ad0775beb171b17767ec70e334e6101f9c1ad26df6860b4f4d59d74510083905
 EBUILD julius-1.4.1.ebuild 1306 BLAKE2B 160cb72243abb56855a255f66441746552e3ffddc1bea2f12f214e43ec5a63b8668324f139b6f30c618ef1d5fbc66b0d23bea51929864146c700aeda66fa43c3 SHA512 ba54aa83edab78734f68b10a98da1ec708e6bd2af2e29cca65ee8b95bf493e95cec6bfb7c2013006e4e3fa7ee0e0456ef6a0768e97e28f7e3ebfd5b2020c96e8
+EBUILD julius-1.6.0.ebuild 1016 BLAKE2B fce77e375dbf5ee81ad7253d3def74e24b28fea6343c6adedac814765418437da5afa1f01cf055b23d94ce3f95dac1cf9de9be1de0f541f74e71415d2cba59c1 SHA512 ddb111573c3031d1086c49a738f5c9185c5556964bef151f18da29916649b8f5c3bb6ee5c5084d1ceafadef8c3dbc94cd381de99a42ac6b0d71264a8cca31811
 MISC metadata.xml 984 BLAKE2B a7e03580853743cf1e3baa0d22da83f6805a8082ffcae37206dd2d50bc8b8ec8ee20648eb5a8cb487f17969c608a53500e8cb0fc615389a0faa0718277b7bc5c SHA512 c807b2848e2380a2dcda2629c47e085b3bb994d45989bd9800376e4f1e6d3cd814772d2ff7b0faf8e211436d615cf49e189c768ea9862ecac0d054d3d82e6638
diff --git a/games-strategy/julius/files/README.gentoo b/games-strategy/julius/files/README.gentoo
new file mode 100644
index 000000000000..1f0867196879
--- /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 000000000000..31fae63d4296
--- /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
+}
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index da2f807de937..d0b3d49008e9 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,7 +1,4 @@
-AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059
 DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
-DIST widelands-build21-source.tar.gz 381374149 BLAKE2B 17f0491bf7bcd10449bcc274be94aec4a0a64625c19f52426a0d460c3356e04a59b51683e72b4492ba1f62bd6ea510250c3cedda89a7588b88a0071abb1cf0cf SHA512 8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e
-EBUILD widelands-0.21.ebuild 1294 BLAKE2B 83dd55f08b40846aa9ccbe6ae4a1a77fe70e4e700978922b2642d5ed1cc19b03300fb5b1ff4046a5c30a1f58b5b799201b93aa5799517099bec4d4d0b642fc8f SHA512 d056e4c495b2279d1d95bdb5e3cfaf141b949c5db661783c08b204e7214e6a73cc780b00c04e93fe813350da3d70dc9b961e71f924a07a2439aca952cb82a475
 EBUILD widelands-1.0.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c
 EBUILD widelands-9999.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c
 MISC metadata.xml 389 BLAKE2B fe4a764c97dea6a413ad64f616b14f041d94682a5bbb92f02c07506f1c727c1c391fc1beae37c01bd16471a765d8ff5c96badfbfac2ab6647c88db4afa59499f SHA512 4192abec8b668283343c9066c80d89441f7a9491078589a792e9584ab1b9195f443313434350954979acdbfa23c8c048557e1884d18d7d0cac90d63919758dfd
diff --git a/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch b/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
deleted file mode 100644
index ee8fda17ee4a..000000000000
--- a/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- widelands-build19-rc1/CMakeLists.txt
-+++ widelands-build19-rc1/CMakeLists.txt
-@@ -146,19 +146,13 @@
-   option(OPTION_ASAN "Build with AddressSanitizer" ON)
- elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
-   if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
--    message(STATUS "GCC >6.2.0 breaks -03, setting -02")
--    set(WL_OPTIMIZE_FLAGS "-O2")
--  else()
--    set(WL_OPTIMIZE_FLAGS "-O3")
-+    message(STATUS "GCC >6.2.0 breaks -03")
-   endif ()
-   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
-   option(OPTION_ASAN "Build with AddressSanitizer" OFF)
- elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-   if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
--    message(STATUS "GCC >6.2.0 breaks -03, setting -02")
--    set(WL_OPTIMIZE_FLAGS "-O2")
--  else()
--    set(WL_OPTIMIZE_FLAGS "-O3")
-+    message(STATUS "GCC >6.2.0 breaks -03")
-   endif ()
-   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
-   option(OPTION_ASAN "Build with AddressSanitizer" ON)
diff --git a/games-strategy/widelands/widelands-0.21.ebuild b/games-strategy/widelands/widelands-0.21.ebuild
deleted file mode 100644
index 398bc433cb5a..000000000000
--- a/games-strategy/widelands/widelands-0.21.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit xdg cmake python-any-r1
-
-MY_PV="build$(ver_cut 2)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Game similar to Settlers 2"
-HOMEPAGE="https://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}-source.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/icu:=
-	media-libs/glew:0=
-	media-libs/libglvnd
-	media-libs/libpng:=
-	media-libs/libsdl2[opengl,sound,video]
-	media-libs/sdl2-image[jpeg,png]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-ttf
-	sys-libs/zlib:=
-	virtual/libintl"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
-)
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
-		-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
-		-DGTK_UPDATE_ICON_CACHE=OFF
-		-DOPTION_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}