gentoo auto-resync : 14:09:2023 - 22:48:30

3 files changed, 42 insertions, 16 deletions

diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
index c94a9c8452aa..5d7b815919b8 100644
--- a/games-puzzle/pauker/Manifest
+++ b/games-puzzle/pauker/Manifest
@@ -1,4 +1,5 @@
+AUX pauker-1.8-r3-project.properties.patch 734 BLAKE2B e65ed8af572af626fa620aab4d315e6c6ee2870e4966abad153e6a072f56bc070ee45c8d5a066aae64e2a396d6d3018557f5e05e64128aac7a7b7bfeb69f4d02 SHA512 3e7bd12f194fe4019cc5785219c8e85ca9e5ffcb64400fe1aec117bc68634e0a89e224b3c0a1367a749b52f5c9144339f3f3d044887b14053de4d243c5fd4212
 AUX pauker_bundledjars.patch 903 BLAKE2B 944e338bf1f0b4501ae68accaf44dcb6cd0c286722ac5077ce7748e93c524ff262a4e21fcfd2a576d2dc5c5d7d5ef9e04354e11d6e0b2a4fc9a0f018daf61708 SHA512 fd6d525fb49b956bfcecaf44e8f8044251d91341844418e1980db96bcfc6e91e86ec60aa08d112a84b1fe1c40b87e0429edfdbfaa1ea100993e89eded230bf6e
 DIST pauker-1.8.src.jar 33886665 BLAKE2B 9dddd9f7e5d5dbc9e7bc18b69e708ba3a4ea67e17b513b218eb14a77094fe40ef3d404e8dc85311ee2cd4d69587625828084cfbbf1d05534c90f40948e8ef8f4 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae
-EBUILD pauker-1.8-r2.ebuild 1705 BLAKE2B a8f2a0f8d68cffdeaa41c6e580d4b7532cefdcca603fe5c8fdb41a962c11c14135c5a70517a2c980026843cb408514c9002788d3be6be0ddb1213736f733795e SHA512 4e3b8ae469c18bb5c126d37c415590d6ed0a1ac63b3ca810d3805da937f7503ae59383c89f163df34e05376d76ae5d4c62248aaae6e1c80ad64ba57af9a55180
+EBUILD pauker-1.8-r3.ebuild 1817 BLAKE2B 468980e073b720a5b94fd557661aebc06672c26eb3b435611b90311673dfc7ca19042e5f67882838fa699d6542938b391f98481ffc9ef3c3d00d1cb1b944da7d SHA512 0ead04710e1aca7212abf7367a4cae975d8731c721ee907159c65922a984a97bf905a3d73569b2e132b34cf26dd70f9113542cae42fbd97484493e071cf6ed9b
 MISC metadata.xml 330 BLAKE2B 42488ad46ce8315bfe9b341e63c0e1490cb883bd6481acdb8620738525a6dd72d1d3dd1dbe558aa83a93ee0efabbf5b9c04e9d6209e34f7ff8515e5134cea112 SHA512 8df3d8c336515d44d4bb3138adf77ede34ba6c6e467b56c3cb267f6ca8b2cace57cab3595256492af08e52ef61ea87741697abc262e0fc5f78bb4c7442eb9296
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
new file mode 100644
index 000000000000..b063b1055621
--- /dev/null
+++ b/games-puzzle/pauker/files/pauker-1.8-r3-project.properties.patch
@@ -0,0 +1,24 @@
+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/pauker-1.8-r2.ebuild b/games-puzzle/pauker/pauker-1.8-r3.ebuild
index d99c4293362c..c41b5e3153e2 100644
--- a/games-puzzle/pauker/pauker-1.8-r2.ebuild
+++ b/games-puzzle/pauker/pauker-1.8-r3.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 JAVA_PKG_IUSE="doc source"
 
 inherit desktop java-pkg-2 java-ant-2
 
 DESCRIPTION="A java based flashcard program"
-HOMEPAGE="http://pauker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pauker/${P}.src.jar"
+HOMEPAGE="https://pauker.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/pauker/pauker/${PV}/${P}.src.jar"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
+BDEPEND="app-arch/unzip"
 COMMON_DEP="
 	dev-java/browserlauncher2:1.0
 	dev-java/javahelp
@@ -22,20 +24,19 @@ COMMON_DEP="
 	dev-java/swing-layout:1
 "
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*
-"
+	>=virtual/jre-1.8:*"
 DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.8:*
-	app-arch/unzip
-"
+	>=virtual/jdk-1.8:*"
+BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
+PATCHES=(
+	"${FILESDIR}/${PN}_bundledjars.patch"
+	"${FILESDIR}/pauker-1.8-r3-project.properties.patch"
+)
 
 src_prepare() {
 	default
-	find . -iname '*.jar' -delete
-
-	eapply "${FILESDIR}/${PN}_bundledjars.patch"
+	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
@@ -46,7 +47,7 @@ src_prepare() {
 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.5.home="${JAVA_HOME}" jar $(use_doc javadoc)
+		-Dplatforms.JDK_1.8.home="${JAVA_HOME}" jar $(use_doc javadoc)
 }
 
 #test depend on jemmy, a netbeans module.  so unless it is packaged separately