gentoo auto-resync : 23:10:2022 - 15:50:25

3 files changed, 71 insertions, 16 deletions

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 5d723171d6b8..41777e41cee0 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,6 +1,8 @@
 AUX widelands-1.0-boost-1.77.patch 473 BLAKE2B c874688efafde34c19b9362b4a744c054076bbdb62ad4bddf3f3960774852fac514e768e20d78b1908b2d0274534304f6629ac2bbf87200f4f44f7730cd63981 SHA512 8b1d989c208f917bd26e9ab6000a1367f1dc9f6fa7dcdf681503541b1dd6d1a6433463c4f547ff387aeceb38156e7e8c73790f329746b6b55350f17b96289f9c
 AUX widelands-1.0-gcc12-werror.patch 1130 BLAKE2B 814e0ae5d710cbd0f02df6888deea17c33f934cde25d7e6cf78ad5dde106f4b1534012eaea9996b66ad12ff1ea2578e08802a581db5a9f17438cfe7d9e0fce78 SHA512 a303972d15f2ad2fb895992358759f7a3006c81c875afbbbac4cf4ec76ca93d3ad93754b26eea2315bd9c82f2967912019759117c7004843d659d2d767c2f7ee
 DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
+DIST widelands-1.1.tar.gz 416104611 BLAKE2B e217ff5a4e3ba0431b96290dd4908d7ddadaf1850e890cee135a54f88162b30d75dbf5bc5f086d6c5e8c5e4410a0a788201117c3615e15a3e2acfd00e8f01272 SHA512 29dbeae0940468c8aad6f0fa610c8467bdb6ecf2ba5fe9175683b7cdaab5f977fa86beb71de29057c829e9738568d15e10bc22fa7fc9e58132151a1a02d72d9d
 EBUILD widelands-1.0.ebuild 1402 BLAKE2B 4298ca52bfbd4da0305d685aa395d1e439e07d748d64ad7b6c9e87788597a5c9b1e620c4fe403fcbf71678aafcd200682ecd642e070fd08a840d5d2cebb30ffa SHA512 7dce68948ac145f1e68dea3aad856bece3913cb4127d50ef45ee310a95839f3557459e4937047ffccc3009f9851497d9088fc87fc8b8a72a371d81be847b7887
-EBUILD widelands-9999.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c
+EBUILD widelands-1.1.ebuild 1307 BLAKE2B aa7b006291aa96890aa2a9469b8bfb3af32d308d6b44dc15b8654bc9a3ee47649c902add180643e82614937c7c631716c8ccb57bd862799c3171ca06e32d3322 SHA512 84e6f55bd5c5fc0b2640db6d3494f4161cd4c11a8da6304023b0d7b1c8bd57a74cf8f9662c0c3a9fbf2a2c792b96787516f9295a67e05ed4c0a72dba51573628
+EBUILD widelands-9999.ebuild 1307 BLAKE2B aa7b006291aa96890aa2a9469b8bfb3af32d308d6b44dc15b8654bc9a3ee47649c902add180643e82614937c7c631716c8ccb57bd862799c3171ca06e32d3322 SHA512 84e6f55bd5c5fc0b2640db6d3494f4161cd4c11a8da6304023b0d7b1c8bd57a74cf8f9662c0c3a9fbf2a2c792b96787516f9295a67e05ed4c0a72dba51573628
 MISC metadata.xml 390 BLAKE2B 139ecbaa266c6fe37441b3e0dd05692dc9eff8301339b7ed358ff32e17c6a1a14cd52b2cf22f141381bcf76d5e9dd579575d204e5a3c1c3793b49ced61b090af SHA512 ecaa9b97ffb2302a7f356e53393f185b70b83563052066d4dd70ad7b725a9963c46b582e1a438f36d517cc52e0ff56316ea8be6c92b54fcdda1726776845f46f
diff --git a/games-strategy/widelands/widelands-1.1.ebuild b/games-strategy/widelands/widelands-1.1.ebuild
new file mode 100644
index 000000000000..8d19ee6f56bb
--- /dev/null
+++ b/games-strategy/widelands/widelands-1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-any-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
+else
+	SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Game similar to Settlers 2"
+HOMEPAGE="https://www.widelands.org/"
+
+LICENSE="GPL-2+ || ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 MIT OFL-1.1"
+SLOT="0"
+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:=[minizip]
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/asio"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext"
+
+src_configure() {
+	CMAKE_BUILD_TYPE=Release # disables -Werror
+
+	local mycmakeargs=(
+		-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
+		-DGTK_UPDATE_ICON_CACHE=OFF
+		-DOPTION_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 6b04bc906390..8d19ee6f56bb 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit xdg cmake python-any-r1
-
-DESCRIPTION="Game similar to Settlers 2"
-HOMEPAGE="https://www.widelands.org/"
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-any-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
 else
 	SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
-LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
+DESCRIPTION="Game similar to Settlers 2"
+HOMEPAGE="https://www.widelands.org/"
+
+LICENSE="GPL-2+ || ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 MIT OFL-1.1"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -32,22 +31,21 @@ RDEPEND="
 	media-libs/sdl2-image[jpeg,png]
 	media-libs/sdl2-mixer[vorbis]
 	media-libs/sdl2-ttf
-	net-misc/curl
-	sys-libs/zlib:=
+	sys-libs/zlib:=[minizip]
 	virtual/libintl"
 DEPEND="
 	${RDEPEND}
-	dev-libs/boost"
+	dev-cpp/asio"
 BDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gettext"
 
 src_configure() {
-	CMAKE_BUILD_TYPE="Release"
+	CMAKE_BUILD_TYPE=Release # disables -Werror
 
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
 		-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
 		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
 		-DGTK_UPDATE_ICON_CACHE=OFF
 		-DOPTION_BUILD_TESTS=$(usex test)