josm bump

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 47 insertions, 69 deletions

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index 4b365c1602ca..8423df15bcbf 100644
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/josm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.25 2009/05/04 20:10:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.26 2009/05/23 09:14:29 hanno Exp $
+
+*josm-1.607 (23 May 2009)
+
+  23 May 2009; Hanno Boeck <hanno@gentoo.org> +josm-1.607.ebuild:
+  Version bump.
 
 *josm-1.566 (04 May 2009)
 
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 3ee6be7da764..80dc10c21f0f 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -4,19 +4,17 @@ Hash: SHA1
 AUX josm-r1 304 RMD160 a54bbdbbc2cd1b8ca4deeb11604be22df4194444 SHA1 0bd5757ed573a2c274d76c0b4ba4b770134a0734 SHA256 c407df927e62c4e2afbff998e105dfe4084ab07484a4b28a00f196e7dafee3cf
 AUX josm.png 1737 RMD160 81fc37d55d4b6b14f9a35c3ed89da3ecd7d538f2 SHA1 cd51f118224555727279536bb42a634afcef6626 SHA256 fed9c1ef73900e6a3cac162a4006ab8cd972ba29938a857e8af604779109c39f
 DIST josm-1566.tar.lzma 3858340 RMD160 3664d937d7ce39c07f0f89e3bdd5433c034da363 SHA1 b12dd1f8a43edf01aa3895de1eceb77b37671d29 SHA256 64a76748a1d6e4406d452f26d40d4049e736a7c08c2a1be1aa32a86d31d5b9d2
-DIST josm-snapshot-1479.jar 4419542 RMD160 a5a2852373e44c7f30a630fbd0d8b4e7efb86716 SHA1 ab0822b7e833b0d2b2ff24b75425e222c3a1aa6b SHA256 92d435098fee30fa82f48c85b6c9db9930edcbca013c66420ef1105dd2336f54
-DIST josm-snapshot-1515.jar 4594623 RMD160 97e90f98646b96ee8b450ed5421b1b912721c533 SHA1 9d1e9a6564bcc3f05464860975ed48c93b1e368e SHA256 df9d5108742cdba4df575f1f680ccc4adbd3236017e2001dca5d901a2bb3bed4
+DIST josm-1607.tar.lzma 4127521 RMD160 342e0ff225c21d3808a586627cab3a12b8dbe1ab SHA1 7d99bcf5a60d429c108739db2ba6dbb4b24053b8 SHA256 8f258f79aa832ab793304ee5a02c74e07cd83a7e58ecfbc1f794f24816fbe70b
 DIST josm-snapshot-1526.jar 4623651 RMD160 bb1f075cd85abbf0e69454d5ba5729828172d7fb SHA1 70d1d55fbea5eadf3086499900aa2c7f1a4462ba SHA256 3900fa32477de95bbd43d0abe50b473daac10e8ecabf9e386f8b2b619aca033c
-EBUILD josm-1.479.ebuild 969 RMD160 a763fc140a6711bda5f6670194fa3436b2a92dd9 SHA1 90709921f02323def5a3a4a83b549d4cd9ef9f65 SHA256 7ef0cef4621a4b5e1bded62d96bdf83b7fc025cd618695bc3dd68333c23be1e1
-EBUILD josm-1.515.ebuild 969 RMD160 2b8ff43355f50044c6a60db6bfec52f0202981a2 SHA1 bcd5e9d88525b845a5e25c56bd73a4ce13d831e3 SHA256 fffee18f0110d393c2133c9034e809c6c34a7b8ae3472ad63454aef511b1434f
 EBUILD josm-1.526.ebuild 969 RMD160 66a4d92e61cc6223540612333f5f8de3de44da29 SHA1 c5aadfc1f8053021b3fc03e3a7bf65b00f31f794 SHA256 d39dfc41b10127553b3c2c46990f8ca74021d9ad027cf252477bee1227f46b73
 EBUILD josm-1.566.ebuild 940 RMD160 bd4bc550edb0da3ae37596f891a638da6f3e7fd0 SHA1 ce5e21573d369c60e36f03c895e5e8db89cfff1f SHA256 244aef0bb05b0739e50c11f85ac203925c448051ab6eb50d5b7a39720598e37c
-MISC ChangeLog 3336 RMD160 f41385a03b967e9220f35e221a57080775d8790c SHA1 63d7714d91ebd6abee268233995714a83fa954d0 SHA256 bc267f7f4bf8381a8033641eaced3f2924905bb8e9d6fc11742cead98cd4cd80
+EBUILD josm-1.607.ebuild 940 RMD160 4c0e52f152a60255bca01f1704231c3607fa242c SHA1 991dae464414fb27d5aee2305ea4da4b0b76aa8f SHA256 f09c2255085d1e87b31e56c57e4d1c3da0b6957e9e1cd7b5af2deb11143694ca
+MISC ChangeLog 3446 RMD160 53394875bd8dc284b757f5bf0bdb41526d2ddddd SHA1 4d67a77e87856618aaae9ab7433d934bd16bec60 SHA256 38cf28a391120fb98db1c2117e25d916d9a76643f72fe23c6054b70be11bb02f
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn/S7kACgkQr2QksT29OyAOMACglBr2z/p5Nd9CVHmQJ40WjA/T
-plYAnRaFss23wBGd31XYLwAkLHCXBPFv
-=MEI5
+iEYEARECAAYFAkoXvn0ACgkQr2QksT29OyCZMACgpHr9O8Y+waeTTNNXzylC6lDv
++TcAoJQdWEhGJYZp1LiIVyvmdfkqR50S
+=WUVI
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/josm/josm-1.479.ebuild b/sci-geosciences/josm/josm-1.479.ebuild
deleted file mode 100644
index 9d94e3226de8..000000000000
--- a/sci-geosciences/josm/josm-1.479.ebuild
+++ /dev/null
@@ -1,30 +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/josm/josm-1.479.ebuild,v 1.1 2009/03/18 12:12:19 hanno Exp $
-
-inherit eutils java-pkg-2
-
-MY_P=${PN}-snapshot-${PV/./}
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="http://josm.openstreetmap.de/"
-SRC_URI="http://josm.openstreetmap.de/download/${MY_P}.jar"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=virtual/jre-1.6"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}"
-
-IUSE=""
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}/${MY_P}.jar"
-
-	# Using the eclass doesn't let us support the http_proxy var,
-	# so we're using our own startscript for now.
-	#java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
-	newbin "${FILESDIR}/${PN}-r1" "${PN}" || die "dobin failed"
-
-	doicon "${FILESDIR}/josm.png" || die "doicon failed"
-	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Application"
-}
diff --git a/sci-geosciences/josm/josm-1.515.ebuild b/sci-geosciences/josm/josm-1.515.ebuild
deleted file mode 100644
index 9e0f0c9b8a91..000000000000
--- a/sci-geosciences/josm/josm-1.515.ebuild
+++ /dev/null
@@ -1,30 +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/josm/josm-1.515.ebuild,v 1.1 2009/04/01 12:24:28 hanno Exp $
-
-inherit eutils java-pkg-2
-
-MY_P=${PN}-snapshot-${PV/./}
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="http://josm.openstreetmap.de/"
-SRC_URI="http://josm.openstreetmap.de/download/${MY_P}.jar"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=virtual/jre-1.6"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}"
-
-IUSE=""
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}/${MY_P}.jar"
-
-	# Using the eclass doesn't let us support the http_proxy var,
-	# so we're using our own startscript for now.
-	#java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
-	newbin "${FILESDIR}/${PN}-r1" "${PN}" || die "dobin failed"
-
-	doicon "${FILESDIR}/josm.png" || die "doicon failed"
-	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Application"
-}
diff --git a/sci-geosciences/josm/josm-1.607.ebuild b/sci-geosciences/josm/josm-1.607.ebuild
new file mode 100644
index 000000000000..63c13932ca00
--- /dev/null
+++ b/sci-geosciences/josm/josm-1.607.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-1.607.ebuild,v 1.1 2009/05/23 09:14:29 hanno Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P=${PN}-${PV/./}
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+SRC_URI="http://josm.fabian-fingerle.de/${MY_P}.tar.lzma"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+IUSE=""
+
+src_compile() {
+	JAVA_ANT_ENCODING=UTF-8
+	eant dist
+}
+
+src_install() {
+	java-pkg_newjar "dist/${PN}-custom.jar" || die "java-pkg_newjar failed"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+	newicon images/logo.png josm.png || die "newicon failed"
+	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Application"
+}