From: | "Tomas Chvatal (scarabeus)" <scarabeus@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sci-geosciences/josm: ChangeLog josm-4203.ebuild josm-4201.ebuild |
Date: | Sun, 31 Jul 2011 14:10:56 |
Message-Id: | 20110731141038.2A6602004B@flycatcher.gentoo.org |
1 | scarabeus 11/07/31 14:10:38 |
2 | |
3 | Modified: ChangeLog |
4 | Added: josm-4203.ebuild |
5 | Removed: josm-4201.ebuild |
6 | Log: |
7 | Version bump to latest. Drop older. |
8 | |
9 | (Portage version: 2.2.0_alpha49/cvs/Linux x86_64) |
10 | |
11 | Revision Changes Path |
12 | 1.40 sci-geosciences/josm/ChangeLog |
13 | |
14 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/ChangeLog?rev=1.40&view=markup |
15 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/ChangeLog?rev=1.40&content-type=text/plain |
16 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/ChangeLog?r1=1.39&r2=1.40 |
17 | |
18 | Index: ChangeLog |
19 | =================================================================== |
20 | RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v |
21 | retrieving revision 1.39 |
22 | retrieving revision 1.40 |
23 | diff -u -r1.39 -r1.40 |
24 | --- ChangeLog 6 Jul 2011 12:23:37 -0000 1.39 |
25 | +++ ChangeLog 31 Jul 2011 14:10:38 -0000 1.40 |
26 | @@ -1,6 +1,12 @@ |
27 | # ChangeLog for sci-geosciences/josm |
28 | # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 | -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.39 2011/07/06 12:23:37 scarabeus Exp $ |
30 | +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.40 2011/07/31 14:10:38 scarabeus Exp $ |
31 | + |
32 | +*josm-4203 (31 Jul 2011) |
33 | + |
34 | + 31 Jul 2011; Tomáš Chvátal <scarabeus@g.o> -josm-4201.ebuild, |
35 | + +josm-4203.ebuild: |
36 | + Version bump to latest. Drop older. |
37 | |
38 | *josm-4201 (06 Jul 2011) |
39 | |
40 | |
41 | |
42 | |
43 | 1.1 sci-geosciences/josm/josm-4203.ebuild |
44 | |
45 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-4203.ebuild?rev=1.1&view=markup |
46 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/josm/josm-4203.ebuild?rev=1.1&content-type=text/plain |
47 | |
48 | Index: josm-4203.ebuild |
49 | =================================================================== |
50 | # Copyright 1999-2011 Gentoo Foundation |
51 | # Distributed under the terms of the GNU General Public License v2 |
52 | # $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4203.ebuild,v 1.1 2011/07/31 14:10:38 scarabeus Exp $ |
53 | |
54 | EAPI=4 |
55 | |
56 | JAVA_ANT_ENCODING=UTF-8 |
57 | |
58 | [[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion" |
59 | ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk" |
60 | inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS} |
61 | unset SUBVERSION_ECLASS |
62 | |
63 | DESCRIPTION="Java-based editor for the OpenStreetMap project" |
64 | HOMEPAGE="http://josm.openstreetmap.de/" |
65 | [[ ${PV} == "9999" ]] || SRC_URI="http://josm.fabian-fingerle.de/${P}.tar.xz" |
66 | |
67 | LICENSE="GPL-2" |
68 | SLOT="0" |
69 | [[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86" |
70 | |
71 | DEPEND=">=virtual/jdk-1.6" |
72 | RDEPEND=">=virtual/jre-1.6" |
73 | |
74 | S="${WORKDIR}/${PN}" |
75 | |
76 | IUSE="" |
77 | |
78 | src_prepare() { |
79 | if [[ ${PV} == "9999" ]]; then |
80 | sed -i \ |
81 | -e "s:josm-custom.jar:josm.jar:" \ |
82 | -e "s:josm-custom-optimized.jar:josm-optimized.jar:" \ |
83 | build.xml || die "Sed failed" |
84 | |
85 | # create-revision needs the compile directory to be a svn directory |
86 | # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html |
87 | sed -i \ |
88 | -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \ |
89 | build.xml || die "Sed failed" |
90 | fi |
91 | } |
92 | |
93 | src_compile() { |
94 | eant dist |
95 | } |
96 | |
97 | src_install() { |
98 | java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed" |
99 | java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed" |
100 | |
101 | newicon images/logo.png josm.png || die "newicon failed" |
102 | make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Science;Geoscience" |
103 | } |