public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/
@ 2015-12-10  2:29 Michael Sterrett
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Sterrett @ 2015-12-10  2:29 UTC (permalink / raw
  To: gentoo-commits

commit:     0a401be2c49343531999490780e87b223ed85a18
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 02:29:00 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 02:29:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a401be2

fix header

Package-Manager: portage-2.2.24

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

diff --git a/games-strategy/freecol/freecol-0.11.5.ebuild b/games-strategy/freecol/freecol-0.11.5.ebuild
index e89e0ac..8591487 100644
--- a/games-strategy/freecol/freecol-0.11.5.ebuild
+++ b/games-strategy/freecol/freecol-0.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.10.7.ebuild,v 1.3 2015/02/25 15:52:06 ago Exp $
+# $Id$
 
 EAPI=5
 inherit eutils java-pkg-2 java-ant-2 games


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

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/
@ 2016-01-15  9:03 Agostino Sarubbo
  0 siblings, 0 replies; 8+ messages in thread
From: Agostino Sarubbo @ 2016-01-15  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     310fc2ee7ac72c276e5d9204d3ca858819a4b80e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 09:01:31 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 09:01:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=310fc2ee

games-strategy/freecol: amd64 stable wrt bug #571338

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

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

diff --git a/games-strategy/freecol/freecol-0.11.5.ebuild b/games-strategy/freecol/freecol-0.11.5.ebuild
index 8591487..b1581cc 100644
--- a/games-strategy/freecol/freecol-0.11.5.ebuild
+++ b/games-strategy/freecol/freecol-0.11.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEP="dev-java/jsr173


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

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/
@ 2016-09-26 12:36 Agostino Sarubbo
  0 siblings, 0 replies; 8+ messages in thread
From: Agostino Sarubbo @ 2016-09-26 12:36 UTC (permalink / raw
  To: gentoo-commits

commit:     c0aea5b4cb119716c621b1c702e24740cabe12bf
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 12:34:56 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 12:35:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0aea5b4

games-strategy/freecol: amd64 stable wrt bug #586234

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

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

diff --git a/games-strategy/freecol/freecol-0.11.6.ebuild b/games-strategy/freecol/freecol-0.11.6.ebuild
index 86e3be0..7cf89a6 100644
--- a/games-strategy/freecol/freecol-0.11.6.ebuild
+++ b/games-strategy/freecol/freecol-0.11.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEP="dev-java/jsr173


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

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/
@ 2017-01-04 15:29 Agostino Sarubbo
  0 siblings, 0 replies; 8+ messages in thread
From: Agostino Sarubbo @ 2017-01-04 15:29 UTC (permalink / raw
  To: gentoo-commits

commit:     1a125d6ad53c8b2476a464e5e83519bcdaa3d19e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 15:29:04 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 15:29:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a125d6a

games-strategy/freecol: x86 stable wrt bug #586234

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

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

diff --git a/games-strategy/freecol/freecol-0.11.6.ebuild b/games-strategy/freecol/freecol-0.11.6.ebuild
index 7cf89a6..291c2c3 100644
--- a/games-strategy/freecol/freecol-0.11.6.ebuild
+++ b/games-strategy/freecol/freecol-0.11.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/jsr173


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

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/
@ 2017-12-21  1:57 David Seifert
  0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2017-12-21  1:57 UTC (permalink / raw
  To: gentoo-commits

commit:     b11608496a9e0cee45b9a06c70ec6399f1a7cdef
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 21:30:32 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 01:55:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1160849

games-strategy/freecol: Remove old

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 games-strategy/freecol/Manifest              |  1 -
 games-strategy/freecol/freecol-0.11.5.ebuild | 79 ----------------------------
 2 files changed, 80 deletions(-)

diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index b61e3b26156..bb4d63f2b73 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,2 +1 @@
-DIST freecol-0.11.5-src.zip 45280324 BLAKE2B 8c1a5d88b9527b0b7b6db0f7c489f34c866a2a9768beb8b64cece7bf1044d286cff69e80f13cc31f281a31a92597b75dee665be3ab3883446b31daccac829e49 SHA512 1059c3b5c87c0f5ae07a99aaab1af2f73c7767a536aa2cff1b6c518b53d9ef6cb75713b4aeb601ab02bf946dcf451d01775b27cf82c457c0b9869e4cfeb55965
 DIST freecol-0.11.6-src.zip 45002451 BLAKE2B 1d0e56b43f63557e3a520d6d30b8831db6c0284ac6cfebf68f3a11264d8bcfc80b883c8d4fe82e4fbd992f02a82ffdf36ed102613010d28375b61cfa30874f68 SHA512 fbfec95ad7128477d631be92b750d639d42bde3e052c94265590933e841adf66e670d5e1b2f6e8ef05629afeafded60cbb495ef93272ebc14ce7fd2f2eaa53de

diff --git a/games-strategy/freecol/freecol-0.11.5.ebuild b/games-strategy/freecol/freecol-0.11.5.ebuild
deleted file mode 100644
index 8f3f1a83ee1..00000000000
--- a/games-strategy/freecol/freecol-0.11.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2 games
-
-DESCRIPTION="An open source clone of the game Colonization"
-HOMEPAGE="http://www.freecol.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jsr173
-	dev-java/wstx:3.2
-	dev-java/commons-cli:1
-	dev-java/cortado
-	dev-java/miglayout"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.7
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
-
-java_prepare() {
-	# jorbis isn't in portage yet
-	rm jars/{commons-cli-1.1,cortado-0.6.0,miglayout-core-4.2,miglayout-swing-4.2}.jar || die
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	EANT_BUILD_TARGET=package
-	EANT_EXTRA_ARGS="
-		-Dstax.jar=$(java-pkg_getjars jsr173)
-		-Dwoodstox.jar=$(java-pkg_getjars wstx-3.2)
-		-Dcli.jar=$(java-pkg_getjars commons-cli-1)
-		-Dmiglayout.jar=$(java-pkg_getjars miglayout)
-		-Dcortado.jar=$(java-pkg_getjars cortado)
-	"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_jarinto "${GAMES_DATADIR}"/${PN}
-	java-pkg_dojar FreeCol.jar
-	java-pkg_dolauncher ${PN} \
-		-into "${GAMES_PREFIX}" \
-		--pwd "${GAMES_DATADIR}"/${PN} \
-		--jar FreeCol.jar \
-		--java_args -Xmx512M
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data schema splash.jpg
-	doicon data/${PN}.png
-	make_desktop_entry ${PN} FreeCol
-	dodoc README
-	prepgamesdirs
-}
-
-pkg_setup() {
-	games_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	java-pkg-2_pkg_preinst
-}


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

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/
@ 2023-03-11 17:15 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-03-11 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     641d9b535a161c8e6035015fd615923539a4e59a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jan 23 18:49:51 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 17:15:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641d9b53

games-strategy/freecol: update upstream metadata

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/games-strategy/freecol/metadata.xml b/games-strategy/freecol/metadata.xml
index 30c9c8e0510b..ef642e3b3ea4 100644
--- a/games-strategy/freecol/metadata.xml
+++ b/games-strategy/freecol/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<bugs-to>https://sourceforge.net/p/freecol/bugs/</bugs-to>
+		<doc>https://github.com/FreeCol/freecol/wiki</doc>
 		<remote-id type="sourceforge">freecol</remote-id>
 	</upstream>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/
@ 2023-03-11 17:15 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-03-11 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     7a77562191c39c59311648690f33f285694a6551
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jan 21 09:06:41 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 17:15:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a775621

games-strategy/freecol: add 1.0.0

Thanks to tkzv (vopros4 <AT> inbox.ru) for the excellent ebuild attached to
https://bugs.gentoo.org/890497.

Some improvements applied here:
- EAPI=8
- HTTPS for HOMEPAGE
- avoid redirect of SRC_URI
- adds findbugs-annotations to CP_DEPEND
- switches to source 11
- java-pkg_clean instead of "rm -v jars/* || die"
- adds JAVA_PKG_IUSE="doc source test"
- switches to java-pkg-simple.eclass for easier handling of tests and
  javadoc
- adds DOCS array
- enables tests

Closes: https://bugs.gentoo.org/890497
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/freecol/Manifest             |  1 +
 games-strategy/freecol/freecol-1.0.0.ebuild | 76 +++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index bb4d63f2b73b..e1c4293517ee 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1 +1,2 @@
 DIST freecol-0.11.6-src.zip 45002451 BLAKE2B 1d0e56b43f63557e3a520d6d30b8831db6c0284ac6cfebf68f3a11264d8bcfc80b883c8d4fe82e4fbd992f02a82ffdf36ed102613010d28375b61cfa30874f68 SHA512 fbfec95ad7128477d631be92b750d639d42bde3e052c94265590933e841adf66e670d5e1b2f6e8ef05629afeafded60cbb495ef93272ebc14ce7fd2f2eaa53de
+DIST freecol-1.0.0-src.zip 159875314 BLAKE2B 6153be9553ded4c2a1f9635d67e48165d07b5d1634f26a44d2f01195e1610d6cb525ffa60368f3225cdf62ffd7751242942fd86b5735455e7396deca68d8350d SHA512 68b313b42fc38e6ea95a4a04ca5af534c4487709fb036018d6d09f6de3455325031ad1fd0ae4c6415cbbeebd3f181e598a2602ad7be6cca9150ad9523b8bb3c2

diff --git a/games-strategy/freecol/freecol-1.0.0.ebuild b/games-strategy/freecol/freecol-1.0.0.ebuild
new file mode 100644
index 000000000000..11a7bf783240
--- /dev/null
+++ b/games-strategy/freecol/freecol-1.0.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open source clone of the game Colonization"
+HOMEPAGE="https://www.freecol.org/"
+SRC_URI="mirror://sourceforge/project/freecol/freecol/freecol-${PV}/freecol-${PV}-src.zip"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/commons-cli:1
+	dev-java/cortado:0
+	dev-java/findbugs-annotations:0
+	dev-java/miglayout:5
+"
+
+DEPEND=">=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+# error: variables in try-with-resources are not supported in -source 8
+RDEPEND=">=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=(
+	CHANGELOG.md
+	COPYING
+	README
+	README.md
+	SECURITY.md
+)
+
+JAVA_JAR_FILENAME="FreeCol.jar"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RUN_ONLY="net.sf.freecol.AllTests"
+JAVA_TEST_SRC_DIR="test/src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	cp build/splash.jpg "${JAVA_RESOURCE_DIRS}" || die
+	grep Main-Class src/MANIFEST.MF \
+		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	local datadir=/usr/share/${PN}
+
+	# launcher of java-pkg-simple.eclass seems not to support --pwd
+	java-pkg_dolauncher ${PN} \
+		--pwd ${datadir} \
+		--main net.sf.freecol.FreeCol \
+		--java_args -Xmx2000M
+
+	insinto ${datadir}
+	doins -r data schema
+
+	doicon data/${PN}.png
+	make_desktop_entry ${PN} FreeCol
+}


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

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/
@ 2024-10-17 15:32 Arthur Zamarin
  0 siblings, 0 replies; 8+ messages in thread
From: Arthur Zamarin @ 2024-10-17 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     81e78976ec7ea03a4128183d6e1d2863c03d7ac3
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 14:38:21 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 15:32:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e78976

games-strategy/freecol: dekeyword x86

After a message to gentoo-dev ML, and no reply from any user on x86,

we decided to dekeyword most Java packages from x86, and reverse

dependencies of them.

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

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

diff --git a/games-strategy/freecol/freecol-1.0.0-r1.ebuild b/games-strategy/freecol/freecol-1.0.0-r1.ebuild
index fc11a278a327..f274086d8f14 100644
--- a/games-strategy/freecol/freecol-1.0.0-r1.ebuild
+++ b/games-strategy/freecol/freecol-1.0.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 CP_DEPEND="
 	dev-java/commons-cli:0


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

end of thread, other threads:[~2024-10-17 15:32 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-10  2:29 [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/ Michael Sterrett
  -- strict thread matches above, loose matches on Subject: below --
2016-01-15  9:03 Agostino Sarubbo
2016-09-26 12:36 Agostino Sarubbo
2017-01-04 15:29 Agostino Sarubbo
2017-12-21  1:57 David Seifert
2023-03-11 17:15 Sam James
2023-03-11 17:15 Sam James
2024-10-17 15:32 Arthur Zamarin

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