commit: 5c1bed15f4b7e71989ff29472838c2c9d02c34db Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon May 20 11:55:33 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Jun 9 15:18:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1bed15
games-puzzle/pauker: drop unneeded build system Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33891 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> .../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 | 70 ---------------------- games-puzzle/pauker/pauker-1.8-r4.ebuild | 54 +++++++++++++++++ 4 files changed, 54 insertions(+), 108 deletions(-) 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"> -- <zipfileset src="${libs.swing-layout.classpath}"/> -- <zipfileset src="libs/jhall.jar" excludes="META-INF/**"/> -- <zipfileset src="libs/lucene-core-2.4.0.jar" excludes="META-INF/**"/> -- <zipfileset src="libs/BrowserLauncher2-1_3.jar" -- excludes="META-INF/**,classes/,source/,package?cache/,.**,*.txt,build.xml"/> - <manifest> - <attribute name="Main-Class" value="pauker.program.gui.swing.PaukerFrame"/> - <attribute name="SplashScreen-Image" value="pauker/icons/Splash.png"/> 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 cadeed423644..000000000000 --- a/games-puzzle/pauker/pauker-1.8-r3.ebuild +++ /dev/null @@ -1,70 +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" - "${FILESDIR}/pauker-1.8-javadoc.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 +}
