media-gfx/sweethome3d-bin: bump + regen manifests

Bug: https://bugs.gentoo.org/902223
Signed-off-by: Vadim Misbakh-Soloviov <mva@gentoo.org>

4 files changed, 56 insertions, 67 deletions

diff --git a/media-gfx/sweethome3d-bin/Manifest b/media-gfx/sweethome3d-bin/Manifest
index 32a8515..f709b9d 100644
--- a/media-gfx/sweethome3d-bin/Manifest
+++ b/media-gfx/sweethome3d-bin/Manifest
@@ -1,2 +1,2 @@
-DIST SweetHome3D-6.2-linux-x64.tgz 67508189 SHA256 5c2090b16c32e52637e87a48197a13d30a0322940949431bbb898b7b082cfca6 SHA512 99d4a93b06adc8fdcf211ccc12223ec346d78e129be3c2ec730c944ea0f4ec936be0fec17f22823cbe8ff9417ad86135c483c6460408c63442b96eeb56ae5313 WHIRLPOOL bd77b674381c61c9f3827d32c61c6f016024393ecd4593569495abd28f4b9d60cbc020eb32f9060871fb9179e5b05f9f456e1d798a149722c6736a65d9ebe72c
-DIST SweetHome3D-6.2-linux-x86.tgz 70795753 SHA256 2056c16564208cb93f4f89ad99b5e3fedcad28d6c835553b6cba099047f54e5a SHA512 069a6b22f0f283ae46301e2ac1aaf47013dfba485271e706b2cb1b9c40e41c27a1ffb239696d54da91b01dcdecd186cb54529be2b770420bac4417000af5da8d WHIRLPOOL 558f4dcb5758b5f35eb9ef665480a40abd7062569e28aedc1d5a645979e50e0b69aa24171af042dcc26ad2fb83e239056826add0a3d77a5c809de7c3885b2dcf
+DIST SweetHome3D-7.1-linux-x64.tgz 70837309 BLAKE2B cc4e56f21e8992224a34c3368ac8fe32226e377b39705d452caeef3a99125dd279fbe3eceddd4bb344c7b83fd14a362a802022a279ce2fc9d998feaa136fd40f SHA512 fb6500841ed2437868ba8ff9017c58a7d4a2e3702a5cbfdffede16a4e86eaac3f6636b38ae79bd4803cbf03d8afe64908085c1be17a86924deeb61bad9ea0e61
+DIST SweetHome3D-7.1-linux-x86.tgz 74182488 BLAKE2B 8ef19e6a38320cc0a33530f19e5e062ba38577cd33735cdab367e356b0c4522cd52f6b840b6c3fb3ade07e0a31e1114329e853e16cdcfdd3cfe243b01c1dada6 SHA512 0546e0958eed013af5036e4e84fff87f9c4d49dfe0aee3d5b074eec39f9568f0b001a8d118a9e4eca27618c6a6c38231860ebcbea227c495cd162896b6bf6411
diff --git a/media-gfx/sweethome3d-bin/metadata.xml b/media-gfx/sweethome3d-bin/metadata.xml
index 475bbb3..97088e1 100644
--- a/media-gfx/sweethome3d-bin/metadata.xml
+++ b/media-gfx/sweethome3d-bin/metadata.xml
@@ -7,9 +7,5 @@
   </maintainer>
   <use>
     <flag name="gtk3">Use GTK3 interface bindings</flag>
-    <flag name="system-java">Don't use bundled JRE packages</flag>
   </use>
-  <upstream>
-    <remote-id type="github">Ultimaker/Cura</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild b/media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild
deleted file mode 100644
index 44de6bb..0000000
--- a/media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils
-
-MY_PN="SweetHome3D"
-
-DESCRIPTION="Sweet Home 3D is a free interior design application."
-HOMEPAGE="http://sweethome3d.com/"
-SRC_URI="
-	amd64? ( mirror://sourceforge/sweethome3d/${MY_PN}-${PV}-linux-x64.tgz )
-	x86? ( mirror://sourceforge/sweethome3d/${MY_PN}-${PV}-linux-x86.tgz )
-"
-LICENSE="GPL-3"
-IUSE="gtk3 +system-java"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	system-java? ( app-eselect/eselect-java )
-"
-RDEPEND="
-	system-java? ( virtual/jre:* )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-QA_PREBUILT="*java3d.*.so"
-
-pkg_setup() {
-	if use system-java && [ ! -f "$JAVA_HOME"/bin/java ]; then
-		die 'Your Java VM installation is broken. Please, select proper system vm through eselect.'
-	fi
-}
-
-src_prepare() {
-	rm THIRDPARTY-LICENSE-* LICENSE.TXT COPYING.TXT
-	if use system-java; then
-		rm -rf jre*
-		sed -r \
-			-e 's@^(exec.*/bin/java)@exec "$JAVA_HOME"/bin/java@' \
-			-e 's@:"\$PROGRAM_DIR"/[^/]*/(lib/javaws.jar) @:"$JAVA_HOME"/jre/\1:"$JAVA_HOME"/\1:/usr/share/icedtea-web/netx.jar @' \
-			-i "${MY_PN}"
-	fi
-	if use gtk3; then
-		sed -r \
-			-e '/^exec.*java /s@(bin/java)@\1 -Dawt.useSystemAAFontSettings=gasp -Dswing.aatext=true -Dsun.java2d.xrender=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel@' \
-			-i "${MY_PN}"
-	fi
-	default
-}
-
-src_install() {
-	insinto /usr/share/"${PF}"
-	exeinto /usr/share/"${PF}"
-	doins -r *
-	doexe "${MY_PN}"
-	dosym ../../usr/share/"${PF}"/"${MY_PN}" /usr/bin/"${MY_PN}"
-	make_desktop_entry "${MY_PN}" "${MY_PN}"
-}
diff --git a/media-gfx/sweethome3d-bin/sweethome3d-bin-7.1.ebuild b/media-gfx/sweethome3d-bin/sweethome3d-bin-7.1.ebuild
new file mode 100644
index 0000000..322958d
--- /dev/null
+++ b/media-gfx/sweethome3d-bin/sweethome3d-bin-7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop wrapper
+
+MY_PN="SweetHome3D"
+
+DESCRIPTION="Sweet Home 3D is a free interior design application."
+HOMEPAGE="http://sweethome3d.com/"
+SRC_URI="
+	amd64? ( mirror://sourceforge/sweethome3d/${MY_PN}-${PV}-linux-x64.tgz )
+	x86? ( mirror://sourceforge/sweethome3d/${MY_PN}-${PV}-linux-x86.tgz )
+"
+LICENSE="GPL-3"
+IUSE="gtk3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/jre"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# QA_PREBUILT="*java3d.*.so"
+
+src_prepare() {
+	rm THIRDPARTY-LICENSE-* LICENSE.TXT COPYING.TXT || die
+	rm -r lib/java3d-* || die # or maybe remove another ones, and keep it?
+	rm -r runtime || die # bundled JRE
+	rm "${MY_PN}"{,-Java3D*} || die # upstream-generated wrappers
+
+	# mv "${MY_PN}Icon.png" "${MY_PN}.png"
+	default
+}
+
+src_install() {
+	inst_path="/usr/share/${PF}"
+	clp=$(find lib -name '*jar' | xargs | sed -e "s@lib/@${inst_path}/lib/@g" -e "s@ @:@g")
+	java_vars=( "\${JAVA_HOME}/bin/java" "\${_JAVA_OPTIONS}" )
+
+	use gtk3 && java_vars+=( "-Dawt.useSystemAAFontSettings=gasp -Dswing.aatext=true -Dsun.java2d.xrender=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" )
+
+	insinto "${inst_path}"
+	doins -r *
+
+	# make_wrapper "${MY_PN}" "${java_vars[*]} -Xmx2g -classpath \"${clp}\" -Djava.library.path=${inst_path}/lib/java3d-1.6 -Djogamp.gluegen.UseTempJarCache=false -Dcom.eteks.sweethome3d.applicationId=SweetHome3D#Installer com.eteks.sweethome3d.SweetHome3D -open"
+	make_wrapper "${MY_PN}" "${java_vars[*]} -Xmx2g -classpath \"${clp}\" -Djava.library.path=${inst_path}/lib:${inst_path}/lib/yafaray -Djogamp.gluegen.UseTempJarCache=false -Dcom.eteks.sweethome3d.applicationId=SweetHome3D#Installer com.eteks.sweethome3d.SweetHome3D -open"
+
+	doicon "${MY_PN}Icon.png"
+
+	make_desktop_entry "${MY_PN}" "${MY_PN}" "${MY_PN}"
+
+	# dosym "${PN}" /usr/bin/sweethome3d
+}