* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/, games-strategy/freecol/files/
@ 2016-02-16 1:38 Michael Sterrett
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett @ 2016-02-16 1:38 UTC (permalink / raw
To: gentoo-commits
commit: 8ab94462d7b923ba85d398eee49355a33530a635
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 00:54:51 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 01:37:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab94462
games-strategy/freecol: clean old
Package-Manager: portage-2.2.26
games-strategy/freecol/Manifest | 1 -
.../freecol/files/freecol-0.10.7-gentoo.patch | 29 -------
games-strategy/freecol/freecol-0.10.7.ebuild | 92 ----------------------
3 files changed, 122 deletions(-)
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index ac0c874..2ca3a17 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,2 +1 @@
-DIST freecol-0.10.7-src.zip 46805547 SHA256 6909fc4e98dd765863b860d0fe16c5b75232d6fd4ef0ddea6e6de50cb06813fc SHA512 39bb8d9cc4566fb63c044552ef8bb698d06cb0a8baad85145288c5a435022efef5af822d6f779ebeb43d943916625320558dd118412e1bcaca0b2a0fa2b859d2 WHIRLPOOL 0fb908668807d3256ffb37e3c97d4ad0421c6f809e7e836f187f0d87af16c5953178165dabd799551fcf261d02f8671f4f360c4b851a6be77c47c556e86f67aa
DIST freecol-0.11.5-src.zip 45280324 SHA256 99b31077fb3d7bfab44fcb900e0ea828a1dedf44fa814e05e166f240a68a5078 SHA512 1059c3b5c87c0f5ae07a99aaab1af2f73c7767a536aa2cff1b6c518b53d9ef6cb75713b4aeb601ab02bf946dcf451d01775b27cf82c457c0b9869e4cfeb55965 WHIRLPOOL 859c5097db4db88642fdfe0189bb731f47e7fe5118e943958698c351b21b6e0762a106b9541a8554633f770c7c2a0d4b57a8b7b26584e96be1277ec887721d67
diff --git a/games-strategy/freecol/files/freecol-0.10.7-gentoo.patch b/games-strategy/freecol/files/freecol-0.10.7-gentoo.patch
deleted file mode 100644
index 20f4069..0000000
--- a/games-strategy/freecol/files/freecol-0.10.7-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- build.xml.old 2012-03-03 20:28:27.470899027 +0100
-+++ build.xml 2012-03-03 20:29:27.702662193 +0100
-@@ -41,14 +41,11 @@
- <!-- Woodstox XML processor -->
- <pathelement location="${basedir}/${woodstox.jar}"/>
- <!-- MigLayout manager -->
-- <pathelement location="${basedir}/${miglayout.jar}"/>
-+ <pathelement location="${miglayout.jar}"/>
- <!-- Command line processor -->
-- <pathelement location="${basedir}/${cli.jar}"/>
-+ <pathelement location="${cli.jar}"/>
- <!-- Cortado Video Applet -->
-- <pathelement location="${basedir}/${cortado.jar}"/>
-- <!-- JOgg/JOrbis libraries -->
-- <pathelement location="${basedir}/jars/jogg-0.0.7.jar"/>
-- <pathelement location="${basedir}/jars/jorbis-0.0.15.jar"/>
-+ <pathelement location="${cortado.jar}"/>
- </path>
- <path id="junit.classpath">
- <pathelement location="${basedir}/test/lib/junit.jar" />
-@@ -163,7 +160,7 @@
- <manifest file="${basedir}/src/MANIFEST.MF">
- <attribute name="Created-By" value="FreeCol Team"/>
- <attribute name="Main-Class" value="net.sf.freecol.FreeCol"/>
-- <attribute name="Class-Path" value="${stax.jar} ${woodstox.jar} jars/jogg-0.0.7.jar jars/jorbis-0.0.15.jar jars/tritonus_share.jar jars/vorbisspi1.0.3.jar ${miglayout.jar} ${cli.jar} ${cortado.jar}"/>
-+ <attribute name="Class-Path" value="${stax.jar} ${woodstox.jar} jars/tritonus_share.jar jars/vorbisspi1.0.3.jar ${miglayout.jar} ${cli.jar} ${cortado.jar}"/>
- <attribute name="Product-Name" value="FreeCol"/>
- <attribute name="Package-Title" value="FreeCol"/>
- <attribute name="Package-Version" value="${svn.Revision}"/>
diff --git a/games-strategy/freecol/freecol-0.10.7.ebuild b/games-strategy/freecol/freecol-0.10.7.ebuild
deleted file mode 100644
index e9622e4..0000000
--- a/games-strategy/freecol/freecol-0.10.7.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit base 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.5
- app-arch/unzip
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-java_prepare() {
- cd jars
- rm jsr173_1.0_api.jar
- rm wstx-lgpl-4.0pr1.jar
- rm commons-cli-1.1.jar
- rm miglayout-3.7.3.1-swing.jar
- rm cortado-0.6.0.jar
- rm jogg-0.0.7.jar
- rm jorbis-0.0.15.jar
-}
-
-src_prepare() {
- base_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}/jars
- java-pkg_dojar jars/vorbisspi1.0.3.jar
- java-pkg_dojar jars/tritonus_share.jar
- 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 ${PN}.xpm
- 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] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/, games-strategy/freecol/files/
@ 2016-05-18 5:17 Michael Sterrett
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett @ 2016-05-18 5:17 UTC (permalink / raw
To: gentoo-commits
commit: fb94b102bd5af7cb4117e764e7a45b1bcfef4eb0
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 05:06:47 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed May 18 05:17:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb94b102
games-strategy/freecol: version bump (bug #571392)
Package-Manager: portage-2.2.28
games-strategy/freecol/Manifest | 1 +
.../freecol/files/freecol-0.11.6-gentoo.patch | 27 ++++++++
games-strategy/freecol/freecol-0.11.6.ebuild | 80 ++++++++++++++++++++++
3 files changed, 108 insertions(+)
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index 2ca3a17..c94a3de 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1 +1,2 @@
DIST freecol-0.11.5-src.zip 45280324 SHA256 99b31077fb3d7bfab44fcb900e0ea828a1dedf44fa814e05e166f240a68a5078 SHA512 1059c3b5c87c0f5ae07a99aaab1af2f73c7767a536aa2cff1b6c518b53d9ef6cb75713b4aeb601ab02bf946dcf451d01775b27cf82c457c0b9869e4cfeb55965 WHIRLPOOL 859c5097db4db88642fdfe0189bb731f47e7fe5118e943958698c351b21b6e0762a106b9541a8554633f770c7c2a0d4b57a8b7b26584e96be1277ec887721d67
+DIST freecol-0.11.6-src.zip 45002451 SHA256 52bbc35a8101cbfa770a004750c88969d6caf3f182733671a1e04dd97b86021a SHA512 fbfec95ad7128477d631be92b750d639d42bde3e052c94265590933e841adf66e670d5e1b2f6e8ef05629afeafded60cbb495ef93272ebc14ce7fd2f2eaa53de WHIRLPOOL 355c046419c4fe62a1564460145d13938ae7435a8cb518e1de156a5f575627249c5bccd79d56e8a2b3f156d8f0d291d2cd9c24e4c1d9b27efb9427a8a33acb07
diff --git a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
new file mode 100644
index 0000000..c087193
--- /dev/null
+++ b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
@@ -0,0 +1,27 @@
+--- build.xml.orig 2015-12-09 21:10:08.272361404 -0500
++++ build.xml 2015-12-09 21:11:26.189663216 -0500
+@@ -36,12 +36,11 @@
+
+ <path id="libraries.classpath">
+ <!-- MigLayout manager -->
+- <pathelement location="${basedir}/${miglayout-swing.jar}"/>
+- <pathelement location="${basedir}/${miglayout-core.jar}"/>
++ <pathelement location="${miglayout.jar}"/>
+ <!-- Command line processor -->
+- <pathelement location="${basedir}/${cli.jar}"/>
++ <pathelement location="${cli.jar}"/>
+ <!-- Cortado Video Applet -->
+- <pathelement location="${basedir}/${cortado.jar}"/>
++ <pathelement location="${cortado.jar}"/>
+ <!-- JOgg/JOrbis libraries -->
+ <pathelement location="${basedir}/jars/jogg-0.0.17.jar"/>
+ <pathelement location="${basedir}/jars/jorbis-0.0.17.jar"/>
+@@ -162,7 +161,7 @@
+
+ <target name="manifest" depends="git-revision"
+ description="Creates the Manifest file.">
+- <manifestclasspath property="jar.classpath"
++ <manifestclasspath maxParentLevels="50" property="jar.classpath"
+ jarfile="Freecol.jar">
+ <classpath refid="libraries.classpath" />
+ </manifestclasspath>
diff --git a/games-strategy/freecol/freecol-0.11.6.ebuild b/games-strategy/freecol/freecol-0.11.6.ebuild
new file mode 100644
index 0000000..86e3be0
--- /dev/null
+++ b/games-strategy/freecol/freecol-0.11.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.8
+ app-arch/unzip
+ ${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.8
+ ${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
+ 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] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/, games-strategy/freecol/files/
@ 2023-03-13 18:07 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-03-13 18:07 UTC (permalink / raw
To: gentoo-commits
commit: f125fae9ac7ba2dee83199b987c5a7e512e3ae2c
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Mar 11 17:58:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 18:03:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f125fae9
games-strategy/freecol: drop 0.11.6-r1
Closes: https://bugs.gentoo.org/846692
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/files/commons-cli-1.3.patch | 22 --------
.../freecol/files/freecol-0.11.6-gentoo.patch | 18 -------
games-strategy/freecol/freecol-0.11.6-r1.ebuild | 63 ----------------------
4 files changed, 104 deletions(-)
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index e1c4293517ee..593d31100cdc 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,2 +1 @@
-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/files/commons-cli-1.3.patch b/games-strategy/freecol/files/commons-cli-1.3.patch
deleted file mode 100644
index 84fc6e5064c1..000000000000
--- a/games-strategy/freecol/files/commons-cli-1.3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Sun, 20 Dec 2015 18:49:11 +0100
-Subject: commons-cli 1.3
-
-Forwarded: not-needed
----
- src/net/sf/freecol/FreeCol.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
-index d05ae3d..99b9cdc 100644
---- a/src/net/sf/freecol/FreeCol.java
-+++ b/src/net/sf/freecol/FreeCol.java
-@@ -426,7 +426,7 @@ public final class FreeCol {
- private static void handleArgs(String[] args) {
- Options options = new Options();
- final String help = Messages.message("cli.help");
-- final File dummy = new File("dummy");
-+ final Class dummy = null;
- final String argDirectory = Messages.message("cli.arg.directory");
-
- // Help options.
diff --git a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
deleted file mode 100644
index 770279b69030..000000000000
--- a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur a/build.xml b/build.xml
---- a/build.xml 2015-10-17 07:54:48.000000000 +0100
-+++ b/build.xml 2019-04-13 21:51:21.679100596 +0100
-@@ -162,14 +162,9 @@
-
- <target name="manifest" depends="git-revision"
- description="Creates the Manifest file.">
-- <manifestclasspath property="jar.classpath"
-- jarfile="Freecol.jar">
-- <classpath refid="libraries.classpath" />
-- </manifestclasspath>
- <manifest file="${basedir}/src/MANIFEST.MF">
- <attribute name="Created-By" value="FreeCol Team"/>
- <attribute name="Main-Class" value="net.sf.freecol.FreeCol"/>
-- <attribute name="Class-Path" value="${jar.classpath}"/>
- <attribute name="Product-Name" value="FreeCol"/>
- <attribute name="Package-Title" value="FreeCol"/>
- <attribute name="Package-Version" value="${FreeCol.Revision}"/>
diff --git a/games-strategy/freecol/freecol-0.11.6-r1.ebuild b/games-strategy/freecol/freecol-0.11.6-r1.ebuild
deleted file mode 100644
index fad44bf0d1eb..000000000000
--- a/games-strategy/freecol/freecol-0.11.6-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-pkg-2 java-ant-2
-
-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"
-
-# Rightly or wrongly, jogg and jorbis are bundled within Cortado but we
-# don't have packages for them anyway.
-
-CP_DEPEND="
- dev-java/commons-cli:1
- dev-java/cortado:0
- dev-java/miglayout:0
-"
-
-DEPEND=">=virtual/jdk-1.8
- app-arch/unzip
- ${CP_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.8
- ${CP_DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
- "${FILESDIR}"/commons-cli-1.3.patch
- "${FILESDIR}"/${P}-gentoo.patch
-)
-
-JAVA_ANT_REWRITE_CLASSPATH=true
-EANT_BUILD_TARGET=package
-
-src_prepare() {
- default
- rm -v jars/* || die
- java-pkg-2_src_prepare
-}
-
-src_install() {
- local datadir=/usr/share/${PN}
-
- java-pkg_dojar FreeCol.jar
- java-pkg_dolauncher ${PN} \
- --pwd ${datadir} \
- --main net.sf.freecol.FreeCol \
- --java_args -Xmx512M
-
- insinto ${datadir}
- doins -r data schema
-
- doicon data/${PN}.png
- make_desktop_entry ${PN} FreeCol
-
- dodoc README
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-13 18:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-13 18:07 [gentoo-commits] repo/gentoo:master commit in: games-strategy/freecol/, games-strategy/freecol/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2016-05-18 5:17 Michael Sterrett
2016-02-16 1:38 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox