josm bump

Package-Manager: portage-2.1.10.37/cvs/Linux x86_64

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index 23ed4025bb3d83b7c92d15ca6fb4d02f4e2a3758..665022959fb3f2dc52b69233fcb1b05f6fff334e 100644 (file)
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/josm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.40 2011/07/31 14:10:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.41 2011/11/24 18:55:06 hanno Exp $
+
+*josm-4550 (24 Nov 2011)
+
+  24 Nov 2011; Hanno Boeck <hanno@gentoo.org> +josm-4550.ebuild:
+  Bump and use optimized jar.
 
 *josm-4203 (31 Jul 2011)
 

diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index 37354d716c203be8fbefd2312f64f9f2c939ce99..5931f33a6ec8cec347cdab8365d868e7f044cc67 100644 (file)
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST josm-4203.tar.xz 6243924 RMD160 fbb308b128be66698126c475ad1d025afa5aa727 SHA1 9177456b0566107f7352daad8b731b902d02c2bd SHA256 966917ebefd15f035c6972d026301c9ea4eeabfc62821b877a4d665cbb4fe13f
+DIST josm-4550.tar.xz 14950388 RMD160 0817f772aed51c7d76d3a58754a03e897f496354 SHA1 fed968dcbba1959a2e77f59a7a46eb5c36eea5e6 SHA256 605aaaa2ca903a70a0abf1068fce8d0a349d8ea18d47c31bab1b2f5a3c5c9e60
 EBUILD josm-4203.ebuild 1599 RMD160 8d025bc6bbb806e25b73536ca2efde2c9dfdb4f2 SHA1 a2d3714be719412026cb4e9dd32721c328152f44 SHA256 af0ade62e78aaf0981f31b4d85a51c850d2615fbd45de096687726c23d7e2a6b
+EBUILD josm-4550.ebuild 1627 RMD160 f2a13f9aa020c456a2b8e083475f62ad7435b936 SHA1 8c7180e5a2e2eefe0dadd55c5d7fc8953d68111c SHA256 f15afe516eda25d4c881c3cb9c5e08336ec982c443d6ddaa9aea8ac786d6365d
 EBUILD josm-9999.ebuild 1599 RMD160 32a3665110ec43ae40f068e6c8fea8e2ac24ce80 SHA1 375eb6d57b04dd28dff096249fac7b4f6f1ca68a SHA256 c50f6c5efee1bd05cc914496e2a830805ab24f6a2947002a76921144351d93d8
-MISC ChangeLog 5344 RMD160 df188ef2854b909bf0fd26eb7de111f2ac34db36 SHA1 2f6a7f22f7191c794b83811f7385818c811c4759 SHA256 0ce5a6e2734195b31a98fa04f6dba111b9d49034f4e4503571dbc74e297d396b
+MISC ChangeLog 5462 RMD160 7e1ed8a8c354567325d1a0196c1aa8016fcec016 SHA1 71a32405dd96295f6698d6078aff0bf51d6764b8 SHA256 0d6c56fe916373e9178fa94686254f769b4b7846a91fa9fdcef2304c5565965b
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk41YkEACgkQHB6c3gNBRYdYhQCfeZMh3mTjbQOoq9eh2+/svIWa
-TOwAoMQuEPxlXgeY4Pgsc7+CKkWnKyRC
-=Ysm3
+iQIcBAEBCAAGBQJOzpMLAAoJEKWIAHK7tR5CYAgP/RJ7toQ4e88hoORVXrh6P4jq
+cqahv773Qy/2VOt4fRc0pQEuqS7jPH9TjORYk5o3tOVF8+cGpakKr8H1CCI21F6n
+5/rKAUmY7xuXWi//A3xVGxyoZfiubuqP5oBU/ABFmhN8+xt0mz6Wthb57G9SFaQI
+puwxwMPJKR451oyCx6Jq0B+zYCmKe04aYHZuXOdDUZpVQIQYkhejmnqcWadTP3oB
+6+jkYb0BDzZWI6CB4fx079G3bI3tJR/c7SquBgOuA4onTp7sQ0jzl9hozxbnuRE3
+n0FWqBSa9VjX/5QUkwBKashgLMUZsjqNcaIA+2R01olki7FK/0RztXeQyvgjgxBm
+Tji0y4SgM1e3Hmuhxo5CqscKTUZCWxvNKiiA/HscVSwgwT/+bEnyLO3oGa0DKsps
+P4K/l463k0Z2I3VkfzP7Z2wOeir0GH7Wh3wZGxFo8tdVa7t/Mei2g8bnVY5CacFf
+wDuT2/1no7l2ZyCG1xD1b8fGGaC/nq0jeg2PyIWShXJ6w8BevYyYV44REgHQz2jD
+8g4kA4PaE/0btpn6S8Wt/I84eeCJZTuECToHZeVN65fGO2sztDqfyU4yfMcCwDOl
+PoOrGMRcUyjYztbVV+TEoKYAjcyeg43cUJKg1fYcJolv2snarvxr+76CXahIZ3e8
+liH/mkvuII954JmALQYK
+=0O2I
 -----END PGP SIGNATURE-----

diff --git a/sci-geosciences/josm/josm-4550.ebuild b/sci-geosciences/josm/josm-4550.ebuild
new file mode 100644 (file)
index 0000000..d0daca9
--- /dev/null
+++ b/sci-geosciences/josm/josm-4550.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4550.ebuild,v 1.1 2011/11/24 18:55:06 hanno Exp $
+
+EAPI=4
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+[[ ${PV} == "9999" ]] || SRC_URI="http://josm.fabian-fingerle.de/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+IUSE=""
+
+src_prepare() {
+       if [[ ${PV} == "9999" ]]; then
+               sed -i \
+                       -e "s:josm-custom.jar:josm.jar:" \
+                       -e "s:josm-custom-optimized.jar:josm-optimized.jar:" \
+                       build.xml || die "Sed failed"
+
+               # create-revision needs the compile directory to be a svn directory
+               # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+               sed -i \
+                       -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+                       build.xml || die "Sed failed"
+       fi
+}
+
+src_compile() {
+       eant dist-optimized
+}
+
+src_install() {
+       java-pkg_newjar "dist/${PN}-optimized.jar" "${PN}.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 "Science;Geoscience"
+}