gentoo resync : 25.08.2020

3 files changed, 44 insertions, 16 deletions

diff --git a/media-tv/tvbrowser-bin/Manifest b/media-tv/tvbrowser-bin/Manifest
index f49edf9ab665..a6851c52cd43 100644
--- a/media-tv/tvbrowser-bin/Manifest
+++ b/media-tv/tvbrowser-bin/Manifest
@@ -1,3 +1,4 @@
-DIST tvbrowser_4.0.1_bin.tar.gz 7226562 BLAKE2B 30dca72b982a0ac4c8e90bc27a066fd52d5bf3f92b07b66384657c96dfc877a7524fad0f634f35ba33ad53cbe341dea6e054f99688d456af2df0770ba7c3d0e5 SHA512 7c509df05c0b66d96428eb1850cabf353ef7a33b902abab05717a768b3f195b60d0033a680beae3ab6f8ea8c0d9deb77fd3c8c1ce15d05af58f27418759fd01f
-EBUILD tvbrowser-bin-4.0.1.ebuild 940 BLAKE2B 9199777ba3a54bf80cda98cc7860651de685c50c4d1010714ea6c743ad58fb33a7bab3d84807275f25b79c89f53bf36e628921181ab906a1b9e59330d36fb60f SHA512 de149184e0ca76eb14dea326262c33273c8f4618d9d982ae956d8c654dcb72a77c01e1cc8a818a9f40e86c4ef0fd3f3421a2117ea6d4274b864bf239a85ee5f0
+AUX tvbrowser 937 BLAKE2B 1e004b137e2da73fca04881dc7650cd7f2cea9e6270da77c63b040393d6d9b3e5b077950e9c4adb2aabf5951a888c3921f76f076788c5ce33f70a9f7d3f33940 SHA512 1d92bf79356f65535f83c8d5ae5ebe6e75534cfe9a463b7ed7cd3ede24f1948d01cae53f5bbbf88ec7b627da46bd9ed630ccada5acab3f59ffbf400fbebeea64
+DIST tvbrowser-bin-4.2.1.tar.gz 5488609 BLAKE2B 7a40c202cd46be7a87f8179c9924ba976aba2fd50d976a3737180a6d53e8c2bfc63e6d72e95275072223b150e3f47e5839e29497fc332e86520b6ccd5fd5ac36 SHA512 c2d0ff4124c3409c73b3e01969dc88abd5652c1ff2df177044827811345343ac47641acc288c9100e0b9dc690bb5544ef41f70299728cb9322f3b3bb51c0da0e
+EBUILD tvbrowser-bin-4.2.1.ebuild 1006 BLAKE2B 6574e7c3c6863adb549dc2a9c052f7306eb4b23b18ad768eb11def088d7c8de8434db1ab8f069ab426b4d85a289b7d1d7ad13919f8251f84a048513503371dc9 SHA512 7c4a2f7c6f65b632485f47bc59a851179ec65cdc52bffed0f2e44fbbbcfaeb0641b8b7369e3be0e4107486828bf809f16e9931158a689d6d97fbae6c61e2054e
 MISC metadata.xml 456 BLAKE2B e07b1cdc49d2ba3db95d9e1a16ded9579e1bd78d39fe63569904b809c9d60dc6d3c50ec9944ed5137f085aa8db3be587732b54ba03e6b9195091ce834d650358 SHA512 d988ce2155df28e05b80f8900efa134a8d3434b82869d016e9649ea8dbbeb5efaf098b2f7009f7a52b4f1839b7a3b9745d7bd18fff8e645fbe4290a76becb4b1
diff --git a/media-tv/tvbrowser-bin/files/tvbrowser b/media-tv/tvbrowser-bin/files/tvbrowser
new file mode 100644
index 000000000000..5222bd3b8147
--- /dev/null
+++ b/media-tv/tvbrowser-bin/files/tvbrowser
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# These variables are induced by the ebuild during the build process
+P=
+JAVA_SLOT=
+
+POSSIBLE_JAVA_PROGRAM_DIRS=(
+    /usr/lib*/openjdk-${JAVA_SLOT}
+    /opt/openjdk-bin-${JAVA_SLOT}
+    /opt/openjdk-jre-bin-${JAVA_SLOT}
+)
+
+for POSSIBLE_DIR in ${POSSIBLE_JAVA_PROGRAM_DIRS[@]}; do
+    if [[ -x ${POSSIBLE_DIR}/bin/java ]]; then
+	export JAVA_PROGRAM_DIR="${POSSIBLE_DIR}/bin/"
+	break
+    fi
+done
+
+if [ -z "$JAVA_PROGRAM_DIR" ]; then
+    echo "Could not find a suitable Java ${JAVA_SLOT} installation!"
+    exit 1
+fi
+
+cd "/opt/${P}"
+echo ${JAVA_PROGRAM_DIR}java -Xms16m -Xmx1G --module-path="lib:tvbrowser.jar" -Djava.library.path="./" -splash:imgs/splash.png -Dpropertiesfile=linux.properties -m tvbrowser/tvbrowser.TVBrowser "$@"
+${JAVA_PROGRAM_DIR}java -Xms16m -Xmx1G --module-path="lib:tvbrowser.jar" -Djava.library.path="./" -splash:imgs/splash.png -Dpropertiesfile=linux.properties -m tvbrowser/tvbrowser.TVBrowser "$@"
+
diff --git a/media-tv/tvbrowser-bin/tvbrowser-bin-4.0.1.ebuild b/media-tv/tvbrowser-bin/tvbrowser-bin-4.2.1.ebuild
index 8b084f826f68..d5d998615c23 100644
--- a/media-tv/tvbrowser-bin/tvbrowser-bin-4.0.1.ebuild
+++ b/media-tv/tvbrowser-bin/tvbrowser-bin-4.2.1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit desktop
 
-MY_PN="tvbrowser"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
 HOMEPAGE="https://www.tvbrowser.org"
-SRC_URI="mirror://sourceforge/project/tvbrowser/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${PV}/${MY_PN}_${PV}_bin.tar.gz"
-
+MY_PN="tvbrowser"
+SRC_URI="mirror://sourceforge/project/tvbrowser/TV-Browser%20Releases%20%28Java%2011%20and%20higher%29/${PV}/${MY_PN}_${PV}_bin.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
-RDEPEND="virtual/jdk:1.8"
+JAVA_SLOT=11
+RDEPEND="|| ( dev-java/openjdk:${JAVA_SLOT}
+	dev-java/openjdk-bin:${JAVA_SLOT}
+	dev-java/openjdk-jre-bin:${JAVA_SLOT} )"
 
-S="${WORKDIR}"/"${MY_P}"
+S="${WORKDIR}"/"${MY_PN}-${PV}"
 
 src_install() {
 	# Copy files and directories
@@ -27,11 +27,10 @@ src_install() {
 
 	# Generate launcher
 	exeinto /opt/bin
-	newexe - tvbrowser <<-_EOF_
-		#!/bin/bash
-		export JAVA_OPTS="\${JAVA_OPTS} -Dpropertiesfile=/opt/${P}/linux.properties"
-		exec /bin/bash /opt/${P}/tvbrowser.sh "\$@"
-	_EOF_
+	sed -e "s/^P=.*\$/P=${P}/" \
+		-e "s/^JAVA_SLOT=.*\$/JAVA_SLOT=${JAVA_SLOT}/" \
+		"${FILESDIR}"/tvbrowser | \
+		newexe - tvbrowser || die
 
 	# Generate desktop entry
 	make_desktop_entry tvbrowser "TV-Browser" \