[gentoo-commits] proj/betagarden:master commit in: media-tv/mediathekview-bin/

[Sebastian Pipping]

commit:     4c6ad1edbd012b232a877c9a6196418f2b8877ba
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 16:01:35 2017 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 16:03:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=4c6ad1ed

media-tv/mediathekview-bin: 13.0.2

 .../mediathekview-bin/mediathekview-bin-10.ebuild  | 58 ----------------------
 .../mediathekview-bin/mediathekview-bin-11.ebuild  | 58 ----------------------
 ...in-7.ebuild => mediathekview-bin-13.0.2.ebuild} | 24 +++++----
 .../mediathekview-bin-3.1.0-r2.ebuild              | 37 --------------
 .../mediathekview-bin-3.2.1-r1.ebuild              | 42 ----------------
 .../mediathekview-bin/mediathekview-bin-4.ebuild   | 45 -----------------
 .../mediathekview-bin/mediathekview-bin-6.ebuild   | 45 -----------------
 .../mediathekview-bin/mediathekview-bin-9.ebuild   | 45 -----------------
 8 files changed, 13 insertions(+), 341 deletions(-)

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
similarity index 55%
rename from media-tv/mediathekview-bin/mediathekview-bin-7.ebuild
rename to 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
-}