public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2018-03-16  7:31 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2018-03-16  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f7c11fe30e5f1998ead00805834abdad7d5b963e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 07:21:56 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 07:31:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c11fe3

games-strategy/colobot: Add missing proxy-maint team

 games-strategy/colobot/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/games-strategy/colobot/metadata.xml b/games-strategy/colobot/metadata.xml
index 16f1e43ba0d..3816bd533ef 100644
--- a/games-strategy/colobot/metadata.xml
+++ b/games-strategy/colobot/metadata.xml
@@ -5,6 +5,10 @@
 		<email>fdsfgs@krutt.org</email>
 		<name>soredake</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">colobot/colobot</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2018-07-18 21:11 Jonas Stein
  0 siblings, 0 replies; 13+ messages in thread
From: Jonas Stein @ 2018-07-18 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     3490e87632dbb481f5532ac0c8ebf6c3bc56652a
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 21:07:19 2018 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 21:07:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3490e876

games-strategy/colobot: Maintainer retired

Proxied maintainer retired.
Bug: https://bugs.gentoo.org/602110
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-strategy/colobot/metadata.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/games-strategy/colobot/metadata.xml b/games-strategy/colobot/metadata.xml
index 3816bd533ef..e955d3f3c92 100644
--- a/games-strategy/colobot/metadata.xml
+++ b/games-strategy/colobot/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>fdsfgs@krutt.org</email>
-		<name>soredake</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">colobot/colobot</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2019-09-23 17:40 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2019-09-23 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     f91db0b30793a351d26ca80ff866f650ae3e8f32
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 17:38:48 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 17:40:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91db0b3

games-strategy/colobot: Update the live ebuild

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/colobot-9999.ebuild | 33 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
index 02e4757ef02..b4179756b90 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils desktop
+# upstream CMakeLists.txt are buggy
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils desktop git-r3 xdg-utils
 
 DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
 HOMEPAGE="https://colobot.info/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/colobot/colobot"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
-fi
+EGIT_REPO_URI="https://github.com/colobot/colobot"
+EGIT_SUBMODULES=()
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="devbuild test tools doc +openal"
+KEYWORDS=""
+IUSE="devbuild doc +openal test tools"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-games/physfs
@@ -52,7 +48,10 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_install() {
-	cmake-utils_src_install
-	doicon -s 256 desktop/colobot.ico
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
 }


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2019-09-23 17:40 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2019-09-23 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     94ac1ac56f74cebb597dac79e8780f37a8acb725
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 16:09:31 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 17:39:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ac1ac5

games-strategy/colobot: Bump to 0.1.12

Closes: https://bugs.gentoo.org/687994
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/Manifest              |  1 +
 games-strategy/colobot/colobot-0.1.12.ebuild | 57 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index e61203e4f87..eeafb000c2b 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1 +1,2 @@
 DIST colobot-0.1.11.tar.gz 1430595 BLAKE2B 6e4a23f17631031a6f502b045637949d99bfcf8aa723f11c406c8cdb9b201b9a2771de8b8c92829bc890848a19eb182bc30a45a51e6d281ce64370f6c7a0d8a5 SHA512 fe32bc56b6fae9435c74a73b694b7d2b93667e5d15b1c57a7558e492613f0a5d4cab72ff341ab4c921150137282cc71292a1e31eb1ed06c752de33c50120f20e
+DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe

diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
new file mode 100644
index 00000000000..3c3762f6152
--- /dev/null
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# upstream CMakeLists.txt are buggy
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils desktop xdg-utils
+
+DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
+HOMEPAGE="https://colobot.info/"
+SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="devbuild doc +openal test tools"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-games/physfs
+	dev-libs/boost:=
+	media-libs/glew:0
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/libsndfile:=
+	media-libs/libvorbis:=
+	media-libs/sdl2-image
+	media-libs/sdl2-ttf
+	media-sound/vorbis-tools
+	sys-devel/gettext
+	openal? ( media-libs/openal )"
+RDEPEND="${DEPEND}
+	games-strategy/colobot-data"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEV_BUILD=$(usex devbuild)
+		-DTESTS=$(usex test)
+		-DTOOLS=$(usex tools)
+		-DINSTALL_DOCS=$(usex doc)
+		-DOPENAL_SOUND=$(usex openal)
+		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
+		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2019-09-23 17:40 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2019-09-23 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     e9d06cfbdd59ec9400098509eadabd4e61da7a74
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 16:09:47 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 17:40:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d06cfb

games-strategy/colobot: Take over as maintainer

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-strategy/colobot/metadata.xml b/games-strategy/colobot/metadata.xml
index e955d3f3c92..f719af21097 100644
--- a/games-strategy/colobot/metadata.xml
+++ b/games-strategy/colobot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">colobot/colobot</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2019-09-24 14:42 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2019-09-24 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     79f6eb179a0a8f0a2fb611d5cf7aafe8e27dd58e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 14:42:19 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 14:42:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f6eb17

games-strategy/colobot: Workaround the Ninja build problem

Call po4a early in order to provide files required for manpage builds.
Those files are normally provided implicitly by dependant target call
but that is not good enough for Ninja.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/colobot-0.1.12.ebuild | 16 +++++++++++++---
 games-strategy/colobot/colobot-9999.ebuild   | 18 ++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index 3c3762f6152..1611ef4a1d6 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-# upstream CMakeLists.txt are buggy
-CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake-utils desktop xdg-utils
 
 DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
@@ -18,6 +16,11 @@ KEYWORDS="~amd64"
 IUSE="devbuild doc +openal test tools"
 RESTRICT="!test? ( test )"
 
+# perl for pod2man
+BDEPEND="
+	app-text/po4a
+	dev-lang/perl
+	sys-devel/gettext"
 DEPEND="
 	dev-games/physfs
 	dev-libs/boost:=
@@ -30,11 +33,18 @@ DEPEND="
 	media-libs/sdl2-image
 	media-libs/sdl2-ttf
 	media-sound/vorbis-tools
-	sys-devel/gettext
 	openal? ( media-libs/openal )"
 RDEPEND="${DEPEND}
 	games-strategy/colobot-data"
 
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# we need to call it explicitly to help Ninja figure out the deps
+	cd desktop || die
+	po4a po4a.cfg || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DDEV_BUILD=$(usex devbuild)

diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
index b4179756b90..49d5ea90727 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-# upstream CMakeLists.txt are buggy
-CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake-utils desktop git-r3 xdg-utils
 
 DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
@@ -12,12 +10,17 @@ HOMEPAGE="https://colobot.info/"
 EGIT_REPO_URI="https://github.com/colobot/colobot"
 EGIT_SUBMODULES=()
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS=""
 IUSE="devbuild doc +openal test tools"
 RESTRICT="!test? ( test )"
 
+# perl for pod2man
+BDEPEND="
+	app-text/po4a
+	dev-lang/perl
+	sys-devel/gettext"
 DEPEND="
 	dev-games/physfs
 	dev-libs/boost:=
@@ -30,11 +33,18 @@ DEPEND="
 	media-libs/sdl2-image
 	media-libs/sdl2-ttf
 	media-sound/vorbis-tools
-	sys-devel/gettext
 	openal? ( media-libs/openal )"
 RDEPEND="${DEPEND}
 	games-strategy/colobot-data"
 
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# we need to call it explicitly to help Ninja figure out the deps
+	cd desktop || die
+	po4a po4a.cfg || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DDEV_BUILD=$(usex devbuild)


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2019-12-26 11:27 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2019-12-26 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     42ad9d6d71d3a4bc94737033f6e3f6346c5b76f7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 11:19:53 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 11:27:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ad9d6d

games-strategy/colobot: Remove redundant version

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/Manifest              |  1 -
 games-strategy/colobot/colobot-0.1.11.ebuild | 59 ----------------------------
 2 files changed, 60 deletions(-)

diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index eeafb000c2b..7d725fdff60 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,2 +1 @@
-DIST colobot-0.1.11.tar.gz 1430595 BLAKE2B 6e4a23f17631031a6f502b045637949d99bfcf8aa723f11c406c8cdb9b201b9a2771de8b8c92829bc890848a19eb182bc30a45a51e6d281ce64370f6c7a0d8a5 SHA512 fe32bc56b6fae9435c74a73b694b7d2b93667e5d15b1c57a7558e492613f0a5d4cab72ff341ab4c921150137282cc71292a1e31eb1ed06c752de33c50120f20e
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe

diff --git a/games-strategy/colobot/colobot-0.1.11.ebuild b/games-strategy/colobot/colobot-0.1.11.ebuild
deleted file mode 100644
index f1765e2658c..00000000000
--- a/games-strategy/colobot/colobot-0.1.11.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
-HOMEPAGE="https://colobot.info/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/colobot/colobot"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="devbuild test tools doc +openal"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-games/physfs
-	dev-libs/boost:=
-	media-libs/glew:0
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libsdl2:=
-	media-libs/libsndfile:=
-	media-libs/libvorbis:=
-	media-libs/sdl2-image
-	media-libs/sdl2-ttf
-	media-sound/vorbis-tools
-	sys-devel/gettext
-	openal? ( media-libs/openal )"
-RDEPEND="${DEPEND}
-	games-strategy/colobot-data"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEV_BUILD=$(usex devbuild)
-		-DTESTS=$(usex test)
-		-DTOOLS=$(usex tools)
-		-DINSTALL_DOCS=$(usex doc)
-		-DOPENAL_SOUND=$(usex openal)
-		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
-		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon -s 256 desktop/colobot.ico
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2020-06-08  8:56 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2020-06-08  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     c0ca36d4f1cf789b394dec437723b0a7774cc79d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 08:41:32 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 08:56:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ca36d4

games-strategy/colobot: Port to cmake.eclass

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/colobot-0.1.12.ebuild | 6 +++---
 games-strategy/colobot/colobot-9999.ebuild   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index 7f53954e401..89f5010924c 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg-utils
+inherit cmake desktop xdg-utils
 
 DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
 HOMEPAGE="https://colobot.info/"
@@ -43,7 +43,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# we need to call it explicitly to help Ninja figure out the deps
 	cd desktop || die
@@ -60,7 +60,7 @@ src_configure() {
 		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
 		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {

diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
index 49d5ea90727..83f1bba5279 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop git-r3 xdg-utils
+inherit cmake desktop git-r3 xdg-utils
 
 DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
 HOMEPAGE="https://colobot.info/"
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}
 	games-strategy/colobot-data"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# we need to call it explicitly to help Ninja figure out the deps
 	cd desktop || die
@@ -55,7 +55,7 @@ src_configure() {
 		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
 		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2020-06-08  8:56 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2020-06-08  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     42cbe45271afaee3a278ac2275b91da5d479c955
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 08:42:59 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 08:56:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42cbe452

games-strategy/colobot: Improve description

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/colobot-0.1.12.ebuild | 2 +-
 games-strategy/colobot/colobot-9999.ebuild   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index 89f5010924c..d44fe267282 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake desktop xdg-utils
 
-DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
+DESCRIPTION="A real-time strategy game, where you can program your bots"
 HOMEPAGE="https://colobot.info/"
 SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz"
 S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"

diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
index 83f1bba5279..441ad6386dc 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake desktop git-r3 xdg-utils
 
-DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
+DESCRIPTION="A real-time strategy game, where you can program your bots"
 HOMEPAGE="https://colobot.info/"
 EGIT_REPO_URI="https://github.com/colobot/colobot"
 EGIT_SUBMODULES=()


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2021-04-12  2:31 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2021-04-12  2:31 UTC (permalink / raw
  To: gentoo-commits

commit:     29c86e0213787b219988ac7fb891c6d6d0fc7d34
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 12 01:38:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 12 02:30:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c86e02

games-strategy/colobot: desktop--

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/colobot/colobot-0.1.12.ebuild | 4 ++--
 games-strategy/colobot/colobot-9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index d44fe267282..56e82f5815b 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.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 desktop xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A real-time strategy game, where you can program your bots"
 HOMEPAGE="https://colobot.info/"

diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
index 441ad6386dc..c70b50c9fba 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-9999.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 desktop git-r3 xdg-utils
+inherit cmake git-r3 xdg-utils
 
 DESCRIPTION="A real-time strategy game, where you can program your bots"
 HOMEPAGE="https://colobot.info/"


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2021-08-22  6:45 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2021-08-22  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     c392566ae167b0792b8a6ab26615886f974f4bee
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 22 06:36:31 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 06:45:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c392566a

games-strategy/colobot: Bump to 0.2.0-alpha

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/Manifest                   |  1 +
 games-strategy/colobot/colobot-0.2.0_alpha.ebuild | 73 +++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 7d725fdff60..980ba6938fa 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1 +1,2 @@
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
+DIST colobot-gold-0.2.0-alpha.tar.gz 1514455 BLAKE2B 9cc1480d342cfa14b12e437c41ce8e65b173cd30ca5f62e574ac17f452e6cd0622b5c2706fcfd427222cf78fce1700cb07b82fac75dd9b4a3ace4389ea3381bc SHA512 9c35ce6da319ef20ff68a9722f0b683adaa2fcada2b89bb322ba5772dfd9371adacd045ae160550780083902c024400c29e1d1f11dcb8b6547ba7d48e401c4c3

diff --git a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
new file mode 100644
index 00000000000..3897d69816c
--- /dev/null
+++ b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+MY_P=colobot-gold-${PV/_/-}
+DESCRIPTION="A real-time strategy game, where you can program your bots"
+HOMEPAGE="https://colobot.info/"
+SRC_URI="https://github.com/colobot/colobot/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="devbuild doc +openal test tools"
+RESTRICT="!test? ( test )"
+
+# perl for pod2man
+BDEPEND="
+	app-text/po4a
+	dev-lang/perl
+	sys-devel/gettext"
+DEPEND="
+	dev-games/physfs
+	dev-libs/boost:=
+	media-libs/glew:0
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/libsndfile:=
+	media-libs/libvorbis:=
+	media-libs/sdl2-image
+	media-libs/sdl2-ttf
+	media-sound/vorbis-tools
+	openal? ( media-libs/openal )"
+RDEPEND="${DEPEND}
+	~games-strategy/colobot-data-${PV}"
+
+PATCHES=(
+	# https://github.com/colobot/colobot/pull/1453
+	"${FILESDIR}"/colobot-0.1.12-sndfile-link.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# we need to call it explicitly to help Ninja figure out the deps
+	cd desktop || die
+	po4a po4a.cfg || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEV_BUILD=$(usex devbuild)
+		-DTESTS=$(usex test)
+		-DTOOLS=$(usex tools)
+		-DINSTALL_DOCS=$(usex doc)
+		-DOPENAL_SOUND=$(usex openal)
+		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
+		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2022-11-18 14:32 Arthur Zamarin
  0 siblings, 0 replies; 13+ messages in thread
From: Arthur Zamarin @ 2022-11-18 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     dcd948adbb16b06df7bff1ceab5ccd58cb408c98
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 14:32:43 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 14:32:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd948ad

games-strategy/colobot: Keyword 0.2.0_alpha arm64, #873805

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 games-strategy/colobot/colobot-0.2.0_alpha.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
index 3897d69816c3..b49ad40a24db 100644
--- a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
+++ b/games-strategy/colobot/colobot-0.2.0_alpha.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
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${MY_P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="devbuild doc +openal test tools"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
@ 2023-08-08  4:59 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2023-08-08  4:59 UTC (permalink / raw
  To: gentoo-commits

commit:     241d1f7a6a78c3d7882ebb57d11cc4a84992abc9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 04:44:50 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 04:59:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=241d1f7a

games-strategy/colobot: Bump to 0.2.1_alpha

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/Manifest                    |  1 +
 ...obot-9999.ebuild => colobot-0.2.1_alpha.ebuild} | 34 +++++++++++++++-------
 games-strategy/colobot/colobot-9999.ebuild         | 25 +++++++++++-----
 3 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 980ba6938fa5..64d8a8246f51 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,2 +1,3 @@
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
 DIST colobot-gold-0.2.0-alpha.tar.gz 1514455 BLAKE2B 9cc1480d342cfa14b12e437c41ce8e65b173cd30ca5f62e574ac17f452e6cd0622b5c2706fcfd427222cf78fce1700cb07b82fac75dd9b4a3ace4389ea3381bc SHA512 9c35ce6da319ef20ff68a9722f0b683adaa2fcada2b89bb322ba5772dfd9371adacd045ae160550780083902c024400c29e1d1f11dcb8b6547ba7d48e401c4c3
+DIST colobot-gold-0.2.1-alpha.tar.gz 1331366 BLAKE2B a4ff7eb10514b829a066654d6800cdf4ddf7c3331c60e8a552b78feb9e153bf666d1a16395be58e3093c98fc2caad8145fd436f66f5afc6b9f9c5d91e9094700 SHA512 cdfe410b30a89bd98513347ba64bbd0569d9f9f9227b063bf99c86101a099de0893b24c2d2e85e718ec0e64e0e428fb6dbdbf88d35f814d99ed31a7f3632f9cd

diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
similarity index 70%
copy from games-strategy/colobot/colobot-9999.ebuild
copy to games-strategy/colobot/colobot-0.2.1_alpha.ebuild
index c70b50c9fba1..731b33cd8a2d 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
@@ -1,26 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake git-r3 xdg-utils
+inherit cmake xdg-utils
 
+MY_P=colobot-gold-${PV/_/-}
 DESCRIPTION="A real-time strategy game, where you can program your bots"
-HOMEPAGE="https://colobot.info/"
-EGIT_REPO_URI="https://github.com/colobot/colobot"
-EGIT_SUBMODULES=()
+HOMEPAGE="
+	https://colobot.info/
+	https://github.com/colobot/colobot/
+"
+SRC_URI="https://github.com/colobot/colobot/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64"
 IUSE="devbuild doc +openal test tools"
 RESTRICT="!test? ( test )"
 
 # perl for pod2man
 BDEPEND="
 	app-text/po4a
+	app-text/xmlstarlet
 	dev-lang/perl
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 DEPEND="
 	dev-games/physfs
 	dev-libs/boost:=
@@ -33,9 +39,15 @@ DEPEND="
 	media-libs/sdl2-image
 	media-libs/sdl2-ttf
 	media-sound/vorbis-tools
-	openal? ( media-libs/openal )"
-RDEPEND="${DEPEND}
-	games-strategy/colobot-data"
+	openal? ( media-libs/openal )
+"
+RDEPEND="
+	${DEPEND}
+	~games-strategy/colobot-data-${PV}
+"
+DEPEND+="
+	test? ( dev-cpp/gtest )
+"
 
 src_prepare() {
 	cmake_src_prepare

diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
index c70b50c9fba1..8b82af05c62b 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake git-r3 xdg-utils
 
 DESCRIPTION="A real-time strategy game, where you can program your bots"
-HOMEPAGE="https://colobot.info/"
+HOMEPAGE="
+	https://colobot.info/
+	https://github.com/colobot/colobot/
+"
 EGIT_REPO_URI="https://github.com/colobot/colobot"
 EGIT_SUBMODULES=()
 
@@ -19,8 +22,10 @@ RESTRICT="!test? ( test )"
 # perl for pod2man
 BDEPEND="
 	app-text/po4a
+	app-text/xmlstarlet
 	dev-lang/perl
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 DEPEND="
 	dev-games/physfs
 	dev-libs/boost:=
@@ -33,9 +38,15 @@ DEPEND="
 	media-libs/sdl2-image
 	media-libs/sdl2-ttf
 	media-sound/vorbis-tools
-	openal? ( media-libs/openal )"
-RDEPEND="${DEPEND}
-	games-strategy/colobot-data"
+	openal? ( media-libs/openal )
+"
+RDEPEND="
+	${DEPEND}
+	games-strategy/colobot-data
+"
+DEPEND+="
+	test? ( dev-cpp/gtest )
+"
 
 src_prepare() {
 	cmake_src_prepare


^ permalink raw reply related	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-08-08  4:59 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-08  8:56 [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2023-08-08  4:59 Michał Górny
2022-11-18 14:32 Arthur Zamarin
2021-08-22  6:45 Michał Górny
2021-04-12  2:31 Sam James
2020-06-08  8:56 Michał Górny
2019-12-26 11:27 Michał Górny
2019-09-24 14:42 Michał Górny
2019-09-23 17:40 Michał Górny
2019-09-23 17:40 Michał Górny
2019-09-23 17:40 Michał Górny
2018-07-18 21:11 Jonas Stein
2018-03-16  7:31 Michał Górny

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