[gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2021-06-03 16:25 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2021-06-03 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     efaf922b84b8f667181abc58ce4afa931abccf67
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  3 14:13:56 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 16:07:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efaf922b

games-strategy/widelands: add github remote-id

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-strategy/widelands/metadata.xml b/games-strategy/widelands/metadata.xml
index 8910ce0417b..27ed8bc858d 100644
--- a/games-strategy/widelands/metadata.xml
+++ b/games-strategy/widelands/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">widelands/widelands</remote-id>
 		<remote-id type="launchpad">widelands</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2024-03-30 11:43 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2024-03-30 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     f7f2514a795a9ac58471c4dfc3769705da94a5da
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 11:04:30 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 11:43:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f2514a

games-strategy/widelands: add 1.2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/Manifest             |  1 +
 games-strategy/widelands/widelands-1.2.ebuild | 58 +++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 0a4c8d53cb7d..ce2d210f4704 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1 +1,2 @@
 DIST widelands-1.1.tar.gz 416104611 BLAKE2B e217ff5a4e3ba0431b96290dd4908d7ddadaf1850e890cee135a54f88162b30d75dbf5bc5f086d6c5e8c5e4410a0a788201117c3615e15a3e2acfd00e8f01272 SHA512 29dbeae0940468c8aad6f0fa610c8467bdb6ecf2ba5fe9175683b7cdaab5f977fa86beb71de29057c829e9738568d15e10bc22fa7fc9e58132151a1a02d72d9d
+DIST widelands-1.2.tar.gz 457713595 BLAKE2B b89caef369268b31fb70c4b054f1df3651e974763c6b2d82488a662a7edaed19f525177371592f9ad28cc14194044d48862e22b38a3a449c6e7ed0023bf30d09 SHA512 e05812f93defe8b9a3da60e6ba73a65bba47abec3199298f9a778fb42655aba671cb45a2603c2936538de1e0f82892a183ea5e1df15937b9812d369d068fab81

diff --git a/games-strategy/widelands/widelands-1.2.ebuild b/games-strategy/widelands/widelands-1.2.ebuild
new file mode 100644
index 000000000000..a573f92451d1
--- /dev/null
+++ b/games-strategy/widelands/widelands-1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2024-03-30 11:43 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2024-03-30 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     79636c2c4ad89a7dc45490fa7db9791536b83f95
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 11:21:47 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 11:43:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79636c2c

games-strategy/widelands: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/widelands-9999.ebuild | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 694f1e6b01d3..a573f92451d1 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake python-any-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -32,13 +32,16 @@ RDEPEND="
 	media-libs/sdl2-mixer[vorbis]
 	media-libs/sdl2-ttf
 	sys-libs/zlib:=[minizip]
-	virtual/libintl"
+	virtual/libintl
+"
 DEPEND="
 	${RDEPEND}
-	dev-cpp/asio"
+	dev-cpp/asio
+"
 BDEPEND="
 	${PYTHON_DEPS}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 src_configure() {
 	CMAKE_BUILD_TYPE=Release # disables -Werror


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2022-10-23 12:58 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2022-10-23 12:58 UTC (permalink / raw
  To: gentoo-commits

commit:     9c1504651fd01e2a5faffd753783495880e39572
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 12:42:25 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 12:58:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c150465

games-strategy/widelands: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/widelands-9999.ebuild | 28 ++++++++++++--------------
 1 file changed, 13 insertions(+), 15 deletions(-)

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)


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2022-10-23 12:58 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2022-10-23 12:58 UTC (permalink / raw
  To: gentoo-commits

commit:     978fe111f9389893ee6fabc510fd3aa73ae0830d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 12:42:13 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 12:58:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978fe111

games-strategy/widelands: add 1.1

Closes: https://bugs.gentoo.org/835859
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/Manifest             |  1 +
 games-strategy/widelands/widelands-1.1.ebuild | 55 +++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 413b5f84b64f..bf07695d8d51 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1 +1,2 @@
 DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
+DIST widelands-1.1.tar.gz 416104611 BLAKE2B e217ff5a4e3ba0431b96290dd4908d7ddadaf1850e890cee135a54f88162b30d75dbf5bc5f086d6c5e8c5e4410a0a788201117c3615e15a3e2acfd00e8f01272 SHA512 29dbeae0940468c8aad6f0fa610c8467bdb6ecf2ba5fe9175683b7cdaab5f977fa86beb71de29057c829e9738568d15e10bc22fa7fc9e58132151a1a02d72d9d

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
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2022-06-17 13:07 Jakov Smolić
  0 siblings, 0 replies; 23+ messages in thread
From: Jakov Smolić @ 2022-06-17 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     b7b2f777a50072a829126b5dc218ee22449f56e9
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 13:07:58 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 13:07:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b2f777

games-strategy/widelands: Keyword 1.0 ppc64, #852224

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 games-strategy/widelands/widelands-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
index dc7894d30c98..6d14e5f8e931 100644
--- a/games-strategy/widelands/widelands-1.0.ebuild
+++ b/games-strategy/widelands/widelands-1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	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 ~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"


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2022-06-17 11:48 Jakov Smolić
  0 siblings, 0 replies; 23+ messages in thread
From: Jakov Smolić @ 2022-06-17 11:48 UTC (permalink / raw
  To: gentoo-commits

commit:     69a4b3b20f9eef6dd576c828235464a1dd9323f8
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 11:48:11 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 11:48:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a4b3b2

games-strategy/widelands: Keyword 1.0 arm64, #852224

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 games-strategy/widelands/widelands-1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
index 1c8af8b6ba6c..dc7894d30c98 100644
--- a/games-strategy/widelands/widelands-1.0.ebuild
+++ b/games-strategy/widelands/widelands-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	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 ~x86"
 fi
 
 LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2021-06-17 21:38 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2021-06-17 21:38 UTC (permalink / raw
  To: gentoo-commits

commit:     06eb3d0bbfc3c4ea5a2c0235e1e3e36b1eb9872e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 21:27:29 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 21:36:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06eb3d0b

games-strategy/widelands: drop use of cxxflags patch

-Werror=uninitialized cause issues with -O3. Upstream is currently
explicitly requesting -O2 but an old patch in Gentoo prevents that.

While not ideal, rather than further patch to remove the warning check,
simply follow upstream and go with what is being tested more.

Closes: https://bugs.gentoo.org/796509
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/widelands-1.0.ebuild  | 4 ----
 games-strategy/widelands/widelands-9999.ebuild | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
index 18052660723..6b04bc90639 100644
--- a/games-strategy/widelands/widelands-1.0.ebuild
+++ b/games-strategy/widelands/widelands-1.0.ebuild
@@ -42,10 +42,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
-)
-
 src_configure() {
 	CMAKE_BUILD_TYPE="Release"
 

diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 18052660723..6b04bc90639 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -42,10 +42,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
-)
-
 src_configure() {
 	CMAKE_BUILD_TYPE="Release"
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2021-06-15 11:37 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2021-06-15 11:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1ec817e369c1ede884951a1d7a0dee5e80aab80d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 11:26:37 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 11:35:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec817e3

games-strategy/widelands: add 1.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/Manifest             |  1 +
 games-strategy/widelands/widelands-1.0.ebuild | 61 +++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 28e70a68538..0f87ebe4120 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1 +1,2 @@
+DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
 DIST widelands-build21-source.tar.gz 381374149 BLAKE2B 17f0491bf7bcd10449bcc274be94aec4a0a64625c19f52426a0d460c3356e04a59b51683e72b4492ba1f62bd6ea510250c3cedda89a7588b88a0071abb1cf0cf SHA512 8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e

diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
new file mode 100644
index 00000000000..18052660723
--- /dev/null
+++ b/games-strategy/widelands/widelands-1.0.ebuild
@@ -0,0 +1,61 @@
+# 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
+
+DESCRIPTION="Game similar to Settlers 2"
+HOMEPAGE="https://www.widelands.org/"
+
+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"
+fi
+
+LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
+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
+	net-misc/curl
+	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
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2021-06-15 11:37 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2021-06-15 11:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1b37e8694c0c592c55dcaac99aefe5fbf1dd906c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 11:27:00 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 11:35:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b37e869

games-strategy/widelands: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/widelands-9999.ebuild | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 8eede6cd3de..18052660723 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -14,12 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
 else
-	MY_PV="build$(ver_cut 2)"
-	MY_P="${PN}-${MY_PV}"
-
-	SRC_URI="https://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}-source.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
+	SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2021-06-08  7:10 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2021-06-08  7:10 UTC (permalink / raw
  To: gentoo-commits

commit:     13559f1df1539f5222faf6da852e5b69213f5274
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  8 06:52:06 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 07:08:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13559f1d

games-strategy/widelands: drop 0.20-r1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/Manifest                 |  1 -
 games-strategy/widelands/widelands-0.20-r1.ebuild | 77 -----------------------
 2 files changed, 78 deletions(-)

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 36caa190473..28e70a68538 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,2 +1 @@
-DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
 DIST widelands-build21-source.tar.gz 381374149 BLAKE2B 17f0491bf7bcd10449bcc274be94aec4a0a64625c19f52426a0d460c3356e04a59b51683e72b4492ba1f62bd6ea510250c3cedda89a7588b88a0071abb1cf0cf SHA512 8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e

diff --git a/games-strategy/widelands/widelands-0.20-r1.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
deleted file mode 100644
index 85634c7beb1..00000000000
--- a/games-strategy/widelands/widelands-0.20-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit desktop cmake python-any-r1
-
-MY_PV="build$(ver_cut 2-)"
-MY_P="${PN}-${MY_PV/_/-}"
-
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="https://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/boost-1.48:=
-	dev-libs/icu:=
-	media-libs/glew:0=
-	media-libs/libglvnd
-	media-libs/libpng:0=
-	media-libs/libsdl2[video]
-	media-libs/sdl2-image[jpeg,png]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-ttf
-	sys-libs/zlib:=[minizip]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	sys-devel/gettext
-"
-
-CMAKE_BUILD_TYPE="Release"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
-	"${FILESDIR}"/${PN}-0.20-glvnd.patch
-	"${FILESDIR}"/${PN}-0.20-boost-1.73.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_BUILD_WEBSITE_TOOLS=OFF
-
-		# Upstream's cmake files are totally fscked up...
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/doc/${PF}
-		# Game is NOT happy being moved from /usr/share/games
-		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# move game binary to correct location
-	dodir /usr/bin
-	mv "${ED}"/usr/share/doc/${PF}/${PN} "${ED}"/usr/bin || die
-
-	newicon data/images/logos/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^}
-}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2021-06-03 16:25 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2021-06-03 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     b8fb6aa58c65e3faf26d14cc0e4564adfb20ab3d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  3 14:15:08 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 16:17:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8fb6aa5

games-strategy/widelands: add 0.21

- add python3_{9,10}
- enable minor tests
- let trivial website tools be built
- removed upstreamed patches
- use upstream provided .desktop
- update LICENSE for the various assets

Closes: https://bugs.gentoo.org/718116
Closes: https://bugs.gentoo.org/736268
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/Manifest              |  1 +
 games-strategy/widelands/widelands-0.21.ebuild | 58 ++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 0efbada5560..36caa190473 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1 +1,2 @@
 DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
+DIST widelands-build21-source.tar.gz 381374149 BLAKE2B 17f0491bf7bcd10449bcc274be94aec4a0a64625c19f52426a0d460c3356e04a59b51683e72b4492ba1f62bd6ea510250c3cedda89a7588b88a0071abb1cf0cf SHA512 8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e

diff --git a/games-strategy/widelands/widelands-0.21.ebuild b/games-strategy/widelands/widelands-0.21.ebuild
new file mode 100644
index 00000000000..398bc433cb5
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.21.ebuild
@@ -0,0 +1,58 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2021-06-03 16:25 Ionen Wolkens
  0 siblings, 0 replies; 23+ messages in thread
From: Ionen Wolkens @ 2021-06-03 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     17f983aa1dd8f400b7da03a3e03bf137911115b5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  3 15:13:36 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 16:23:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f983aa

games-strategy/widelands: update live ebuild

Same as 0.21 but with new dependency on curl.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/widelands/widelands-9999.ebuild | 91 +++++++++-----------------
 1 file changed, 32 insertions(+), 59 deletions(-)

diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index d258fbdebb2..8eede6cd3de 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -1,93 +1,66 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake python-any-r1 xdg
+inherit xdg cmake python-any-r1
 
-MY_PV="build$(ver_cut 2-)"
-MY_P="${PN}-${MY_PV/_/-}"
-
-DESCRIPTION="A game similar to Settlers 2"
+DESCRIPTION="Game similar to Settlers 2"
 HOMEPAGE="https://www.widelands.org/"
 
-if [[ "${PV}" == *9999 ]] ; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
 else
-	SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
+	MY_PV="build$(ver_cut 2)"
+	MY_P="${PN}-${MY_PV}"
+
+	SRC_URI="https://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}-source.tar.gz"
 	S="${WORKDIR}/${MY_P}"
+
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
 SLOT="0"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/boost-1.48:=
 	dev-libs/icu:=
 	media-libs/glew:0=
 	media-libs/libglvnd
-	media-libs/libpng:0=
-	media-libs/libsdl2[video]
+	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]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
 BDEPEND="
-	sys-devel/gettext
-"
-
-CMAKE_BUILD_TYPE="Release"
+	${PYTHON_DEPS}
+	sys-devel/gettext"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
 )
 
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
-	# don't call gtk-update-icon-cache
-	sed '/^find_program(GTK_UPDATE_ICON_CACHE/d' \
-		-i xdg/CMakeLists.txt || die
-}
-
 src_configure() {
-	local WLDIR="${EPREFIX}/usr/share/${PN}"
-	local mycmakeargs=(
-		-DOPTION_BUILD_WEBSITE_TOOLS=OFF
-
-		# -DUSE_XDG=ON breaks finding of datadir
-		-DUSE_XDG=OFF
+	CMAKE_BUILD_TYPE="Release"
 
-		# Upstream's cmake files are totally fscked up...
-		# This just helps dealing with less crap in src_install
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DWL_INSTALL_BASEDIR="${WLDIR}"
-		-DWL_INSTALL_DATADIR="${WLDIR}/data"
+	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
-}
-
-src_install() {
-	cmake_src_install
 
-	# upstream CMakeLists.txt file is totally bonkers
-	local sharedir="${ED}/usr/share"
-	dodir /usr/bin
-	mv "${ED}"/usr/${PN} "${ED}"/usr/bin || die
-	mv "${ED}"/share/* "${sharedir}" || die
-	rmdir "${ED}"/share || die
-	rm "${sharedir}"/${PN}/{COPYING,CREDITS,ChangeLog} || die
-	mv "${sharedir}"/${PN}/VERSION "${sharedir}"/doc/${PF}/ || die
-
-	#newicon data/images/logos/wl-ico-128.png ${PN}.png
-	#make_desktop_entry ${PN} ${PN^}
+	cmake_src_configure
 }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2020-12-02 23:08 Marek Szuba
  0 siblings, 0 replies; 23+ messages in thread
From: Marek Szuba @ 2020-12-02 23:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c3b5eb39349d14067bcce3f3bb9398f90fbb2373
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  2 22:54:29 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Dec  2 23:08:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b5eb39

games-strategy/widelands: Do not depend on dev-lang/lua

Short version: this package builds, tests and installs without any
errors on systems without any versions of Lua installed, and even when a
copy of Lua *is* installed does not interact with it in any way (which
was already reflected by the fact dev-lang/lua was not mentioned in
RDEPEND, only in DEPEND).

Details:

Widelands source code comes bundled with Lua - or to be precise with
Eris (https://github.com/fnuecke/eris), which according to its upstream
should be considered "a custom 'distribution' of Lua" due to the fact it
hooks heavily into Lua internals. Since src/third_party/eris/README.eris
explicitly states that the bundled Eris is what brings in the Lua
version used in Widelands, it is no surprise that upstream build scripts
do not even attempt to look for system Lua.

Bug: https://bugs.gentoo.org/752729
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 games-strategy/widelands/widelands-0.20-r1.ebuild | 1 -
 games-strategy/widelands/widelands-9999.ebuild    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/games-strategy/widelands/widelands-0.20-r1.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
index c0629174bc7..c01f32953ab 100644
--- a/games-strategy/widelands/widelands-0.20-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 	sys-libs/zlib:=[minizip]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/lua:0
 "
 BDEPEND="
 	sys-devel/gettext

diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 15743092919..33ade68e2d5 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	sys-libs/zlib:=[minizip]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/lua:0
 "
 BDEPEND="
 	sys-devel/gettext

^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2020-03-13 20:25 Lars Wendler
  0 siblings, 0 replies; 23+ messages in thread
From: Lars Wendler @ 2020-03-13 20:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9cdf825b85a33b52a7da3ed889497e2612c94f3a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 20:25:42 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 20:25:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cdf825b

games-strategy/widelands: Added live ebuild

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/widelands/widelands-9999.ebuild | 94 ++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
new file mode 100644
index 00000000000..2c269447903
--- /dev/null
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-any-r1 xdg
+
+MY_PV="build$(ver_cut 2-)"
+MY_P="${PN}-${MY_PV/_/-}"
+
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
+else
+	SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.48:=
+	dev-libs/icu:=
+	media-libs/glew:0=
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	media-libs/libsdl2[video]
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
+	sys-libs/zlib:=[minizip]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/lua:0
+"
+BDEPEND="
+	sys-devel/gettext
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
+	# don't call gtk-update-icon-cache
+	sed '/^find_program(GTK_UPDATE_ICON_CACHE/d' \
+		-i xdg/CMakeLists.txt || die
+}
+
+src_configure() {
+	local WLDIR="${EPREFIX}/usr/share/${PN}"
+	local mycmakeargs=(
+		-DOPTION_BUILD_WEBSITE_TOOLS=OFF
+
+		# -DUSE_XDG=ON breaks finding of datadir
+		-DUSE_XDG=OFF
+
+		# Upstream's cmake files are totally fscked up...
+		# This just helps dealing with less crap in src_install
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DWL_INSTALL_BASEDIR="${WLDIR}"
+		-DWL_INSTALL_DATADIR="${WLDIR}/data"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# upstream CMakeLists.txt file is totally bonkers
+	local sharedir="${ED}/usr/share"
+	dodir /usr/bin
+	mv "${ED}"/usr/${PN} "${ED}"/usr/bin || die
+	mv "${ED}"/share/* "${sharedir}" || die
+	rmdir "${ED}"/share || die
+	rm "${sharedir}"/${PN}/{COPYING,CREDITS,ChangeLog} || die
+	mv "${sharedir}"/${PN}/VERSION "${sharedir}"/doc/${PF}/ || die
+
+	#newicon data/images/logos/wl-ico-128.png ${PN}.png
+	#make_desktop_entry ${PN} ${PN^}
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2020-03-12 15:30 Lars Wendler
  0 siblings, 0 replies; 23+ messages in thread
From: Lars Wendler @ 2020-03-12 15:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a000fcfff24b664eb147089561bc81c72b389b39
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 15:26:50 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 15:30:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a000fcff

games-strategy/widelands: Adjusted dependencies

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/widelands/widelands-0.20.ebuild | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20.ebuild
index 366325c6dfe..e714c6e11a9 100644
--- a/games-strategy/widelands/widelands-0.20.ebuild
+++ b/games-strategy/widelands/widelands-0.20.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit desktop cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop cmake python-any-r1
 
 MY_PV="build$(ver_cut 2-)"
 MY_P="${PN}-${MY_PV/_/-}"
@@ -18,19 +20,21 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	dev-lang/lua:0
-	dev-libs/icu:=
 	>=dev-libs/boost-1.48:=
+	dev-libs/icu:=
 	media-libs/glew:0=
+	media-libs/libglvnd
 	media-libs/libpng:0=
 	media-libs/libsdl2[video]
-	media-libs/sdl2-gfx
 	media-libs/sdl2-image[jpeg,png]
 	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-net
 	media-libs/sdl2-ttf
 	sys-libs/zlib:=[minizip]"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/lua:0
+"
+BDEPEND="
 	sys-devel/gettext
 "
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2020-03-12 15:30 Lars Wendler
  0 siblings, 0 replies; 23+ messages in thread
From: Lars Wendler @ 2020-03-12 15:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3100a98a926ad93be93cd65c752a7e5287bb2bc3
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 15:13:58 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 15:30:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3100a98a

games-strategy/widelands: Removed old

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/widelands/Manifest                  |  1 -
 games-strategy/widelands/widelands-0.20_rc1.ebuild | 72 ----------------------
 2 files changed, 73 deletions(-)

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index b621b800bf4..0efbada5560 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,2 +1 @@
-DIST widelands-build20-rc1.tar.bz2 232490916 BLAKE2B 7dd13c325fa0dc891a5ab3cc643ae86025c5e853909d172b39d9d1cd2a41132d099f3d03349322b03dc52353f1465391ec006a83e70eb6554be133199efd96b8 SHA512 2d713db8e4a0774e8a6615b6f0dbec4f29870d69fa9bf48db8694316f7320b58ee5afa5a7796e0886471c9c787954c21f478b1364f52ce01a23212a7512465a6
 DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5

diff --git a/games-strategy/widelands/widelands-0.20_rc1.ebuild b/games-strategy/widelands/widelands-0.20_rc1.ebuild
deleted file mode 100644
index 52af37a2466..00000000000
--- a/games-strategy/widelands/widelands-0.20_rc1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop cmake
-
-MY_PV="build$(ver_cut 2-)"
-MY_P="${PN}-${MY_PV/_/-}"
-
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/lua:0
-	dev-libs/icu:=
-	>=dev-libs/boost-1.48:=
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-libs/libsdl2[video]
-	media-libs/sdl2-gfx
-	media-libs/sdl2-image[jpeg,png]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-net
-	media-libs/sdl2-ttf
-	sys-libs/zlib:=[minizip]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-CMAKE_BUILD_TYPE="Release"
-
-S="${WORKDIR}/${MY_P/20/19}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPTION_BUILD_WEBSITE_TOOLS=OFF
-
-		# Upstream's cmake files are totally fscked up...
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/doc/${PF}
-		# Game is NOT happy being moved from /usr/share/games
-		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# move game binary to correct location
-	dodir /usr/bin
-	mv "${ED}"/usr/share/doc/${PF}/${PN} "${ED}"/usr/bin || die
-
-	newicon data/images/logos/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^}
-}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2019-05-02 14:52 Lars Wendler
  0 siblings, 0 replies; 23+ messages in thread
From: Lars Wendler @ 2019-05-02 14:52 UTC (permalink / raw
  To: gentoo-commits

commit:     9ee2167fbeac97e56cb747f120b95129f09eadf4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 14:46:55 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May  2 14:52:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee2167f

games-strategy/widelands: Bump to version 0.20

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/widelands/Manifest              |  1 +
 games-strategy/widelands/widelands-0.20.ebuild | 72 ++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index cf7962786e0..b570f4d1511 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,2 +1,3 @@
 DIST widelands-build18-src.tar.bz2 183443325 BLAKE2B 100555b7a800cac1094a768edd40e6b44d6bd0d36386c6f057e0cd81f9b03404b249f259c85d3fae655d7343bb50c41a70f228651530c13092e50190fdd2f9b8 SHA512 9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72
 DIST widelands-build20-rc1.tar.bz2 232490916 BLAKE2B 7dd13c325fa0dc891a5ab3cc643ae86025c5e853909d172b39d9d1cd2a41132d099f3d03349322b03dc52353f1465391ec006a83e70eb6554be133199efd96b8 SHA512 2d713db8e4a0774e8a6615b6f0dbec4f29870d69fa9bf48db8694316f7320b58ee5afa5a7796e0886471c9c787954c21f478b1364f52ce01a23212a7512465a6
+DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5

diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20.ebuild
new file mode 100644
index 00000000000..b1bdd267733
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.20.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop cmake-utils
+
+MY_PV="build$(ver_cut 2-)"
+MY_P="${PN}-${MY_PV/_/-}"
+
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/"
+SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/lua:0
+	dev-libs/icu:=
+	>=dev-libs/boost-1.48:=
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/libsdl2[video]
+	media-libs/sdl2-gfx
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-net
+	media-libs/sdl2-ttf
+	sys-libs/zlib:=[minizip]"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_BUILD_WEBSITE_TOOLS=OFF
+
+		# Upstream's cmake files are totally fscked up...
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/doc/${PF}
+		# Game is NOT happy being moved from /usr/share/games
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# move game binary to correct location
+	dodir /usr/bin
+	mv "${ED}"/usr/share/doc/${PF}/${PN} "${ED}"/usr/bin || die
+
+	newicon data/images/logos/wl-ico-128.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2017-05-03 20:25 David Seifert
  0 siblings, 0 replies; 23+ messages in thread
From: David Seifert @ 2017-05-03 20:25 UTC (permalink / raw
  To: gentoo-commits

commit:     733de6de563d91df003218c1ba8e8c35e978463f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 20:22:30 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May  3 20:25:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=733de6de

games-strategy/widelands: Mark amd64/ppc/x86 stable

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/widelands/widelands-0.18-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild b/games-strategy/widelands/widelands-0.18-r1.ebuild
index 68633a78a37..2f40ffaa05d 100644
--- a/games-strategy/widelands/widelands-0.18-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.18-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2017-05-03 20:25 David Seifert
  0 siblings, 0 replies; 23+ messages in thread
From: David Seifert @ 2017-05-03 20:25 UTC (permalink / raw
  To: gentoo-commits

commit:     14ca01dbeba3097beef76581824497c27998d1ab
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 20:21:31 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May  3 20:24:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ca01db

games-strategy/widelands: [QA] Remove PREFIX setting for CMake

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/widelands/widelands-0.18-r1.ebuild | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild b/games-strategy/widelands/widelands-0.18-r1.ebuild
index 8b1942ab2fe..68633a78a37 100644
--- a/games-strategy/widelands/widelands-0.18-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.18-r1.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit eutils versionator cmake-utils
 
 MY_PV=build$(get_version_component_range 2)
 MY_P=${PN}-${MY_PV}-src
+
 DESCRIPTION="A game similar to Settlers 2"
 HOMEPAGE="http://www.widelands.org/"
 SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
@@ -15,10 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="dev-lang/lua:0
-	>=dev-libs/boost-1.48
-	media-libs/glew
-	media-libs/libpng:0
+RDEPEND="
+	dev-lang/lua:0
+	>=dev-libs/boost-1.48:=
+	media-libs/glew:0=
+	media-libs/libpng:0=
 	media-libs/libsdl[video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[jpeg,png]
@@ -26,21 +29,18 @@ DEPEND="dev-lang/lua:0
 	media-libs/sdl-net
 	media-libs/sdl-ttf
 	sys-libs/zlib[minizip]"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
 CMAKE_BUILD_TYPE=Release
 
-# Game is NOT happy being moved from /usr/share/games
-PREFIX="/usr/share/games/${PN}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-cxxflags.patch
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
 	sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
@@ -48,22 +48,22 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		'-DWL_VERSION_STANDARD=true'
-		"-DWL_INSTALL_PREFIX=/usr/games"
-		"-DWL_INSTALL_DATADIR=/usr/share/games/${PN}"
-		"-DWL_INSTALL_LOCALEDIR=/usr/share/games/${PN}/locale"
-		"-DWL_INSTALL_BINDIR=/usr/bin"
+		-DWL_VERSION_STANDARD=true
+
+		# Game is NOT happy being moved from /usr/share/games
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/games/${PN}
+
+		-DWL_INSTALL_PREFIX="${EPREFIX}"/usr/games
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
+		-DWL_INSTALL_LOCALEDIR="${EPREFIX}"/usr/share/games/${PN}/locale
+		-DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
 	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
+
 	newicon pics/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} Widelands
-	dodoc ChangeLog CREDITS
+	make_desktop_entry ${PN} ${PN^}
 }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2016-08-05  0:23 Austin English
  0 siblings, 0 replies; 23+ messages in thread
From: Austin English @ 2016-08-05  0:23 UTC (permalink / raw
  To: gentoo-commits

commit:     de96c31b5c59dab68f8143af5945ed3274326f03
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 18:29:01 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 00:22:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de96c31b

games-strategy/widelands: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 games-strategy/widelands/widelands-0.18-r1.ebuild | 70 +++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild b/games-strategy/widelands/widelands-0.18-r1.ebuild
new file mode 100644
index 0000000..02660c0
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.18-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils versionator cmake-utils
+
+MY_PV=build$(get_version_component_range 2)
+MY_P=${PN}-${MY_PV}-src
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/"
+SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/lua:0
+	>=dev-libs/boost-1.48
+	media-libs/glew
+	media-libs/libpng:0
+	media-libs/libsdl[video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	sys-libs/zlib[minizip]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+CMAKE_BUILD_TYPE=Release
+
+# Game is NOT happy being moved from /usr/share/games
+PREFIX="/usr/share/games/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cxxflags.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
+	sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		'-DWL_VERSION_STANDARD=true'
+		"-DWL_INSTALL_PREFIX=/usr/games"
+		"-DWL_INSTALL_DATADIR=/usr/share/games/${PN}"
+		"-DWL_INSTALL_LOCALEDIR=/usr/share/games/${PN}/locale"
+		"-DWL_INSTALL_BINDIR=/usr/bin"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	newicon pics/wl-ico-128.png ${PN}.png
+	make_desktop_entry ${PN} Widelands
+	dodoc ChangeLog CREDITS
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2016-05-13 14:51 Agostino Sarubbo
  0 siblings, 0 replies; 23+ messages in thread
From: Agostino Sarubbo @ 2016-05-13 14:51 UTC (permalink / raw
  To: gentoo-commits

commit:     4a0e8714121b473bbbe785d64b02dee5edf9e399
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 14:50:39 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 13 14:50:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0e8714

games-strategy/widelands: amd64 stable wrt bug #581218

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-strategy/widelands/widelands-0.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/widelands/widelands-0.18.ebuild b/games-strategy/widelands/widelands-0.18.ebuild
index 43425ef..c0fe2ce 100644
--- a/games-strategy/widelands/widelands-0.18.ebuild
+++ b/games-strategy/widelands/widelands-0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/lua:0


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/
@ 2016-01-13  6:34 Michael Sterrett
  0 siblings, 0 replies; 23+ messages in thread
From: Michael Sterrett @ 2016-01-13  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a1396d44cd994b3bd50139f461d1c3a68d1665b3
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 06:34:09 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 06:34:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1396d44

games-strategy/widelands: add slot deps for dev-lang/lua and media-libs/libpng; tidy

Package-Manager: portage-2.2.26

 games-strategy/widelands/widelands-0.17.ebuild | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild
index 9f32421..c27274c 100644
--- a/games-strategy/widelands/widelands-0.17.ebuild
+++ b/games-strategy/widelands/widelands-0.17.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils versionator toolchain-funcs flag-o-matic cmake-utils games
+inherit eutils versionator cmake-utils games
 
 MY_PV=build$(get_version_component_range 2)
 MY_P=${PN}-${MY_PV}-src
@@ -16,13 +16,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="dev-lang/lua
+DEPEND="dev-lang/lua:0
 	media-libs/libsdl[video]
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-gfx
 	media-libs/sdl-net
-	media-libs/libpng
+	media-libs/libpng:0
 	sys-libs/zlib
 	media-libs/glew
 	media-libs/sdl-ttf
@@ -43,21 +43,6 @@ src_prepare() {
 	sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die
 	sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die
 	sed -i -e '/Boost_USE_STATIC_LIBS/s:ON:OFF:' CMakeLists.txt || die
-
-	# how do I hate boost? Let me count the ways...
-	local boost_ver=$(best_version ">=dev-libs/boost-1.37")
-
-	boost_ver=${boost_ver/*boost-/}
-	boost_ver=${boost_ver%.*}
-	boost_ver=${boost_ver/./_}
-
-	einfo "Using boost version ${boost_ver}"
-	append-cxxflags \
-		-I/usr/include/boost-${boost_ver}
-	append-ldflags \
-		-L/usr/$(get_libdir)/boost-${boost_ver}
-	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
-	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2024-03-30 11:43 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-03 16:25 [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/ Ionen Wolkens
  -- strict thread matches above, loose matches on Subject: below --
2024-03-30 11:43 Ionen Wolkens
2024-03-30 11:43 Ionen Wolkens
2022-10-23 12:58 Ionen Wolkens
2022-10-23 12:58 Ionen Wolkens
2022-06-17 13:07 Jakov Smolić
2022-06-17 11:48 Jakov Smolić
2021-06-17 21:38 Ionen Wolkens
2021-06-15 11:37 Ionen Wolkens
2021-06-15 11:37 Ionen Wolkens
2021-06-08  7:10 Ionen Wolkens
2021-06-03 16:25 Ionen Wolkens
2021-06-03 16:25 Ionen Wolkens
2020-12-02 23:08 Marek Szuba
2020-03-13 20:25 Lars Wendler
2020-03-12 15:30 Lars Wendler
2020-03-12 15:30 Lars Wendler
2019-05-02 14:52 Lars Wendler
2017-05-03 20:25 David Seifert
2017-05-03 20:25 David Seifert
2016-08-05  0:23 Austin English
2016-05-13 14:51 Agostino Sarubbo
2016-01-13  6:34 Michael Sterrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox