[gentoo-commits] repo/gentoo:master commit in: dev-games/mercator/

[gentoo-commits] repo/gentoo:master commit in: dev-games/mercator/

[David Seifert]

commit:     92541d9cc38821826a1a3d082fc3fa38441e3cc0
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Apr 15 08:31:04 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 11:32:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92541d9c

dev-games/mercator: use HTTPS

 dev-games/mercator/mercator-0.3.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-games/mercator/mercator-0.3.3.ebuild b/dev-games/mercator/mercator-0.3.3.ebuild
index b472cf3aa31..92cdc48b0a2 100644
--- a/dev-games/mercator/mercator-0.3.3.ebuild
+++ b/dev-games/mercator/mercator-0.3.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="WorldForge library primarily aimed at terrain"
-HOMEPAGE="http://www.worldforge.org/index.php/components/mercator/"
+HOMEPAGE="https://www.worldforge.org/index.php/components/mercator/"
 SRC_URI="mirror://sourceforge/worldforge/${P}.tar.gz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: dev-games/mercator/

[Sam James]

commit:     aa8e06c74de46bcaad4130ed4983e47bf4c4d72a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 03:59:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 04:30:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa8e06c7

dev-games/mercator: port to EAPI 7, ltprune--

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

 dev-games/mercator/mercator-0.3.3.ebuild | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/dev-games/mercator/mercator-0.3.3.ebuild b/dev-games/mercator/mercator-0.3.3.ebuild
index 34cbfc3fe78..3a4046872ac 100644
--- a/dev-games/mercator/mercator-0.3.3.ebuild
+++ b/dev-games/mercator/mercator-0.3.3.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit ltprune
+EAPI=7
 
 DESCRIPTION="WorldForge library primarily aimed at terrain"
 HOMEPAGE="https://www.worldforge.org/index.php/components/mercator/"
 SRC_URI="mirror://sourceforge/worldforge/${P}.tar.gz"
 
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 x86"
 IUSE="doc"
-SLOT="0"
 
 RDEPEND=">=dev-games/wfmath-1"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
+"
 
 src_compile() {
 	default
@@ -25,6 +26,11 @@ src_compile() {
 
 src_install() {
 	default
-	use doc && dohtml -r doc/html/*
-	prune_libtool_files
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: dev-games/mercator/

[David Seifert]

commit:     9fb32b9616d04e3413da63d5fd9f656031d32cb1
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 09:47:32 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 09:47:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb32b96

dev-games/mercator: Fix metadata order

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-games/mercator/mercator-0.3.3.ebuild | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-games/mercator/mercator-0.3.3.ebuild b/dev-games/mercator/mercator-0.3.3.ebuild
index 3a4046872ac..c8b6495f80d 100644
--- a/dev-games/mercator/mercator-0.3.3.ebuild
+++ b/dev-games/mercator/mercator-0.3.3.ebuild
@@ -7,8 +7,8 @@ DESCRIPTION="WorldForge library primarily aimed at terrain"
 HOMEPAGE="https://www.worldforge.org/index.php/components/mercator/"
 SRC_URI="mirror://sourceforge/worldforge/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
@@ -26,11 +26,7 @@ src_compile() {
 
 src_install() {
 	default
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
+	use doc && dodoc -r doc/html
 
 	find "${ED}" -name '*.la' -delete || die
 }