media-tv/mediathekview-bin: 13.0.2

9 files changed, 14 insertions, 349 deletions

diff --git a/media-tv/mediathekview-bin/Manifest b/media-tv/mediathekview-bin/Manifest
index e31e17b..c83c905 100644
--- a/media-tv/mediathekview-bin/Manifest
+++ b/media-tv/mediathekview-bin/Manifest
@@ -1,8 +1 @@
-DIST MediathekView_10.zip 31918217 SHA256 00c82c646f89fa3cf5dfc6105a43d53d5936f5a86954c850894f32d7fddf1b61 SHA512 4dd5fd31879387ccf01a7fa5576b36c796cea7e10d60c88c876d4a20616866e63cb49d31f4af97e37477cd6952ee760a18b51d99bbec095fd966716837c10189 WHIRLPOOL c1547fa0069951374fd0073629a165f132eecd4df217cdb23ca8cdc8ba1a23450f41ca0f7d536e0541382b3370fe2d855758964d13d1454ee2a5fc9fc806a8ca
-DIST MediathekView_11.zip 37860047 SHA256 1846e2e2dcb29ea0f1c1d4e33587a971de16453a6d733b1f71b37bd19c4ccbbf SHA512 fc7f673ae76889abced79cd59cca9b6935afa7649c2240047f34645c56ac91d5ffa879085c3eebcfb6b2014a48d599d898eb7c2227e5951da74023cabce38c5d WHIRLPOOL 07b77323d5901e5371b0b3ff4146b1bd8f3f494deca7272f89f2d64934c98cf5ec348cdcd84ed8df0772648cc50f98d8bb703a10c1a4d369e2f090fe3cb9e2d2
-DIST MediathekView_3.1.0.zip 4343470 SHA256 9cd892762eae310965be0b910785ef65172b9a5ecacc5f09854994322d9ec921 SHA512 dcb1c026a475be3b086656fad4b30dc72f9f5f15e8c8092d19b6f115ddbb71ac46910cd3c4a19d60e80adb69de4cc2fa52d7362abdd50669630cd8324e729cc3 WHIRLPOOL 4ba3fc38053c71c17ec7e7866df80d50cc9797098dcf384791c1eb6aa2b06b77166dcd7224c4758d5b7eb603f4a937b4764be81231d96d09a53bb9246064d73d
-DIST MediathekView_3.2.1.zip 9737619 SHA256 ea09ead028eedd5e225e1371af43bf3b8a431f0c819cc0e5f65b6fc710279c97 SHA512 0bc6a8802b9001a26e1a80f5639fa4b1a71682b2f746c03517598d8eee0621751c1b9969f3cafa7dd0c37535c580e20d36251f5497c825628e12bc5df1bda97e WHIRLPOOL f186bc4979857418453767d1ee0f9550be00454184da95a26fcd712f3e29e3eb77550d3180acf2eddf0cea3f4fa4db13945869dc4783d61b180b16dad8d1a4d7
-DIST MediathekView_4.zip 29640231 SHA256 7664a474094966567a39dd993e8af453639d5b5499dbd5116bd6a9af340018f1 SHA512 1bbdb1a5b3e633777bc0417907e78366a36f8691360381d9e0e8fd72690989318bb6e449c77aebd1b7838d9f9c4a24d43bdf3cc053ffdda2c1b60400ecb478a9 WHIRLPOOL 983bf2f5c32699d47b7b22670338b475e6d61ce9a369f353a0eca6d78a07233c440f7d095f0c0312a67c5a32e6f757594d4e61a6793abf0cd846ce2670ebf803
-DIST MediathekView_6.zip 28875706 SHA256 422dcbc021d5b227b4882dafbdfa97bd60e4816e1c6111a0cebe4a069fc13659 SHA512 f5ced059620e12259cf19a5626dc258e957b3225908f068cdc64facd9a094645a6152dc7152b4025a1bea34d2acebfced3776f2548c2265429d69e682e517559 WHIRLPOOL dfb39c8ff2d432a51fb61096f71f25bf473d5bbb376e634d4fb2e983247d2e065bdca0bb1338634ae64bb52c94a7b482202141d233312c1b389770a2c0e1a270
-DIST MediathekView_7.zip 30755210 SHA256 f22ecb80d80421b73a7e7e954ec016cd18f31c00b78460c40f4fb971ff5d06b2 SHA512 72472db40909133910af42a3678d39f67245e193c1d1b9d5de6a8cb777c42a3f008706656ab8cd6fc9de6964d23f0f388598cbc47d23e8cf32eef9d88b9cf8fc WHIRLPOOL 9199c8aead784e136e2635d89a14522cb793f7c8dfceec6aa166c84cf57331c8f8663199fb00fd14b652c8e5577d8ad281fe2fb1a8308563388896a6f23cdde8
-DIST MediathekView_9.zip 31682440 SHA256 449dce4d080f230f3e9d683721aee5ad6a548c59db1f2e6bb8e98f915f04cef1 SHA512 c205817e7a2b8d5478eccf4cbe949d78dfc247411688361b04453369a4bc27b07658f16dcf809292ad0c6ad89bb81543ae60c7fe9d9667032d34e9da95aae971 WHIRLPOOL ea04b176bf985bf1f6c910bc61747141b39c854175a66e170929d4a6e13b5378ad6ac59344f49725b538603dfb6796dbca47fde3afca6c8d9cb1888b04546ecd
+DIST MediathekView-13.0.2.zip 27674465 SHA256 1e4ee0fa685a3d44dd0bbfbd48922f883210cbbb0c6e027f3459f7f0f992c2a0 SHA512 377eb0f1ec453b100b8d4fb6143572dbf4397329ee3cd24837a7a194a558bd7e3a8900889217d4ed68dc5a20aacc208f8de429088c3ded657751100fe9103e6f WHIRLPOOL f1cc1720ccd5360fa53fc8c4c421ca3a39a51625e036e6e133246699d0c220ae9b11f0ecf3e5dea5a4dd7077205f4aab22c9045772c3cbcc9c27e53e4abb4ab6
diff --git a/media-tv/mediathekview-bin/mediathekview-bin-10.ebuild b/media-tv/mediathekview-bin/mediathekview-bin-10.ebuild
deleted file mode 100644
index 46f6555..0000000
--- a/media-tv/mediathekview-bin/mediathekview-bin-10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="Download files from the public broadcasting services"
-HOMEPAGE="http://zdfmediathk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zdfmediathk/Mediathek/Mediathek%20${PV}/MediathekView_${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	media-video/vlc
-	media-video/flvstreamer
-	>=dev-java/commons-compress-1.8.1:0
-	>=dev-java/commons-lang-3.3.2:3.3
-	dev-java/jgoodies-common:1.8
-	dev-java/jgoodies-forms:1.8
-	dev-java/xz-java:0
-	"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	rm lib/commons-compress-1.8.1.jar || die
-	rm lib/commons-lang3-3.3.2.jar || die
-	rm lib/jgoodies-common-1.8.0.jar || die
-	rm lib/jgoodies-forms-1.8.0.jar || die
-	rm lib/xz.jar || die
-
-	ewarn "Bundled libs remaining:"
-	ewarn "$(find lib -name '*.jar' | sort)"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar MediathekView.jar
-	java-pkg_dojar lib/*.jar
-
-	exeinto /usr/share/${PN}/lib/bin/
-	doexe bin/flv.sh || die
-
-	java-pkg_register-dependency commons-compress commons-compress.jar
-	java-pkg_register-dependency commons-lang-3.3 commons-lang.jar
-	java-pkg_register-dependency jgoodies-common-1.8 jgoodies-common.jar
-	java-pkg_register-dependency jgoodies-forms-1.8 jgoodies-forms.jar
-	java-pkg_register-dependency xz-java xz.jar
-
-	java-pkg_dolauncher ${PN} --main mediathek.Main
-}
diff --git a/media-tv/mediathekview-bin/mediathekview-bin-11.ebuild b/media-tv/mediathekview-bin/mediathekview-bin-11.ebuild
deleted file mode 100644
index 46f6555..0000000
--- a/media-tv/mediathekview-bin/mediathekview-bin-11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="Download files from the public broadcasting services"
-HOMEPAGE="http://zdfmediathk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zdfmediathk/Mediathek/Mediathek%20${PV}/MediathekView_${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	media-video/vlc
-	media-video/flvstreamer
-	>=dev-java/commons-compress-1.8.1:0
-	>=dev-java/commons-lang-3.3.2:3.3
-	dev-java/jgoodies-common:1.8
-	dev-java/jgoodies-forms:1.8
-	dev-java/xz-java:0
-	"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	rm lib/commons-compress-1.8.1.jar || die
-	rm lib/commons-lang3-3.3.2.jar || die
-	rm lib/jgoodies-common-1.8.0.jar || die
-	rm lib/jgoodies-forms-1.8.0.jar || die
-	rm lib/xz.jar || die
-
-	ewarn "Bundled libs remaining:"
-	ewarn "$(find lib -name '*.jar' | sort)"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar MediathekView.jar
-	java-pkg_dojar lib/*.jar
-
-	exeinto /usr/share/${PN}/lib/bin/
-	doexe bin/flv.sh || die
-
-	java-pkg_register-dependency commons-compress commons-compress.jar
-	java-pkg_register-dependency commons-lang-3.3 commons-lang.jar
-	java-pkg_register-dependency jgoodies-common-1.8 jgoodies-common.jar
-	java-pkg_register-dependency jgoodies-forms-1.8 jgoodies-forms.jar
-	java-pkg_register-dependency xz-java xz.jar
-
-	java-pkg_dolauncher ${PN} --main mediathek.Main
-}
diff --git a/media-tv/mediathekview-bin/mediathekview-bin-7.ebuild b/media-tv/mediathekview-bin/mediathekview-bin-13.0.2.ebuild
index 6ecfc66..29c2fed 100644
--- a/media-tv/mediathekview-bin/mediathekview-bin-7.ebuild
+++ b/media-tv/mediathekview-bin/mediathekview-bin-13.0.2.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 inherit java-pkg-2
 
+MY_PN=MediathekView
 DESCRIPTION="Download files from the public broadcasting services"
 HOMEPAGE="http://zdfmediathk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zdfmediathk/Mediathek/Mediathek%20${PV}/MediathekView_${PV}.zip"
+SRC_URI="https://github.com/${MY_PN,,}/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8 >=dev-java/oracle-jre-bin-1.8[javafx]
 	media-video/vlc
 	media-video/flvstreamer
-	dev-java/xz-java"
+	"
 
-S=${WORKDIR}
+S="${WORKDIR}"/${MY_PN}-${PV}
 
 src_prepare() {
-	rm lib/xz.jar
-
 	ewarn "Bundled libs remaining:"
 	ewarn "$(find lib -name '*.jar' | sort)"
+	eapply_user
 }
 
 src_compile() {
@@ -39,7 +39,9 @@ src_install() {
 	exeinto /usr/share/${PN}/lib/bin/
 	doexe bin/flv.sh || die
 
-	java-pkg_register-dependency xz-java xz.jar
-
 	java-pkg_dolauncher ${PN} --main mediathek.Main
+
+	# FIXME javafx:
+	local javafx_jar="$(ls -1 /opt/oracle-jre-bin-1.8.*/lib/ext/jfxrt.jar)"
+	sed "s,^CLASSPATH=\"\(.*\)\",CLASSPATH=\"\1:${javafx_jar}\"," -i "${JAVA_PKG_ENV}" || die
 }
diff --git a/media-tv/mediathekview-bin/mediathekview-bin-3.1.0-r2.ebuild b/media-tv/mediathekview-bin/mediathekview-bin-3.1.0-r2.ebuild
deleted file mode 100644
index a70dc84..0000000
--- a/media-tv/mediathekview-bin/mediathekview-bin-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit java-pkg-2
-
-DESCRIPTION="Download files from the public broadcasting services"
-HOMEPAGE="http://zdfmediathk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zdfmediathk/Mediathek/Mediathek%20${PV}/MediathekView_${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-compress-1.4
-	media-video/vlc
-	media-video/flvstreamer"
-
-S=${WORKDIR}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar MediathekView.jar
-
-	insinto /usr/share/${PN}/lib/bin/
-	doins bin/flv.sh || die
-
-	java-pkg_register-dependency commons-compress commons-compress.jar
-
-	java-pkg_dolauncher ${PN} --main mediathek.Main
-}
diff --git a/media-tv/mediathekview-bin/mediathekview-bin-3.2.1-r1.ebuild b/media-tv/mediathekview-bin/mediathekview-bin-3.2.1-r1.ebuild
deleted file mode 100644
index a83b385..0000000
--- a/media-tv/mediathekview-bin/mediathekview-bin-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit java-pkg-2
-
-DESCRIPTION="Download files from the public broadcasting services"
-HOMEPAGE="http://zdfmediathk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zdfmediathk/Mediathek/Mediathek%20${PV}/MediathekView_${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4
-	media-video/vlc
-	media-video/flvstreamer
-	>=dev-java/commons-compress-1.4
-	dev-java/swingx:1.6
-	>=dev-java/jgoodies-forms-1.3.0"
-
-S=${WORKDIR}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar MediathekView.jar
-	java-pkg_dojar lib/jide-oss-3.5.1.jar
-
-	insinto /usr/share/${PN}/lib/bin/
-	doins bin/flv.sh || die
-
-	java-pkg_register-dependency commons-compress commons-compress.jar
-	java-pkg_register-dependency jgoodies-forms forms.jar
-	java-pkg_register-dependency swingx-1.6 swingx.jar
-
-	java-pkg_dolauncher ${PN} --main mediathek.Main
-}
diff --git a/media-tv/mediathekview-bin/mediathekview-bin-4.ebuild b/media-tv/mediathekview-bin/mediathekview-bin-4.ebuild
deleted file mode 100644
index e105de0..0000000
--- a/media-tv/mediathekview-bin/mediathekview-bin-4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit java-pkg-2
-
-DESCRIPTION="Download files from the public broadcasting services"
-HOMEPAGE="http://zdfmediathk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zdfmediathk/Mediathek/Mediathek%20${PV}/MediathekView_${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	media-video/vlc
-	media-video/flvstreamer
-	dev-java/xz-java"
-
-S=${WORKDIR}
-
-src_prepare() {
-	rm lib/xz.jar
-
-	ewarn "Bundled libs remaining:"
-	ewarn "$(find lib -name '*.jar' | sort)"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar MediathekView.jar
-	java-pkg_dojar lib/*.jar
-
-	insinto /usr/share/${PN}/lib/bin/
-	doins bin/flv.sh || die
-
-	java-pkg_register-dependency xz-java xz.jar
-
-	java-pkg_dolauncher ${PN} --main mediathek.Main
-}
diff --git a/media-tv/mediathekview-bin/mediathekview-bin-6.ebuild b/media-tv/mediathekview-bin/mediathekview-bin-6.ebuild
deleted file mode 100644
index e105de0..0000000
--- a/media-tv/mediathekview-bin/mediathekview-bin-6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit java-pkg-2
-
-DESCRIPTION="Download files from the public broadcasting services"
-HOMEPAGE="http://zdfmediathk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zdfmediathk/Mediathek/Mediathek%20${PV}/MediathekView_${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	media-video/vlc
-	media-video/flvstreamer
-	dev-java/xz-java"
-
-S=${WORKDIR}
-
-src_prepare() {
-	rm lib/xz.jar
-
-	ewarn "Bundled libs remaining:"
-	ewarn "$(find lib -name '*.jar' | sort)"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar MediathekView.jar
-	java-pkg_dojar lib/*.jar
-
-	insinto /usr/share/${PN}/lib/bin/
-	doins bin/flv.sh || die
-
-	java-pkg_register-dependency xz-java xz.jar
-
-	java-pkg_dolauncher ${PN} --main mediathek.Main
-}
diff --git a/media-tv/mediathekview-bin/mediathekview-bin-9.ebuild b/media-tv/mediathekview-bin/mediathekview-bin-9.ebuild
deleted file mode 100644
index 6ecfc66..0000000
--- a/media-tv/mediathekview-bin/mediathekview-bin-9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit java-pkg-2
-
-DESCRIPTION="Download files from the public broadcasting services"
-HOMEPAGE="http://zdfmediathk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zdfmediathk/Mediathek/Mediathek%20${PV}/MediathekView_${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	media-video/vlc
-	media-video/flvstreamer
-	dev-java/xz-java"
-
-S=${WORKDIR}
-
-src_prepare() {
-	rm lib/xz.jar
-
-	ewarn "Bundled libs remaining:"
-	ewarn "$(find lib -name '*.jar' | sort)"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar MediathekView.jar
-	java-pkg_dojar lib/*.jar
-
-	exeinto /usr/share/${PN}/lib/bin/
-	doexe bin/flv.sh || die
-
-	java-pkg_register-dependency xz-java xz.jar
-
-	java-pkg_dolauncher ${PN} --main mediathek.Main
-}