Version bump to latest wrt bug#366273. Remove older to fix bug#311807.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

4 files changed, 15 insertions, 122 deletions

diff --git a/sci-geosciences/bt747/ChangeLog b/sci-geosciences/bt747/ChangeLog
index 3f2a950f2be2..bdfd33bebaa6 100644
--- a/sci-geosciences/bt747/ChangeLog
+++ b/sci-geosciences/bt747/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/bt747
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/bt747/ChangeLog,v 1.5 2012/02/27 09:39:20 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/bt747/ChangeLog,v 1.6 2012/05/24 19:55:59 scarabeus Exp $
+
+*bt747-2.0.3 (24 May 2012)
+
+  24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> +bt747-2.0.3.ebuild,
+  -bt747-1.68.22.ebuild, -bt747-1.68.25.ebuild, -bt747-1.68.32.ebuild:
+  Version bump to latest wrt bug#366273. Remove older to fix bug#311807.
 
   27 Feb 2012; Tupone Alfredo <tupone@gentoo.org> metadata.xml:
   Removing me as maintainer
diff --git a/sci-geosciences/bt747/bt747-1.68.22.ebuild b/sci-geosciences/bt747/bt747-1.68.22.ebuild
deleted file mode 100644
index 74d9068c80f9..000000000000
--- a/sci-geosciences/bt747/bt747-1.68.22.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/bt747/bt747-1.68.22.ebuild,v 1.1 2009/07/16 07:17:15 tupone Exp $
-EAPI=2
-
-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}/${MY_P}_full.zip"
-
-LICENSE="GPL-3"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/rxtx:2
-	dev-java/swing-layout:1
-	dev-java/jcalendar:1.2"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-EANT_BUILD_TARGET="dist.j2se"
-EANT_EXTRA_ARGS="-Dskip.proguard=yes
-	-Drxtxcomm.jar=lib/RXTXcomm.jar
-	-Dswinglayout.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* jc*
-	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"
-}
diff --git a/sci-geosciences/bt747/bt747-1.68.32.ebuild b/sci-geosciences/bt747/bt747-1.68.32.ebuild
deleted file mode 100644
index 843b322f4a96..000000000000
--- a/sci-geosciences/bt747/bt747-1.68.32.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/bt747/bt747-1.68.32.ebuild,v 1.1 2010/01/10 22:10:17 bangert Exp $
-EAPI=2
-
-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}/${MY_P}_full.zip"
-
-LICENSE="GPL-3"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/rxtx:2
-	dev-java/swing-layout:1
-	dev-java/jcalendar:1.2"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-EANT_BUILD_TARGET="dist.j2se"
-EANT_EXTRA_ARGS="-Dskip.proguard=yes
-	-Drxtxcomm.jar=lib/RXTXcomm.jar
-	-Dswinglayout.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* jc*
-	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"
-}
diff --git a/sci-geosciences/bt747/bt747-1.68.25.ebuild b/sci-geosciences/bt747/bt747-2.0.3.ebuild
index 3b4e9eb06d60..edf18bf5e89b 100644
--- a/sci-geosciences/bt747/bt747-1.68.25.ebuild
+++ b/sci-geosciences/bt747/bt747-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/bt747/bt747-1.68.25.ebuild,v 1.2 2009/09/19 08:32:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/bt747/bt747-2.0.3.ebuild,v 1.1 2012/05/24 19:55:59 scarabeus Exp $
 EAPI=2
 
 WANT_ANT_TASKS="ant-nodeps"
@@ -12,16 +12,17 @@ MY_P=${MY_PN}_${PV}
 
 DESCRIPTION="MTK GPS Datalogger Device Control"
 HOMEPAGE="http://bt747.free.fr/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_full.zip"
+SRC_URI="mirror://sourceforge/${PN}/BT747_${PV}_full.zip"
 
 LICENSE="GPL-3"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEP="dev-java/rxtx:2
+COMMON_DEP=">=dev-java/rxtx-2.2_pre2
 	dev-java/swing-layout:1
-	dev-java/jcalendar:1.2"
+	dev-java/jcalendar:1.2
+	dev-java/jcharts"
 
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
@@ -32,7 +33,7 @@ DEPEND=">=virtual/jdk-1.5
 EANT_BUILD_TARGET="dist.j2se"
 EANT_EXTRA_ARGS="-Dskip.proguard=yes
 	-Drxtxcomm.jar=lib/RXTXcomm.jar
-	-Dswinglayout.jar=lib/swing-layout.jar
+	-Dswing-layout.jar=lib/swing-layout.jar
 	-Djcalendar.jar=lib/jcalendar.jar"
 
 S="${WORKDIR}"
@@ -40,7 +41,7 @@ S="${WORKDIR}"
 java_prepare() {
 	rm -rf dist
 	cd lib
-	rm -rf r* W* c* swing-* w* jc*
+	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