From 0aad4cd3e3fe3db90904ffc51b35e4ff160b53c5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Jun 2024 00:08:04 +0100 Subject: gentoo auto-resync : 10:06:2024 - 00:08:04 --- games-puzzle/Manifest.gz | Bin 17291 -> 17294 bytes games-puzzle/pauker/Manifest | 5 +- games-puzzle/pauker/files/pauker-1.8-javadoc.patch | 34 ++++++++++ .../files/pauker-1.8-r3-project.properties.patch | 24 ------- games-puzzle/pauker/files/pauker_bundledjars.patch | 14 ----- games-puzzle/pauker/pauker-1.8-r3.ebuild | 69 --------------------- games-puzzle/pauker/pauker-1.8-r4.ebuild | 54 ++++++++++++++++ 7 files changed, 90 insertions(+), 110 deletions(-) create mode 100644 games-puzzle/pauker/files/pauker-1.8-javadoc.patch delete mode 100644 games-puzzle/pauker/files/pauker-1.8-r3-project.properties.patch delete mode 100644 games-puzzle/pauker/files/pauker_bundledjars.patch delete mode 100644 games-puzzle/pauker/pauker-1.8-r3.ebuild create mode 100644 games-puzzle/pauker/pauker-1.8-r4.ebuild (limited to 'games-puzzle') diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz index 0e7bc8b7b76a..8e55c6471476 100644 Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest index e4d9f646f8d9..454f6fd20598 100644 --- a/games-puzzle/pauker/Manifest +++ b/games-puzzle/pauker/Manifest @@ -1,5 +1,4 @@ -AUX pauker-1.8-r3-project.properties.patch 734 BLAKE2B e65ed8af572af626fa620aab4d315e6c6ee2870e4966abad153e6a072f56bc070ee45c8d5a066aae64e2a396d6d3018557f5e05e64128aac7a7b7bfeb69f4d02 SHA512 3e7bd12f194fe4019cc5785219c8e85ca9e5ffcb64400fe1aec117bc68634e0a89e224b3c0a1367a749b52f5c9144339f3f3d044887b14053de4d243c5fd4212 -AUX pauker_bundledjars.patch 903 BLAKE2B 944e338bf1f0b4501ae68accaf44dcb6cd0c286722ac5077ce7748e93c524ff262a4e21fcfd2a576d2dc5c5d7d5ef9e04354e11d6e0b2a4fc9a0f018daf61708 SHA512 fd6d525fb49b956bfcecaf44e8f8044251d91341844418e1980db96bcfc6e91e86ec60aa08d112a84b1fe1c40b87e0429edfdbfaa1ea100993e89eded230bf6e +AUX pauker-1.8-javadoc.patch 1179 BLAKE2B 46063ea5b1869be3c9a156a164e70e3d0dc674b6f30288c46a36c3edf486d1eba065fc8f8221d9b8321628854b7dfdca679611d6f50c738e2695223447cade8b SHA512 a42265a582f189619b4617818866953616e20567bf4f11731ad0060a2254da539642ae5e1ea96c88d7f3d58c1bd406f5bcdb57fa0b9f437f3122f529db5e1eaf DIST pauker-1.8.src.jar 33886665 BLAKE2B 9dddd9f7e5d5dbc9e7bc18b69e708ba3a4ea67e17b513b218eb14a77094fe40ef3d404e8dc85311ee2cd4d69587625828084cfbbf1d05534c90f40948e8ef8f4 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae -EBUILD pauker-1.8-r3.ebuild 1805 BLAKE2B c11d78fc115a814ac45dc6b33b7e0c48c33b1d958b975939a44dedf158fdbefb83a412de94926bfddfdc21e81509b86bf25808adf012bb614f5db007bb8b0940 SHA512 24ae415da504c52b308a067ac228ad084956f554b8b9f5f41052818932186bc232d12f511c51f392a05db073c345e7202a46cfc0d644cf103be4b31670970724 +EBUILD pauker-1.8-r4.ebuild 1285 BLAKE2B 7dec9907450970202d222faee5b4d89638cce26f031683b00ea36f5f094aeaed1c0d7d9ea67dcc4f8b6a28de6b4deb34ecf0dfe6c15ed370d4dce97c72df80d1 SHA512 3777972632482fa34a42f01a89545099ce34d4ad32ec9c3f1d993cdcc7b2b5e33679d7909ede3f7d373a6b7ee3d3780904e9b02602773b8c7ded41c068abfdd1 MISC metadata.xml 330 BLAKE2B 42488ad46ce8315bfe9b341e63c0e1490cb883bd6481acdb8620738525a6dd72d1d3dd1dbe558aa83a93ee0efabbf5b9c04e9d6209e34f7ff8515e5134cea112 SHA512 8df3d8c336515d44d4bb3138adf77ede34ba6c6e467b56c3cb267f6ca8b2cace57cab3595256492af08e52ef61ea87741697abc262e0fc5f78bb4c7442eb9296 diff --git a/games-puzzle/pauker/files/pauker-1.8-javadoc.patch b/games-puzzle/pauker/files/pauker-1.8-javadoc.patch new file mode 100644 index 000000000000..ab87fe73c723 --- /dev/null +++ b/games-puzzle/pauker/files/pauker-1.8-javadoc.patch @@ -0,0 +1,34 @@ +#829503 +--- a/src/pauker/program/gui/swing/LineLabeler.java ++++ b/src/pauker/program/gui/swing/LineLabeler.java +@@ -25,7 +25,7 @@ import javax.swing.text.JTextComponent; + + /** + * A panel for labelling the Pauker import dialog +- * @author Ronny Standtke ++ * @author Ronny Standtke + */ + public class LineLabeler extends JPanel implements DocumentListener { + +--- a/src/pauker/program/Card.java ++++ b/src/pauker/program/Card.java +@@ -118,7 +118,7 @@ public class Card { + /** + * sets if the card is learned or not + * @param learned if true the cards state is set to learned and the current date is used as +- * learnedDate ++ * learnedDate + */ + public void setLearned(boolean learned) { + frontSide.setLearned(learned); +LongTermBatch.java:101: error: @param name not found +--- a/src/pauker/program/LongTermBatch.java ++++ b/src/pauker/program/LongTermBatch.java +@@ -98,7 +98,6 @@ public class LongTermBatch extends Batch { + } + + /** gets an expired card +- * @param i the index of the expired card + * @return the expired card + */ + public Card getOldestExpiredCard() { diff --git a/games-puzzle/pauker/files/pauker-1.8-r3-project.properties.patch b/games-puzzle/pauker/files/pauker-1.8-r3-project.properties.patch deleted file mode 100644 index b063b1055621..000000000000 --- a/games-puzzle/pauker/files/pauker-1.8-r3-project.properties.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/nbproject/project.properties b/nbproject/project.properties -index 02aef46..edca271 100644 ---- a/nbproject/project.properties -+++ b/nbproject/project.properties -@@ -37,8 +37,8 @@ javac.classpath=\ - # Space-separated list of extra javac options - javac.compilerargs=-Xlint:all,-serial - javac.deprecation=true --javac.source=1.5 --javac.target=1.5 -+javac.source=1.8 -+javac.target=1.8 - javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ -@@ -64,7 +64,7 @@ jnlp.signed=false - main.class=pauker.program.gui.swing.PaukerFrame - manifest.file=manifest.mf - meta.inf.dir=${src.dir}/META-INF --platform.active=JDK_1.5 -+platform.active=JDK_1.8 - run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} diff --git a/games-puzzle/pauker/files/pauker_bundledjars.patch b/games-puzzle/pauker/files/pauker_bundledjars.patch deleted file mode 100644 index bebcbd088b12..000000000000 --- a/games-puzzle/pauker/files/pauker_bundledjars.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/build.xml.orig 2008-11-24 20:24:55.000000000 +1300 -+++ b/build.xml 2008-11-24 20:25:33.000000000 +1300 -@@ -88,11 +88,6 @@ - basedir="build/classes/" - includes="pauker/**,tools/**" - excludes="pauker/Changes.txt,pauker/TODO.txt,**/*BeanInfo*,**/GraphicalStatisticPanel.gif"> -- -- -- -- - - - diff --git a/games-puzzle/pauker/pauker-1.8-r3.ebuild b/games-puzzle/pauker/pauker-1.8-r3.ebuild deleted file mode 100644 index 6fb8a63cf540..000000000000 --- a/games-puzzle/pauker/pauker-1.8-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit desktop java-pkg-2 java-ant-2 - -DESCRIPTION="A java based flashcard program" -HOMEPAGE="https://pauker.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/project/pauker/pauker/${PV}/${P}.src.jar" -S="${WORKDIR}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -COMMON_DEP=" - dev-java/browserlauncher2:1.0 - dev-java/javahelp - dev-java/lucene:2.4 - dev-java/swing-layout:1 -" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.8:*" -BDEPEND="app-arch/unzip" - -PATCHES=( - "${FILESDIR}/${PN}_bundledjars.patch" - "${FILESDIR}/pauker-1.8-r3-project.properties.patch" -) - -src_prepare() { - default - find . -iname '*.jar' -delete || die - - java-pkg_jar-from --into libs browserlauncher2-1.0 browserlauncher2.jar BrowserLauncher2-1_3.jar - java-pkg_jar-from --into libs javahelp jhall.jar - java-pkg_jar-from --into libs lucene-2.4 lucene-core.jar lucene-core-2.4.0.jar - java-pkg_jar-from --into libs swing-layout-1 swing-layout.jar -} - -src_compile() { - eant -Dfile.reference.BrowserLauncher2-1_3.jar="libs/BrowserLauncher2-1_3.jar" \ - -Dlibs.swing-layout.classpath="libs/swing-layout.jar" \ - -Dplatforms.JDK_1.8.home="${JAVA_HOME}" jar $(use_doc javadoc) -} - -#test depend on jemmy, a netbeans module. so unless it is packaged separately -#tests cannot be build. - -src_install() { - java-pkg_jarinto "/usr/share/${PN}" - java-pkg_newjar "dist/${P}.jar" - - java-pkg_dolauncher ${PN} \ - -into "/usr" \ - --pwd /usr/share/${PN} \ - --main pauker.program.gui.swing.PaukerFrame - - use doc && java-pkg_dojavadoc dist/javadoc - use source && java-pkg_dosrc src - - newicon src/pauker/icons/repeat.png ${PN}.png - make_desktop_entry pauker Pauker -} diff --git a/games-puzzle/pauker/pauker-1.8-r4.ebuild b/games-puzzle/pauker/pauker-1.8-r4.ebuild new file mode 100644 index 000000000000..962456b5c716 --- /dev/null +++ b/games-puzzle/pauker/pauker-1.8-r4.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit desktop java-pkg-2 java-pkg-simple + +DESCRIPTION="A java based flashcard program" +HOMEPAGE="https://pauker.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/project/pauker/pauker/${PV}/${P}.src.jar" +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="app-arch/unzip" +CP_DEPEND=" + dev-java/browserlauncher2:1.0 + dev-java/javahelp:0 + dev-java/lucene:2.4 + dev-java/swing-layout:1 +" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/pauker-1.8-javadoc.patch" ) + +JAVA_MAIN_CLASS="pauker.program.gui.swing.PaukerFrame" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + cp -r src res || die + find res -type f \( -name '*.java' -o -name '*.txt' \ + -o -name '*.form' -o -name '*BeanInfo.java' \ + -o -name '*Panel.gif' \) -exec rm -rf {} + || die +} + +#test depend on jemmy, a netbeans module. so unless it is packaged separately +#tests cannot be build. + +src_install() { + java-pkg-simple_src_install + newicon src/pauker/icons/repeat.png ${PN}.png + make_desktop_entry pauker Pauker +} -- cgit v1.2.3