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

2024-04-10 Thread Arthur Zamarin 
commit: 8aefed45a9fbdb82ceb8399a07525785aedeea7c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Jan 26 13:05:44 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Apr 10 19:37:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aefed45

sci-geosciences/bt747: update EAPI 6 -> 8

Closes: https://bugs.gentoo.org/914467
Closes: https://bugs.gentoo.org/916574
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Arthur Zamarin  gentoo.org>

 ...bt747-2.1.7-r2.ebuild => bt747-2.1.7-r3.ebuild} | 26 +-
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild 
b/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild
similarity index 85%
rename from sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
rename to sci-geosciences/bt747/bt747-2.1.7-r3.ebuild
index 72062ed3a7cf..8e3037d93822 100644
--- a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
+++ b/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit desktop java-pkg-2 java-ant-2
 
 DESCRIPTION="MTK GPS Datalogger Device Control"
 HOMEPAGE="https://www.bt747.org;
-SRC_URI="mirror://sourceforge/${PN}/Stable/BT747_${PV}_full.zip
+SRC_URI="mirror://sourceforge/project/bt747/Development/BT747_${PV}_full.zip
https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif"
+S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="app-arch/unzip:0"
 CDEPEND="
dev-java/commons-imaging:0
dev-java/jcalendar:1.2
@@ -24,17 +26,12 @@ CDEPEND="
dev-java/swingx:1.6
dev-java/swingx-ws:bt747
 "
-
-RDEPEND="
-   ${CDEPEND}
+RDEPEND="${CDEPEND}
dev-libs/glib:2[dbus]
-   >=virtual/jre-1.7
+   >=virtual/jre-1.8:*
 "
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-1.7
-   app-arch/unzip
+DEPEND="${CDEPEND}
+   >=virtual/jdk-1.8:*
 "
 
 EANT_BUILD_TARGET="dist.j2se"
@@ -42,9 +39,8 @@ EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true 
-Dsvnversion=true -Dbuild.curren
 
EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 
-S="${WORKDIR}"
-
 src_prepare() {
+   java-pkg-2_src_prepare
# Fix for newer jchart2d.
eapply "${FILESDIR}/jchart2d-3.2.patch"
 
@@ -54,8 +50,6 @@ src_prepare() {
# 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
-
-   eapply_user
 }
 
 src_install() {

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

2021-04-21 Thread Sam James 
commit: 92250e7e113833d5a3d30b0f2f4c8524a743
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 21 09:50:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 21 18:50:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9225

sci-geosciences/bt747: drop epatch

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/bt747/bt747-2.1.7-r2.ebuild| 4 ++--
 sci-geosciences/bt747/files/jchart2d-3.2.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild 
b/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
index 4e7c78038fa..72062ed3a7c 100644
--- a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
+++ b/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit epatch java-pkg-2 java-ant-2
+inherit desktop java-pkg-2 java-ant-2
 
 DESCRIPTION="MTK GPS Datalogger Device Control"
 HOMEPAGE="https://www.bt747.org;
@@ -46,7 +46,7 @@ S="${WORKDIR}"
 
 src_prepare() {
# Fix for newer jchart2d.
-   epatch "${FILESDIR}/jchart2d-3.2.patch"
+   eapply "${FILESDIR}/jchart2d-3.2.patch"
 
# Remove all the bundled stuff.
rm -rv dist/ lib/ || die

diff --git a/sci-geosciences/bt747/files/jchart2d-3.2.patch 
b/sci-geosciences/bt747/files/jchart2d-3.2.patch
index 8f81a5a4a59..c1dfe9fb285 100644
--- a/sci-geosciences/bt747/files/jchart2d-3.2.patch
+++ b/sci-geosciences/bt747/files/jchart2d-3.2.patch
@@ -1,5 +1,5 @@
 src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java.orig   
2010-03-08 22:15:41.0 +
-+++ src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java
2016-02-10 22:17:02.188118721 +
+--- a/src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java
 b/src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java
 @@ -46,9 +46,9 @@
  heightAxis.getAxisTitle().setTitle("Height");
  speedAxis.getAxisTitle().setTitle("Speed");

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

2018-06-09 Thread Aaron Bauman 
commit: cfe9326ccb1b90614ffae04fcdb0c9532ab846bb
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu May 31 19:08:41 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Jun  9 14:08:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe9326c

sci-geosciences/bt747: use HTTPs

 sci-geosciences/bt747/bt747-2.1.7-r1.ebuild | 6 +++---
 sci-geosciences/bt747/bt747-2.1.7-r2.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild 
b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
index 94c6f870e37..d55b5a6b403 100644
--- a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
+++ b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,9 +6,9 @@ EAPI=6
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="MTK GPS Datalogger Device Control"
-HOMEPAGE="http://www.bt747.org;
+HOMEPAGE="https://www.bt747.org;
 SRC_URI="mirror://sourceforge/${PN}/Stable/BT747_${PV}_full.zip
-   http://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif"
+   https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif"
 
 LICENSE="GPL-3"
 SLOT="1"

diff --git a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild 
b/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
index 17c7ae799eb..33434af2b11 100644
--- a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
+++ b/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,9 +6,9 @@ EAPI=6
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="MTK GPS Datalogger Device Control"
-HOMEPAGE="http://www.bt747.org;
+HOMEPAGE="https://www.bt747.org;
 SRC_URI="mirror://sourceforge/${PN}/Stable/BT747_${PV}_full.zip
-   http://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif"
+   https://www.bt747.org/icon/bt747_128x128.gif -> ${PN}.gif"
 
 LICENSE="GPL-3"
 SLOT="1"

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

2017-04-07 Thread Amy Liffey 
commit: 78c0d1870fa19c1c900fe932c7141eeb7ac58d4f
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Apr  7 12:44:59 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Apr  7 12:44:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c0d187

Revert "sci-geosciences/bt747: fix jopt-simple missing bug #594698. Vadim 
Efimov"

This reverts commit 41f4f3830a33ce872dbb907623c8aaa1beaf4450.

 sci-geosciences/bt747/bt747-2.1.7-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild 
b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
index 17c7ae799eb..94c6f870e37 100644
--- a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
+++ b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,12 +39,12 @@ DEPEND="
 
 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,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747"
+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}"
 
-src_prepare() {
+java_prepare() {
# Fix for newer jchart2d.
epatch "${FILESDIR}/jchart2d-3.2.patch"

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

2017-04-07 Thread Amy Liffey 
commit: 83aada622d727f2bf92c280a3e420f17262c04ad
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Apr  7 12:40:10 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Apr  7 12:42:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83aada62

sci-geosciences/bt747: missing jopt-simple missing bug #594698. Vadim Efimov

Package-Manager: portage-2.3.0

 sci-geosciences/bt747/bt747-2.1.7-r2.ebuild | 70 +
 1 file changed, 70 insertions(+)

diff --git a/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild 
b/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
new file mode 100644
index 000..17c7ae799eb
--- /dev/null
+++ b/sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+CDEPEND="
+   dev-java/commons-imaging:0
+   dev-java/jcalendar:1.2
+   dev-java/jchart2d:0
+   dev-java/jopt-simple:0
+   >=dev-java/rxtx-2.2_pre2:2
+   dev-java/swing-layout:1
+   dev-java/swingx:1.6
+   dev-java/swingx-ws:bt747
+"
+
+RDEPEND="
+   ${CDEPEND}
+   dev-libs/glib:2[dbus]
+   >=virtual/jre-1.7
+"
+
+DEPEND="
+   ${CDEPEND}
+   >=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,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+S="${WORKDIR}"
+
+src_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
+
+   eapply_user
+}
+
+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
+}

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

2017-04-07 Thread Amy Liffey 
commit: 41f4f3830a33ce872dbb907623c8aaa1beaf4450
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Apr  7 12:29:51 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Apr  7 12:42:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f4f383

sci-geosciences/bt747: fix jopt-simple missing bug #594698. Vadim Efimov

Package-Manager: portage-2.3.0

 sci-geosciences/bt747/bt747-2.1.7-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild 
b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
index 94c6f870e37..17c7ae799eb 100644
--- a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
+++ b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,12 +39,12 @@ DEPEND="
 
 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"
+EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 
 S="${WORKDIR}"
 
-java_prepare() {
+src_prepare() {
# Fix for newer jchart2d.
epatch "${FILESDIR}/jchart2d-3.2.patch"

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

2016-09-21 Thread Patrice Clement 
commit: c04c73f4d1f6e54afe8a8d188cfcf4354eb06655
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Sep 21 07:56:02 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Sep 21 08:09:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c04c73f4

sci-geosciences/bt747: bump jopt-simple SLOT.

Gentoo-Bug: https://bugs.gentoo.org/594582

Package-Manager: portage-2.2.28

 sci-geosciences/bt747/Manifest |  1 -
 sci-geosciences/bt747/bt747-2.1.3.ebuild   | 66 --
 .../{bt747-2.1.7.ebuild => bt747-2.1.7-r1.ebuild}  | 12 ++--
 3 files changed, 8 insertions(+), 71 deletions(-)

diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest
index f564112..1c3a572 100644
--- a/sci-geosciences/bt747/Manifest
+++ b/sci-geosciences/bt747/Manifest
@@ -1,3 +1,2 @@
-DIST BT747_2.1.3_full.zip 9714015 SHA256 
434c1f854a00d146057488c448ca4f9456c38316ef3157ce195aab9b02c789ba SHA512 
519059df07901036c4631936eae90dd2578100432d40fa7a068588ce72004591efd507a259607101e09ad259c328cd533fe6ec5a7f9f4d892aed5eb2a5622ba3
 WHIRLPOOL 
2e42cb3adfba25a7fbb36ccbd9574f205185938116b7f7f2631e1150f04a8a2ccd9c8b8a1fa1bc84c4e1086f880fa47aad24c01da0df6bf044709dff903e26f2
 DIST BT747_2.1.7_full.zip 9649645 SHA256 
d8a9c3920a6b5de75cac41da74e3fa49f134104ea9293504386ebc7a81fc91df SHA512 
362533ccbf6b9252d6d7e09497a75038b0776e76a2c2f73f05e2abc0c521d0a640d0ae9e7d5d40da1d14850838a2924f17622d91535e90b900a5ae97b66f6b3d
 WHIRLPOOL 
02b1eb02d9eaea592643240de605ecf231856a47276fc7b450cfd052455c621e3329c34bd27cf3260304437ab340a9c1f51661a4f20e827d0904b23a65de7bf6
 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
deleted file mode 100644
index af77a9f..
--- a/sci-geosciences/bt747/bt747-2.1.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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/bt747-2.1.7.ebuild 
b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
similarity index 95%
rename from sci-geosciences/bt747/bt747-2.1.7.ebuild
rename to sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
index b398ec4..e3f74e5 100644
--- a/sci-geosciences/bt747/bt747-2.1.7.ebuild
+++ b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild
@@ -15,21 +15,25 @@ LICENSE="GPL-3"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEP="
+CDEPEND="
dev-java/commons-imaging:0
dev-java/jcalendar:1.2
dev-java/jchart2d:0
-   dev-java/jopt-simple:4.4
+   dev-java/jopt-simple:0
>=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}
+
+RDEPEND="
+   ${CDEPEND}
dev-libs/glib:2[dbus]

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

2016-03-27 Thread Sam Jorna 
commit: c9baafa6d2447796849d903381a003895e353a5d
Author: Sam Jorna  gentoo  org>
AuthorDate: Sun Mar 27 11:36:38 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sun Mar 27 11:57:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9baafa6

sci-geosciences/bt747: bump to 2.1.7

Package-Manager: portage-2.2.28

 sci-geosciences/bt747/Manifest   |  1 +
 sci-geosciences/bt747/bt747-2.1.7.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest
index 5faa997..f564112 100644
--- a/sci-geosciences/bt747/Manifest
+++ b/sci-geosciences/bt747/Manifest
@@ -1,2 +1,3 @@
 DIST BT747_2.1.3_full.zip 9714015 SHA256 
434c1f854a00d146057488c448ca4f9456c38316ef3157ce195aab9b02c789ba SHA512 
519059df07901036c4631936eae90dd2578100432d40fa7a068588ce72004591efd507a259607101e09ad259c328cd533fe6ec5a7f9f4d892aed5eb2a5622ba3
 WHIRLPOOL 
2e42cb3adfba25a7fbb36ccbd9574f205185938116b7f7f2631e1150f04a8a2ccd9c8b8a1fa1bc84c4e1086f880fa47aad24c01da0df6bf044709dff903e26f2
+DIST BT747_2.1.7_full.zip 9649645 SHA256 
d8a9c3920a6b5de75cac41da74e3fa49f134104ea9293504386ebc7a81fc91df SHA512 
362533ccbf6b9252d6d7e09497a75038b0776e76a2c2f73f05e2abc0c521d0a640d0ae9e7d5d40da1d14850838a2924f17622d91535e90b900a5ae97b66f6b3d
 WHIRLPOOL 
02b1eb02d9eaea592643240de605ecf231856a47276fc7b450cfd052455c621e3329c34bd27cf3260304437ab340a9c1f51661a4f20e827d0904b23a65de7bf6
 DIST bt747.gif 5903 SHA256 
6e2aa20d9fcdf44b8ac779f0a12a87480cd6f3f1b47127b250bac978c1d42149 SHA512 
55c3bbc9ec5fe12261b2604980c7b5d4416afa3ec73f7834c62d3ebbdf4580b247c1feb2ac112f876e7110a8aabe652da39d2181f01661435ba465671a631252
 WHIRLPOOL 
15413f4fcfb23051f770c91c9a73bc5a41dc1268b3a985c4d3e33e4dbd36d6aee510c7fdcdf8b26dac296226c175fa6cb927c9f6e8537ab1cf8616f37c2da552

diff --git a/sci-geosciences/bt747/bt747-2.1.7.ebuild 
b/sci-geosciences/bt747/bt747-2.1.7.ebuild
new file mode 100644
index 000..b398ec4
--- /dev/null
+++ b/sci-geosciences/bt747/bt747-2.1.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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
+
+   eapply_user
+}
+
+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
+}

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

2016-03-15 Thread James Le Cuirot 
commit: 0cfbe24f54bb2998d4755625d07f2b0f7cf36896
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Feb 16 13:56:16 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Mar 15 07:05:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfbe24f

sci-geosciences/bt747: Remove old

This drops the only stable version but we have to in order to kill off
Java 6. The new version should get stabilised soon.

Package-Manager: portage-2.2.27

 sci-geosciences/bt747/Manifest   |  1 -
 sci-geosciences/bt747/bt747-2.0.3.ebuild | 63 
 2 files changed, 64 deletions(-)

diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest
index 473ff61..5faa997 100644
--- a/sci-geosciences/bt747/Manifest
+++ b/sci-geosciences/bt747/Manifest
@@ -1,3 +1,2 @@
-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.0.3.ebuild 
b/sci-geosciences/bt747/bt747-2.0.3.ebuild
deleted file mode 100644
index c9f289f..000
--- a/sci-geosciences/bt747/bt747-2.0.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-utils-2 java-pkg-2 java-ant-2
-
-MY_PN=BT747
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="MTK GPS Datalogger Device Control"
-HOMEPAGE="http://bt747.free.fr/;
-SRC_URI="mirror://sourceforge/${PN}/BT747_${PV}_full.zip"
-
-LICENSE="GPL-3"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="
-   >=dev-java/rxtx-2.2_pre2
-   dev-java/swing-layout:1
-   dev-java/jcalendar:1.2
-   dev-java/jcharts
-"
-RDEPEND="${COMMON_DEP}
-   dev-libs/glib:2[dbus]
-   >=virtual/jre-1.5
-"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-1.5
-   app-arch/unzip
-"
-
-EANT_BUILD_TARGET="dist.j2se"
-EANT_EXTRA_ARGS="-Dskip.proguard=yes
-   -Drxtxcomm.jar=lib/RXTXcomm.jar
-   -Dswing-layout.jar=lib/swing-layout.jar
-   -Djcalendar.jar=lib/jcalendar.jar"
-
-S="${WORKDIR}"
-
-java_prepare() {
-   rm -rf dist
-   cd lib
-   rm -rf r* W* c* swing-* w* jca*
-   java-pkg_jar-from rxtx-2
-   java-pkg_jar-from swing-layout-1
-   java-pkg_jar-from jcalendar-1.2
-}
-
-src_install() {
-   dodoc ChangeLog.txt README.txt
-   java-pkg_dojar dist/*.jar
-   java-pkg_jarinto /opt/${PN}-${SLOT}/lib
-   java-pkg_newjar lib/jopt-simple-2.4.1.jar jopt-simple.jar
-   java-pkg_dojar lib/swingx*.jar
-   java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \
-   --java-args="-Xmx192m"
-}

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

2016-02-13 Thread James Le Cuirot 
commit: be4ae75fb49cef2249a97e982428d9181f019d38
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 13 13:02:41 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 13 13:09:38 2016 +
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 000..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 000..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.0 +
 src_j2se/net/sf/bt747/j2se/app/trackgraph/TrackDisplay.java
2016-02-10 22:17:02.188118721 +
+@@ -46,9 +46,9 @@
+ heightAxis.getAxisTitle().setTitle("Height");
+ speedAxis.getAxisTitle().setTitle("Speed");
+ 
+-setAxisXBottom(timeAxis);
+-

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

2015-11-01 Thread Mikle Kolyada 
commit: c384d5ff1a2aba1619fd981df063bccd544824c6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Nov  1 16:13:47 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Nov  1 16:13:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c384d5ff

sci-geosciences/bt747: x86 stable wrt bug #464992

Package-Manager: portage-2.2.20.1

 sci-geosciences/bt747/bt747-2.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/bt747/bt747-2.0.3.ebuild 
b/sci-geosciences/bt747/bt747-2.0.3.ebuild
index d025a51..c9f289f 100644
--- a/sci-geosciences/bt747/bt747-2.0.3.ebuild
+++ b/sci-geosciences/bt747/bt747-2.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/BT747_${PV}_full.zip"
 
 LICENSE="GPL-3"
 SLOT="1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="

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

2015-09-24 Thread Agostino Sarubbo 
commit: 705d1eddc10f0104947b5da9b802b5cba7860d10
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep 24 12:38:06 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep 24 12:38:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705d1edd

sci-geosciences/bt747: amd64 stable wrt bug #464992

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 sci-geosciences/bt747/bt747-2.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/bt747/bt747-2.0.3.ebuild 
b/sci-geosciences/bt747/bt747-2.0.3.ebuild
index 35a6302..d025a51 100644
--- a/sci-geosciences/bt747/bt747-2.0.3.ebuild
+++ b/sci-geosciences/bt747/bt747-2.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/BT747_${PV}_full.zip"
 
 LICENSE="GPL-3"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEP="