[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/bt747/files/, sci-geosciences/bt747/

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/bt747/files/, sci-geosciences/bt747/

[James Le Cuirot]

commit:     be4ae75fb49cef2249a97e982428d9181f019d38
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 13:02:41 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 13:09:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4ae75f

sci-geosciences/bt747: Version bump to 2.1.3, closes bug #503810

This is needed in order to remove Java 6 because of jcharts. All the
libraries are now unbundled and a desktop entry is now included. The
jchart2d patch is admittedly guesswork so please report to me if it
does strange things at runtime.

Package-Manager: portage-2.2.27

 sci-geosciences/bt747/Manifest                 |  2 +
 sci-geosciences/bt747/bt747-2.1.3.ebuild       | 66 ++++++++++++++++++++++++++
 sci-geosciences/bt747/files/jchart2d-3.2.patch | 15 ++++++
 3 files changed, 83 insertions(+)

diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest
index eeffc6a..473ff61 100644
--- a/sci-geosciences/bt747/Manifest
+++ b/sci-geosciences/bt747/Manifest
@@ -1 +1,3 @@
 DIST BT747_2.0.3_full.zip 10678027 SHA256 592544312e4d31826c419c051dd56b242faec7f0ca13e9da370140e123d29bb0 SHA512 678eb29f1c639627db32a119b24b3c93d6551cb785346f5bfa6363761147196f99dc46e18969923807bf632b52f66ce06b559230f676d6b3a6908cf27fe19a6f WHIRLPOOL 86a2d47b710145b78f2a9b31ddd96ae1731ce5778786fe3c447d980a3b6e9a335de52f24e31eca56607cd25d3b7a063aab740f820565a1ffbfd5ed95b2c85f21
+DIST BT747_2.1.3_full.zip 9714015 SHA256 434c1f854a00d146057488c448ca4f9456c38316ef3157ce195aab9b02c789ba SHA512 519059df07901036c4631936eae90dd2578100432d40fa7a068588ce72004591efd507a259607101e09ad259c328cd533fe6ec5a7f9f4d892aed5eb2a5622ba3 WHIRLPOOL 2e42cb3adfba25a7fbb36ccbd9574f205185938116b7f7f2631e1150f04a8a2ccd9c8b8a1fa1bc84c4e1086f880fa47aad24c01da0df6bf044709dff903e26f2
+DIST bt747.gif 5903 SHA256 6e2aa20d9fcdf44b8ac779f0a12a87480cd6f3f1b47127b250bac978c1d42149 SHA512 55c3bbc9ec5fe12261b2604980c7b5d4416afa3ec73f7834c62d3ebbdf4580b247c1feb2ac112f876e7110a8aabe652da39d2181f01661435ba465671a631252 WHIRLPOOL 15413f4fcfb23051f770c91c9a73bc5a41dc1268b3a985c4d3e33e4dbd36d6aee510c7fdcdf8b26dac296226c175fa6cb927c9f6e8537ab1cf8616f37c2da552

diff --git a/sci-geosciences/bt747/bt747-2.1.3.ebuild b/sci-geosciences/bt747/bt747-2.1.3.ebuild
new file mode 100644
index 0000000..af77a9f
--- /dev/null
+++ b/sci-geosciences/bt747/bt747-2.1.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="MTK GPS Datalogger Device Control"
+HOMEPAGE="http://www.bt747.org"
+SRC_URI="mirror://sourceforge/${PN}/Stable/BT747_${PV}_full.zip
+	http://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif"
+
+LICENSE="GPL-3"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/commons-imaging:0
+	dev-java/jcalendar:1.2
+	dev-java/jchart2d:0
+	dev-java/jopt-simple:4.4
+	>=dev-java/rxtx-2.2_pre2:2
+	dev-java/swing-layout:1
+	dev-java/swingx:1.6
+	dev-java/swingx-ws:bt747
+"
+RDEPEND="${COMMON_DEP}
+	dev-libs/glib:2[dbus]
+	>=virtual/jre-1.7
+"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.7
+	app-arch/unzip
+"
+
+EANT_BUILD_TARGET="dist.j2se"
+EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo"
+EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple-4.4,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	# Fix for newer jchart2d.
+	epatch "${FILESDIR}/jchart2d-3.2.patch"
+
+	# Remove all the bundled stuff.
+	rm -rv dist/ lib/ || die
+
+	# GraphicsUtilities moved in later SwingX versions.
+	sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
+		src_j2se/net/sf/bt747/j2se/app/list/FileListCellRenderer.java || die
+}
+
+src_install() {
+	dodoc {ChangeLog,README}.txt
+
+	java-pkg_dojar dist/*.jar
+	java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \
+		--java-args="-Xmx192m"
+
+	doicon "${DISTDIR}/${PN}.gif"
+	make_desktop_entry ${PN} BT747 bt747.gif
+
+}

diff --git a/sci-geosciences/bt747/files/jchart2d-3.2.patch b/sci-geosciences/bt747/files/jchart2d-3.2.patch
new file mode 100644
index 0000000..8f81a5a
--- /dev/null
+++ b/sci-geosciences/bt747/files/jchart2d-3.2.patch
@@ -0,0 +1,15 @@
+--- src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java.orig	2010-03-08 22:15:41.000000000 +0000
++++ src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java	2016-02-10 22:17:02.188118721 +0000
+@@ -46,9 +46,9 @@
+         heightAxis.getAxisTitle().setTitle("Height");
+         speedAxis.getAxisTitle().setTitle("Speed");
+ 
+-        setAxisXBottom(timeAxis);
+-        setAxisYLeft(heightAxis);
+-        setAxisYRight(speedAxis);
++        setAxisXBottom(timeAxis, 0);
++        setAxisYLeft(heightAxis, 0);
++        setAxisYRight(speedAxis, 0);
+ 
+     }
+