gentoo resync : 11.07.2019

3 files changed, 38 insertions, 6 deletions

diff --git a/app-office/moneydance/Manifest b/app-office/moneydance/Manifest
index cff75b57e395..642ca20c428a 100644
--- a/app-office/moneydance/Manifest
+++ b/app-office/moneydance/Manifest
@@ -1,6 +1,7 @@
+AUX moneydance-bin 567 BLAKE2B 4a1f80df1e5e20c08ba95168b680f8e0cdd7413fdc7991b12d40048dde6465db8c4d3a18c7b3f70bb829a2f5d2002258a8e6ccefcc64afbf419633ff948f3e15 SHA512 344e05050f28ea61264899b62f3e14844371ef452b0b84c6146abdecd2b9fc1230102bf2685b6c0649e014048c82ecd5dd7ce3117e65a9a22a2737eb39f4ca9a
 DIST moneydance-2017.10-amd64.tar.gz 132116528 BLAKE2B f5ba44a89944657c6c1380226dc512729825b084783e6d70dd7b2b731411294c7333bae858b2be3d5321e5145230257b325dc2b72a22744a877673c1c934d854 SHA512 175ff470b5fb5c3851eae708cc641777d7bdf1ede40366ccf5a135d6c813c08d9ce32665a2307c3aefa63eeb2206ad0874cb989aa998415abb86184a2b114ce8
 DIST moneydance-2017.10-x86.tar.gz 134860964 BLAKE2B 92181a6c6a81063377823b0fd9ed652036cf1f633c2cab57f19d1dbb18a2542361fc2bafab8852c11b941a24532f662351ea2d05bc928818db24a4cf3cae7112 SHA512 18d9d4ce7b0b65566ac81fea66ba34d66173559ca90ac166cc9b90631400845ae1c9d92ae781a618cacc57cd4f630f079736101d29b66d9c6cee7d32c7c15c22
-DIST moneydance-2019.1-amd64.tar.gz 132469388 BLAKE2B 516ff3af46e23370cf97b7a41e9802f14f5272c36b01080d69f339bdb9ca7de045de35baead8d97a8febece062dcd8b2befecad2744773e9a1c79b9a16b9639a SHA512 a28787dcc10173f4d492ec1bd5a8f17b6592f86c324e57a7e2951a0265825e4f78b620a4aabb4cde94c97860d3aaac8066572882c772d5abfa79c90cd33770ee
+DIST moneydance-2019.3.1880-amd64.tar.gz 134414524 BLAKE2B fa6991b245efb76d9af17611ce5f24c4c77fe171417f41ccdccccbfa0b6795fbcb1c56c072dc7382e85f81ec57302040eb0cb091162964026fd230e6b5b3eecd SHA512 1e0cedb759168123de357cf4f69691ac4bd9868524d012f924d00c8f653a3505d3defe8c79e0c151d2b9163dfa40b551b0cc86fd7da678e841902bab812a1d2c
 EBUILD moneydance-2017.10.ebuild 1503 BLAKE2B 26cde10e7460a69484a3449f288e0a2f55925a55a7e8144650e563a00ed8395c9c95680034878af75195e858389bf30954bc7cfc679ada7a10f2f7081d61412e SHA512 207e71aa55a9f194c5f23d04c6626687c34d5717a80c64a30590623e5396912fd26e874bad4f29b63627800806ab8a3af0685be4854d9cfa27536c270427a268
-EBUILD moneydance-2019.1.ebuild 1264 BLAKE2B dd9a183411e1152df2d38b934c4acde963f5cefdb208a4f9522e68c93daa9b3a1295e1ba698436a29970d41fb0891a21c517822d17339c7409091c2a98170510 SHA512 b3baa1daf9cdc79eb6574b861323247aab78cb44a726d8cd54ff5195f6d5b485c9d89df8e241f676b5a0891429a7a0fdc82462046be7c9b6280e4c24ad69d9e4
+EBUILD moneydance-2019.3.1880.ebuild 1368 BLAKE2B 46bf27fe15c0e9f5a4e1094ae28ad3ff1a613c7b781163b85afab7c81e3145e9659fe0e59c32f2fef12af9415488d63d0e7424c87bceb89bcee67c88f2770238 SHA512 d693047132cc62d4cb9710dd2d92dde3eff331b46b6aaf14b34d792ab3449ee00045205d542824c5e324d7b284587093f9ef01cd211aeec2d7de0155abcb7b46
 MISC metadata.xml 601 BLAKE2B da75b9789bf828531d9a23f3143bf6977af23efdefd4c2d9cf1488c7d3a66a304f202b1cd496fc807cdf52d271f7a50bf3090e1d7d60d427656ab2bdec4f9ce1 SHA512 a77ece9db983b7955d26e760f6d1951cafaafac57c217cd916070a3d477daaea93338a26ff523d87e4ca4227e1ce02d122f5939069caf8c7bbbb3d0fda9d8e6d
diff --git a/app-office/moneydance/files/moneydance-bin b/app-office/moneydance/files/moneydance-bin
new file mode 100644
index 000000000000..1e8089e99bf0
--- /dev/null
+++ b/app-office/moneydance/files/moneydance-bin
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Options
+JAVA_OPTS="-client -Dawt.useSystemAAFontSettings=gasp -Dawt.useSystemAAFontSettings=on -Xmx2048m"
+MONEYDANCE_LIBS="/usr/share/moneydance/lib"
+
+# Choose JAVA
+set -- /opt/openjdk-bin-11.* /usr/lib*/openjdk-11
+while ! [ -d "${1}" ]; do
+	if [ ${#} -eq 1 ]; then
+		echo "Error: No JAVA 11 runtime found!"
+		exit 1
+	fi
+
+	shift
+done
+JAVA_HOME="${1}"
+
+# Set CLASSPATH
+for MONEYDANCE_JAR in ${MONEYDANCE_LIBS}/*.jar; do
+	CLASSPATH=${CLASSPATH}:${MONEYDANCE_JAR}
+done
+
+# Launch Moneydance
+"${JAVA_HOME}"/bin/java -cp "${CLASSPATH}" ${JAVA_OPTS} Moneydance
diff --git a/app-office/moneydance/moneydance-2019.1.ebuild b/app-office/moneydance/moneydance-2019.3.1880.ebuild
index e6885dce27bd..7b33f4976477 100644
--- a/app-office/moneydance/moneydance-2019.1.ebuild
+++ b/app-office/moneydance/moneydance-2019.3.1880.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit desktop eapi7-ver java-pkg-2 xdg-utils
 
 MY_PN="Moneydance"
-MY_PV="$(ver_cut 1)"
+MY_PV="$(ver_cut 1-2)_$(ver_cut 3)"
 
 DESCRIPTION="A cross-platform personal finance application"
 HOMEPAGE="https://moneydance.com/"
@@ -19,7 +19,6 @@ KEYWORDS="~amd64"
 RDEPEND="|| (
 		>=dev-java/openjdk-bin-11.0
 		>=dev-java/openjdk-11.0
-		>=dev-java/oracle-jdk-bin-11.0
 	)
 "
 
@@ -33,6 +32,8 @@ pkg_nofetch() {
 	elog "Please download ${A} from"
 	elog "https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_amd64.tar.gz"
 	elog "and place it in your DISTDIR directory."
+	elog ""
+	elog "Please keep in mind, that you have to rename the download to ${P}-amd64.tar.gz."
 }
 
 src_compile() {
@@ -41,9 +42,14 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar lib/*.jar
-	java-pkg_dolauncher moneydance --main "Moneydance" --java_args "-client -Dawt.useSystemAAFontSettings=gasp -Dawt.useSystemAAFontSettings=on -Xmx1024m"
 
-	doicon resources/*.png
+	newbin "${FILESDIR}/moneydance-bin" moneydance
+
+	local iconsizes="32 128 512"
+	for iconsize in ${iconsizes}; do
+		newicon -s ${iconsize} resources/moneydance_icon${iconsize}.png moneydance.png
+	done
+
 	make_desktop_entry "moneydance" "Moneydance" moneydance Office
 }