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

[Patrice Clement]

commit:     c04c73f4d1f6e54afe8a8d188cfcf4354eb06655
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 21 07:56:02 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Sep 21 08:09:39 2016 +0000
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..00000000
--- 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]
 	>=virtual/jre-1.7
 "
-DEPEND="${COMMON_DEP}
+
+DEPEND="
+	${CDEPEND}
 	>=virtual/jdk-1.7
 	app-arch/unzip
 "